mirror of
https://github.com/neovim/neovim.git
synced 2025-02-25 18:55:25 -06:00
foldcolumn: support "auto" (#13571)
"set foldcolumn=auto" is documented but not supported. Support it by making it behave as "auto:1", similar to "signcolumn". Close https://github.com/neovim/neovim/pull/13561
This commit is contained in:
@@ -886,6 +886,41 @@ describe("folded lines", function()
|
||||
|
|
||||
]])
|
||||
end
|
||||
command("set foldcolumn=auto")
|
||||
if multigrid then
|
||||
screen:expect{grid=[[
|
||||
## grid 1
|
||||
[2:---------------------------------------------]|
|
||||
[2:---------------------------------------------]|
|
||||
[2:---------------------------------------------]|
|
||||
[2:---------------------------------------------]|
|
||||
[2:---------------------------------------------]|
|
||||
[2:---------------------------------------------]|
|
||||
[2:---------------------------------------------]|
|
||||
[3:---------------------------------------------]|
|
||||
## grid 2
|
||||
{7:+}{5:^+-- 2 lines: line 1························}|
|
||||
{7: }line 3 |
|
||||
{7: }line 4 |
|
||||
{1:~ }|
|
||||
{1:~ }|
|
||||
{1:~ }|
|
||||
{1:~ }|
|
||||
## grid 3
|
||||
|
|
||||
]], unchanged=true}
|
||||
else
|
||||
screen:expect{grid=[[
|
||||
{7:+}{5:^+-- 2 lines: line 1························}|
|
||||
{7: }line 3 |
|
||||
{7: }line 4 |
|
||||
{1:~ }|
|
||||
{1:~ }|
|
||||
{1:~ }|
|
||||
{1:~ }|
|
||||
|
|
||||
]], unchanged=true}
|
||||
end
|
||||
-- fdc should not change with a new fold as the maximum is 1
|
||||
feed("zf3j")
|
||||
|
||||
@@ -924,6 +959,41 @@ describe("folded lines", function()
|
||||
]])
|
||||
end
|
||||
|
||||
command("set foldcolumn=auto:1")
|
||||
if multigrid then screen:expect{grid=[[
|
||||
## grid 1
|
||||
[2:---------------------------------------------]|
|
||||
[2:---------------------------------------------]|
|
||||
[2:---------------------------------------------]|
|
||||
[2:---------------------------------------------]|
|
||||
[2:---------------------------------------------]|
|
||||
[2:---------------------------------------------]|
|
||||
[2:---------------------------------------------]|
|
||||
[3:---------------------------------------------]|
|
||||
## grid 2
|
||||
{7:+}{5:^+-- 4 lines: line 1························}|
|
||||
{1:~ }|
|
||||
{1:~ }|
|
||||
{1:~ }|
|
||||
{1:~ }|
|
||||
{1:~ }|
|
||||
{1:~ }|
|
||||
## grid 3
|
||||
|
|
||||
]], unchanged=true}
|
||||
else
|
||||
screen:expect{grid=[[
|
||||
{7:+}{5:^+-- 4 lines: line 1························}|
|
||||
{1:~ }|
|
||||
{1:~ }|
|
||||
{1:~ }|
|
||||
{1:~ }|
|
||||
{1:~ }|
|
||||
{1:~ }|
|
||||
|
|
||||
]], unchanged=true}
|
||||
end
|
||||
|
||||
-- relax the maximum fdc thus fdc should expand to
|
||||
-- accomodate the current number of folds
|
||||
command("set foldcolumn=auto:4")
|
||||
|
||||
Reference in New Issue
Block a user