IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

'fillchars': fix defaults logic; handle ambiwidth=double #7986

Browse Source 
Update tests.
This commit is contained in:
Matthieu Coudron 2018-02-09 08:44:24 +09:00 committed by Justin M. Keyes
parent 0c930c2969
commit 384a39479a
13 changed files with 305 additions and 261 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
runtime/doc/options.txt
View File

@ -2377,7 +2377,7 @@ A jump table for the options with a short description can be found at |Q_op|.
Only normal file name characters can be used, "/\*?[|<>" are illegal. Only normal file name characters can be used, "/\*?[|<>" are illegal.
*'fillchars'* *'fcs'* *'fillchars'* *'fcs'*
'fillchars' 'fcs' string (default "vert:│,fold:·") 'fillchars' 'fcs' string (default "")
global global
{not available when compiled without the |+windows| {not available when compiled without the |+windows|
and |+folding| features} and |+folding| features}
@ -2387,14 +2387,17 @@ A jump table for the options with a short description can be found at |Q_op|.
item default Used for ~ item default Used for ~
stl:c ' ' or '^' statusline of the current window stl:c ' ' or '^' statusline of the current window
stlnc:c ' ' or '=' statusline of the non-current windows stlnc:c ' ' or '=' statusline of the non-current windows
vert:c '│' vertical separators |:vsplit| vert:c '│' or '|' vertical separators |:vsplit|
fold:c '·' filling 'foldtext' fold:c '·' or '-' filling 'foldtext'
diff:c '-' deleted lines of the 'diff' option diff:c '-' deleted lines of the 'diff' option
Any one that is omitted will fall back to the default. For "stl" and Any one that is omitted will fall back to the default. For "stl" and
"stlnc" the space will be used when there is highlighting, '^' or '=' "stlnc" the space will be used when there is highlighting, '^' or '='
otherwise. otherwise.
If 'ambiwidth' is "double" then "vert" and "fold" default to
single-byte alternatives.
Example: > Example: >
:set fillchars=stl:^,stlnc:=,vert:│,fold:·,diff:- :set fillchars=stl:^,stlnc:=,vert:│,fold:·,diff:-
< This is similar to the default, except that these characters will also < This is similar to the default, except that these characters will also

4
src/nvim/globals.h
View File

@ -937,7 +937,7 @@ extern char_u *compiled_sys;
* directory is not a local directory, globaldir is NULL. */ * directory is not a local directory, globaldir is NULL. */
EXTERN char_u *globaldir INIT(= NULL); EXTERN char_u *globaldir INIT(= NULL);
/* Characters from 'listchars' option */ // 'listchars' characters. Defaults are overridden in set_chars_option().
EXTERN int lcs_eol INIT(= '$'); EXTERN int lcs_eol INIT(= '$');
EXTERN int lcs_ext INIT(= NUL); EXTERN int lcs_ext INIT(= NUL);
EXTERN int lcs_prec INIT(= NUL); EXTERN int lcs_prec INIT(= NUL);
@ -948,7 +948,7 @@ EXTERN int lcs_tab2 INIT(= NUL);
EXTERN int lcs_trail INIT(= NUL); EXTERN int lcs_trail INIT(= NUL);
EXTERN int lcs_conceal INIT(= ' '); EXTERN int lcs_conceal INIT(= ' ');
/* Characters from 'fillchars' option */ // 'fillchars' characters. Defaults are overridden in set_chars_option().
EXTERN int fill_stl INIT(= ' '); EXTERN int fill_stl INIT(= ' ');
EXTERN int fill_stlnc INIT(= ' '); EXTERN int fill_stlnc INIT(= ' ');
EXTERN int fill_vert INIT(= 9474); // │ EXTERN int fill_vert INIT(= 9474); // │

76
src/nvim/option.c
View File

