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

Merge pull request #22454 from bfredl/lspredraw

Browse Source 
perf(lsp): only redraw the windows containing LSP tokens
This commit is contained in:
bfredl 2023-02-28 14:11:27 +01:00 committed by GitHub
commit df1d15a255
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 148 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
runtime/lua/vim/lsp/semantic_tokens.lua
View File

@ -334,7 +334,8 @@ function STHighlighter:process_response(response, client, version)
current_result.highlights = tokens_to_ranges(tokens, self.bufnr, client) current_result.highlights = tokens_to_ranges(tokens, self.bufnr, client)
current_result.namespace_cleared = false current_result.namespace_cleared = false
api.nvim_command('redraw!') -- redraw all windows displaying buffer
api.nvim__buf_redraw_range(self.bufnr, 0, -1)
end end
--- on_win handler for the decoration provider (see |nvim_set_decoration_provider|) --- on_win handler for the decoration provider (see |nvim_set_decoration_provider|)

3
src/nvim/api/buffer.c
View File

@ -248,6 +248,9 @@ void nvim__buf_redraw_range(Buffer buffer, Integer first, Integer last, Error *e
if (!buf) { if (!buf) {
return; return;
} }
if (last < 0) {
last = buf->b_ml.ml_line_count;
}
redraw_buf_range_later(buf, (linenr_T)first + 1, (linenr_T)last); redraw_buf_range_later(buf, (linenr_T)first + 1, (linenr_T)last);
} }

160
test/functional/plugin/lsp/semantic_tokens_spec.lua
View File

@ -24,6 +24,25 @@ end)
describe('semantic token highlighting', function() describe('semantic token highlighting', function()
local screen
before_each(function()
screen = Screen.new(40, 16)
screen:attach()
screen:set_default_attr_ids {
[1] = { bold = true, foreground = Screen.colors.Blue1 };
[2] = { foreground = Screen.colors.DarkCyan };
[3] = { foreground = Screen.colors.SlateBlue };
[4] = { bold = true, foreground = Screen.colors.SeaGreen };
[5] = { foreground = tonumber('0x6a0dad') };
[6] = { foreground = Screen.colors.Blue1 };
[7] = { bold = true, foreground = Screen.colors.DarkCyan };
[8] = { bold = true, foreground = Screen.colors.SlateBlue };
}
command([[ hi link @namespace Type ]])
command([[ hi link @function Special ]])
command([[ hi @declaration gui=bold ]])
end)
describe('general', function() describe('general', function()
local text = dedent([[ local text = dedent([[
#include <iostream> #include <iostream>
@ -58,24 +77,7 @@ describe('semantic token highlighting', function()
"resultId":"2" "resultId":"2"
}]] }]]
local screen
before_each(function() before_each(function()
screen = Screen.new(40, 16)
screen:attach()
screen:set_default_attr_ids {
[1] = { bold = true, foreground = Screen.colors.Blue1 };
[2] = { foreground = Screen.colors.DarkCyan };
[3] = { foreground = Screen.colors.SlateBlue };
[4] = { bold = true, foreground = Screen.colors.SeaGreen };
[5] = { foreground = tonumber('0x6a0dad') };
[6] = { foreground = Screen.colors.Blue1 };
[7] = { bold = true, foreground = Screen.colors.DarkCyan };
[8] = { bold = true, foreground = Screen.colors.SlateBlue };
}
command([[ hi link @namespace Type ]])
command([[ hi link @function Special ]])
command([[ hi @declaration gui=bold ]])
exec_lua(create_server_definition) exec_lua(create_server_definition)
exec_lua([[ exec_lua([[
local legend, response, edit_response = ... local legend, response, edit_response = ...
@ -928,6 +930,46 @@ b = "as"]],
extmark_added = true, extmark_added = true,
} }
}, },
expected_screen1 = function()
screen:expect{grid=[[
char* {7:foo} = "\n"^; |
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
|
]]}
end,
expected_screen2 = function()
screen:expect{grid=[[
^ |
char* {7:foo} = "\n"; |
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
|
]]}
end,
}, },
{ {
it = 'response with multiple delta edits', it = 'response with multiple delta edits',
@ -1127,6 +1169,46 @@ int main()
extmark_added = true, extmark_added = true,
} }
}, },
expected_screen1 = function()
screen:expect{grid=[[
#include <iostream> |
|
int {8:main}() |
{ |
int {7:x}; |
#ifdef {5:__cplusplus} |
{4:std}::{2:cout} << {2:x} << "\n"; |
{6:#else} |
{6: printf("%d\n", x);} |
{6:#endif} |
^} |
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
|
]]}
end,
expected_screen2 = function()
screen:expect{grid=[[
#include <iostream> |
|
int {8:main}() |
{ |
int {8:x}(); |
double {7:y}; |
#ifdef {5:__cplusplus} |
{4:std}::{2:cout} << {3:x} << "\n"; |
{6:#else} |
{6: printf("%d\n", x);} |
{6:^#endif} |
} |
{1:~ }|
{1:~ }|
{1:~ }|
|
]]}
end,
}, },
{ {
it = 'optional token_edit.data on deletion', it = 'optional token_edit.data on deletion',
@ -1156,6 +1238,46 @@ int main()
}, },
expected2 = { expected2 = {
}, },
expected_screen1 = function()
screen:expect{grid=[[
{7:string} = "test^" |
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
|
]]}
end,
expected_screen2 = function()
screen:expect{grid=[[
^ |
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
|
]]}
end,
}, },
}) do }) do
it(test.it, function() it(test.it, function()
@ -1192,6 +1314,8 @@ int main()
insert(test.text1) insert(test.text1)
test.expected_screen1()
local highlights = exec_lua([[ local highlights = exec_lua([[
return semantic_tokens.__STHighlighter.active[bufnr].client_state[client_id].current_result.highlights return semantic_tokens.__STHighlighter.active[bufnr].client_state[client_id].current_result.highlights
]]) ]])
@ -1208,6 +1332,8 @@ int main()
]], test.text2) ]], test.text2)
end end
test.expected_screen2()
highlights = exec_lua([[ highlights = exec_lua([[
return semantic_tokens.__STHighlighter.active[bufnr].client_state[client_id].current_result.highlights return semantic_tokens.__STHighlighter.active[bufnr].client_state[client_id].current_result.highlights
]]) ]])