patch 9.0.2187: Visual not drawn with 'breakindent' when line doesn't fit

Problem:  Visual selection isn't drawn with 'breakindent' when the line
          doesn't fit in the window (Jaehwang Jung)
Solution: Adjust wlv->fromcol also for 'breakindent' (zeertzjq)

closes: #13767
closes: #13768

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/drawline.c b/src/drawline.c
index 9f385f033a68f7b5ed5e704c0fd0dd149c5c5f57..08b6f45c441adfeb367039f4d3647b5d1adba671 100644 (file)
--- a/src/drawline.c
+++ b/src/drawline.c
@@ -527,6 +527,12 @@ handle_breakindent(win_T *wp, winlinevars_T *wlv)
            if (wp->w_skipcol > 0 && wlv->startrow == 0
                                           && wp->w_p_wrap && wp->w_briopt_sbr)
                wlv->need_showbreak = FALSE;
+
+           // Correct start of highlighted area for 'breakindent',
+           if (wlv->fromcol >= wlv->vcol
+                                   && wlv->fromcol < wlv->vcol + wlv->n_extra)
+               wlv->fromcol = wlv->vcol + wlv->n_extra;
+
            // Correct end of highlighted area for 'breakindent',
            // required when 'linebreak' is also set.
            if (wlv->tocol == wlv->vcol)

diff --git a/src/testdir/dumps/Test_visual_starts_before_skipcol_1.dump b/src/testdir/dumps/Test_visual_starts_before_skipcol_1.dump
new file mode 100644 (file)
index 0000000..f61440a
--- /dev/null
+++ b/src/testdir/dumps/Test_visual_starts_before_skipcol_1.dump
@@ -0,0 +1,6 @@
+|<+0#4040ff13#ffffff0@2| +0#0000000&@4| +0&#e0e0e08|9|3| |9|4| |9|5| |9|6| |9|7| |9|8| |9@1> +0&#ffffff0@45
+|[+3&&|N|o| |N|a|m|e|]| |[|+|]| @43|1|,|2|9|1|-|3@1|0| @5|A|l@1
+| +0&&@74
+|~+0#4040ff13&| @73
+|[+1#0000000&|N|o| |N|a|m|e|]| @47|0|,|0|-|1| @9|A|l@1
+|-+2&&@1| |V|I|S|U|A|L| |-@1| +0&&@51|2|9|1| @7

diff --git a/src/testdir/dumps/Test_visual_starts_before_skipcol_2.dump b/src/testdir/dumps/Test_visual_starts_before_skipcol_2.dump
new file mode 100644 (file)
index 0000000..1f10940
--- /dev/null
+++ b/src/testdir/dumps/Test_visual_starts_before_skipcol_2.dump
@@ -0,0 +1,6 @@
+| +0&#ffffff0@7|++0#4040ff13&@2| +0#0000000#e0e0e08|9|0| |9|1| |9|2| |9|3| |9|4| |9|5| |9|6| |9|7| |9|8| |9@1> +0&#ffffff0@33
+|[+3&&|N|o| |N|a|m|e|]| |[|+|]| @43|1|,|2|9|1|-|3|4|2| @5|A|l@1
+| +0&&@74
+|~+0#4040ff13&| @73
+|[+1#0000000&|N|o| |N|a|m|e|]| @47|0|,|0|-|1| @9|A|l@1
+|-+2&&@1| |V|I|S|U|A|L| |-@1| +0&&@51|2|9|1| @7

diff --git a/src/testdir/dumps/Test_visual_starts_before_skipcol_3.dump b/src/testdir/dumps/Test_visual_starts_before_skipcol_3.dump
new file mode 100644 (file)
index 0000000..d36d675
--- /dev/null
+++ b/src/testdir/dumps/Test_visual_starts_before_skipcol_3.dump
@@ -0,0 +1,6 @@
+|++0#4040ff13#ffffff0@2| +0#0000000&@4| +0&#e0e0e08|9|3| |9|4| |9|5| |9|6| |9|7| |9|8| |9@1> +0&#ffffff0@45
+|[+3&&|N|o| |N|a|m|e|]| |[|+|]| @43|1|,|2|9|1|-|3@1|0| @5|A|l@1
+| +0&&@74
+|~+0#4040ff13&| @73
+|[+1#0000000&|N|o| |N|a|m|e|]| @47|0|,|0|-|1| @9|A|l@1
+|-+2&&@1| |V|I|S|U|A|L| |-@1| +0&&@51|2|9|1| @7

diff --git a/src/testdir/dumps/Test_visual_starts_before_skipcol_4.dump b/src/testdir/dumps/Test_visual_starts_before_skipcol_4.dump
new file mode 100644 (file)
index 0000000..2460407
--- /dev/null
+++ b/src/testdir/dumps/Test_visual_starts_before_skipcol_4.dump
@@ -0,0 +1,6 @@
+|++0#4040ff13#ffffff0@8>+@65
+|[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|1|,|2|9|1|-|3|1|0| @5|A|l@1
+| +0&&@74
+|~+0#4040ff13&| @73
+|[+1#0000000&|N|o| |N|a|m|e|]| @47|0|,|0|-|1| @9|A|l@1
+|-+2&&@1| |V|I|S|U|A|L| |-@1| +0&&@51|2|9|1| @7

diff --git a/src/testdir/test_breakindent.vim b/src/testdir/test_breakindent.vim
index 3c4d0f1d04afc5e88c901abccf1cebdaba19d11f..ee05548222dbac85b97b7b5deac9ba71b64aeb53 100644 (file)
--- a/src/testdir/test_breakindent.vim
+++ b/src/testdir/test_breakindent.vim
@@ -923,6 +923,29 @@ func Test_cursor_position_with_showbreak()
   call StopVimInTerminal(buf)
 endfunc
 
+func Test_visual_starts_before_skipcol()
+  CheckScreendump
+
+  let lines =<< trim END
+    1new
+    setlocal breakindent
+    call setline(1, "\t" .. join(range(100)))
+  END
+  call writefile(lines, 'XvisualStartsBeforeSkipcol', 'D')
+  let buf = RunVimInTerminal('-S XvisualStartsBeforeSkipcol', #{rows: 6})
+
+  call term_sendkeys(buf, "v$")
+  call VerifyScreenDump(buf, 'Test_visual_starts_before_skipcol_1', {})
+  call term_sendkeys(buf, "\<Esc>:setlocal showbreak=+++\<CR>gv")
+  call VerifyScreenDump(buf, 'Test_visual_starts_before_skipcol_2', {})
+  call term_sendkeys(buf, "\<Esc>:setlocal breakindentopt+=sbr\<CR>gv")
+  call VerifyScreenDump(buf, 'Test_visual_starts_before_skipcol_3', {})
+  call term_sendkeys(buf, "\<Esc>:setlocal nobreakindent\<CR>gv")
+  call VerifyScreenDump(buf, 'Test_visual_starts_before_skipcol_4', {})
+
+  call StopVimInTerminal(buf)
+endfunc
+
 func Test_no_spurious_match()
   let s:input = printf('- y %s y %s', repeat('x', 50), repeat('x', 50))
   call s:test_windows('setl breakindent breakindentopt=list:-1 formatlistpat=^- hls')

diff --git a/src/version.c b/src/version.c
index 5446a5264e79bb9aa352d4f4113edc5d49725ee6..f7dc49bfe5f5995536f583e612074d556ed65b76 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2187,
 /**/
     2186,
 /**/