test: avoid repeated screen lines in expected states

This is the command invoked repeatedly to make the changes:

    :%s/^\(.*\)|\%(\*\(\d\+\)\)\?$\n\1|\%(\*\(\d\+\)\)\?$/\=submatch(1)..'|*'..(max([str2nr(submatch(2)),1])+max([str2nr(submatch(3)),1]))/g

2 files changed, 24 insertions, 145 deletions

diff --git a/test/functional/treesitter/fold_spec.lua b/test/functional/treesitter/fold_spec.lua
index a8abbc002b..bcace366bd 100644
--- a/test/functional/treesitter/fold_spec.lua
+++ b/test/functional/treesitter/fold_spec.lua
@@ -157,10 +157,7 @@ void ui_refresh(void)
       {1:3}    }                                                      |
       {1:2}  }                                                        |
       {1:│}^}                                                          |
-      {2:~                                                           }|
-      {2:~                                                           }|
-      {2:~                                                           }|
-      {2:~                                                           }|
+      {2:~                                                           }|*4
       {3:[No Name] [+]                                               }|
       {1:-}void ui_refresh(void)                                      |
       {1:│}{                                                          |
@@ -181,9 +178,7 @@ void ui_refresh(void)
       {1:3}    }                                                      |
       {1:2}  }                                                        |
       {1:│}}                                                          |
-      {2:~                                                           }|
-      {2:~                                                           }|
-      {2:~                                                           }|
+      {2:~                                                           }|*3
       {4:[No Name] [+]                                               }|
                                                                   |
     ]]}
@@ -208,12 +203,7 @@ void ui_refresh(void)
       {1:2}    }                                                      |
       {1:│}  }                                                        |
       {1: }}                                                          |
-      {2:~                                                           }|
-      {2:~                                                           }|
-      {2:~                                                           }|
-      {2:~                                                           }|
-      {2:~                                                           }|
-      {2:~                                                           }|
+      {2:~                                                           }|*6
       {3:[No Name] [+]                                               }|
       {1: }  int width = INT_MAX, height = INT_MAX;                   |
       {1: }  bool ext_widgets[kUIExtCount];                           |
@@ -232,11 +222,7 @@ void ui_refresh(void)
       {1:2}    }                                                      |
       {1:│}  }                                                        |
       {1: }}                                                          |
-      {2:~                                                           }|
-      {2:~                                                           }|
-      {2:~                                                           }|
-      {2:~                                                           }|
-      {2:~                                                           }|
+      {2:~                                                           }|*5
       {4:[No Name] [+]                                               }|
                                                                   |
     ]]}
@@ -264,10 +250,7 @@ void ui_refresh(void)
       {1:3}    }                                                      |
       {1:2}  }                                                        |
       {1:│}}                                                          |
-      {2:~                                                           }|
-      {2:~                                                           }|
-      {2:~                                                           }|
-      {2:~                                                           }|
+      {2:~                                                           }|*4
       {3:[No Name] [+]                                               }|
       {1:-}void ui_refresh(void)                                      |
       {1:│}{                                                          |
@@ -288,9 +271,7 @@ void ui_refresh(void)
       {1:3}    }                                                      |
       {1:2}  }                                                        |
       {1:│}}                                                          |
-      {2:~                                                           }|
-      {2:~                                                           }|
-      {2:~                                                           }|
+      {2:~                                                           }|*3
       {4:[No Name] [+]                                               }|
                                                                   |
     ]]}
@@ -324,12 +305,7 @@ void ui_refresh(void)
       {1:  }    }                                                     |
       {1:  }  }                                                       |
       {1:  }}                                                         |
-      {3:~                                                           }|
-      {3:~                                                           }|
-      {3:~                                                           }|
-      {3:~                                                           }|
-      {3:~                                                           }|
-      {3:~                                                           }|
+      {3:~                                                           }|*6
       {4:[No Name] [+]                                               }|
       {1:+ }{2:+--  9 lines: void ui_refresh(void)·······················}|
       {1:  }  for (size_t i = 0; i < ui_count; i++) {                 |
@@ -342,11 +318,7 @@ void ui_refresh(void)
       {1:  }    ^}                                                     |
       {1:  }  }                                                       |
       {1:  }}                                                         |
-      {3:~                                                           }|
-      {3:~                                                           }|
-      {3:~                                                           }|
-      {3:~                                                           }|
-      {3:~                                                           }|
+      {3:~                                                           }|*5
       {5:[No Name] [+]                                               }|
                                                                   |
     ]], attr_ids={
@@ -409,9 +381,7 @@ void qsort(void *base, size_t nel, size_t width, int (*compar)(const void *, con
     feed('ggVGzf')
     screen:expect{grid=[[
       {2:^void}{1: }{3:qsort}{4:(}{2:void}{1: }{5:*}{3:base}{4:,}{1: }{2:size_t}{1: }{3:nel}{4:,}{1: }{2:size_t}{1: }{3:width}{4:,}{1: }{2:int}{1: }{4:(}{5:*}{3:compa}|
-      {0:~                                                           }|
-      {0:~                                                           }|
-      {0:~                                                           }|
+      {0:~                                                           }|*3
                                                                   |
     ]]}
   end)
@@ -465,9 +435,7 @@ end]])
     feed('ggVGzf')
     screen:expect{grid=[[
       {1:^+-- 19 lines: void qsort(void *base, size_t nel, size_t widt}|
-      {0:~                                                           }|
-      {0:~                                                           }|
-      {0:~                                                           }|
+      {0:~                                                           }|*3
                                                                   |
     ]]}
   end)
diff --git a/test/functional/treesitter/highlight_spec.lua b/test/functional/treesitter/highlight_spec.lua
index e037c9e215..01f92de0d6 100644
--- a/test/functional/treesitter/highlight_spec.lua
+++ b/test/functional/treesitter/highlight_spec.lua
@@ -100,17 +100,7 @@ local injection_grid_c = [[
                 return 42;  \                                      |
               }                                                    |
   ^                                                                 |
-  {1:~                                                                }|
-  {1:~                                                                }|
-  {1:~                                                                }|
-  {1:~                                                                }|
-  {1:~                                                                }|
-  {1:~                                                                }|
-  {1:~                                                                }|
-  {1:~                                                                }|
-  {1:~                                                                }|
-  {1:~                                                                }|
-  {1:~                                                                }|
+  {1:~                                                                }|*11
                                                                    |
 ]]
 
