patch 9.0.1800: Cursor position still wrong with 'showbreak' and virtual text
Problem: Cursor position still wrong with 'showbreak' and virtual text
after last character or 'listchars' "eol".
Solution: Remove unnecessary w_wcol adjustment in curs_columns(). Also
fix first char of virtual text not shown at the start of a screen
line.
closes: #12478
closes: #12532
closes: #12904
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: zeertzjq <zeertzjq@outlook.com>
diff --git a/src/testdir/dumps/Test_cursor_position_with_showbreak_3.dump b/src/testdir/dumps/Test_cursor_position_with_showbreak_3.dump
new file mode 100644
index 0000000..4eca369
--- /dev/null
+++ b/src/testdir/dumps/Test_cursor_position_with_showbreak_3.dump
@@ -0,0 +1,6 @@
+| +0#0000e05#a8a8a8255@1|x+0#0000000#ffffff0@71|X
+| +0#0000e05#a8a8a8255@1|++0#4040ff13#ffffff0>$| +0#0000000&@70
+| +0#0000e05#a8a8a8255@1|s+0#0000000#ffffff0|e|c|o|n|d| |l|i|n|e|$+0#4040ff13&| +0#0000000&@60
+|~+0#4040ff13&| @73
+|~| @73
+|-+2#0000000&@1| |I|N|S|E|R|T| |-@1| +0&&@44|1|,|7|4| @9|A|l@1|
diff --git a/src/testdir/dumps/Test_prop_inserts_text_lcs_extends_1.dump b/src/testdir/dumps/Test_prop_inserts_text_lcs_extends_1.dump
new file mode 100644
index 0000000..11e61cc
--- /dev/null
+++ b/src/testdir/dumps/Test_prop_inserts_text_lcs_extends_1.dump
@@ -0,0 +1,3 @@
+|a+0&#ffffff0@19>a@28|!+0#4040ff13&
+|~| @48
+| +0#0000000&@31|1|,|2|1| @9|A|l@1|
diff --git a/src/testdir/dumps/Test_prop_inserts_text_lcs_extends_2.dump b/src/testdir/dumps/Test_prop_inserts_text_lcs_extends_2.dump
new file mode 100644
index 0000000..14d5ec1
--- /dev/null
+++ b/src/testdir/dumps/Test_prop_inserts_text_lcs_extends_2.dump
@@ -0,0 +1,3 @@
+|a+0&#ffffff0@18>a@29|!+0#4040ff13&
+|~| @48
+| +0#0000000&@31|1|,|2|1| @9|A|l@1|
diff --git a/src/testdir/dumps/Test_prop_inserts_text_lcs_extends_3.dump b/src/testdir/dumps/Test_prop_inserts_text_lcs_extends_3.dump
new file mode 100644
index 0000000..7ff0949
--- /dev/null
+++ b/src/testdir/dumps/Test_prop_inserts_text_lcs_extends_3.dump
@@ -0,0 +1,3 @@
+|a+0&#ffffff0@17>a@30|!+0#4040ff13&
+|~| @48
+| +0#0000000&@31|1|,|2|1| @9|A|l@1|
diff --git a/src/testdir/dumps/Test_prop_inserts_text_lcs_extends_4.dump b/src/testdir/dumps/Test_prop_inserts_text_lcs_extends_4.dump
new file mode 100644
index 0000000..1a70a75
--- /dev/null
+++ b/src/testdir/dumps/Test_prop_inserts_text_lcs_extends_4.dump
@@ -0,0 +1,3 @@
+|a+0&#ffffff0@16>a@30|b+0#e000e06&|!+0#4040ff13&
+|~| @48
+| +0#0000000&@31|1|,|2|1| @9|A|l@1|
diff --git a/src/testdir/dumps/Test_prop_inserts_text_lcs_extends_5.dump b/src/testdir/dumps/Test_prop_inserts_text_lcs_extends_5.dump
new file mode 100644
index 0000000..a6683d7
--- /dev/null
+++ b/src/testdir/dumps/Test_prop_inserts_text_lcs_extends_5.dump
@@ -0,0 +1,3 @@
+|a+0&#ffffff0@15>a@30|b+0#e000e06&@2
+|~+0#4040ff13&| @48
+| +0#0000000&@31|1|,|2|1| @9|A|l@1|
diff --git a/src/testdir/dumps/Test_prop_inserts_text_showbreak_23.dump b/src/testdir/dumps/Test_prop_inserts_text_showbreak_23.dump
new file mode 100644
index 0000000..8577952
--- /dev/null
+++ b/src/testdir/dumps/Test_prop_inserts_text_showbreak_23.dump
@@ -0,0 +1,6 @@
+| +0&#ffffff0@1|1| |a@25
+| @5|++0#4040ff13&>1+0#e000e06&|2|3|1|2|3|1|2|3|1|2|3|1|2|3|1|2|3|1|2|3|1|2
+| +0#0000000&@5|++0#4040ff13&|3+0#e000e06&|1|2|3|1|2|3|1|2|3|1|2|3|1|2|3|1|2|3|1|2|3|1
+| +0#0000000&@5|++0#4040ff13&|2+0#e000e06&|3|1|2|3|1|2|3|1|2|3|1|2|3|1|2|3|1|2|3|1|2|3
+|~+0#4040ff13&| @28
+|-+2#0000000&@1| |I|N|S|E|R|T| |-@1| +0&&@17
diff --git a/src/testdir/dumps/Test_prop_inserts_text_showbreak_24.dump b/src/testdir/dumps/Test_prop_inserts_text_showbreak_24.dump
new file mode 100644
index 0000000..d089cda
--- /dev/null
+++ b/src/testdir/dumps/Test_prop_inserts_text_showbreak_24.dump
@@ -0,0 +1,6 @@
+| +0&#ffffff0@1|1| |a@25
+| @3|++0#4040ff13&>1+0#e000e06&|2|3|1|2|3|1|2|3|1|2|3|1|2|3|1|2|3|1|2|3|1|2|3|1
+| +0#0000000&@3|++0#4040ff13&|2+0#e000e06&|3|1|2|3|1|2|3|1|2|3|1|2|3|1|2|3|1|2|3|1|2|3|1|2
+| +0#0000000&@3|++0#4040ff13&|3+0#e000e06&|1|2|3|1|2|3|1|2|3|1|2|3|1|2|3|1|2|3| +0#0000000&@5
+|~+0#4040ff13&| @28
+|-+2#0000000&@1| |I|N|S|E|R|T| |-@1| +0&&@17
diff --git a/src/testdir/test_breakindent.vim b/src/testdir/test_breakindent.vim
index 2bc85a3..3c4d0f1 100644
--- a/src/testdir/test_breakindent.vim
+++ b/src/testdir/test_breakindent.vim
@@ -898,7 +898,6 @@
vim9script
&signcolumn = 'yes'
&showbreak = '++'
- &breakindent = true
&breakindentopt = 'shift:2'
var leftcol: number = win_getid()->getwininfo()->get(0, {})->get('textoff')
repeat('x', &columns - leftcol - 1)->setline(1)
@@ -912,9 +911,14 @@
" No line wraps, so changing 'showbreak' should lead to the same screen.
call term_sendkeys(buf, "\<C-\>\<C-O>:setlocal showbreak=+\<CR>")
call VerifyScreenDump(buf, 'Test_cursor_position_with_showbreak_1', {})
+ " No line wraps, so setting 'breakindent' should lead to the same screen.
+ call term_sendkeys(buf, "\<C-\>\<C-O>:setlocal breakindent\<CR>")
+ call VerifyScreenDump(buf, 'Test_cursor_position_with_showbreak_1', {})
" The first line now wraps because of "eol" in 'listchars'.
call term_sendkeys(buf, "\<C-\>\<C-O>:setlocal list\<CR>")
call VerifyScreenDump(buf, 'Test_cursor_position_with_showbreak_2', {})
+ call term_sendkeys(buf, "\<C-\>\<C-O>:setlocal nobreakindent\<CR>")
+ call VerifyScreenDump(buf, 'Test_cursor_position_with_showbreak_3', {})
call StopVimInTerminal(buf)
endfunc
diff --git a/src/testdir/test_textprop.vim b/src/testdir/test_textprop.vim
index 93baa7a..f258c19 100644
--- a/src/testdir/test_textprop.vim
+++ b/src/testdir/test_textprop.vim
@@ -2686,11 +2686,11 @@
let lines =<< trim END
highlight! link LineNr Normal
+ setlocal number showbreak=+ breakindent breakindentopt=shift:2
+ setlocal scrolloff=0 smoothscroll
call setline(1, repeat('a', 28))
call prop_type_add('theprop', #{highlight: 'Special'})
call prop_add(1, 28, #{type: 'theprop', text: repeat('123', 23), text_wrap: 'wrap'})
- setlocal number showbreak=+ breakindent breakindentopt=shift:2
- setlocal scrolloff=0 smoothscroll
normal! $
END
let lines = insert(lines, a:cmd)
@@ -2740,6 +2740,10 @@
call VerifyScreenDump(buf, 'Test_prop_inserts_text_showbreak_21', {})
call term_sendkeys(buf, "zbx")
call VerifyScreenDump(buf, 'Test_prop_inserts_text_showbreak_22', {})
+ call term_sendkeys(buf, "26ia\<Esc>a")
+ call VerifyScreenDump(buf, 'Test_prop_inserts_text_showbreak_23', {})
+ call term_sendkeys(buf, "\<C-\>\<C-O>:setlocal breakindentopt=\<CR>")
+ call VerifyScreenDump(buf, 'Test_prop_inserts_text_showbreak_24', {})
call StopVimInTerminal(buf)
endfunc
@@ -2754,10 +2758,10 @@
CheckRunVimInTerminal
let lines =<< trim END
+ setlocal list listchars=tab:<-> scrolloff=0 smoothscroll
call setline(1, repeat("\t", 4) .. 'a')
call prop_type_add('theprop', #{highlight: 'Special'})
call prop_add(1, 4, #{type: 'theprop', text: repeat('12', 32), text_wrap: 'wrap'})
- setlocal list listchars=tab:<-> scrolloff=0 smoothscroll
normal! $
END
call writefile(lines, 'XscriptPropsBeforeTabSkipcol', 'D')
@@ -2787,6 +2791,31 @@
call StopVimInTerminal(buf)
endfunc
+func Test_prop_inserts_text_lcs_extends()
+ CheckRunVimInTerminal
+
+ let lines =<< trim END
+ setlocal nowrap list listchars=extends:!
+ call setline(1, repeat('a', &columns + 1))
+ call prop_type_add('theprop', #{highlight: 'Special'})
+ call prop_add(1, &columns + 2, #{type: 'theprop', text: 'bbb'})
+ END
+ call writefile(lines, 'XscriptPropsListExtends', 'D')
+ let buf = RunVimInTerminal('-S XscriptPropsListExtends', #{rows: 3, cols: 50})
+ call term_sendkeys(buf, '20l')
+ call VerifyScreenDump(buf, 'Test_prop_inserts_text_lcs_extends_1', {})
+ call term_sendkeys(buf, 'zl')
+ call VerifyScreenDump(buf, 'Test_prop_inserts_text_lcs_extends_2', {})
+ call term_sendkeys(buf, 'zl')
+ call VerifyScreenDump(buf, 'Test_prop_inserts_text_lcs_extends_3', {})
+ call term_sendkeys(buf, 'zl')
+ call VerifyScreenDump(buf, 'Test_prop_inserts_text_lcs_extends_4', {})
+ call term_sendkeys(buf, 'zl')
+ call VerifyScreenDump(buf, 'Test_prop_inserts_text_lcs_extends_5', {})
+
+ call StopVimInTerminal(buf)
+endfunc
+
func Test_prop_add_with_text_fails()
call prop_type_add('failing', #{highlight: 'ErrorMsg'})
call assert_fails("call prop_add(1, 0, #{type: 'failing', text: 'X', end_lnum: 1})", 'E1305:')