Mercurial > vim

diff src/testdir/test_conceal.vim @ 31618:68fed60575ca v9.0.1141

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.0.1141: 'cursorcolumn' and 'colorcolumn' wrong after concealing Commit: https://github.com/vim/vim/commit/aaa16b09180080284c4a5049fe16bdaccbb13b74 Author: Alexey Radkov <alexey.radkov@gmail.com> Date: Wed Jan 4 11:15:30 2023 +0000 patch 9.0.1141: 'cursorcolumn' and 'colorcolumn' wrong after concealing Problem: 'cursorcolumn' and 'colorcolumn' wrong after concealing and wrapping line. Solution: Reset "wlv.vcol_off" after each screen line. (Alexey Radkov, closes #11777)
author Bram Moolenaar <Bram@vim.org>
date Wed, 04 Jan 2023 12:30:05 +0100
parents 0fbf3e042602
children 22a08166a876
line wrap: on
line diff
--- a/src/testdir/test_conceal.vim
+++ b/src/testdir/test_conceal.vim
@@ -139,6 +139,38 @@ func Test_conceal_with_cursorline()
   call StopVimInTerminal(buf)
 endfunc
 
+func Test_conceal_with_cursorcolumn()
+  CheckScreendump
+
+  " Check that cursorcolumn and colorcolumn don't get broken in presence of
+  " wrapped lines containing concealed text
+  let code =<< trim [CODE]
+    let lines = ["one one one |hidden| one one one one one one one one",
+          \ "two two two two |hidden| here two two",
+          \ "three |hidden| three three three three three three three three"]
+    call setline(1, lines)
+    set wrap linebreak
+    set showbreak=\ >>>\ 
+    syntax match test /|hidden|/ conceal
+    set conceallevel=2
+    set concealcursor=
+    exe "normal /here\r"
+    set cursorcolumn
+    set colorcolumn=50
+  [CODE]
+
+  call writefile(code, 'XTest_conceal_cuc', 'D')
+  let buf = RunVimInTerminal('-S XTest_conceal_cuc', {'rows': 10, 'cols': 40})
+  call VerifyScreenDump(buf, 'Test_conceal_cuc_01', {})
+
+  " move cursor to the end of line (the cursor jumps to the next screen line)
+  call term_sendkeys(buf, "$")
+  call VerifyScreenDump(buf, 'Test_conceal_cuc_02', {})
+
+  " clean up
+  call StopVimInTerminal(buf)
+endfunc
+
 func Test_conceal_resize_term()
   CheckScreendump