fix(lsp): token_edit.data might be null on deletion (neovim#21462)

yesean · Mar 25, 2023 · 8bcd433 · 8bcd433
1 parent c098ae9
commit 8bcd433
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 2 deletions.
diff --git a/runtime/lua/vim/lsp/semantic_tokens.lua b/runtime/lua/vim/lsp/semantic_tokens.lua
@@ -323,7 +323,9 @@ function STHighlighter:process_response(response, client, version)
  local idx = 1
  for _, token_edit in ipairs(token_edits) do
  vim.list_extend(tokens, old_tokens, idx, token_edit.start)
- vim.list_extend(tokens, token_edit.data)
+ if token_edit.data then
+ vim.list_extend(tokens, token_edit.data)
+ end
  idx = token_edit.start + token_edit.deleteCount + 1
  end
  vim.list_extend(tokens, old_tokens, idx)

diff --git a/test/functional/plugin/lsp/semantic_tokens_spec.lua b/test/functional/plugin/lsp/semantic_tokens_spec.lua
@@ -1109,7 +1109,36 @@ int main()
  extmark_added = true,
  }
  },
- }
+ },
+ {
+ it = 'optional token_edit.data on deletion',
+ legend = [[{
+ "tokenTypes": [
+ "comment", "keyword", "operator", "string", "number", "regexp", "type", "class", "interface", "enum", "enumMember", "typeParameter", "function", "method", "property", "variable", "parameter", "module", "intrinsic", "selfParameter", "clsParameter", "magicFunction", "builtinConstant", "parenthesis", "curlybrace", "bracket", "colon", "semicolon", "arrow"
+ ],
+ "tokenModifiers": [
+ "declaration", "static", "abstract", "async", "documentation", "typeHint", "typeHintComment", "readonly", "decorator", "builtin"
+ ]
+ }]],
+ text1 = [[string = "test"]],
+ text2 = [[]],
+ response1 = [[{"data": [0, 0, 6, 15, 1], "resultId": "1"}]],
+ response2 = [[{"edits": [{ "start": 0, "deleteCount": 5 }], "resultId": "2"}]],
+ expected1 = {
+ {
+ line = 0,
+ modifiers = {
+ 'declaration',
+ },
+ start_col = 0,
+ end_col = 6,
+ type = 'variable',
+ extmark_added = true,
+ }
+ },
+ expected2 = {
+ },
+ },
  }) do
  it(test.it, function()
  exec_lua(create_server_definition)