commit 28e31f5d3d16fac349d5e2b55837afddb822b0f3 parent ab72799841c83e3cb883ac74681ae8d5d75a2068 Author: Shadman <shadmansaleh3@gmail.com> Date: Tue, 22 Apr 2025 04:05:34 +0600 feat(options): default statusline expression #33036 Problem: Default 'statusline' is implemented in C and not representable as a statusline expression. This makes it hard for user configs/plugins to extend it. Solution: - Change the default 'statusline' slightly to a statusline expression. - Remove the C implementation. Diffstat:
23 files changed, 167 insertions(+), 151 deletions(-)
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt @@ -6031,7 +6031,7 @@ A jump table for the options with a short description can be found at |Q_op|. an expensive expression can negatively affect render performance. *'statusline'* *'stl'* *E540* *E542* -'statusline' 'stl' string (default "") +'statusline' 'stl' string (default "%<%f %h%w%m%r %=%{% &showcmdloc == 'statusline' ? '%-10.S ' : '' %}%{% exists('b:keymap_name') ? '<'..b:keymap_name..'> ' : '' %}%{% &ruler ? ( &rulerformat == '' ? '%-14.(%l,%c%V%) %P' : &rulerformat ) : '' %}") global or local to window |global-local| When non-empty, this option determines the content of the status line. Also see |status-line|. diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua @@ -6685,7 +6685,7 @@ vim.wo.stc = vim.wo.statuscolumn --- --- --- @type string -vim.o.statusline = "" +vim.o.statusline = "%<%f %h%w%m%r %=%{% &showcmdloc == 'statusline' ? '%-10.S ' : '' %}%{% exists('b:keymap_name') ? '<'..b:keymap_name..'> ' : '' %}%{% &ruler ? ( &rulerformat == '' ? '%-14.(%l,%c%V%) %P' : &rulerformat ) : '' %}" vim.o.stl = vim.o.statusline vim.wo.statusline = vim.o.statusline vim.wo.stl = vim.wo.statusline diff --git a/src/nvim/option.c b/src/nvim/option.c @@ -439,7 +439,7 @@ void set_init_1(bool clean_arg) /// @param opt_flags Option flags (can be OPT_LOCAL, OPT_GLOBAL or a combination). /// /// @return Default value of option for the scope specified in opt_flags. -static OptVal get_option_default(const OptIndex opt_idx, int opt_flags) +OptVal get_option_default(const OptIndex opt_idx, int opt_flags) { vimoption_T *opt = &options[opt_idx]; bool is_global_local_option = option_is_global_local(opt_idx); @@ -3468,7 +3468,7 @@ static const char *did_set_option(OptIndex opt_idx, void *varp, OptVal old_value .os_errbuf = errbuf, .os_errbuflen = errbuflen, .os_buf = curbuf, - .os_win = curwin + .os_win = curwin, }; if (direct) { diff --git a/src/nvim/options.lua b/src/nvim/options.lua @@ -8541,7 +8541,14 @@ local options = { { abbreviation = 'stl', cb = 'did_set_statusline', - defaults = '', + defaults = table.concat({ + '%<', + '%f %h%w%m%r ', + '%=', + "%{% &showcmdloc == 'statusline' ? '%-10.S ' : '' %}", + "%{% exists('b:keymap_name') ? '<'..b:keymap_name..'> ' : '' %}", + "%{% &ruler ? ( &rulerformat == '' ? '%-14.(%l,%c%V%) %P' : &rulerformat ) : '' %}", + }), desc = [=[ When non-empty, this option determines the content of the status line. Also see |status-line|. diff --git a/src/nvim/optionstr.c b/src/nvim/optionstr.c @@ -1792,6 +1792,16 @@ static const char *did_set_statustabline_rulerformat(optset_T *args, bool rulerf } const char *errmsg = NULL; char *s = *varp; + + // reset statusline to default when setting global option and empty string is being set + if (args->os_idx == kOptStatusline + && ((args->os_flags & OPT_GLOBAL) || !(args->os_flags & OPT_LOCAL)) + && s[0] == NUL) { + xfree(*varp); + *varp = xstrdup(get_option_default(args->os_idx, args->os_flags).data.string.data); + s = *varp; + } + if (rulerformat && *s == '%') { // set ru_wid if 'ruf' starts with "%99(" if (*++s == '-') { // ignore a '-' diff --git a/src/nvim/statusline.c b/src/nvim/statusline.c @@ -90,85 +90,6 @@ void win_redr_status(win_T *wp) } else if (*p_stl != NUL || *wp->w_p_stl != NUL) { // redraw custom status line redraw_custom_statusline(wp); - } else { - schar_T fillchar = fillchar_status(&attr, wp); - const int stl_width = is_stl_global ? Columns : wp->w_width; - - get_trans_bufname(wp->w_buffer); - char *p = NameBuff; - int plen = (int)strlen(p); - - if ((bt_help(wp->w_buffer) - || wp->w_p_pvw - || bufIsChanged(wp->w_buffer) - || wp->w_buffer->b_p_ro) - && plen < MAXPATHL - 1) { - *(p + plen++) = ' '; // replace NUL with space - *(p + plen) = NUL; // NUL terminate the string - } - if (bt_help(wp->w_buffer)) { - plen += snprintf(p + plen, MAXPATHL - (size_t)plen, "%s", _("[Help]")); - } - if (wp->w_p_pvw) { - plen += snprintf(p + plen, MAXPATHL - (size_t)plen, "%s", _("[Preview]")); - } - if (bufIsChanged(wp->w_buffer)) { - plen += snprintf(p + plen, MAXPATHL - (size_t)plen, "%s", "[+]"); - } - if (wp->w_buffer->b_p_ro) { - plen += snprintf(p + plen, MAXPATHL - (size_t)plen, "%s", _("[RO]")); - } - (void)plen; - - int n = (stl_width + 1) / 2; - int this_ru_col = ru_col - (Columns - stl_width); - this_ru_col = MAX(this_ru_col, n); - if (this_ru_col <= 1) { - p = "<"; // No room for file name! - plen = 1; - } else { - int i; - - // Count total number of display cells. - plen = (int)mb_string2cells(p); - - // Find first character that will fit. - // Going from start to end is much faster for DBCS. - for (i = 0; p[i] != NUL && plen >= this_ru_col - 1; - i += utfc_ptr2len(p + i)) { - plen -= utf_ptr2cells(p + i); - } - if (i > 0) { - p = p + i - 1; - *p = '<'; - plen++; - } - } - - grid_line_start(&default_grid, is_stl_global ? (Rows - (int)p_ch - 1) : W_ENDROW(wp)); - const int off = is_stl_global ? 0 : wp->w_wincol; - - int width = grid_line_puts(off, p, -1, attr); - grid_line_fill(off + width, off + this_ru_col, fillchar, attr); - - int NameBufflen = get_keymap_str(wp, "<%s>", NameBuff, MAXPATHL); - if (NameBufflen > 0 && this_ru_col - plen > NameBufflen + 1) { - grid_line_puts(off + this_ru_col - NameBufflen - 1, NameBuff, -1, attr); - } - - win_redr_ruler(wp); - - // Draw the 'showcmd' information if 'showcmdloc' == "statusline". - if (p_sc && *p_sloc == 's') { - n = this_ru_col - plen - 2; // perform the calculation here so we only do it once - const int sc_width = MIN(10, n); - - if (sc_width > 0) { - grid_line_puts(off + this_ru_col - sc_width - 1, showcmd_buf, sc_width, attr); - } - } - - grid_line_flush(); } // May need to draw the character below the vertical separator. diff --git a/test/functional/api/window_spec.lua b/test/functional/api/window_spec.lua @@ -274,7 +274,7 @@ describe('API/win', function() ccc │ccc | {21:dd^d }│{21:ddd }| {1:~ }│{1:~ }|*2 - {3:[No Name] [+] 4,3 All }{2:[No Name] [+] 4,3 All}| + {3:< Name] [+] 4,3 All }{2:<Name] [+] 4,3 All}| | ]]) api.nvim_win_set_cursor(oldwin, { 1, 0 }) @@ -284,7 +284,7 @@ describe('API/win', function() ccc │ccc | {21:dd^d }│ddd | {1:~ }│{1:~ }|*2 - {3:[No Name] [+] 4,3 All }{2:[No Name] [+] 1,1 All}| + {3:< Name] [+] 4,3 All }{2:<Name] [+] 1,1 All}| | ]]) end) @@ -465,11 +465,17 @@ describe('API/win', function() -- global-local option api.nvim_set_option_value('statusline', 'window-status', { win = 0 }) eq('window-status', api.nvim_get_option_value('statusline', { win = 0 })) - eq('', api.nvim_get_option_value('statusline', { scope = 'global' })) + eq( + "%<%f %{%nvim_eval_statusline('%h%w%m%r', {'maxwidth': 30}).width > 0 ? '%h%w%m%r ' : ''%}%=%{% &showcmdloc == 'statusline' ? '%-10.S ' : '' %}%{% exists('b:keymap_name') ? '<'..b:keymap_name..'> ' : '' %}%{% &ruler ? ( &rulerformat == '' ? '%-14.(%l,%c%V%) %P' : &rulerformat ) : '' %}", + api.nvim_get_option_value('statusline', { scope = 'global' }) + ) command('set modified') command('enew') -- global-local: not preserved in new buffer -- confirm local value was not copied - eq('', api.nvim_get_option_value('statusline', { win = 0 })) + eq( + "%<%f %{%nvim_eval_statusline('%h%w%m%r', {'maxwidth': 30}).width > 0 ? '%h%w%m%r ' : ''%}%=%{% &showcmdloc == 'statusline' ? '%-10.S ' : '' %}%{% exists('b:keymap_name') ? '<'..b:keymap_name..'> ' : '' %}%{% &ruler ? ( &rulerformat == '' ? '%-14.(%l,%c%V%) %P' : &rulerformat ) : '' %}", + api.nvim_get_option_value('statusline', { win = 0 }) + ) eq('', eval('&l:statusline')) end) diff --git a/test/functional/legacy/autocmd_option_spec.lua b/test/functional/legacy/autocmd_option_spec.lua @@ -355,21 +355,55 @@ describe('au OptionSet', function() it('with string global-local (to window) option', function() local oldval = eval('&statusline') + local default_statusline = + "%<%f %h%w%m%r %=%{% &showcmdloc == 'statusline' ? '%-10.S ' : '' %}%{% exists('b:keymap_name') ? '<'..b:keymap_name..'> ' : '' %}%{% &ruler ? ( &rulerformat == '' ? '%-14.(%l,%c%V%) %P' : &rulerformat ) : '' %}" command('set statusline=foo') - expected_combination({ 'statusline', oldval, oldval, '', 'foo', 'global', 'set' }) + expected_combination({ + 'statusline', + oldval, + oldval, + oldval, + 'foo', + 'global', + 'set', + }) -- Note: v:option_old is the old global value for global-local options. -- but the old local value for all other kinds of options. command('set statusline&') - expected_combination({ 'statusline', 'foo', 'foo', 'foo', oldval, 'global', 'set' }) + expected_combination({ + 'statusline', + 'foo', + 'foo', + 'foo', + default_statusline, + 'global', + 'set', + }) command('setglobal statusline=bar') - expected_combination({ 'statusline', oldval, '', oldval, 'bar', 'global', 'setglobal' }) + expected_combination({ + 'statusline', + default_statusline, + '', + default_statusline, + 'bar', + 'global', + 'setglobal', + }) command('noa set statusline&') command('setlocal statusline=baz') - expected_combination({ 'statusline', oldval, oldval, '', 'baz', 'local', 'setlocal' }) + expected_combination({ + 'statusline', + default_statusline, + default_statusline, + '', + 'baz', + 'local', + 'setlocal', + }) -- Note: v:option_old is the old global value for global-local options. -- but the old local value for all other kinds of options. diff --git a/test/functional/legacy/scroll_opt_spec.lua b/test/functional/legacy/scroll_opt_spec.lua @@ -1053,7 +1053,7 @@ describe('smoothscroll', function() {8: }21 22 23 24 25 26 27 28 29 | {8: 11 }|| 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 | {8: }21 22 23 24 25 26 27 28 29 | - {2:[Quickfix List] }| + {2:[Quickfix List] [-] }| | ]]) @@ -1064,7 +1064,7 @@ describe('smoothscroll', function() {3:[No Name] }| {8: 1 } | {1:~ }|*4 - {2:[Quickfix List] }| + {2:[Quickfix List] [-] }| :call setqflist([], 'r') | ]] screen:expect(screen_empty) @@ -1079,7 +1079,7 @@ describe('smoothscroll', function() {8: }21 22 23 24 25 26 27 28 29 | {8: 3 }|| 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 | {8: }21 22 23 24 25 26 27 28 29 | - {2:[Quickfix List] }| + {2:[Quickfix List] [-] }| :call setqflist(g:l, 'r') | ]] screen:expect(screen_l_top) @@ -1094,7 +1094,7 @@ describe('smoothscroll', function() {8: }{10: 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 5}| {8: }{10:8 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 }| {8: }{10:77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95}| - {2:[Quickfix List] }| + {2:[Quickfix List] [-] }| :call setqflist(g:l1, 'r') | ]] screen:expect(screen_l1_top) @@ -1109,7 +1109,7 @@ describe('smoothscroll', function() {8: }{10: 965 966 967 968 969 970 971 972 973 974 975 976 977 978}| {8: }{10: 979 980 981 982 983 984 985 986 987 988 989 990 991 992}| {8: }{10: 993 994 995 996 997 998 999 }| - {2:[Quickfix List] }| + {2:[Quickfix List] [-] }| :call setqflist(g:l1, 'r') | ]] screen:expect(screen_l1_bot) diff --git a/test/functional/lua/vim_spec.lua b/test/functional/lua/vim_spec.lua @@ -4011,9 +4011,9 @@ stack traceback: ]] screen:expect [[ 19 | - {2:[No Name] [+] 20,1 3%}| + {2:< Name] [+] 20,1 3%}| ^19 | - {3:[No Name] [+] 20,1 3%}| + {3:< Name] [+] 20,1 3%}| | ]] exec_lua [[ @@ -4022,9 +4022,9 @@ stack traceback: ]] screen:expect [[ 99 | - {2:[No Name] [+] 100,1 19%}| + {2:< Name] [+] 100,1 19%}| ^19 | - {3:[No Name] [+] 20,1 3%}| + {3:< Name] [+] 20,1 3%}| | ]] end) diff --git a/test/functional/lua/with_spec.lua b/test/functional/lua/with_spec.lua @@ -1189,9 +1189,9 @@ describe('vim._with', function() ]] screen:expect [[ 19 | - {1:[No Name] [+] 20,1 3%}| + {1:< Name] [+] 20,1 3%}| ^19 | - {2:[No Name] [+] 20,1 3%}| + {2:< Name] [+] 20,1 3%}| | ]] exec_lua [[ @@ -1200,9 +1200,9 @@ describe('vim._with', function() ]] screen:expect [[ 99 | - {1:[No Name] [+] 100,1 19%}| + {1:< Name] [+] 100,1 19%}| ^19 | - {2:[No Name] [+] 20,1 3%}| + {2:< Name] [+] 20,1 3%}| | ]] end) diff --git a/test/functional/plugin/health_spec.lua b/test/functional/plugin/health_spec.lua @@ -396,7 +396,7 @@ describe(':checkhealth window', function() top and [[ [4:--------------------------------------------------]|*12 - health:// | + health:// [-] | [2:--------------------------------------------------]|*11]] or ([[ [2:--------------------------------------------------]|*11 diff --git a/test/functional/terminal/cursor_spec.lua b/test/functional/terminal/cursor_spec.lua @@ -172,7 +172,7 @@ describe(':terminal cursor', function() {4:~ }| {5:floob }| |*2 - {18:[Scratch] }| + {18:[Scratch] [-] }| | ]]) @@ -183,7 +183,7 @@ describe(':terminal cursor', function() {1:floob }| ^ | | - {17:[Scratch] }| + {17:[Scratch] [-] }| {3:-- TERMINAL --} | ]]) end) @@ -437,7 +437,7 @@ describe(':terminal cursor', function() screen:expect([[ ^ │ | │ |*4 - {17:[Scratch] }{18:[Scratch] }| + {17:[Scratch] [-] }{18:[Scratch] [-] }| {3:-- TERMINAL --} | ]]) eq('block', screen._mode_info[terminal_mode_idx].cursor_shape) @@ -463,7 +463,7 @@ describe(':terminal cursor', function() screen:expect([[ │^ | │ |*4 - {18:[Scratch] }{17:[Scratch] }| + {18:[Scratch] [-] }{17:[Scratch] [-] }| {3:-- TERMINAL --} | ]]) eq('horizontal', screen._mode_info[terminal_mode_idx].cursor_shape) diff --git a/test/functional/terminal/tui_spec.lua b/test/functional/terminal/tui_spec.lua @@ -2271,6 +2271,8 @@ describe('TUI', function() '--cmd', 'set notermguicolors', '--cmd', + nvim_set, + '--cmd', 'let start = reltime() | while v:true | if reltimefloat(reltime(start)) > 2 | break | endif | endwhile', }, { term = true, @@ -2284,10 +2286,9 @@ describe('TUI', function() ]]) screen:expect([[ ^ │ | - {2:~ }│{4:~ }|*5 - {2:~ }│{5:[No Name] 0,0-1 All}| + {2:~ }│{4:~ }|*6 {2:~ }│ | - {5:new }{6:{MATCH:<.*[/\]nvim }}| + {5:new }{6:{MATCH:<.*[/\]nvim} [-] }| | ]]) end) @@ -2519,7 +2520,7 @@ describe('TUI', function() grid = [[ ^aaaaaaaaaaaa | aaaaaaaaaaaa |*3 - < [+] 1,1 | + < All | | -- TERMINAL -- | ]], diff --git a/test/functional/testnvim.lua b/test/functional/testnvim.lua @@ -24,6 +24,7 @@ M.nvim_set = ( 'set shortmess+=IS background=light noswapfile noautoindent startofline' .. ' laststatus=1 undodir=. directory=. viewdir=. backupdir=.' .. ' belloff= wildoptions-=pum joinspaces noshowcmd noruler nomore redrawdebug=invalid' + .. [[ statusline=%<%f\ %{%nvim_eval_statusline('%h%w%m%r',\ {'maxwidth':\ 30}).width\ >\ 0\ ?\ '%h%w%m%r\ '\ :\ ''%}%=%{%\ &showcmdloc\ ==\ 'statusline'\ ?\ '%-10.S\ '\ :\ ''\ %}%{%\ exists('b:keymap_name')\ ?\ '<'..b:keymap_name..'>\ '\ :\ ''\ %}%{%\ &ruler\ ?\ (\ &rulerformat\ ==\ ''\ ?\ '%-14.(%l,%c%V%)\ %P'\ :\ &rulerformat\ )\ :\ ''\ %}]] ) M.nvim_argv = { M.nvim_prog, diff --git a/test/functional/ui/linematch_spec.lua b/test/functional/ui/linematch_spec.lua @@ -114,7 +114,7 @@ describe('Diff mode screen with 3 diffs open', function() {7: }{8: 5 }{4: }{27:BBB}{4: }│{7: }{8: 7 }{4: }{27:BBB}{4: }│{7: }{8: 5 }{4: }{27:AAA}{4: }| {7: }{8: }{23:---------------------------}│{7: }{8: 8 }{22:>>>>>>> branch1 }│{7: }{8: }{23:---------------------------}| {1:~ }│{1:~ }│{1:~ }|*6 - {2:<test-functional-diff-screen-1.3 }{3:<functional-diff-screen-1.2 [+] }{2:Xtest-functional-diff-screen-1 }| + {2:Xtest-functional-diff-screen-1.3 }{3:<functional-diff-screen-1.2 [+] }{2:Xtest-functional-diff-screen-1 }| :5,7diffget screen-1.3 | ]]) end) @@ -135,7 +135,7 @@ describe('Diff mode screen with 3 diffs open', function() {7: }{8: 5 } BBB │{7: }{8: 10 } BBB │{7: }{8: 9 } BBB | {7: }{8: }{23:---------------------------}│{7: }{8: 11 }{4:>>>>>>> branch1 }│{7: }{8: 10 }{4:>>>>>>> branch1 }| {1:~ }│{1:~ }│{1:~ }|*3 - {2:<test-functional-diff-screen-1.3 <est-functional-diff-screen-1.2 }{3:<st-functional-diff-screen-1 [+] }| + {2:Xtest-functional-diff-screen-1.3 <est-functional-diff-screen-1.2 }{3:<st-functional-diff-screen-1 [+] }| :5,6diffget screen-1.2 | ]]) end) @@ -156,7 +156,7 @@ describe('Diff mode screen with 3 diffs open', function() {7: }{8: 5 } BBB │{7: }{8: 10 } BBB │{7: }{8: 7 } BBB | {7: }{8: }{23:---------------------------}│{7: }{8: 11 }{22:>>>>>>> branch1 }│{7: }{8: }{23:---------------------------}| {1:~ }│{1:~ }│{1:~ }|*3 - {2:<test-functional-diff-screen-1.3 }{3:<est-functional-diff-screen-1.2 }{2:<st-functional-diff-screen-1 [+] }| + {2:Xtest-functional-diff-screen-1.3 }{3:<est-functional-diff-screen-1.2 }{2:<st-functional-diff-screen-1 [+] }| :6,8diffput screen-1 | ]]) end) @@ -176,7 +176,7 @@ describe('Diff mode screen with 3 diffs open', function() {7: }{8: 5 } BBB │{7: }{8: 10 } BBB │{7: }{8: 9 } BBB | {7: }{8: }{23:---------------------------}│{7: }{8: 11 }{4:>>>>>>> branch1 }│{7: }{8: 10 }{4:>>>>>>> branch1 }| {1:~ }│{1:~ }│{1:~ }|*3 - {2:<test-functional-diff-screen-1.3 }{3:<est-functional-diff-screen-1.2 }{2:<st-functional-diff-screen-1 [+] }| + {2:Xtest-functional-diff-screen-1.3 }{3:<est-functional-diff-screen-1.2 }{2:<st-functional-diff-screen-1 [+] }| :6,11diffput screen-1 | ]]) end) diff --git a/test/functional/ui/messages_spec.lua b/test/functional/ui/messages_spec.lua @@ -422,7 +422,7 @@ describe('ui/ext_messages', function() grid = [[ ^*help.txt* Nvim | | - {3:help.txt [Help][RO] }| + {3:help.txt [Help][-][RO] }| line | {2:<i_messages_spec [+][RO] }| ]], @@ -1068,12 +1068,15 @@ describe('ui/ext_messages', function() -- when ruler is part of statusline it is not externalized. -- this will be added as part of future ext_statusline support command('set laststatus=2') - screen:expect([[ - abcde | - ^ | - {1:~ }|*2 - {3:<o Name] [+] 2,0-1 All}| - ]]) + screen:expect({ + grid = [[ + abcde | + ^ | + {1:~ }|*2 + {3:<] [+] 2,0-1 All}| + ]], + ruler = { { '2,0-1 All' } }, + }) end) it('keeps history of message of different kinds', function() diff --git a/test/functional/ui/multibyte_spec.lua b/test/functional/ui/multibyte_spec.lua @@ -465,9 +465,9 @@ describe('multibyte rendering: statusline', function() grid = [[ ^ | {1:~ }| - {3:🧑�💻 }| + {3:🧑<200b>💻 }| | - ]], + ]], } end) diff --git a/test/functional/ui/multigrid_spec.lua b/test/functional/ui/multigrid_spec.lua @@ -282,7 +282,7 @@ describe('ext_multigrid', function() screen:expect{grid=[[ ## grid 1 [4:----------]│[2:------------------------------------------]|*12 - {11:<No Name] }{12:[No Name] }| + {11:[No Name] }{12:[No Name] }| [3:-----------------------------------------------------]| ## grid 2 | diff --git a/test/functional/ui/popupmenu_spec.lua b/test/functional/ui/popupmenu_spec.lua @@ -1756,7 +1756,7 @@ describe('builtin popupmenu', function() grid = [[ ## grid 1 [5:--------------------------------]|*3 - {3:[Scratch] [Preview] }| + {3:[Scratch] [Preview][-] }| [2:--------------------------------]|*14 {4:[No Name] [+] }| [3:--------------------------------]| @@ -1781,7 +1781,7 @@ describe('builtin popupmenu', function() screen:expect([[ 1info | {1:~ }|*2 - {3:[Scratch] [Preview] }| + {3:[Scratch] [Preview][-] }| one^ | {s:one }{1: }| {n:two }{1: }| @@ -8493,7 +8493,7 @@ describe('builtin popupmenu', function() screen:expect([[ info | {1:~ }|*2 - {3:[Scratch] [Preview] }| + {3:[Scratch] [Preview][-] }| {8:foo}^ | {s:foo }{1: }| {n:bar }{1: }| diff --git a/test/functional/ui/quickfix_spec.lua b/test/functional/ui/quickfix_spec.lua @@ -69,7 +69,7 @@ describe('quickfix selection highlight', function() {14:|}{3:4}{14:|} Line | {14:|}{3:5}{14:|} Line | {14:||} | - {4:[Quickfix List] }| + {4:[Quickfix List] [-] }| | ]]) @@ -84,7 +84,7 @@ describe('quickfix selection highlight', function() {14:|}{3:4}{14:|} Line | {14:|}{3:5}{14:|} Line | {14:||} | - {4:[Quickfix List] }| + {4:[Quickfix List] [-] }| | ]]) end) @@ -103,7 +103,7 @@ describe('quickfix selection highlight', function() {14:|}{3:4}{14:|} Line | {14:|}{3:5}{14:|} Line | {14:||} | - {4:[Quickfix List] }| + {4:[Quickfix List] [-] }| | ]]) @@ -118,7 +118,7 @@ describe('quickfix selection highlight', function() {14:|}{3:4}{14:|} Line | {14:|}{3:5}{14:|} Line | {14:||} | - {4:[Quickfix List] }| + {4:[Quickfix List] [-] }| | ]]) end) @@ -139,7 +139,7 @@ describe('quickfix selection highlight', function() {14:|}{3:4}{14:|} Line | {14:|}{3:5}{14:|} Line | {14:||} | - {4:[Quickfix List] }| + {4:[Quickfix List] [-] }| | ]]) @@ -154,7 +154,7 @@ describe('quickfix selection highlight', function() {14:|}{3:4}{14:|} Line | {14:|}{3:5}{14:|} Line | {14:||} | - {4:[Quickfix List] }| + {4:[Quickfix List] [-] }| | ]]) end) @@ -175,7 +175,7 @@ describe('quickfix selection highlight', function() {14:|}{3:4}{14:|} Line | {14:|}{3:5}{14:|} Line | {14:||} | - {4:[Quickfix List] }| + {4:[Quickfix List] [-] }| | ]]) @@ -190,7 +190,7 @@ describe('quickfix selection highlight', function() {14:|}{3:4}{14:|} Line | {14:|}{3:5}{14:|} Line | {14:||} | - {4:[Quickfix List] }| + {4:[Quickfix List] [-] }| | ]]) end) diff --git a/test/functional/ui/searchhl_spec.lua b/test/functional/ui/searchhl_spec.lua @@ -366,7 +366,7 @@ describe('search highlighting', function() bar baz {10:foo} │{MATCH:%d+}: {10:foo}{MATCH:%s+}| bar {10:foo} baz │{MATCH:%d+}: {10:foo}{MATCH:%s+}| {1:~ }│{MATCH:.*}|*2 - {3:[No Name] [+] }{101:term }| + {3:[No Name] [+] }{101:term [-] }| /foo^ | ]]) end) diff --git a/test/functional/ui/statusline_spec.lua b/test/functional/ui/statusline_spec.lua @@ -317,15 +317,15 @@ describe('global statusline', function() screen:expect([[ │ │ │^ | {1:~ }│{1:~ }│{1:~}│{1:~ }|*3 - {1:~ }│{2:< Name] 0,0-1 }│{1:~}│{1:~ }| + {1:~ }│{2:<-1 All}│{1:~}│{1:~ }| {1:~ }│ │{1:~}│{1:~ }| {1:~ }│{1:~ }│{1:~}│{1:~ }| - {1:~ }│{1:~ }│{1:~}│{3:<No Name] 0,0-1 All}| + {1:~ }│{1:~ }│{1:~}│{3:< 0,0-1 All}| {1:~ }│{1:~ }│{1:~}│ | - {2:<No Name] 0,0-1 All < Name] 0,0-1 <}│{1:~ }| + {2:< 0,0-1 All <-1 All <}│{1:~ }| │{1:~ }| {1:~ }│{1:~ }|*3 - {2:[No Name] 0,0-1 All <No Name] 0,0-1 All}| + {2:[No Name] 0,0-1 All < 0,0-1 All}| | ]]) @@ -349,12 +349,12 @@ describe('global statusline', function() screen:expect([[ │ │ │^ | {1:~ }│{1:~ }│{1:~}│{1:~ }|*3 - {1:~ }│{2:< Name] 0,0-1 }│{1:~}│{1:~ }| + {1:~ }│{2:<-1 All}│{1:~}│{1:~ }| {1:~ }│ │{1:~}│{1:~ }| {1:~ }│{1:~ }│{1:~}│{1:~ }| - {1:~ }│{1:~ }│{1:~}│{3:<No Name] 0,0-1 All}| + {1:~ }│{1:~ }│{1:~}│{3:< 0,0-1 All}| {1:~ }│{1:~ }│{1:~}│ | - {2:<No Name] 0,0-1 All < Name] 0,0-1 <}│{1:~ }| + {2:< 0,0-1 All <-1 All <}│{1:~ }| │{1:~ }| {1:~ }│{1:~ }|*4 0,0-1 All | @@ -676,7 +676,7 @@ describe('statusline', function() screen:expect([[ ^ | {1:~ }|*2 - {3:[No Name] 1longlonglong }| + {3:[No Name] 1longlonglong}| │ | {1:~ }│{1:~ }|*2 3longlonglong | @@ -687,7 +687,7 @@ describe('statusline', function() screen:expect([[ | {1:~ }|*2 - {2:[No Name] 1longlonglong }| + {2:[No Name] 1longlonglong}| ^ │ | {1:~ }│{1:~ }|*2 2longlonglong | @@ -697,7 +697,7 @@ describe('statusline', function() screen:expect([[ | {1:~ }|*2 - {2:[No Name] 1longlonglong }| + {2:[No Name] 1longlonglong}| │^ | {1:~ }│{1:~ }|*2 3longlonglong | @@ -723,7 +723,7 @@ describe('statusline', function() screen:expect([[ │^ | {1:~ }│{1:~ }|*5 - {2:[No Name] }{3:[No Name] 1234 }| + {2:[No Name] }{3:<o Name] 1234 }| | ]]) feed('<Esc>') @@ -767,3 +767,36 @@ describe('statusline', function() ]]) end) end) + +describe('default statusline', function() + local screen + + before_each(function() + clear() + screen = Screen.new(60, 16) + screen:add_extra_attr_ids { + [100] = { foreground = Screen.colors.Magenta1, bold = true }, + } + command('set laststatus=2') + command('set ruler') + end) + + it('setting statusline to empty string sets default statusline', function() + exec_lua("vim.o.statusline = 'asdf'") + eq('asdf', eval('&statusline')) + + local default_statusline = + "%<%f %h%w%m%r %=%{% &showcmdloc == 'statusline' ? '%-10.S ' : '' %}%{% exists('b:keymap_name') ? '<'..b:keymap_name..'> ' : '' %}%{% &ruler ? ( &rulerformat == '' ? '%-14.(%l,%c%V%) %P' : &rulerformat ) : '' %}" + + exec_lua("vim.o.statusline = ''") + + eq(default_statusline, eval('&statusline')) + + screen:expect([[ + ^ | + {1:~ }|*13 + {3:[No Name] 0,0-1 All}| + | + ]]) + end) +end)