patch 9.0.1813: linebreak incorrect drawn with breakindent
Problem: 'linebreak' is incorrectly drawn after 'breakindent'.
Solution: Don't include 'breakindent' size when already after it.
closes: #12937
closes: #12940
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: zeertzjq <zeertzjq@outlook.com>
diff --git a/src/testdir/test_display.vim b/src/testdir/test_display.vim
index f817a85..55764ba 100644
--- a/src/testdir/test_display.vim
+++ b/src/testdir/test_display.vim
@@ -410,12 +410,19 @@
new
vert resize 25
let _breakat = &breakat
- setl signcolumn=yes linebreak breakat=) showbreak=+\
+ setl signcolumn=yes linebreak breakat=) showbreak=++
call setline(1, repeat('x', winwidth(0) - 2) .. ')abc')
let lines = ScreenLines([1, 2], 25)
let expected = [
\ ' xxxxxxxxxxxxxxxxxxxxxxx',
- \ ' + )abc '
+ \ ' ++)abc ',
+ \ ]
+ call assert_equal(expected, lines)
+ setl breakindent breakindentopt=shift:2
+ let lines = ScreenLines([1, 2], 25)
+ let expected = [
+ \ ' xxxxxxxxxxxxxxxxxxxxxxx',
+ \ ' ++)abc ',
\ ]
call assert_equal(expected, lines)
%bw!