@ -3381,37 +3381,38 @@ skip:
return NULL; /* no error */ return NULL; /* no error */
} }
/*
* Handle setting 'listchars' or 'fillchars'. /// Handle setting 'listchars' or 'fillchars'.
* Returns error message, NULL if it's OK. /// Assume monocell characters
*/ ///
/// @param varp either &p_lcs ('listchars') or &p_fcs ('fillchar')
/// @return error message, NULL if it's OK.
static char_u *set_chars_option(char_u **varp) static char_u *set_chars_option(char_u **varp)
{ {
int round, i, len, entries; int round, i, len, entries;
char_u *p, *s; char_u *p, *s;
int c1, c2 = 0; int c1, c2 = 0;
struct charstab { struct charstab {
int *cp; int *cp; ///< char value
char *name; char *name; ///< char id
int def; ///< default value
}; };
static struct charstab filltab[] = static struct charstab filltab[] = {
{ { &fill_stl, "stl" , ' ' },
{&fill_stl, "stl"}, { &fill_stlnc, "stlnc", ' ' },
{&fill_stlnc, "stlnc"}, { &fill_vert, "vert" , 9474 }, // │
{&fill_vert, "vert"}, { &fill_fold, "fold" , 183 }, // ·
{&fill_fold, "fold"}, { &fill_diff, "diff" , '-' },
{&fill_diff, "diff"},
}; };
static struct charstab lcstab[] = static struct charstab lcstab[] = {
{ { &lcs_eol, "eol", NUL },
{&lcs_eol, "eol"}, { &lcs_ext, "extends", NUL },
{&lcs_ext, "extends"}, { &lcs_nbsp, "nbsp", NUL },
{&lcs_nbsp, "nbsp"}, { &lcs_prec, "precedes", NUL },
{&lcs_prec, "precedes"}, { &lcs_space, "space", NUL },
{&lcs_space, "space"}, { &lcs_tab2, "tab", NUL },
{&lcs_tab2, "tab"}, { &lcs_trail, "trail", NUL },
{&lcs_trail, "trail"}, { &lcs_conceal, "conceal", NUL },
{&lcs_conceal, "conceal"},
}; };
struct charstab *tab; struct charstab *tab;
@ -3421,20 +3422,29 @@ static char_u *set_chars_option(char_u **varp)
} else { } else {
tab = filltab; tab = filltab;
entries = ARRAY_SIZE(filltab); entries = ARRAY_SIZE(filltab);
if (*p_ambw == 'd') {
// XXX: If ambiwidth=double then "|" and "·" take 2 columns, which is
// forbidden (TUI limitation?). Set old defaults.
filltab[2].def = '|';
filltab[3].def = '-';
} else {
filltab[2].def = 9474; // │
filltab[3].def = 183; // ·
}
} }
/* first round: check for valid value, second round: assign values */ // first round: check for valid value, second round: assign values
for (round = 0; round <= 1; ++round) { for (round = 0; round <= 1; round++) {
if (round > 0) { if (round > 0) {
/* After checking that the value is valid: set defaults: space for // After checking that the value is valid: set defaults
* 'fillchars', NUL for 'listchars' */ for (i = 0; i < entries; i++) {
for (i = 0; i < entries; ++i) if (tab[i].cp != NULL) {
if (tab[i].cp != NULL) *(tab[i].cp) = tab[i].def;
*(tab[i].cp) = (varp == &p_lcs ? NUL : ' '); }
if (varp == &p_lcs) }
if (varp == &p_lcs) {
lcs_tab1 = NUL; lcs_tab1 = NUL;
else }
fill_diff = '-';
} }
p = *varp; p = *varp;
while (*p) { while (*p) {

2
src/nvim/options.lua
View File

@ -812,7 +812,7 @@ return {
vi_def=true, vi_def=true,
redraw={'all_windows'}, redraw={'all_windows'},
varname='p_fcs', varname='p_fcs',
defaults={if_true={vi="vert:│,fold:·"}} defaults={if_true={vi=''}}
}, },
{ {
full_name='fixendofline', abbreviation='fixeol', full_name='fixendofline', abbreviation='fixeol',

4
src/nvim/screen.c
View File

@ -7088,12 +7088,8 @@ static int fillchar_status(int *attr, win_T *wp)
static int fillchar_vsep(win_T *wp, int *attr) static int fillchar_vsep(win_T *wp, int *attr)
{ {
*attr = win_hl_attr(wp, HLF_C); *attr = win_hl_attr(wp, HLF_C);
if (*attr == 0 && fill_vert == ' ') {
return 9474; // default: "│"
} else {
return fill_vert; return fill_vert;
} }
}
/* /*
* Return TRUE if redrawing should currently be done. * Return TRUE if redrawing should currently be done.

1
src/nvim/testdir/setup.vim
View File

@ -6,6 +6,7 @@ set directory^=.
set backspace= set backspace=
set nohidden smarttab noautoindent noautoread complete-=i noruler noshowcmd set nohidden smarttab noautoindent noautoread complete-=i noruler noshowcmd
set listchars=eol:$ set listchars=eol:$
set fillchars=vert:\|,fold:-
" Prevent Nvim log from writing to stderr. " Prevent Nvim log from writing to stderr.
let $NVIM_LOG_FILE = exists($NVIM_LOG_FILE) ? $NVIM_LOG_FILE : 'Xnvim.log' let $NVIM_LOG_FILE = exists($NVIM_LOG_FILE) ? $NVIM_LOG_FILE : 'Xnvim.log'

32
test/functional/ex_cmds/drop_spec.lua
View File

@ -44,14 +44,14 @@ describe(":drop", function()
feed_command("edit tmp2") feed_command("edit tmp2")
feed_command("drop tmp1") feed_command("drop tmp1")
screen:expect([[ screen:expect([[
{2:|}^ | {2:│}^ |
{0:~ }{2:|}{0:~ }| {0:~ }{2:│}{0:~ }|
{0:~ }{2:|}{0:~ }| {0:~ }{2:│}{0:~ }|
{0:~ }{2:|}{0:~ }| {0:~ }{2:│}{0:~ }|
{0:~ }{2:|}{0:~ }| {0:~ }{2:│}{0:~ }|
{0:~ }{2:|}{0:~ }| {0:~ }{2:│}{0:~ }|
{0:~ }{2:|}{0:~ }| {0:~ }{2:│}{0:~ }|
{0:~ }{2:|}{0:~ }| {0:~ }{2:│}{0:~ }|
{2:tmp2 }{1:tmp1 }| {2:tmp2 }{1:tmp1 }|
:drop tmp1 | :drop tmp1 |
]]) ]])
@ -64,14 +64,14 @@ describe(":drop", function()
feed("iABC<esc>") feed("iABC<esc>")
feed_command("drop tmp3") feed_command("drop tmp3")
screen:expect([[ screen:expect([[
^ {2:|} | ^ {2:│} |
{0:~ }{2:|}{0:~ }| {0:~ }{2:│}{0:~ }|
{0:~ }{2:|}{0:~ }| {0:~ }{2:│}{0:~ }|
{0:~ }{2:|}{0:~ }| {0:~ }{2:│}{0:~ }|
{1:tmp3 }{2:|}{0:~ }| {1:tmp3 }{2:│}{0:~ }|
ABC {2:|}{0:~ }| ABC {2:│}{0:~ }|
{0:~ }{2:|}{0:~ }| {0:~ }{2:│}{0:~ }|
{0:~ }{2:|}{0:~ }| {0:~ }{2:│}{0:~ }|
{2:tmp2 [+] tmp1 }| {2:tmp2 [+] tmp1 }|
"tmp3" [New File] | "tmp3" [New File] |
]]) ]])

36
test/functional/options/defaults_spec.lua
View File

@ -7,6 +7,7 @@ local command = helpers.command
local clear = helpers.clear local clear = helpers.clear
local eval = helpers.eval local eval = helpers.eval
local eq = helpers.eq local eq = helpers.eq
local insert = helpers.insert
local neq = helpers.neq local neq = helpers.neq
local mkdir = helpers.mkdir local mkdir = helpers.mkdir
local rmdir = helpers.rmdir local rmdir = helpers.rmdir
@ -115,7 +116,40 @@ describe('startup defaults', function()
end) end)
end) end)
describe('packpath', function() describe("'fillchars'", function()
it('vert/fold flags', function()
clear()
local screen = Screen.new(50, 5)
screen:attach()
command('set laststatus=0')
insert([[
1
2
3
4]])
command('normal! ggjzfj')
command('vsp')
screen:expect([[
1 │1 |
^+-- 2 lines: 2··········│+-- 2 lines: 2·········|
4 │4 |
~ │~ |
|
]])
-- ambiwidth=double defaults to single-byte fillchars.
command('set ambiwidth=double')
screen:expect([[
1 |1 |
^+-- 2 lines: 2----------|+-- 2 lines: 2---------|
4 |4 |
~ |~ |
|
]])
end)
end)
describe("'packpath'", function()
it('defaults to &runtimepath', function() it('defaults to &runtimepath', function()
eq(meths.get_option('runtimepath'), meths.get_option('packpath')) eq(meths.get_option('runtimepath'), meths.get_option('packpath'))
end) end)

80
test/functional/terminal/mouse_spec.lua
View File

@ -98,41 +98,41 @@ describe('terminal mouse', function()
before_each(function() before_each(function()
feed('<c-\\><c-n>:vsp<cr>') feed('<c-\\><c-n>:vsp<cr>')
screen:expect([[ screen:expect([[
line28 |line28 | line28 │line28 |
line29 |line29 | line29 │line29 |
line30 |line30 | line30 │line30 |
rows: 5, cols: 24 |rows: 5, cols: 24 | rows: 5, cols: 24 │rows: 5, cols: 24 |
{2:^ } |{2: } | {2:^ } │{2: } |
========== ========== | ========== ========== |
:vsp | :vsp |
]]) ]])
feed(':enew | set number<cr>') feed(':enew | set number<cr>')
screen:expect([[ screen:expect([[
{7: 1 }^ |line28 | {7: 1 }^ │line28 |
{4:~ }|line29 | {4:~ }│line29 |
{4:~ }|line30 | {4:~ }│line30 |
{4:~ }|rows: 5, cols: 24 | {4:~ }│rows: 5, cols: 24 |
{4:~ }|{2: } | {4:~ }│{2: } |
========== ========== | ========== ========== |
:enew | set number | :enew | set number |
]]) ]])
feed('30iline\n<esc>') feed('30iline\n<esc>')
screen:expect([[ screen:expect([[
{7: 27 }line |line28 | {7: 27 }line │line28 |
{7: 28 }line |line29 | {7: 28 }line │line29 |
{7: 29 }line |line30 | {7: 29 }line │line30 |
{7: 30 }line |rows: 5, cols: 24 | {7: 30 }line │rows: 5, cols: 24 |
{7: 31 }^ |{2: } | {7: 31 }^ │{2: } |
========== ========== | ========== ========== |
| |
]]) ]])
feed('<c-w>li') feed('<c-w>li')
screen:expect([[ screen:expect([[
{7: 27 }line |line28 | {7: 27 }line │line28 |
{7: 28 }line |line29 | {7: 28 }line │line29 |
{7: 29 }line |line30 | {7: 29 }line │line30 |
{7: 30 }line |rows: 5, cols: 24 | {7: 30 }line │rows: 5, cols: 24 |
{7: 31 } |{1: } | {7: 31 } │{1: } |
========== ========== | ========== ========== |
{3:-- TERMINAL --} | {3:-- TERMINAL --} |
]]) ]])
@ -140,11 +140,11 @@ describe('terminal mouse', function()
thelpers.enable_mouse() thelpers.enable_mouse()
thelpers.feed_data('mouse enabled\n') thelpers.feed_data('mouse enabled\n')
screen:expect([[ screen:expect([[
{7: 27 }line |line29 | {7: 27 }line │line29 |
{7: 28 }line |line30 | {7: 28 }line │line30 |
{7: 29 }line |rows: 5, cols: 24 | {7: 29 }line │rows: 5, cols: 24 |
{7: 30 }line |mouse enabled | {7: 30 }line │mouse enabled |
{7: 31 } |{1: } | {7: 31 } │{1: } |
========== ========== | ========== ========== |
{3:-- TERMINAL --} | {3:-- TERMINAL --} |
]]) ]])
@ -153,21 +153,21 @@ describe('terminal mouse', function()
it('wont lose focus if another window is scrolled', function() it('wont lose focus if another window is scrolled', function()
feed('<ScrollWheelUp><0,0><ScrollWheelUp><0,0>') feed('<ScrollWheelUp><0,0><ScrollWheelUp><0,0>')
screen:expect([[ screen:expect([[
{7: 21 }line |line29 | {7: 21 }line │line29 |
{7: 22 }line |line30 | {7: 22 }line │line30 |
{7: 23 }line |rows: 5, cols: 24 | {7: 23 }line │rows: 5, cols: 24 |
{7: 24 }line |mouse enabled | {7: 24 }line │mouse enabled |
{7: 25 }line |{1: } | {7: 25 }line │{1: } |
========== ========== | ========== ========== |
{3:-- TERMINAL --} | {3:-- TERMINAL --} |
]]) ]])
feed('<S-ScrollWheelDown><0,0>') feed('<S-ScrollWheelDown><0,0>')
screen:expect([[ screen:expect([[
{7: 26 }line |line29 | {7: 26 }line │line29 |
{7: 27 }line |line30 | {7: 27 }line │line30 |
{7: 28 }line |rows: 5, cols: 24 | {7: 28 }line │rows: 5, cols: 24 |
{7: 29 }line |mouse enabled | {7: 29 }line │mouse enabled |
{7: 30 }line |{1: } | {7: 30 }line │{1: } |
========== ========== | ========== ========== |
{3:-- TERMINAL --} | {3:-- TERMINAL --} |
]]) ]])
@ -176,11 +176,11 @@ describe('terminal mouse', function()
it('will lose focus if another window is clicked', function() it('will lose focus if another window is clicked', function()
feed('<LeftMouse><5,1>') feed('<LeftMouse><5,1>')
screen:expect([[ screen:expect([[
{7: 27 }line |line29 | {7: 27 }line │line29 |
{7: 28 }l^ine |line30 | {7: 28 }l^ine │line30 |
{7: 29 }line |rows: 5, cols: 24 | {7: 29 }line │rows: 5, cols: 24 |
{7: 30 }line |mouse enabled | {7: 30 }line │mouse enabled |
{7: 31 } |{2: } | {7: 31 } │{2: } |
========== ========== | ========== ========== |
| |
]]) ]])

60
test/functional/ui/highlight_spec.lua
View File

@ -108,12 +108,12 @@ describe('highlight defaults', function()
}) })
feed_command('sp', 'vsp', 'vsp') feed_command('sp', 'vsp', 'vsp')
screen:expect([[ screen:expect([[
^ {2:|} {2:|} | ^ {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:~ }{2:│}{0:~ }{2:│}{0:~ }|
{0:~ }{2:|}{0:~ }{2:|}{0:~ }| {0:~ }{2:│}{0:~ }{2:│}{0:~ }|
{0:~ }{2:|}{0:~ }{2:|}{0:~ }| {0:~ }{2:│}{0:~ }{2:│}{0:~ }|
{1:[No Name] }{2:[No Name] [No Name] }| {1:[No Name] }{2:[No Name] [No Name] }|
| |
{0:~ }| {0:~ }|
@ -126,12 +126,12 @@ describe('highlight defaults', function()
-- navigate to verify that the attributes are properly moved -- navigate to verify that the attributes are properly moved
feed('<c-w>j') feed('<c-w>j')
screen:expect([[ screen:expect([[
{2:|} {2:|} | {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:~ }{2:│}{0:~ }{2:│}{0:~ }|
{0:~ }{2:|}{0:~ }{2:|}{0:~ }| {0:~ }{2:│}{0:~ }{2:│}{0:~ }|
{0:~ }{2:|}{0:~ }{2:|}{0:~ }| {0:~ }{2:│}{0:~ }{2:│}{0:~ }|
{2:[No Name] [No Name] [No Name] }| {2:[No Name] [No Name] [No Name] }|
^ | ^ |
{0:~ }| {0:~ }|
@ -146,12 +146,12 @@ describe('highlight defaults', function()
-- (upstream vim has the same behavior) -- (upstream vim has the same behavior)
feed('<c-w>k<c-w>l') feed('<c-w>k<c-w>l')
screen:expect([[ screen:expect([[
{2:|}^ {2:|} | {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:~ }{2:│}{0:~ }{2:│}{0:~ }|
{0:~ }{2:|}{0:~ }{2:|}{0:~ }| {0:~ }{2:│}{0:~ }{2:│}{0:~ }|
{0:~ }{2:|}{0:~ }{2:|}{0:~ }| {0:~ }{2:│}{0:~ }{2:│}{0:~ }|
{2:[No Name] }{1:[No Name] }{2:[No Name] }| {2:[No Name] }{1:[No Name] }{2:[No Name] }|
| |
{0:~ }| {0:~ }|
@ -163,12 +163,12 @@ describe('highlight defaults', function()
]]) ]])
feed('<c-w>l') feed('<c-w>l')
screen:expect([[ screen:expect([[
{2:|} {2:|}^ | {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:~ }{2:│}{0:~ }{2:│}{0:~ }|
{0:~ }{2:|}{0:~ }{2:|}{0:~ }| {0:~ }{2:│}{0:~ }{2:│}{0:~ }|
{0:~ }{2:|}{0:~ }{2:|}{0:~ }| {0:~ }{2:│}{0:~ }{2:│}{0:~ }|
{2:[No Name] [No Name] }{1:[No Name] }| {2:[No Name] [No Name] }{1:[No Name] }|
| |
{0:~ }| {0:~ }|
@ -180,12 +180,12 @@ describe('highlight defaults', function()
]]) ]])
feed('<c-w>h<c-w>h') feed('<c-w>h<c-w>h')
screen:expect([[ screen:expect([[
^ {2:|} {2:|} | ^ {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:~ }{2:│}{0:~ }{2:│}{0:~ }|
{0:~ }{2:|}{0:~ }{2:|}{0:~ }| {0:~ }{2:│}{0:~ }{2:│}{0:~ }|
{0:~ }{2:|}{0:~ }{2:|}{0:~ }| {0:~ }{2:│}{0:~ }{2:│}{0:~ }|
{1:[No Name] }{2:[No Name] [No Name] }| {1:[No Name] }{2:[No Name] [No Name] }|
| |
{0:~ }| {0:~ }|

68
test/functional/ui/inccommand_spec.lua
View File

@ -1638,26 +1638,26 @@ describe("'inccommand' split windows", function()
feed_command("split") feed_command("split")
feed(":%s/tw") feed(":%s/tw")
screen:expect([[ screen:expect([[
Inc substitution on {10:|}Inc substitution on| Inc substitution on {10:│}Inc substitution on|
{12:tw}o lines {10:|}{12:tw}o lines | {12:tw}o lines {10:│}{12:tw}o lines |
{10:|} | {10:│} |
{15:~ }{10:|}{15:~ }| {15:~ }{10:│}{15:~ }|
{15:~ }{10:|}{15:~ }| {15:~ }{10:│}{15:~ }|
{15:~ }{10:|}{15:~ }| {15:~ }{10:│}{15:~ }|
{15:~ }{10:|}{15:~ }| {15:~ }{10:│}{15:~ }|
{15:~ }{10:|}{15:~ }| {15:~ }{10:│}{15:~ }|
{15:~ }{10:|}{15:~ }| {15:~ }{10:│}{15:~ }|
{15:~ }{10:|}{15:~ }| {15:~ }{10:│}{15:~ }|
{15:~ }{10:|}{15:~ }| {15:~ }{10:│}{15:~ }|
{15:~ }{10:|}{15:~ }| {15:~ }{10:│}{15:~ }|
{15:~ }{10:|}{15:~ }| {15:~ }{10:│}{15:~ }|
{15:~ }{10:|}{15:~ }| {15:~ }{10:│}{15:~ }|
{11:[No Name] [+] }{10:|}{15:~ }| {11:[No Name] [+] }{10:│}{15:~ }|
Inc substitution on {10:|}{15:~ }| Inc substitution on {10:│}{15:~ }|
{12:tw}o lines {10:|}{15:~ }| {12:tw}o lines {10:│}{15:~ }|
{10:|}{15:~ }| {10:│}{15:~ }|
{15:~ }{10:|}{15:~ }| {15:~ }{10:│}{15:~ }|
{15:~ }{10:|}{15:~ }| {15:~ }{10:│}{15:~ }|
{10:[No Name] [+] [No Name] [+] }| {10:[No Name] [+] [No Name] [+] }|
|2| {12:tw}o lines | |2| {12:tw}o lines |
{15:~ }| {15:~ }|
@ -1677,20 +1677,20 @@ describe("'inccommand' split windows", function()
feed(":%s/tw") feed(":%s/tw")
screen:expect([[ screen:expect([[
Inc substitution on {10:|}Inc substitution on| Inc substitution on {10:│}Inc substitution on|
{12:tw}o lines {10:|}{12:tw}o lines | {12:tw}o lines {10:│}{12:tw}o lines |
{10:|} | {10:│} |
{15:~ }{10:|}{15:~ }| {15:~ }{10:│}{15:~ }|
{15:~ }{10:|}{15:~ }| {15:~ }{10:│}{15:~ }|
{15:~ }{10:|}{15:~ }| {15:~ }{10:│}{15:~ }|
{15:~ }{10:|}{15:~ }| {15:~ }{10:│}{15:~ }|
{15:~ }{10:|}{15:~ }| {15:~ }{10:│}{15:~ }|
{15:~ }{10:|}{15:~ }| {15:~ }{10:│}{15:~ }|
{15:~ }{10:|}{15:~ }| {15:~ }{10:│}{15:~ }|
{15:~ }{10:|}{15:~ }| {15:~ }{10:│}{15:~ }|
{15:~ }{10:|}{15:~ }| {15:~ }{10:│}{15:~ }|
{15:~ }{10:|}{15:~ }| {15:~ }{10:│}{15:~ }|
{15:~ }{10:|}{15:~ }| {15:~ }{10:│}{15:~ }|
{11:[No Name] [+] }{10:[No Name] [+] }| {11:[No Name] [+] }{10:[No Name] [+] }|
Inc substitution on | Inc substitution on |
{12:tw}o lines | {12:tw}o lines |

48
test/functional/ui/mouse_spec.lua
View File

@ -638,12 +638,12 @@ describe('ui/mouse/input', function()
screen:try_resize(53, 14) screen:try_resize(53, 14)
feed_command('sp', 'vsp') feed_command('sp', 'vsp')
screen:expect([[ screen:expect([[
lines {4:|}lines | lines {4:│}lines |
to {4:|}to | to {4:│}to |
test {4:|}test | test {4:│}test |
mouse scrolling {4:|}mouse scrolling | mouse scrolling {4:│}mouse scrolling |
^ {4:|} | ^ {4:│} |
{0:~ }{4:|}{0:~ }| {0:~ }{4:│}{0:~ }|
{5:[No Name] [+] }{4:[No Name] [+] }| {5:[No Name] [+] }{4:[No Name] [+] }|
to | to |
test | test |
@ -655,12 +655,12 @@ describe('ui/mouse/input', function()
]]) ]])
feed('<ScrollWheelDown><0,0>') feed('<ScrollWheelDown><0,0>')
screen:expect([[ screen:expect([[
mouse scrolling {4:|}lines | mouse scrolling {4:│}lines |
^ {4:|}to | ^ {4:│}to |
{0:~ }{4:|}test | {0:~ }{4:│}test |
{0:~ }{4:|}mouse scrolling | {0:~ }{4:│}mouse scrolling |
{0:~ }{4:|} | {0:~ }{4:│} |
{0:~ }{4:|}{0:~ }| {0:~ }{4:│}{0:~ }|
{5:[No Name] [+] }{4:[No Name] [+] }| {5:[No Name] [+] }{4:[No Name] [+] }|
to | to |
test | test |
@ -672,12 +672,12 @@ describe('ui/mouse/input', function()
]]) ]])
feed('<ScrollWheelUp><27,0>') feed('<ScrollWheelUp><27,0>')
screen:expect([[ screen:expect([[
mouse scrolling {4:|}text | mouse scrolling {4:│}text |
^ {4:|}with | ^ {4:│}with |
{0:~ }{4:|}many | {0:~ }{4:│}many |
{0:~ }{4:|}lines | {0:~ }{4:│}lines |
{0:~ }{4:|}to | {0:~ }{4:│}to |
{0:~ }{4:|}test | {0:~ }{4:│}test |
{5:[No Name] [+] }{4:[No Name] [+] }| {5:[No Name] [+] }{4:[No Name] [+] }|
to | to |
test | test |
@ -689,12 +689,12 @@ describe('ui/mouse/input', function()
]]) ]])
feed('<ScrollWheelUp><27,7><ScrollWheelUp>') feed('<ScrollWheelUp><27,7><ScrollWheelUp>')
screen:expect([[ screen:expect([[
mouse scrolling {4:|}text | mouse scrolling {4:│}text |
^ {4:|}with | ^ {4:│}with |
{0:~ }{4:|}many | {0:~ }{4:│}many |
{0:~ }{4:|}lines | {0:~ }{4:│}lines |
{0:~ }{4:|}to | {0:~ }{4:│}to |
{0:~ }{4:|}test | {0:~ }{4:│}test |
{5:[No Name] [+] }{4:[No Name] [+] }| {5:[No Name] [+] }{4:[No Name] [+] }|
Inserting | Inserting |
text | text |

144
test/functional/ui/screen_basic_spec.lua
View File

@ -189,12 +189,12 @@ describe('Screen', function()
command('vsp') command('vsp')
command('vsp') command('vsp')
screen:expect([[ screen:expect([[
^ {3:|} {3:|} | ^ {3:│} {3:│} |
{0:~ }{3:|}{0:~ }{3:|}{0:~ }| {0:~ }{3:│}{0:~ }{3:│}{0:~ }|
{0:~ }{3:|}{0:~ }{3:|}{0:~ }| {0:~ }{3:│}{0:~ }{3:│}{0:~ }|
{0:~ }{3:|}{0:~ }{3:|}{0:~ }| {0:~ }{3:│}{0:~ }{3:│}{0:~ }|
{0:~ }{3:|}{0:~ }{3:|}{0:~ }| {0:~ }{3:│}{0:~ }{3:│}{0:~ }|
{0:~ }{3:|}{0:~ }{3:|}{0:~ }| {0:~ }{3:│}{0:~ }{3:│}{0:~ }|
{1:[No Name] }{3:[No Name] [No Name] }| {1:[No Name] }{3:[No Name] [No Name] }|
| |
{0:~ }| {0:~ }|
@ -206,12 +206,12 @@ describe('Screen', function()
]]) ]])
insert('hello') insert('hello')
screen:expect([[ screen:expect([[
hell^o {3:|}hello {3:|}hello | hell^o {3:│}hello {3:│}hello |
{0:~ }{3:|}{0:~ }{3:|}{0:~ }| {0:~ }{3:│}{0:~ }{3:│}{0:~ }|
{0:~ }{3:|}{0:~ }{3:|}{0:~ }| {0:~ }{3:│}{0:~ }{3:│}{0:~ }|
{0:~ }{3:|}{0:~ }{3:|}{0:~ }| {0:~ }{3:│}{0:~ }{3:│}{0:~ }|
{0:~ }{3:|}{0:~ }{3:|}{0:~ }| {0:~ }{3:│}{0:~ }{3:│}{0:~ }|
{0:~ }{3:|}{0:~ }{3:|}{0:~ }| {0:~ }{3:│}{0:~ }{3:│}{0:~ }|
{1:[No Name] [+] }{3:[No Name] [+] [No Name] [+] }| {1:[No Name] [+] }{3:[No Name] [+] [No Name] [+] }|
hello | hello |
{0:~ }| {0:~ }|
@ -232,12 +232,12 @@ describe('Screen', function()
command('vsp') command('vsp')
insert('hello') insert('hello')
screen:expect([[ screen:expect([[
hell^o {3:|}hello {3:|}hello | hell^o {3:│}hello {3:│}hello |
{0:~ }{3:|}{0:~ }{3:|}{0:~ }| {0:~ }{3:│}{0:~ }{3:│}{0:~ }|
{0:~ }{3:|}{0:~ }{3:|}{0:~ }| {0:~ }{3:│}{0:~ }{3:│}{0:~ }|
{0:~ }{3:|}{0:~ }{3:|}{0:~ }| {0:~ }{3:│}{0:~ }{3:│}{0:~ }|
{0:~ }{3:|}{0:~ }{3:|}{0:~ }| {0:~ }{3:│}{0:~ }{3:│}{0:~ }|
{0:~ }{3:|}{0:~ }{3:|}{0:~ }| {0:~ }{3:│}{0:~ }{3:│}{0:~ }|
{1:[No Name] [+] }{3:[No Name] [+] [No Name] [+] }| {1:[No Name] [+] }{3:[No Name] [+] [No Name] [+] }|
hello | hello |
{0:~ }| {0:~ }|
@ -269,12 +269,12 @@ describe('Screen', function()
command('tabprevious') command('tabprevious')
screen:expect([[ screen:expect([[
{2: }{6:4}{2:+ [No Name] }{4: + [No Name] }{3: }{4:X}| {2: }{6:4}{2:+ [No Name] }{4: + [No Name] }{3: }{4:X}|
hell^o {3:|}hello {3:|}hello | hell^o {3:│}hello {3:│}hello |
{0:~ }{3:|}{0:~ }{3:|}{0:~ }| {0:~ }{3:│}{0:~ }{3:│}{0:~ }|
{0:~ }{3:|}{0:~ }{3:|}{0:~ }| {0:~ }{3:│}{0:~ }{3:│}{0:~ }|
{0:~ }{3:|}{0:~ }{3:|}{0:~ }| {0:~ }{3:│}{0:~ }{3:│}{0:~ }|
{0:~ }{3:|}{0:~ }{3:|}{0:~ }| {0:~ }{3:│}{0:~ }{3:│}{0:~ }|
{0:~ }{3:|}{0:~ }{3:|}{0:~ }| {0:~ }{3:│}{0:~ }{3:│}{0:~ }|
{1:[No Name] [+] }{3:[No Name] [+] [No Name] [+] }| {1:[No Name] [+] }{3:[No Name] [+] [No Name] [+] }|
hello | hello |
{0:~ }| {0:~ }|
@ -398,12 +398,12 @@ describe('Screen', function()
command('vsp') command('vsp')
command('vsp') command('vsp')
screen:expect([[ screen:expect([[
and {3:|}and {3:|}and | and {3:│}and {3:│}and |
clearing {3:|}clearing {3:|}clearing | clearing {3:│}clearing {3:│}clearing |
in {3:|}in {3:|}in | in {3:│}in {3:│}in |
split {3:|}split {3:|}split | split {3:│}split {3:│}split |
windows {3:|}windows {3:|}windows | windows {3:│}windows {3:│}windows |
^ {3:|} {3:|} | ^ {3:│} {3:│} |
{1:[No Name] [+] }{3:[No Name] [+] [No Name] [+] }| {1:[No Name] [+] }{3:[No Name] [+] [No Name] [+] }|
clearing | clearing |
in | in |
@ -418,12 +418,12 @@ describe('Screen', function()
it('only affects the current scroll region', function() it('only affects the current scroll region', function()
feed('6k') feed('6k')
screen:expect([[ screen:expect([[
^scrolling {3:|}and {3:|}and | ^scrolling {3:│}and {3:│}and |
and {3:|}clearing {3:|}clearing | and {3:│}clearing {3:│}clearing |
clearing {3:|}in {3:|}in | clearing {3:│}in {3:│}in |
in {3:|}split {3:|}split | in {3:│}split {3:│}split |
split {3:|}windows {3:|}windows | split {3:│}windows {3:│}windows |
windows {3:|} {3:|} | windows {3:│} {3:│} |
{1:[No Name] [+] }{3:[No Name] [+] [No Name] [+] }| {1:[No Name] [+] }{3:[No Name] [+] [No Name] [+] }|
clearing | clearing |
in | in |
@ -435,12 +435,12 @@ describe('Screen', function()
]]) ]])
feed('<c-w>l') feed('<c-w>l')
screen:expect([[ screen:expect([[
scrolling {3:|}and {3:|}and | scrolling {3:│}and {3:│}and |
and {3:|}clearing {3:|}clearing | and {3:│}clearing {3:│}clearing |
clearing {3:|}in {3:|}in | clearing {3:│}in {3:│}in |
in {3:|}split {3:|}split | in {3:│}split {3:│}split |
split {3:|}windows {3:|}windows | split {3:│}windows {3:│}windows |
windows {3:|}^ {3:|} | windows {3:│}^ {3:│} |
{3:[No Name] [+] }{1:[No Name] [+] }{3:<Name] [+] }| {3:[No Name] [+] }{1:[No Name] [+] }{3:<Name] [+] }|
clearing | clearing |
in | in |
@ -452,12 +452,12 @@ describe('Screen', function()
]]) ]])
feed('gg') feed('gg')
screen:expect([[ screen:expect([[
scrolling {3:|}^Inserting {3:|}and | scrolling {3:│}^Inserting {3:│}and |
and {3:|}text {3:|}clearing | and {3:│}text {3:│}clearing |
clearing {3:|}with {3:|}in | clearing {3:│}with {3:│}in |
in {3:|}many {3:|}split | in {3:│}many {3:│}split |
split {3:|}lines {3:|}windows | split {3:│}lines {3:│}windows |
windows {3:|}to {3:|} | windows {3:│}to {3:│} |
{3:[No Name] [+] }{1:[No Name] [+] }{3:<Name] [+] }| {3:[No Name] [+] }{1:[No Name] [+] }{3:<Name] [+] }|
clearing | clearing |
in | in |
@ -469,12 +469,12 @@ describe('Screen', function()
]]) ]])
feed('7j') feed('7j')
screen:expect([[ screen:expect([[
scrolling {3:|}with {3:|}and | scrolling {3:│}with {3:│}and |
and {3:|}many {3:|}clearing | and {3:│}many {3:│}clearing |
clearing {3:|}lines {3:|}in | clearing {3:│}lines {3:│}in |
in {3:|}to {3:|}split | in {3:│}to {3:│}split |
split {3:|}test {3:|}windows | split {3:│}test {3:│}windows |
windows {3:|}^scrolling {3:|} | windows {3:│}^scrolling {3:│} |
{3:[No Name] [+] }{1:[No Name] [+] }{3:<Name] [+] }| {3:[No Name] [+] }{1:[No Name] [+] }{3:<Name] [+] }|
clearing | clearing |
in | in |
@ -486,12 +486,12 @@ describe('Screen', function()
]]) ]])
feed('2j') feed('2j')
screen:expect([[ screen:expect([[
scrolling {3:|}lines {3:|}and | scrolling {3:│}lines {3:│}and |
and {3:|}to {3:|}clearing | and {3:│}to {3:│}clearing |
clearing {3:|}test {3:|}in | clearing {3:│}test {3:│}in |
in {3:|}scrolling {3:|}split | in {3:│}scrolling {3:│}split |
split {3:|}and {3:|}windows | split {3:│}and {3:│}windows |
windows {3:|}^clearing {3:|} | windows {3:│}^clearing {3:│} |
{3:[No Name] [+] }{1:[No Name] [+] }{3:<Name] [+] }| {3:[No Name] [+] }{1:[No Name] [+] }{3:<Name] [+] }|
clearing | clearing |
in | in |
@ -503,12 +503,12 @@ describe('Screen', function()
]]) ]])
feed('5k') feed('5k')
screen:expect([[ screen:expect([[
scrolling {3:|}^lines {3:|}and | scrolling {3:│}^lines {3:│}and |
and {3:|}to {3:|}clearing | and {3:│}to {3:│}clearing |
clearing {3:|}test {3:|}in | clearing {3:│}test {3:│}in |
in {3:|}scrolling {3:|}split | in {3:│}scrolling {3:│}split |
split {3:|}and {3:|}windows | split {3:│}and {3:│}windows |
windows {3:|}clearing {3:|} | windows {3:│}clearing {3:│} |
{3:[No Name] [+] }{1:[No Name] [+] }{3:<Name] [+] }| {3:[No Name] [+] }{1:[No Name] [+] }{3:<Name] [+] }|
clearing | clearing |
in | in |
@ -520,12 +520,12 @@ describe('Screen', function()
]]) ]])
feed('k') feed('k')
screen:expect([[ screen:expect([[
scrolling {3:|}^many {3:|}and | scrolling {3:│}^many {3:│}and |
and {3:|}lines {3:|}clearing | and {3:│}lines {3:│}clearing |
clearing {3:|}to {3:|}in | clearing {3:│}to {3:│}in |
in {3:|}test {3:|}split | in {3:│}test {3:│}split |
split {3:|}scrolling {3:|}windows | split {3:│}scrolling {3:│}windows |
windows {3:|}and {3:|} | windows {3:│}and {3:│} |
{3:[No Name] [+] }{1:[No Name] [+] }{3:<Name] [+] }| {3:[No Name] [+] }{1:[No Name] [+] }{3:<Name] [+] }|
clearing | clearing |
in | in |