patch 9.2.0270: test: trailing spaces used in tests

Problem:  test: trailing spaces used in tests
Solution: Rewrite tests to avoid trailing spaces (Paul Ollis).

Some tests currently rely on trailing whitespace at the end of lines,
escaped with '\'. I have demonstrated in another PR, such spaces can be
inadvertently removed and this is difficult to spot.

Note: there are more trailing spaces in a few more test files, see
testdir/test_codestyle.vim. Those are not yet removed.

closes: #19838

Signed-off-by: Paul Ollis <paul@cleversheep.org>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/testdir/test_conceal.vim b/src/testdir/test_conceal.vim
index 360e600b472bc72a8a01dbe27f51309122ca8048..de60cd8286cc9b5a5831fa08999c5dc7c4fb94c8 100644 (file)
--- a/src/testdir/test_conceal.vim
+++ b/src/testdir/test_conceal.vim
@@ -148,7 +148,7 @@ func Test_conceal_with_cursorcolumn()
           \ "three |hidden| three three three three three three three three"]
     call setline(1, lines)
     set wrap linebreak
-    set showbreak=\ >>>\ 
+    let &showbreak = ' >>> '
     syntax match test /|hidden|/ conceal
     set conceallevel=2
     set concealcursor=

diff --git a/src/testdir/test_display.vim b/src/testdir/test_display.vim
index 7717b866ba0ba03e71f3ce2827d6a83ea40a75b3..cbb4f4fc6d392a3c541ef49abbe46b5eb007aa23 100644 (file)
--- a/src/testdir/test_display.vim
+++ b/src/testdir/test_display.vim
@@ -342,7 +342,7 @@ func Test_eob_fillchars()
   set fillchars=eob:+
   redraw
   call assert_equal('+', Screenline(2))
-  set fillchars=eob:\ 
+  let &fillchars = 'eob: '
   redraw
   call assert_equal(' ', nr2char(screenchar(2, 1)))
   set fillchars&
@@ -413,7 +413,7 @@ func Test_fold_fillchars()
   call assert_equal(expected, lines)
 
   " check setting foldinner
