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

API: don't directly call update_screen() in API functions

Browse Source 
There is no need to call update_screen() directly in an API function,
mode input processing invokes update_screen() as needed. And if the API
call is done in a context where redraw is disabled, then redraw is
disabled for a reason. A lot of API functions are of equal semantical
strength (nvim_call_function and nvim_execute_lua can also do whatever,
nvim_command is not special), this inconsistency has no purpose.
This commit is contained in:
Björn Linse 2019-01-08 20:37:35 +01:00
parent c8e78abaf9
commit 9452532036
3 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/nvim/api/vim.c
View File

@ -75,7 +75,6 @@ void nvim_command(String command, Error *err)
{ {
try_start(); try_start();
do_cmdline_cmd(command.data); do_cmdline_cmd(command.data);
update_screen(VALID);
try_end(err); try_end(err);
} }

2
src/nvim/api/window.c
View File

@ -135,7 +135,7 @@ void nvim_win_set_cursor(Window window, ArrayOf(Integer, 2) pos, Error *err)
// make sure cursor is in visible range even if win != curwin // make sure cursor is in visible range even if win != curwin
update_topline_win(win); update_topline_win(win);
update_screen(VALID); redraw_win_later(win, VALID);
} }
/// Gets the window height /// Gets the window height

61
test/functional/legacy/051_highlight_spec.lua
View File

@ -3,10 +3,11 @@
local Screen = require('test.functional.ui.screen') local Screen = require('test.functional.ui.screen')
local helpers = require('test.functional.helpers')(after_each) local helpers = require('test.functional.helpers')(after_each)
local clear, feed = helpers.clear, helpers.feed local clear, feed = helpers.clear, helpers.feed
local command, expect = helpers.command, helpers.expect local expect = helpers.expect
local eq = helpers.eq local eq = helpers.eq
local wait = helpers.wait local wait = helpers.wait
local exc_exec = helpers.exc_exec local exc_exec = helpers.exc_exec
local feed_command = helpers.feed_command
describe(':highlight', function() describe(':highlight', function()
setup(clear) setup(clear)
@ -15,7 +16,7 @@ describe(':highlight', function()
local screen = Screen.new(35, 10) local screen = Screen.new(35, 10)
screen:attach() screen:attach()
-- Basic test if ":highlight" doesn't crash -- Basic test if ":highlight" doesn't crash
command('set more') feed_command('set more')
feed(':highlight<CR>') feed(':highlight<CR>')
-- FIXME(tarruda): We need to be sure the prompt is displayed before -- FIXME(tarruda): We need to be sure the prompt is displayed before
-- continuing, or risk a race condition where some of the following input -- continuing, or risk a race condition where some of the following input
@ -34,52 +35,62 @@ describe(':highlight', function()
]]) ]])
feed('q') feed('q')
wait() -- wait until we're back to normal wait() -- wait until we're back to normal
command('hi Search') feed_command('hi Search')
command('hi Normal') feed_command('hi Normal')
-- Test setting colors. -- Test setting colors.
-- Test clearing one color and all doesn't generate error or warning -- Test clearing one color and all doesn't generate error or warning
command('hi NewGroup cterm=italic ctermfg=DarkBlue ctermbg=Grey gui=NONE guifg=#00ff00 guibg=Cyan') feed_command('hi NewGroup cterm=italic ctermfg=DarkBlue ctermbg=Grey gui=NONE guifg=#00ff00 guibg=Cyan')
command('hi Group2 cterm=NONE') feed_command('hi Group2 cterm=NONE')
command('hi Group3 cterm=bold') feed_command('hi Group3 cterm=bold')
command('redir! @a') feed_command('redir! @a')
command('hi NewGroup') feed_command('hi NewGroup')
command('hi Group2') feed_command('hi Group2')
command('hi Group3') feed_command('hi Group3')
command('hi clear NewGroup') feed_command('hi clear NewGroup')
command('hi NewGroup') feed_command('hi NewGroup')
command('hi Group2') feed_command('hi Group2')
command('hi Group2 NONE') feed_command('hi Group2 NONE')
command('hi Group2') feed_command('hi Group2')
command('hi clear') feed_command('hi clear')
command('hi Group3') feed_command('hi Group3')
feed('<cr>')
eq('Vim(highlight):E475: Invalid argument: cterm=\'asdf', eq('Vim(highlight):E475: Invalid argument: cterm=\'asdf',
exc_exec([[hi Crash cterm='asdf]])) exc_exec([[hi Crash cterm='asdf]]))
command('redir END') feed_command('redir END')
-- Filter ctermfg and ctermbg, the numbers depend on the terminal -- Filter ctermfg and ctermbg, the numbers depend on the terminal
command('0put a') feed_command('0put a')
command([[%s/ctermfg=\d*/ctermfg=2/]]) feed_command([[%s/ctermfg=\d*/ctermfg=2/]])
command([[%s/ctermbg=\d*/ctermbg=3/]]) feed_command([[%s/ctermbg=\d*/ctermbg=3/]])
-- Fix the fileformat -- Fix the fileformat
command('set ff&') feed_command('set ff&')
command('$d') feed_command('$d')
-- Assert buffer contents. -- Assert buffer contents.
expect([[ expect([[
NewGroup xxx cterm=italic NewGroup xxx cterm=italic
ctermfg=2 ctermfg=2
ctermbg=3 ctermbg=3
guifg=#00ff00 guifg=#00ff00
guibg=Cyan guibg=Cyan
Group2 xxx cleared Group2 xxx cleared
Group3 xxx cterm=bold Group3 xxx cterm=bold
NewGroup xxx cleared NewGroup xxx cleared
Group2 xxx cleared Group2 xxx cleared
Group2 xxx cleared Group2 xxx cleared
Group3 xxx cleared]]) Group3 xxx cleared]])
screen:detach()
end) end)
end) end)