From 8c24e1462c567c30410d3a45e552ecffc95bbd1d Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Wed, 17 Nov 2021 07:07:15 +0800
Subject: vim-patch:8.2.2518: 'listchars' should be window-local

Problem:    'listchars' should be window-local.
Solution:   Make 'listchars' global-local. (Yegappan Lakshmanan, Marco Hinz,
            closes vim/vim#5206, closes vim/vim#7850)
https://github.com/vim/vim/commit/eed9d46293f0842aad0d50ff3a526f9a48b12421

Nvim already has this feature, but it implements :set listchars the same
as :setglobal listchars, which is incorrect. Vim's implementation of
:set listchars is correct: using :set listchars clears local value.
---
 src/nvim/testdir/test_listchars.vim | 115 +++++++++++++++++++++++++++++++++++-
 src/nvim/testdir/test_listlbr.vim   |   2 +
 2 files changed, 114 insertions(+), 3 deletions(-)

(limited to 'src/nvim/testdir')

diff --git a/src/nvim/testdir/test_listchars.vim b/src/nvim/testdir/test_listchars.vim
index 8a1393a45d..f57d4f9ab9 100644
--- a/src/nvim/testdir/test_listchars.vim
+++ b/src/nvim/testdir/test_listchars.vim
@@ -112,7 +112,7 @@ func Test_listchars()
 
   " Test lead and trail
   normal ggdG
-  set listchars=eol:$
+  set listchars=eol:$  " Accommodate Nvim default
   set listchars+=lead:>,trail:<,space:x
   set list
 
@@ -142,7 +142,7 @@ func Test_listchars()
 
   " Test multispace
   normal ggdG
-  set listchars=eol:$
+  set listchars=eol:$  " Accommodate Nvim default
   set listchars+=multispace:yYzZ
   set list
 
@@ -301,7 +301,7 @@ func Test_listchars_invalid()
   enew!
   set ff=unix
 
-  set listchars=eol:$
+  set listchars=eol:$  " Accommodate Nvim default
   set list
   set ambiwidth=double
 
@@ -365,3 +365,112 @@ func Test_listchars_composing()
   enew!
   set listchars& ff&
 endfunction
+
+" Check for the value of the 'listchars' option
+func s:CheckListCharsValue(expected)
+  call assert_equal(a:expected, &listchars)
+  call assert_equal(a:expected, getwinvar(0, '&listchars'))
+endfunc
+
+" Test for using a window local value for 'listchars'
+func Test_listchars_window_local()
+  %bw!
+  set list listchars&
+  let l:default_listchars = &listchars  " Accommodate Nvim default
+  new
+  " set a local value for 'listchars'
+  setlocal listchars=tab:+-,eol:#
+  call s:CheckListCharsValue('tab:+-,eol:#')
+  " When local value is reset, global value should be used
+  setlocal listchars=
+  call s:CheckListCharsValue(l:default_listchars)  " Accommodate Nvim default
+  " Use 'setlocal <' to copy global value
+  setlocal listchars=space:.,extends:>
+  setlocal listchars<
+  call s:CheckListCharsValue(l:default_listchars)  " Accommodate Nvim default
+  " Use 'set <' to copy global value
+  setlocal listchars=space:.,extends:>
+  set listchars<
+  call s:CheckListCharsValue(l:default_listchars)  " Accommodate Nvim default
+  " Changing global setting should not change the local setting
+  setlocal listchars=space:.,extends:>
+  setglobal listchars=tab:+-,eol:#
+  call s:CheckListCharsValue('space:.,extends:>')
+  " when split opening a new window, local value should be copied
+  split
+  call s:CheckListCharsValue('space:.,extends:>')
+  " clearing local value in one window should not change the other window
+  set listchars&
+  call s:CheckListCharsValue(l:default_listchars)  " Accommodate Nvim default
+  close
+  call s:CheckListCharsValue('space:.,extends:>')
+
+  " use different values for 'listchars' items in two different windows
+  call setline(1, ["\t  one  two  "])
+  setlocal listchars=tab:<->,lead:_,space:.,trail:@,eol:#
+  split
+  setlocal listchars=tab:[.],lead:#,space:_,trail:.,eol:&
+  split
+  set listchars=tab:+-+,lead:^,space:>,trail:<,eol:%
+  call assert_equal(['+------+^^one>>two<<%'], ScreenLines(1, virtcol('$')))
+  close
+  call assert_equal(['[......]##one__two..&'], ScreenLines(1, virtcol('$')))
+  close
+  call assert_equal(['<------>__one..two@@#'], ScreenLines(1, virtcol('$')))
+  " changing the global setting should not change the local value
+  setglobal listchars=tab:[.],lead:#,space:_,trail:.,eol:&
+  call assert_equal(['<------>__one..two@@#'], ScreenLines(1, virtcol('$')))
+  set listchars<
+  call assert_equal(['[......]##one__two..&'], ScreenLines(1, virtcol('$')))
+
+  " Using setglobal in a window with local setting should not affect the
+  " window. But should impact other windows using the global setting.
+  enew! | only
+  call setline(1, ["\t  one  two  "])
+  set listchars=tab:[.],lead:#,space:_,trail:.,eol:&
+  split
+  setlocal listchars=tab:+-+,lead:^,space:>,trail:<,eol:%
+  split
+  setlocal listchars=tab:<->,lead:_,space:.,trail:@,eol:#
+  setglobal listchars=tab:{.},lead:-,space:=,trail:#,eol:$
+  call assert_equal(['<------>__one..two@@#'], ScreenLines(1, virtcol('$')))
+  close
+  call assert_equal(['+------+^^one>>two<<%'], ScreenLines(1, virtcol('$')))
+  close
+  call assert_equal(['{......}--one==two##$'], ScreenLines(1, virtcol('$')))
+
+  " Setting the global setting to the default value should not impact a window
+  " using a local setting
+  split
+  setlocal listchars=tab:<->,lead:_,space:.,trail:@,eol:#
+  setglobal listchars=eol:$  " Accommodate Nvim default
+  call assert_equal(['<------>__one..two@@#'], ScreenLines(1, virtcol('$')))
+  close
+  call assert_equal(['^I  one  two  $'], ScreenLines(1, virtcol('$')))
+
+  " Setting the local setting to the default value should not impact a window
+  " using a global setting
+  set listchars=tab:{.},lead:-,space:=,trail:#,eol:$
+  split
+  setlocal listchars=tab:<->,lead:_,space:.,trail:@,eol:#
+  call assert_equal(['<------>__one..two@@#'], ScreenLines(1, virtcol('$')))
+  setlocal listchars=eol:$  " Accommodate Nvim default
+  call assert_equal(['^I  one  two  $'], ScreenLines(1, virtcol('$')))
+  close
+  call assert_equal(['{......}--one==two##$'], ScreenLines(1, virtcol('$')))
+
+  " Using set in a window with a local setting should change it to use the
+  " global setting and also impact other windows using the global setting
+  split
+  setlocal listchars=tab:<->,lead:_,space:.,trail:@,eol:#
+  call assert_equal(['<------>__one..two@@#'], ScreenLines(1, virtcol('$')))
+  set listchars=tab:+-+,lead:^,space:>,trail:<,eol:%
+  call assert_equal(['+------+^^one>>two<<%'], ScreenLines(1, virtcol('$')))
+  close
+  call assert_equal(['+------+^^one>>two<<%'], ScreenLines(1, virtcol('$')))
+
+  %bw!
+  set list& listchars&
+endfunc
+
+" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/nvim/testdir/test_listlbr.vim b/src/nvim/testdir/test_listlbr.vim
index e0518de3c2..2fda12d8b4 100644
--- a/src/nvim/testdir/test_listlbr.vim
+++ b/src/nvim/testdir/test_listlbr.vim
@@ -43,6 +43,7 @@ endfunc
 
 func Test_linebreak_with_list()
   throw 'skipped: Nvim does not support enc=latin1'
+  set listchars=
   call s:test_windows('setl ts=4 sbr=+ list listchars=')
   call setline(1, "\tabcdef hijklmn\tpqrstuvwxyz_1060ABCDEFGHIJKLMNOP ")
   let lines = s:screen_lines([1, 4], winwidth(0))
@@ -54,6 +55,7 @@ func Test_linebreak_with_list()
 \ ]
   call s:compare_lines(expect, lines)
   call s:close_windows()
