mirror of
https://github.com/neovim/neovim.git
synced 2025-12-10 16:42:42 +00:00
refactor(ui)!: link VertSplit to Normal by default
Avoids using `gui=reverse` on `VertSplit` and makes window separators look much nicer by default.
This commit is contained in:
@@ -104,12 +104,12 @@ describe('highlight defaults', function()
|
||||
})
|
||||
feed_command('sp', 'vsp', 'vsp')
|
||||
screen:expect([[
|
||||
^ {2:│} {2:│} |
|
||||
{0:~ }{2:│}{0:~ }{2:│}{0:~ }|
|
||||
{0:~ }{2:│}{0:~ }{2:│}{0:~ }|
|
||||
{0:~ }{2:│}{0:~ }{2:│}{0:~ }|
|
||||
{0:~ }{2:│}{0:~ }{2:│}{0:~ }|
|
||||
{0:~ }{2:│}{0:~ }{2:│}{0:~ }|
|
||||
^ │ │ |
|
||||
{0:~ }│{0:~ }│{0:~ }|
|
||||
{0:~ }│{0:~ }│{0:~ }|
|
||||
{0:~ }│{0:~ }│{0:~ }|
|
||||
{0:~ }│{0:~ }│{0:~ }|
|
||||
{0:~ }│{0:~ }│{0:~ }|
|
||||
{1:[No Name] }{2:[No Name] [No Name] }|
|
||||
|
|
||||
{0:~ }|
|
||||
@@ -122,12 +122,12 @@ describe('highlight defaults', function()
|
||||
-- navigate to verify that the attributes are properly moved
|
||||
feed('<c-w>j')
|
||||
screen:expect([[
|
||||
{2:│} {2:│} |
|
||||
{0:~ }{2:│}{0:~ }{2:│}{0:~ }|
|
||||
{0:~ }{2:│}{0:~ }{2:│}{0:~ }|
|
||||
{0:~ }{2:│}{0:~ }{2:│}{0:~ }|
|
||||
{0:~ }{2:│}{0:~ }{2:│}{0:~ }|
|
||||
{0:~ }{2:│}{0:~ }{2:│}{0:~ }|
|
||||
│ │ |
|
||||
{0:~ }│{0:~ }│{0:~ }|
|
||||
{0:~ }│{0:~ }│{0:~ }|
|
||||
{0:~ }│{0:~ }│{0:~ }|
|
||||
{0:~ }│{0:~ }│{0:~ }|
|
||||
{0:~ }│{0:~ }│{0:~ }|
|
||||
{2:[No Name] [No Name] [No Name] }|
|
||||
^ |
|
||||
{0:~ }|
|
||||
@@ -142,12 +142,12 @@ describe('highlight defaults', function()
|
||||
-- (upstream vim has the same behavior)
|
||||
feed('<c-w>k<c-w>l')
|
||||
screen:expect([[
|
||||
{2:│}^ {2:│} |
|
||||
{0:~ }{2:│}{0:~ }{2:│}{0:~ }|
|
||||
{0:~ }{2:│}{0:~ }{2:│}{0:~ }|
|
||||
{0:~ }{2:│}{0:~ }{2:│}{0:~ }|
|
||||
{0:~ }{2:│}{0:~ }{2:│}{0:~ }|
|
||||
{0:~ }{2:│}{0:~ }{2:│}{0:~ }|
|
||||
│^ │ |
|
||||
{0:~ }│{0:~ }│{0:~ }|
|
||||
{0:~ }│{0:~ }│{0:~ }|
|
||||
{0:~ }│{0:~ }│{0:~ }|
|
||||
{0:~ }│{0:~ }│{0:~ }|
|
||||
{0:~ }│{0:~ }│{0:~ }|
|
||||
{2:[No Name] }{1:[No Name] }{2:[No Name] }|
|
||||
|
|
||||
{0:~ }|
|
||||
@@ -159,12 +159,12 @@ describe('highlight defaults', function()
|
||||
]])
|
||||
feed('<c-w>l')
|
||||
screen:expect([[
|
||||
{2:│} {2:│}^ |
|
||||
{0:~ }{2:│}{0:~ }{2:│}{0:~ }|
|
||||
{0:~ }{2:│}{0:~ }{2:│}{0:~ }|
|
||||
{0:~ }{2:│}{0:~ }{2:│}{0:~ }|
|
||||
{0:~ }{2:│}{0:~ }{2:│}{0:~ }|
|
||||
{0:~ }{2:│}{0:~ }{2:│}{0:~ }|
|
||||
│ │^ |
|
||||
{0:~ }│{0:~ }│{0:~ }|
|
||||
{0:~ }│{0:~ }│{0:~ }|
|
||||
{0:~ }│{0:~ }│{0:~ }|
|
||||
{0:~ }│{0:~ }│{0:~ }|
|
||||
{0:~ }│{0:~ }│{0:~ }|
|
||||
{2:[No Name] [No Name] }{1:[No Name] }|
|
||||
|
|
||||
{0:~ }|
|
||||
@@ -176,12 +176,12 @@ describe('highlight defaults', function()
|
||||
]])
|
||||
feed('<c-w>h<c-w>h')
|
||||
screen:expect([[
|
||||
^ {2:│} {2:│} |
|
||||
{0:~ }{2:│}{0:~ }{2:│}{0:~ }|
|
||||
{0:~ }{2:│}{0:~ }{2:│}{0:~ }|
|
||||
{0:~ }{2:│}{0:~ }{2:│}{0:~ }|
|
||||
{0:~ }{2:│}{0:~ }{2:│}{0:~ }|
|
||||
{0:~ }{2:│}{0:~ }{2:│}{0:~ }|
|
||||
^ │ │ |
|
||||
{0:~ }│{0:~ }│{0:~ }|
|
||||
{0:~ }│{0:~ }│{0:~ }|
|
||||
{0:~ }│{0:~ }│{0:~ }|
|
||||
{0:~ }│{0:~ }│{0:~ }|
|
||||
{0:~ }│{0:~ }│{0:~ }|
|
||||
{1:[No Name] }{2:[No Name] [No Name] }|
|
||||
|
|
||||
{0:~ }|
|
||||
@@ -1185,31 +1185,31 @@ describe('CursorLine and CursorLineNr highlights', function()
|
||||
feed('<esc>gg')
|
||||
command('windo diffthis')
|
||||
screen:expect([[
|
||||
{1: }{7:line 1 some text }{4:│}{1: }{7:^line 1 some text }|
|
||||
{1: }{3:line 2 mo}{2:Re text!}{3: }{4:│}{1: }{3:line 2 mo}{2:re text}{3: }|
|
||||
{1: }{5:extra line! }{4:│}{1: }{6:----------------------}|
|
||||
{1: }extra line! {4:│}{1: }extra line! |
|
||||
{1: }extra line! {4:│}{1: }extra line! |
|
||||
{1: }last line ... {4:│}{1: }last line ... |
|
||||
{1: } {4:│}{1: } |
|
||||
{8:~ }{4:│}{8:~ }|
|
||||
{8:~ }{4:│}{8:~ }|
|
||||
{8:~ }{4:│}{8:~ }|
|
||||
{1: }{7:line 1 some text }│{1: }{7:^line 1 some text }|
|
||||
{1: }{3:line 2 mo}{2:Re text!}{3: }│{1: }{3:line 2 mo}{2:re text}{3: }|
|
||||
{1: }{5:extra line! }│{1: }{6:----------------------}|
|
||||
{1: }extra line! │{1: }extra line! |
|
||||
{1: }extra line! │{1: }extra line! |
|
||||
{1: }last line ... │{1: }last line ... |
|
||||
{1: } │{1: } |
|
||||
{8:~ }│{8:~ }|
|
||||
{8:~ }│{8:~ }|
|
||||
{8:~ }│{8:~ }|
|
||||
{4:[No Name] [+] }{9:[No Name] [+] }|
|
||||
|
|
||||
]])
|
||||
feed('jjjjj')
|
||||
screen:expect([[
|
||||
{1: }line 1 some text {4:│}{1: }line 1 some text |
|
||||
{1: }{3:line 2 mo}{2:Re text!}{3: }{4:│}{1: }{3:line 2 mo}{2:re text}{3: }|
|
||||
{1: }{5:extra line! }{4:│}{1: }{6:----------------------}|
|
||||
{1: }extra line! {4:│}{1: }extra line! |
|
||||
{1: }extra line! {4:│}{1: }extra line! |
|
||||
{1: }last line ... {4:│}{1: }last line ... |
|
||||
{1: }{7: }{4:│}{1: }{7:^ }|
|
||||
{8:~ }{4:│}{8:~ }|
|
||||
{8:~ }{4:│}{8:~ }|
|
||||
{8:~ }{4:│}{8:~ }|
|
||||
{1: }line 1 some text │{1: }line 1 some text |
|
||||
{1: }{3:line 2 mo}{2:Re text!}{3: }│{1: }{3:line 2 mo}{2:re text}{3: }|
|
||||
{1: }{5:extra line! }│{1: }{6:----------------------}|
|
||||
{1: }extra line! │{1: }extra line! |
|
||||
{1: }extra line! │{1: }extra line! |
|
||||
{1: }last line ... │{1: }last line ... |
|
||||
{1: }{7: }│{1: }{7:^ }|
|
||||
{8:~ }│{8:~ }|
|
||||
{8:~ }│{8:~ }|
|
||||
{8:~ }│{8:~ }|
|
||||
{4:[No Name] [+] }{9:[No Name] [+] }|
|
||||
|
|
||||
]])
|
||||
@@ -1219,16 +1219,16 @@ describe('CursorLine and CursorLineNr highlights', function()
|
||||
command('hi CursorLine ctermbg=red ctermfg=NONE guibg=red guifg=NONE')
|
||||
feed('kkkk')
|
||||
screen:expect([[
|
||||
{1: }line 1 some text {4:│}{1: }line 1 some text |
|
||||
{1: }{11:line 2 mo}{12:Re text!}{11: }{4:│}{1: }{11:^line 2 mo}{12:re text}{11: }|
|
||||
{1: }{5:extra line! }{4:│}{1: }{6:----------------------}|
|
||||
{1: }extra line! {4:│}{1: }extra line! |
|
||||
{1: }extra line! {4:│}{1: }extra line! |
|
||||
{1: }last line ... {4:│}{1: }last line ... |
|
||||
{1: } {4:│}{1: } |
|
||||
{8:~ }{4:│}{8:~ }|
|
||||
{8:~ }{4:│}{8:~ }|
|
||||
{8:~ }{4:│}{8:~ }|
|
||||
{1: }line 1 some text │{1: }line 1 some text |
|
||||
{1: }{11:line 2 mo}{12:Re text!}{11: }│{1: }{11:^line 2 mo}{12:re text}{11: }|
|
||||
{1: }{5:extra line! }│{1: }{6:----------------------}|
|
||||
{1: }extra line! │{1: }extra line! |
|
||||
{1: }extra line! │{1: }extra line! |
|
||||
{1: }last line ... │{1: }last line ... |
|
||||
{1: } │{1: } |
|
||||
{8:~ }│{8:~ }|
|
||||
{8:~ }│{8:~ }|
|
||||
{8:~ }│{8:~ }|
|
||||
{4:[No Name] [+] }{9:[No Name] [+] }|
|
||||
|
|
||||
]], {
|
||||
@@ -1274,31 +1274,31 @@ describe('CursorLine and CursorLineNr highlights', function()
|
||||
command('windo diffthis')
|
||||
command('1wincmd w')
|
||||
screen:expect([[
|
||||
{1: }{9: }{2:-------------------}{3:│}{1: }{9: 1 }{4:baz }|
|
||||
{1: }{6: 1 }{5:^foo }{3:│}{1: }{6: 2 }{5:foo }|
|
||||
{1: }{9: 2 }foo {3:│}{1: }{9: 3 }foo |
|
||||
{1: }{9: 3 }bar {3:│}{1: }{9: 4 }bar |
|
||||
{7:~ }{3:│}{7:~ }|
|
||||
{7:~ }{3:│}{7:~ }|
|
||||
{7:~ }{3:│}{7:~ }|
|
||||
{7:~ }{3:│}{7:~ }|
|
||||
{7:~ }{3:│}{7:~ }|
|
||||
{7:~ }{3:│}{7:~ }|
|
||||
{1: }{9: }{2:-------------------}│{1: }{9: 1 }{4:baz }|
|
||||
{1: }{6: 1 }{5:^foo }│{1: }{6: 2 }{5:foo }|
|
||||
{1: }{9: 2 }foo │{1: }{9: 3 }foo |
|
||||
{1: }{9: 3 }bar │{1: }{9: 4 }bar |
|
||||
{7:~ }│{7:~ }|
|
||||
{7:~ }│{7:~ }|
|
||||
{7:~ }│{7:~ }|
|
||||
{7:~ }│{7:~ }|
|
||||
{7:~ }│{7:~ }|
|
||||
{7:~ }│{7:~ }|
|
||||
{8:[No Name] [+] }{3:[No Name] [+] }|
|
||||
|
|
||||
]])
|
||||
command('set cursorlineopt=number')
|
||||
screen:expect([[
|
||||
{1: }{9: }{2:-------------------}{3:│}{1: }{9: 1 }{4:baz }|
|
||||
{1: }{6: 1 }^foo {3:│}{1: }{6: 2 }{5:foo }|
|
||||
{1: }{9: 2 }foo {3:│}{1: }{9: 3 }foo |
|
||||
{1: }{9: 3 }bar {3:│}{1: }{9: 4 }bar |
|
||||
{7:~ }{3:│}{7:~ }|
|
||||
{7:~ }{3:│}{7:~ }|
|
||||
{7:~ }{3:│}{7:~ }|
|
||||
{7:~ }{3:│}{7:~ }|
|
||||
{7:~ }{3:│}{7:~ }|
|
||||
{7:~ }{3:│}{7:~ }|
|
||||
{1: }{9: }{2:-------------------}│{1: }{9: 1 }{4:baz }|
|
||||
{1: }{6: 1 }^foo │{1: }{6: 2 }{5:foo }|
|
||||
{1: }{9: 2 }foo │{1: }{9: 3 }foo |
|
||||
{1: }{9: 3 }bar │{1: }{9: 4 }bar |
|
||||
{7:~ }│{7:~ }|
|
||||
{7:~ }│{7:~ }|
|
||||
{7:~ }│{7:~ }|
|
||||
{7:~ }│{7:~ }|
|
||||
{7:~ }│{7:~ }|
|
||||
{7:~ }│{7:~ }|
|
||||
{8:[No Name] [+] }{3:[No Name] [+] }|
|
||||
|
|
||||
]])
|
||||
|
||||
Reference in New Issue
Block a user