aboutsummaryrefslogtreecommitdiff
path: root/test/functional/legacy/scroll_opt_spec.lua
diff options
context:
space:
mode:
Diffstat (limited to 'test/functional/legacy/scroll_opt_spec.lua')
-rw-r--r--test/functional/legacy/scroll_opt_spec.lua146
1 files changed, 61 insertions, 85 deletions
diff --git a/test/functional/legacy/scroll_opt_spec.lua b/test/functional/legacy/scroll_opt_spec.lua
index e8836f41db..78028f2f44 100644
--- a/test/functional/legacy/scroll_opt_spec.lua
+++ b/test/functional/legacy/scroll_opt_spec.lua
@@ -659,10 +659,6 @@ describe('smoothscroll', function()
-- oldtest: Test_smoothscroll_zero_width()
it('does not divide by zero with a narrow window', function()
screen:try_resize(12, 2)
- screen:set_default_attr_ids({
- [1] = { foreground = Screen.colors.Brown },
- [2] = { foreground = Screen.colors.Blue1, bold = true },
- })
exec([[
call setline(1, ['a'->repeat(100)])
set wrap smoothscroll number laststatus=0
@@ -672,12 +668,12 @@ describe('smoothscroll', function()
wincmd v
]])
screen:expect([[
- {1: 1^ }│{1: }│{1: }│{1: }│{1: }|
+ {8: 1^ }│{8: }│{8: }│{8: }│{8: }|
|
]])
feed('llllllllll<C-W>o')
screen:expect([[
- {2:<<<}{1: }aa^aaaaaa|
+ {1:<<<}{8: }aa^aaaaaa|
|
]])
end)
@@ -757,12 +753,6 @@ describe('smoothscroll', function()
-- oldtest: Test_smoothscroll_incsearch()
it('does not reset skipcol when doing incremental search on the same word', function()
screen:try_resize(40, 8)
- screen:set_default_attr_ids({
- [1] = { foreground = Screen.colors.Brown },
- [2] = { foreground = Screen.colors.Blue1, bold = true },
- [3] = { background = Screen.colors.Yellow1 },
- [4] = { reverse = true },
- })
exec([[
set smoothscroll number scrolloff=0 incsearch
call setline(1, repeat([''], 20))
@@ -771,46 +761,46 @@ describe('smoothscroll', function()
]])
feed('/b')
screen:expect([[
- {2:<<<}{1: }aaaaaaaaaaaaaaaaaaaaaaaaaaaa |
- {1: 12 } |
- {1: 13 } |
- {1: 14 }{4:b}{3:bbb} |
- {1: 15 } |
- {1: 16 } |
- {1: 17 } |
+ {1:<<<}{8: }aaaaaaaaaaaaaaaaaaaaaaaaaaaa |
+ {8: 12 } |
+ {8: 13 } |
+ {8: 14 }{2:b}{10:bbb} |
+ {8: 15 } |
+ {8: 16 } |
+ {8: 17 } |
/b^ |
]])
feed('b')
screen:expect([[
- {2:<<<}{1: }aaaaaaaaaaaaaaaaaaaaaaaaaaaa |
- {1: 12 } |
- {1: 13 } |
- {1: 14 }{4:bb}{3:bb} |
- {1: 15 } |
- {1: 16 } |
- {1: 17 } |
+ {1:<<<}{8: }aaaaaaaaaaaaaaaaaaaaaaaaaaaa |
+ {8: 12 } |
+ {8: 13 } |
+ {8: 14 }{2:bb}{10:bb} |
+ {8: 15 } |
+ {8: 16 } |
+ {8: 17 } |
/bb^ |
]])
feed('b')
screen:expect([[
- {2:<<<}{1: }aaaaaaaaaaaaaaaaaaaaaaaaaaaa |
- {1: 12 } |
- {1: 13 } |
- {1: 14 }{4:bbb}b |
- {1: 15 } |
- {1: 16 } |
- {1: 17 } |
+ {1:<<<}{8: }aaaaaaaaaaaaaaaaaaaaaaaaaaaa |
+ {8: 12 } |
+ {8: 13 } |
+ {8: 14 }{2:bbb}b |
+ {8: 15 } |
+ {8: 16 } |
+ {8: 17 } |
/bbb^ |
]])
feed('b')
screen:expect([[
- {2:<<<}{1: }aaaaaaaaaaaaaaaaaaaaaaaaaaaa |
- {1: 12 } |
- {1: 13 } |
- {1: 14 }{4:bbbb} |
- {1: 15 } |
- {1: 16 } |
- {1: 17 } |
+ {1:<<<}{8: }aaaaaaaaaaaaaaaaaaaaaaaaaaaa |
+ {8: 12 } |
+ {8: 13 } |
+ {8: 14 }{2:bbbb} |
+ {8: 15 } |
+ {8: 16 } |
+ {8: 17 } |
/bbbb^ |
]])
end)
@@ -818,10 +808,6 @@ describe('smoothscroll', function()
-- oldtest: Test_smoothscroll_multi_skipcol()
it('scrolling multiple lines and stopping at non-zero skipcol', function()
screen:try_resize(40, 10)
- screen:set_default_attr_ids({
- [0] = { foreground = Screen.colors.Blue, bold = true },
- [1] = { background = Screen.colors.Grey90 },
- })
exec([[
setlocal cursorline scrolloff=0 smoothscroll
call setline(1, repeat([''], 8))
@@ -832,7 +818,7 @@ describe('smoothscroll', function()
redraw
]])
screen:expect([[
- {1:^ }|
+ {21:^ }|
|
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
aaaaaaaaaa |
@@ -844,22 +830,22 @@ describe('smoothscroll', function()
]])
feed('3<C-E>')
screen:expect([[
- {0:<<<}{1:aaaaaa^a }|
+ {1:<<<}{21:aaaaaa^a }|
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
aaaaaaaaaa |
|*2
bbb |
ccc |
- {0:~ }|*2
+ {1:~ }|*2
|
]])
feed('2<C-E>')
screen:expect([[
- {0:<<<}{1:aaaaaa^a }|
+ {1:<<<}{21:aaaaaa^a }|
|*2
bbb |
ccc |
- {0:~ }|*4
+ {1:~ }|*4
|
]])
end)
@@ -867,12 +853,6 @@ describe('smoothscroll', function()
-- oldtest: Test_smoothscroll_zero_width_scroll_cursor_bot()
it('does not divide by zero in zero-width window', function()
screen:try_resize(40, 19)
- screen:set_default_attr_ids({
- [1] = { foreground = Screen.colors.Brown }, -- LineNr
- [2] = { bold = true, foreground = Screen.colors.Blue }, -- NonText
- [3] = { bold = true, reverse = true }, -- StatusLine
- [4] = { reverse = true }, -- StatusLineNC
- })
exec([[
silent normal yy
silent normal 19p
@@ -885,10 +865,10 @@ describe('smoothscroll', function()
silent normal 20G
]])
screen:expect([[
- {1: }│ |
- {2:@}│ |*15
- {2:^@}│ |
- {3:< }{4:[No Name] [+] }|
+ {8: }│ |
+ {1:@}│ |*15
+ {1:^@}│ |
+ {3:< }{2:[No Name] [+] }|
|
]])
end)
@@ -1085,41 +1065,37 @@ describe('smoothscroll', function()
end)
it('works with very long line', function()
- screen:set_default_attr_ids({
- [1] = { foreground = Screen.colors.Brown },
- [2] = { foreground = Screen.colors.Blue1, bold = true },
- })
exec([[
edit test/functional/fixtures/bigfile_oneline.txt
setlocal smoothscroll number
]])
screen:expect([[
- {1: 1 }^0000;<control>;Cc;0;BN;;;;;N;NULL;;;|
- {1: }; 0001;<control>;Cc;0;BN;;;;;N;START|
- {1: } OF HEADING;;;; 0002;<control>;Cc;0;|
- {1: }BN;;;;;N;START OF TEXT;;;; 0003;<con|
- {1: }trol>;Cc;0;BN;;;;;N;END OF TEXT;;;; |
- {1: }0004;<control>;Cc;0;BN;;;;;N;END OF |
- {1: }TRANSMISSION;;;; 0005;<control>;Cc;0|
- {1: };BN;;;;;N;ENQUIRY;;;; 0006;<control>|
- {1: };Cc;0;BN;;;;;N;ACKNOWLEDGE;;;; 0007;|
- {1: }<control>;Cc;0;BN;;;;;N;BELL;;;; 000|
- {1: }8;<control>;Cc;0;BN;;;;;N;BACKSPACE;|
+ {8: 1 }^0000;<control>;Cc;0;BN;;;;;N;NULL;;;|
+ {8: }; 0001;<control>;Cc;0;BN;;;;;N;START|
+ {8: } OF HEADING;;;; 0002;<control>;Cc;0;|
+ {8: }BN;;;;;N;START OF TEXT;;;; 0003;<con|
+ {8: }trol>;Cc;0;BN;;;;;N;END OF TEXT;;;; |
+ {8: }0004;<control>;Cc;0;BN;;;;;N;END OF |
+ {8: }TRANSMISSION;;;; 0005;<control>;Cc;0|
+ {8: };BN;;;;;N;ENQUIRY;;;; 0006;<control>|
+ {8: };Cc;0;BN;;;;;N;ACKNOWLEDGE;;;; 0007;|
+ {8: }<control>;Cc;0;BN;;;;;N;BELL;;;; 000|
+ {8: }8;<control>;Cc;0;BN;;;;;N;BACKSPACE;|
|
]])
feed('j')
screen:expect([[
- {2:<<<}{1: }CJK COMPATIBILITY IDEOGRAPH-2F91F;Lo|
- {1: };0;L;243AB;;;;N;;;;; 2F920;CJK COMPA|
- {1: }TIBILITY IDEOGRAPH-2F920;Lo;0;L;7228|
- {1: };;;;N;;;;; 2F921;CJK COMPATIBILITY I|
- {1: }DEOGRAPH-2F921;Lo;0;L;7235;;;;N;;;;;|
- {1: } 2F922;CJK COMPATIBILITY IDEOGRAPH-2|
- {1: }F922;Lo;0;L;7250;;;;N;;;;; |
- {1: 2 }^2F923;CJK COMPATIBILITY IDEOGRAPH-2F|
- {1: }923;Lo;0;L;24608;;;;N;;;;; |
- {1: 3 }2F924;CJK COMPATIBILITY IDEOGRAPH-2F|
- {1: }924;Lo;0;L;7280;;;;N;;;;; |
+ {1:<<<}{8: }CJK COMPATIBILITY IDEOGRAPH-2F91F;Lo|
+ {8: };0;L;243AB;;;;N;;;;; 2F920;CJK COMPA|
+ {8: }TIBILITY IDEOGRAPH-2F920;Lo;0;L;7228|
+ {8: };;;;N;;;;; 2F921;CJK COMPATIBILITY I|
+ {8: }DEOGRAPH-2F921;Lo;0;L;7235;;;;N;;;;;|
+ {8: } 2F922;CJK COMPATIBILITY IDEOGRAPH-2|
+ {8: }F922;Lo;0;L;7250;;;;N;;;;; |
+ {8: 2 }^2F923;CJK COMPATIBILITY IDEOGRAPH-2F|
+ {8: }923;Lo;0;L;24608;;;;N;;;;; |
+ {8: 3 }2F924;CJK COMPATIBILITY IDEOGRAPH-2F|
+ {8: }924;Lo;0;L;7280;;;;N;;;;; |
|
]])
end)
generated by cgit (git 2.34.1) at 2025-06-19 17:39:03 +0000