@@ -121,17 +111,7 @@ local injection_grid_expected_c = [[
                 {4:return} {5:42};  \                                      |
               }                                                    |
   ^                                                                 |
-  {1:~                                                                }|
-  {1:~                                                                }|
-  {1:~                                                                }|
-  {1:~                                                                }|
-  {1:~                                                                }|
-  {1:~                                                                }|
-  {1:~                                                                }|
-  {1:~                                                                }|
-  {1:~                                                                }|
-  {1:~                                                                }|
-  {1:~                                                                }|
+  {1:~                                                                }|*11
                                                                    |
 ]]
 
@@ -178,8 +158,7 @@ describe('treesitter highlighting (C)', function()
                        1, (void *)(ptrdiff_t)cb);                      |
         return 0;                                                      |
       ^}                                                                |
-      {1:~                                                                }|
-      {1:~                                                                }|
+      {1:~                                                                }|*2
                                                                        |
     ]]}
 
@@ -204,8 +183,7 @@ describe('treesitter highlighting (C)', function()
                        {5:1}, ({3:void} *)({3:ptrdiff_t})cb);                      |
         {4:return} {5:0};                                                      |
       ^}                                                                |
-      {1:~                                                                }|
-      {1:~                                                                }|
+      {1:~                                                                }|*2
                                                                        |
     ]]}
 
@@ -227,8 +205,7 @@ describe('treesitter highlighting (C)', function()
                        {5:1}, ({3:void} *)({3:ptrdiff_t})cb);                      |
         {4:return} {5:0};                                                      |
       }                                                                |
-      {1:~                                                                }|
-      {1:~                                                                }|
+      {1:~                                                                }|*2
                                                                        |
     ]]}
 
@@ -366,8 +343,7 @@ describe('treesitter highlighting (C)', function()
         {4:for} ({3:UIExtension} i = {5:0}; ({3:int})i < kUIExtCount; i++) {           |
         {4:for} ({3:size_t} i = {5:0}; i < ui_count; i++) {                        |
         {3:int} width = {5:INT_MAX}, height = {5:INT_MAX};                         |
-        }                                                              |
-        }                                                              |
+        }                                                              |*2
       {3:void} ui_refresh({3:void})                                            |
       :sort                                                            |
     ]]}
@@ -517,17 +493,7 @@ describe('treesitter highlighting (C)', function()
                     {4:return} {5:42};  \                                      |
                   }                                                    |
       ^                                                                 |
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
+      {1:~                                                                }|*11
                                                                        |
     ]]}
   end)
@@ -556,8 +522,7 @@ describe('treesitter highlighting (C)', function()
                        {5:1}, ({3:void} *)({3:ptrdiff_t})cb);                      |
         {4:return} {5:0};                                                      |
       ^}                                                                |
-      {1:~                                                                }|
-      {1:~                                                                }|
+      {1:~                                                                }|*2
                                                                        |
     ]]}
 
@@ -580,8 +545,7 @@ describe('treesitter highlighting (C)', function()
                        {5:1}, ({3:void} *)({3:ptrdiff_t})cb);                      |
         {4:return} {5:0};                                                      |
       ^}                                                                |
-      {1:~                                                                }|
-      {1:~                                                                }|
+      {1:~                                                                }|*2
                                                                        |
     ]]}
     screen:expect{ unchanged=true }
@@ -608,17 +572,7 @@ describe('treesitter highlighting (C)', function()
       {8:              }{12:return}{8: 42;  \}                                      |
       {8:            }}                                                    |
       ^                                                                 |
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
+      {1:~                                                                }|*11
                                                                        |
     ]], attr_ids={
       [1] = {bold = true, foreground = Screen.colors.Blue1};
@@ -641,21 +595,7 @@ describe('treesitter highlighting (C)', function()
     screen:expect{grid=[[
       char* x = "Will somebody ever read this?";                       |
       ^                                                                 |
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
+      {1:~                                                                }|*15
                                                                        |
     ]]}
 
@@ -672,21 +612,7 @@ describe('treesitter highlighting (C)', function()
     screen:expect{grid=[[
       {3:char}* x = {5:"Will somebody ever read this?"};                       |
       ^                                                                 |
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
+      {1:~                                                                }|*15
                                                                        |
     ]]}
 
@@ -695,21 +621,7 @@ describe('treesitter highlighting (C)', function()
     screen:expect{grid=[[
       {5:char}* x = {5:"Will somebody ever read this?"};                       |
       ^                                                                 |
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
-      {1:~                                                                }|
+      {1:~                                                                }|*15
                                                                        |
     ]]}
   end)
@@ -747,8 +659,7 @@ describe('treesitter highlighting (C)', function()
                        1, (void *)(ptrdiff_t)cb);                      |
         return 0;                                                      |
       ^}                                                                |
-      {1:~                                                                }|
-      {1:~                                                                }|
+      {1:~                                                                }|*2
                                                                        |
     ]]}
   end)