+  set listchars&vim
 endfunc
 
 func Test_linebreak_with_nolist()
-- 
cgit 


From 5ed2a5cf9cf6a5f90e2b5bf3ef26ffea02f923f1 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Wed, 17 Nov 2021 07:07:15 +0800
Subject: vim-patch:8.2.2520: missing tests for 'listchars'

Problem:    Missing tests for 'listchars'.
Solution:   Add a few more checks. (Yegappan Lakshmanan, closes vim/vim#7854)
https://github.com/vim/vim/commit/04ea7e9049706788179945e2a91922c0b7cb9ed0
---
 src/nvim/testdir/test_listchars.vim | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'src/nvim/testdir')

diff --git a/src/nvim/testdir/test_listchars.vim b/src/nvim/testdir/test_listchars.vim
index f57d4f9ab9..d55237c202 100644
--- a/src/nvim/testdir/test_listchars.vim
+++ b/src/nvim/testdir/test_listchars.vim
@@ -469,6 +469,26 @@ func Test_listchars_window_local()
   close
   call assert_equal(['+------+^^one>>two<<%'], ScreenLines(1, virtcol('$')))
 
+  " Setting invalid value for a local setting should not impact the local and
+  " global settings
+  split
+  setlocal listchars=tab:<->,lead:_,space:.,trail:@,eol:#
+  let cmd = 'setlocal listchars=tab:{.},lead:-,space:=,trail:#,eol:$,x'
+  call assert_fails(cmd, 'E474:')
+  call assert_equal(['<------>__one..two@@#'], ScreenLines(1, virtcol('$')))
+  close
+  call assert_equal(['+------+^^one>>two<<%'], ScreenLines(1, virtcol('$')))
+
+  " Setting invalid value for a global setting should not impact the local and
+  " global settings
+  split
+  setlocal listchars=tab:<->,lead:_,space:.,trail:@,eol:#
+  let cmd = 'setglobal listchars=tab:{.},lead:-,space:=,trail:#,eol:$,x'
+  call assert_fails(cmd, 'E474:')
+  call assert_equal(['<------>__one..two@@#'], ScreenLines(1, virtcol('$')))
+  close
+  call assert_equal(['+------+^^one>>two<<%'], ScreenLines(1, virtcol('$')))
+
   %bw!
   set list& listchars&
 endfunc
