mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-12-16 03:15:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

screen.c: remove fold_line

Browse Source 
as well as copy_text_attr, text_to_screenline.
Display of folded line is now done via win_line, which reduces code
deduplication.
As fold_line was a trimmed down version of win_line, this change brings
new features such CursorLineNr highighting even on folded line, as well
as CursorLine highlighting.
This commit is contained in:
Matthieu Coudron
2020-06-20 01:57:07 +02:00
committed by Björn Linse
parent 4f8d98e583
commit f8134f2fd1
2 changed files with 117 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
test/functional/ui/fold_spec.lua
View File

@@ -21,6 +21,8 @@ describe("folded lines", function()
[5] = {foreground = Screen.colors.DarkBlue, background = Screen.colors.LightGrey},
[6] = {background = Screen.colors.Yellow},
[7] = {foreground = Screen.colors.DarkBlue, background = Screen.colors.WebGray},
[8] = {foreground = Screen.colors.Brown },
[9] = {bold = true, foreground = Screen.colors.Brown}
})
end)
@@ -29,7 +31,7 @@ describe("folded lines", function()
feed("i<cr><esc>")
feed("vkzf")
screen:expect([[
{5: ^+-- 2 lines: ·············}|
{7: }{5:^+-- 2 lines: ·············}|
{1:~ }|
{1:~ }|
{1:~ }|
@@ -49,8 +51,8 @@ describe("folded lines", function()
funcs.setline(4, 'line 2')
feed("j")
screen:expect([[
{7:+ }{5: 1 +-- 2 lines: ·························}|
{7:+ }{5: 0 ^+-- 2 lines: ·························}|
{7:+ }{8: 1 }{5:+-- 2 lines: ·························}|
{7:+ }{9: 0 }{5:^+-- 2 lines: ·························}|
{1:~ }|
{1:~ }|
{1:~ }|
@@ -130,17 +132,27 @@ describe("folded lines", function()
]])
feed('vkzf')
screen:expect([[
{5:^+-- 2 lines: å 语 x̎͂̀̂͛͛ ﺎﻠﻋَﺮَﺒِﻳَّﺓ·················}|
-- screen:snapshot_util()
-- screen:expect([[
-- {5:^+-- 2 lines: å 语 x̎͛ العَرَبِيَّة········
-- {1:~ }|
-- {1:~ }|
-- {1:~ }|
-- {1:~ }|
-- {1:~ }|
-- {1:~ }|
-- |
-- ]])
screen:expect{grid=[[
{5:^+-- 2 lines: å 语 x̎͛ العَرَبِيَّة·················}|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
|
]])
|
]]}
feed_command("set noarabicshape")
screen:expect([[
{5:^+-- 2 lines: å 语 x̎͂̀̂͛͛ العَرَبِيَّة·················}|