From d9de4c0efb142e140bbddd87ffcb0bf222bb6fbc Mon Sep 17 00:00:00 2001 From: Marco Hinz Date: Wed, 3 Apr 2019 10:48:47 +0200 Subject: vim-patch:8.1.1072: extending sign and foldcolumn below the text is confusing (#9816) Problem: Extending sign and foldcolumn below the text is confusing. Solution: Let the sign and foldcolumn stop at the last text line, just like the line number column. Also stop the command line window leader. (Christian Brabandt) https://github.com/vim/vim/commit/8ee4c01b8c79a29065c1af05e5d9c0721069765f Closes https://github.com/neovim/neovim/issues/9613 --- test/functional/ui/fold_spec.lua | 48 ++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'test/functional/ui/fold_spec.lua') diff --git a/test/functional/ui/fold_spec.lua b/test/functional/ui/fold_spec.lua index 943cbcef56..5fa299bed9 100644 --- a/test/functional/ui/fold_spec.lua +++ b/test/functional/ui/fold_spec.lua @@ -39,11 +39,11 @@ describe("folded lines", function() screen:expect([[ {7:+ }{5: 1 +-- 2 lines: ·························}| {7:+ }{5: 0 ^+-- 2 lines: ·························}| - {7: }{1:~ }| - {7: }{1:~ }| - {7: }{1:~ }| - {7: }{1:~ }| - {7: }{1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| :set foldcolumn=2 | ]]) end) @@ -93,12 +93,12 @@ describe("folded lines", function() feed_command("set number foldcolumn=2") screen:expect([[ {7:+ }{5: 1 ^+-- 2 lines: å 语 x̎͂̀̂͛͛ العَرَبِيَّة···········}| - {7: }{1:~ }| - {7: }{1:~ }| - {7: }{1:~ }| - {7: }{1:~ }| - {7: }{1:~ }| - {7: }{1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| + {1:~ }| :set number foldcolumn=2 | ]]) @@ -106,12 +106,12 @@ describe("folded lines", function() feed_command("set rightleft") screen:expect([[ {5:+-- 2 lines: å ······················^· 1 }{7: +}| - {1: ~}{7: }| - {1: ~}{7: }| - {1: ~}{7: }| - {1: ~}{7: }| - {1: ~}{7: }| - {1: ~}{7: }| + {1: ~}| + {1: ~}| + {1: ~}| + {1: ~}| + {1: ~}| + {1: ~}| :set rightleft | ]]) @@ -178,7 +178,7 @@ describe("folded lines", function() {1::}set foldmethod=manual | {1::}let x = 1 | {1::}^ | - {1::~ }| + {1:~ }| {3:[Command Line] }| : | ]]) @@ -189,8 +189,8 @@ describe("folded lines", function() {2:[No Name] }| {1::}{5:^+-- 2 lines: set foldmethod=manual·········}| {1::} | - {1::~ }| - {1::~ }| + {1:~ }| + {1:~ }| {3:[Command Line] }| : | ]]) @@ -214,7 +214,7 @@ describe("folded lines", function() {1:/}alpha | {1:/}{6:omega} | {1:/}^ | - {1:/~ }| + {1:~ }| {3:[Command Line] }| / | ]]) @@ -224,9 +224,9 @@ describe("folded lines", function() | {2:[No Name] }| {1:/}{5:^+-- 3 lines: alpha·························}| - {1:/~ }| - {1:/~ }| - {1:/~ }| + {1:~ }| + {1:~ }| + {1:~ }| {3:[Command Line] }| / | ]]) -- cgit