-- 
cgit 


From 8dbe47a4bc823e05afed8048e548a5ff9cc1819f Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Wed, 17 Nov 2021 07:07:15 +0800
Subject: vim-patch:8.2.3572: memory leak when closing window and using
 "multispace"

Problem:    Memory leak when closing window and using "multispace" in
            'listchars'.
Solution:   Free the memory. (closes vim/vim#9071)
https://github.com/vim/vim/commit/7a33ebfc5b04353aa7674972087d581def8fdcc1
---
 src/nvim/testdir/test_listchars.vim | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'src/nvim/testdir')

diff --git a/src/nvim/testdir/test_listchars.vim b/src/nvim/testdir/test_listchars.vim
index d55237c202..7596b34433 100644
--- a/src/nvim/testdir/test_listchars.vim
+++ b/src/nvim/testdir/test_listchars.vim
@@ -440,7 +440,7 @@ func Test_listchars_window_local()
   call assert_equal(['{......}--one==two##$'], ScreenLines(1, virtcol('$')))
 
   " Setting the global setting to the default value should not impact a window
-  " using a local setting
+  " using a local setting.
   split
   setlocal listchars=tab:<->,lead:_,space:.,trail:@,eol:#
   setglobal listchars=eol:$  " Accommodate Nvim default
@@ -449,7 +449,7 @@ func Test_listchars_window_local()
   call assert_equal(['^I  one  two  $'], ScreenLines(1, virtcol('$')))
 
   " Setting the local setting to the default value should not impact a window
-  " using a global setting
+  " using a global setting.
   set listchars=tab:{.},lead:-,space:=,trail:#,eol:$
   split
   setlocal listchars=tab:<->,lead:_,space:.,trail:@,eol:#
@@ -460,7 +460,7 @@ func Test_listchars_window_local()
   call assert_equal(['{......}--one==two##$'], ScreenLines(1, virtcol('$')))
 
   " Using set in a window with a local setting should change it to use the
-  " global setting and also impact other windows using the global setting
+  " global setting and also impact other windows using the global setting.
   split
   setlocal listchars=tab:<->,lead:_,space:.,trail:@,eol:#
   call assert_equal(['<------>__one..two@@#'], ScreenLines(1, virtcol('$')))
@@ -470,7 +470,7 @@ func Test_listchars_window_local()
   call assert_equal(['+------+^^one>>two<<%'], ScreenLines(1, virtcol('$')))
 
   " Setting invalid value for a local setting should not impact the local and
-  " global settings
+  " global settings.
   split
   setlocal listchars=tab:<->,lead:_,space:.,trail:@,eol:#
   let cmd = 'setlocal listchars=tab:{.},lead:-,space:=,trail:#,eol:$,x'
@@ -480,7 +480,7 @@ func Test_listchars_window_local()
   call assert_equal(['+------+^^one>>two<<%'], ScreenLines(1, virtcol('$')))
 
   " Setting invalid value for a global setting should not impact the local and
-  " global settings
+  " global settings.
   split
   setlocal listchars=tab:<->,lead:_,space:.,trail:@,eol:#
   let cmd = 'setglobal listchars=tab:{.},lead:-,space:=,trail:#,eol:$,x'
@@ -489,6 +489,12 @@ func Test_listchars_window_local()
   close
   call assert_equal(['+------+^^one>>two<<%'], ScreenLines(1, virtcol('$')))
 
+  " Closing window with local lcs-multispace should not cause a memory leak.
+  setlocal listchars=multispace:---+
+  split
+  call s:CheckListCharsValue('multispace:---+')
+  close
+
   %bw!
   set list& listchars&
 endfunc
-- 
cgit