-  set fillchars+=foldinner:\ 
+  let &fillchars = &fillchars .. ',foldinner: '
   let lines = ScreenLines([1, 6], 22)
   let expected = [
         \ ' one                  ',

diff --git a/src/testdir/test_ins_complete.vim b/src/testdir/test_ins_complete.vim
index 2796379c9191b2a7b5c4847212c06e3690f4b7f0..7f235dc5931ba8db16a1e02ca6eebce758b1c9cb 100644 (file)
--- a/src/testdir/test_ins_complete.vim
+++ b/src/testdir/test_ins_complete.vim
@@ -3311,7 +3311,9 @@ endfunc
 func Test_ins_complete_end_of_line()
   " this was reading past the end of the line
   new
-  norm 8o\80ý 
+  " Note that the 'space' at the end of the expression below is a non-breaking
+  " space, U+00a0.
+  execute "norm 8o\80ý "
   sil! norm o\10\18\10\18\10
 
   bwipe!

diff --git a/src/testdir/test_listchars.vim b/src/testdir/test_listchars.vim
index 741b20d9b4dbc34b49b456497bf3782fc469a62b..957a0f4e35a740409a01fd99d50dd9fddbc5be58 100644 (file)
--- a/src/testdir/test_listchars.vim
+++ b/src/testdir/test_listchars.vim
@@ -420,7 +420,7 @@ func Test_listchars()
 
   " Test leadtab with pipe character
   normal ggdG
-  set listchars=tab:>-,leadtab:\|\ 
+  let &listchars = 'tab:>-,leadtab:| '
   call append(0, ["\ttext"])
   let expected = ['|       text']
   call Check_listchars(expected, 1, 12)
@@ -428,7 +428,7 @@ func Test_listchars()
 
   " Test leadtab with unicode bar
   normal ggdG
-  set listchars=tab:>-,leadtab:│\ 
+  let &listchars = 'tab:>-,leadtab:│ '
   call append(0, ["\ttext"])
   let expected = ['│       text']
   call Check_listchars(expected, 1, 12)

diff --git a/src/testdir/test_normal.vim b/src/testdir/test_normal.vim
index 4f353c5b8c1db659da792b7a05fa29fbac08ee4d..4f435610bdaaca73c57131017beeeda9d3f57796 100644 (file)
--- a/src/testdir/test_normal.vim
+++ b/src/testdir/test_normal.vim
@@ -4434,6 +4434,7 @@ endfunc
 "
 " The problem occurred because WM_SETFOCUS was processed slowly, and typebuf
 " was not empty when it should have been.
+" TODO: Is this test flaky?
 func Test_win32_gui_setfocus_prevent_showcmd()
   if !has('win32') || !has('gui_running')
     throw 'Skipped: Windows GUI regression test'

diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index 57dd03ed90255e2126c0d188c993696ec0cb193b..023d8906764a00d75c6117d32687b3584e8b1df7 100644 (file)
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -1165,7 +1165,7 @@ func Test_popup_with_showbreak()
   CheckScreendump
 
   let lines =<< trim END
-        set showbreak=>>\ 
+        let &showbreak ='>> '
         call setline(1, range(1, 20))
         let winid = popup_dialog(
           \ 'a long line here that wraps',

diff --git a/src/testdir/test_scroll_opt.vim b/src/testdir/test_scroll_opt.vim
index 2b82410b9ca15ef67d0cc585572f629364f899f9..99fd32a0094b44319b6acacb0dbeab41131eeaf1 100644 (file)
--- a/src/testdir/test_scroll_opt.vim
+++ b/src/testdir/test_scroll_opt.vim
@@ -517,7 +517,8 @@ func Test_smoothscroll_long_line_showbreak()
       vim9script
       # a line that spans four screen lines
       setline(1, 'with lots of text in one line '->repeat(6))
-      set smoothscroll scrolloff=0 showbreak=+++\ 
+      set smoothscroll scrolloff=0
+      &showbreak = '+++ '
   END
   call writefile(lines, 'XSmoothLongShowbreak', 'D')
   let buf = RunVimInTerminal('-S XSmoothLongShowbreak', #{rows: 6, cols: 40})

diff --git a/src/testdir/test_signs.vim b/src/testdir/test_signs.vim
index bde3d047606c23e7e8b9e8c94e0e7e19b84d48d5..627f6416a84f73b3174206272478624bfcc3fe10 100644 (file)
--- a/src/testdir/test_signs.vim
+++ b/src/testdir/test_signs.vim
@@ -165,7 +165,9 @@ func Test_sign()
 
   sign define Sign5 text=X\  linehl=Comment
   sign undefine Sign5
-  sign define Sign5 linehl=Comment text=X\ 
+  " The use of execute in the next line is just to ensure the space for
+  " the text value is obvious and does not get accidently deleted.
+  execute "sign define Sign5 linehl=Comment text=X\ "
   sign undefine Sign5
 
   " define sign with backslash

diff --git a/src/testdir/test_textprop.vim b/src/testdir/test_textprop.vim
index f8323019bd5e21b1db4218ba5717609737801537..09b6e87f4761fb04c49dedf7400c972cb3527875 100644 (file)
--- a/src/testdir/test_textprop.vim
+++ b/src/testdir/test_textprop.vim
@@ -3606,7 +3606,7 @@ func Test_props_with_text_below_nowrap()
       vim9script
       edit foobar
       set nowrap
-      set showbreak=+++\ 
+      set showbreak=+++
       setline(1, ['onasdf asdf asdf sdf df asdf asdf e asdf asdf asdf asdf asd fas df', 'two'])
       prop_type_add('test', {highlight: 'Special'})
       prop_add(1, 0, {
@@ -4273,7 +4273,7 @@ func Test_text_after_wrap_showbreak()
     set shiftwidth=4
 
     set breakindent
-    set showbreak=>\ 
+    let &showbreak = '> '
     set breakindentopt=shift:2,min:64
 
     call setline(1, ['        " 1234567890', 'foo', 'bar'])

diff --git a/src/version.c b/src/version.c
index 50844e28d8aa6078bafe5a759536a19e64f8d300..24341528f4437a55e67c9528a62e1f58c5844a6a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    270,
 /**/
     269,
 /**/