diff options
| author | Michael Lingelbach <m.j.lbach@gmail.com> | 2021-05-19 12:39:44 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-19 12:39:44 -0700 |
| commit | 045e47ec5522b6449e849bc343697ab81ebd7814 (patch) | |
| tree | cb42b5340f8e50f4366f11d454e9009188c3be92 /runtime/lua/vim/lsp/util.lua | |
| parent | abf2ffd1e1054e2da5728dccba8b36246432dfe0 (diff) | |
| parent | 63df353545f5d2e9b8d93f24d6f46b7852c43206 (diff) | |
| download | rneovim-045e47ec5522b6449e849bc343697ab81ebd7814.tar.gz rneovim-045e47ec5522b6449e849bc343697ab81ebd7814.tar.bz2 rneovim-045e47ec5522b6449e849bc343697ab81ebd7814.zip | |
Merge pull request #14563 from mjlbach/fix_intelephense_langserver
lsp: handle case where CompletionItem.insertTextFormat is nil
Diffstat (limited to 'runtime/lua/vim/lsp/util.lua')
| -rw-r--r-- | runtime/lua/vim/lsp/util.lua | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua index fc5e894801..e403a8ee1b 100644 --- a/runtime/lua/vim/lsp/util.lua +++ b/runtime/lua/vim/lsp/util.lua @@ -566,13 +566,15 @@ end --@see https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_completion local function get_completion_word(item) if item.textEdit ~= nil and item.textEdit.newText ~= nil and item.textEdit.newText ~= "" then - if protocol.InsertTextFormat[item.insertTextFormat] == "PlainText" then + local insert_text_format = protocol.InsertTextFormat[item.insertTextFormat] + if insert_text_format == "PlainText" or insert_text_format == nil then return item.textEdit.newText else return M.parse_snippet(item.textEdit.newText) end elseif item.insertText ~= nil and item.insertText ~= "" then - if protocol.InsertTextFormat[item.insertTextFormat] == "PlainText" then + local insert_text_format = protocol.InsertTextFormat[item.insertTextFormat] + if insert_text_format == "PlainText" or insert_text_format == nil then return item.insertText else return M.parse_snippet(item.insertText) |