aboutsummaryrefslogtreecommitdiff
path: root/test/functional/legacy/window_cmd_spec.lua
diff options
context:
space:
mode:
authorbfredl <bjorn.linse@gmail.com>2024-03-22 11:02:52 +0100
committerbfredl <bjorn.linse@gmail.com>2024-03-23 13:44:35 +0100
commit0c59771e314d6faaad69676985cd2a11c157ee37 (patch)
treeb83d69de5f7a5877e26a4be8b882857a9477a437 /test/functional/legacy/window_cmd_spec.lua
parentdc110cba3c0d48d7c9dbb91900f8be0cf6cf0c9b (diff)
downloadrneovim-0c59771e314d6faaad69676985cd2a11c157ee37.tar.gz
rneovim-0c59771e314d6faaad69676985cd2a11c157ee37.tar.bz2
rneovim-0c59771e314d6faaad69676985cd2a11c157ee37.zip
refactor(tests): all screen tests should use highlights
This is the first installment of a multi-PR series significantly refactoring how highlights are being specified. The end goal is to have a base set of 20 ish most common highlights, and then specific files only need to add more groups to that as needed. As a complicating factor, we also want to migrate to the new default color scheme eventually. But by sharing a base set, that future PR will hopefully be a lot smaller since a lot of tests will be migrated just simply by updating the base set in place. As a first step, fix the anti-pattern than Screen defaults to ignoring highlights. Highlights are integral part of the screen state, not something "extra" which we only test "sometimes". For now, we still allow opt-out via the intentionally ugly screen._default_attr_ids = nil The end goal is to get rid of all of these eventually (which will be easier as part of the color scheme migration)
Diffstat (limited to 'test/functional/legacy/window_cmd_spec.lua')
-rw-r--r--test/functional/legacy/window_cmd_spec.lua152
1 files changed, 76 insertions, 76 deletions
diff --git a/test/functional/legacy/window_cmd_spec.lua b/test/functional/legacy/window_cmd_spec.lua
index 7fe4ec8eb6..3cd3a69239 100644
--- a/test/functional/legacy/window_cmd_spec.lua
+++ b/test/functional/legacy/window_cmd_spec.lua
@@ -65,10 +65,10 @@ describe('splitkeep', function()
99 |
^100 |
101 |
- [No Name] [+] |
+ {3:[No Name] [+] }|
5 |
6 |
- [No Name] [+] |
+ {2:[No Name] [+] }|
|
]])
@@ -77,10 +77,10 @@ describe('splitkeep', function()
100 |
^101 |
102 |
- [No Name] [+] |
+ {3:[No Name] [+] }|
5 |
6 |
- [No Name] [+] |
+ {2:[No Name] [+] }|
|
]])
@@ -90,10 +90,10 @@ describe('splitkeep', function()
198 |
199 |
^200 |
- [No Name] [+] |
+ {3:[No Name] [+] }|
5 |
6 |
- [No Name] [+] |
+ {2:[No Name] [+] }|
|
]])
end)
@@ -135,13 +135,13 @@ describe('splitkeep', function()
3 |
4 |
5 |
- [No Name] [+] |
+ {2:[No Name] [+] }|
^7 |
8 |
9 |
10 |
11 |
- [No Name] [+] |
+ {3:[No Name] [+] }|
|
]])
feed(':quit<CR>Ht')
@@ -152,13 +152,13 @@ describe('splitkeep', function()
3 |
4 |
5 |
- [No Name] [+] |
+ {3:[No Name] [+] }|
7 |
8 |
9 |
10 |
11 |
- [No Name] [+] |
+ {2:[No Name] [+] }|
:quit |
]])
feed(':set sb<CR>:quit<CR>Gj')
@@ -168,14 +168,14 @@ describe('splitkeep', function()
3 |
4 |
^5 |
- [No Name] [+] |
+ {3:[No Name] [+] }|
7 |
8 |
9 |
10 |
11 |
12 |
- [No Name] [+] |
+ {2:[No Name] [+] }|
:quit |
]])
feed(':quit<CR>Gt')
@@ -185,14 +185,14 @@ describe('splitkeep', function()
3 |
4 |
5 |
- [No Name] [+] |
+ {2:[No Name] [+] }|
7 |
8 |
9 |
10 |
11 |
^12 |
- [No Name] [+] |
+ {3:[No Name] [+] }|
:quit |
]])
end)
@@ -213,70 +213,70 @@ describe('splitkeep', function()
]])
feed('L:wincmd s<CR>')
screen:expect([[
- 1 +-- 7 lines: int FuncName() {···················|
- 8 after fold |
- 9 +-- 7 lines: int FuncName() {···················|
- 16 after fold |
- 17 +-- 7 lines: int FuncName() {···················|
- 24 ^after fold |
- [No Name] [+] |
- 32 after fold |
- 33 +-- 7 lines: int FuncName() {···················|
- 40 after fold |
- 41 +-- 7 lines: int FuncName() {···················|
- 48 after fold |
- [No Name] [+] |
+ {8: 1 }{13:+-- 7 lines: int FuncName() {···················}|
+ {8: 8 }after fold |
+ {8: 9 }{13:+-- 7 lines: int FuncName() {···················}|
+ {8: 16 }after fold |
+ {8: 17 }{13:+-- 7 lines: int FuncName() {···················}|
+ {8: 24 }^after fold |
+ {3:[No Name] [+] }|
+ {8: 32 }after fold |
+ {8: 33 }{13:+-- 7 lines: int FuncName() {···················}|
+ {8: 40 }after fold |
+ {8: 41 }{13:+-- 7 lines: int FuncName() {···················}|
+ {8: 48 }after fold |
+ {2:[No Name] [+] }|
:wincmd s |
]])
feed(':quit<CR>')
screen:expect([[
- 1 +-- 7 lines: int FuncName() {···················|
- 8 after fold |
- 9 +-- 7 lines: int FuncName() {···················|
- 16 after fold |
- 17 +-- 7 lines: int FuncName() {···················|
- 24 after fold |
- 25 +-- 7 lines: int FuncName() {···················|
- 32 after fold |
- 33 +-- 7 lines: int FuncName() {···················|
- 40 after fold |
- 41 +-- 7 lines: int FuncName() {···················|
- 48 after fold |
- 49 ^+-- 7 lines: int FuncName() {···················|
+ {8: 1 }{13:+-- 7 lines: int FuncName() {···················}|
+ {8: 8 }after fold |
+ {8: 9 }{13:+-- 7 lines: int FuncName() {···················}|
+ {8: 16 }after fold |
+ {8: 17 }{13:+-- 7 lines: int FuncName() {···················}|
+ {8: 24 }after fold |
+ {8: 25 }{13:+-- 7 lines: int FuncName() {···················}|
+ {8: 32 }after fold |
+ {8: 33 }{13:+-- 7 lines: int FuncName() {···················}|
+ {8: 40 }after fold |
+ {8: 41 }{13:+-- 7 lines: int FuncName() {···················}|
+ {8: 48 }after fold |
+ {8: 49 }{13:^+-- 7 lines: int FuncName() {···················}|
:quit |
]])
feed('H:below split<CR>')
screen:expect([[
- 1 +-- 7 lines: int FuncName() {···················|
- 8 after fold |
- 9 +-- 7 lines: int FuncName() {···················|
- 16 after fold |
- 17 +-- 7 lines: int FuncName() {···················|
- [No Name] [+] |
- 25 ^+-- 7 lines: int FuncName() {···················|
- 32 after fold |
- 33 +-- 7 lines: int FuncName() {···················|
- 40 after fold |
- 41 +-- 7 lines: int FuncName() {···················|
- 48 after fold |
- [No Name] [+] |
+ {8: 1 }{13:+-- 7 lines: int FuncName() {···················}|
+ {8: 8 }after fold |
+ {8: 9 }{13:+-- 7 lines: int FuncName() {···················}|
+ {8: 16 }after fold |
+ {8: 17 }{13:+-- 7 lines: int FuncName() {···················}|
+ {2:[No Name] [+] }|
+ {8: 25 }{13:^+-- 7 lines: int FuncName() {···················}|
+ {8: 32 }after fold |
+ {8: 33 }{13:+-- 7 lines: int FuncName() {···················}|
+ {8: 40 }after fold |
+ {8: 41 }{13:+-- 7 lines: int FuncName() {···················}|
+ {8: 48 }after fold |
+ {3:[No Name] [+] }|
:below split |
]])
feed(':wincmd k<CR>:quit<CR>')
screen:expect([[
- 1 +-- 7 lines: int FuncName() {···················|
- 8 after fold |
- 9 +-- 7 lines: int FuncName() {···················|
- 16 after fold |
- 17 +-- 7 lines: int FuncName() {···················|
- 24 after fold |
- 25 ^+-- 7 lines: int FuncName() {···················|
- 32 after fold |
- 33 +-- 7 lines: int FuncName() {···················|
- 40 after fold |
- 41 +-- 7 lines: int FuncName() {···················|
- 48 after fold |
- 49 +-- 7 lines: int FuncName() {···················|
+ {8: 1 }{13:+-- 7 lines: int FuncName() {···················}|
+ {8: 8 }after fold |
+ {8: 9 }{13:+-- 7 lines: int FuncName() {···················}|
+ {8: 16 }after fold |
+ {8: 17 }{13:+-- 7 lines: int FuncName() {···················}|
+ {8: 24 }after fold |
+ {8: 25 }{13:^+-- 7 lines: int FuncName() {···················}|
+ {8: 32 }after fold |
+ {8: 33 }{13:+-- 7 lines: int FuncName() {···················}|
+ {8: 40 }after fold |
+ {8: 41 }{13:+-- 7 lines: int FuncName() {···················}|
+ {8: 48 }after fold |
+ {8: 49 }{13:+-- 7 lines: int FuncName() {···················}|
:quit |
]])
end)
@@ -296,13 +296,13 @@ describe('splitkeep', function()
a |
b |
c |
- ~ |*4
- [No Name] |
+ {1:~ }|*4
+ {2:[No Name] }|
^a |
b |
c |
- ~ |
- [No Name] |
+ {1:~ }|
+ {3:[No Name] }|
|
]])
end)
@@ -317,16 +317,16 @@ describe('splitkeep', function()
wincmd s
]])
screen:expect([[
- <<<e line with lots of text in one line |
+ {1:<<<}e line with lots of text in one line |
with lots of text in one line with lots |
of text in one line |
- ~ |
- [No Name] [+] |
- <<<e line with lots of text in one line |
+ {1:~ }|
+ {2:[No Name] [+] }|
+ {1:<<<}e line with lots of text in one line |
^with lots of text in one line with lots |
of text in one line |
- ~ |*2
- [No Name] [+] |
+ {1:~ }|*2
+ {3:[No Name] [+] }|
|
]])
end)