diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2021-09-14 09:22:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-14 09:22:31 -0700 |
| commit | 04cde576edc1cb4795769ef2520416997c0f79c0 (patch) | |
| tree | 08a4617da1143bc792463dfe5f0a1322068655fb /runtime/lua/vim/lsp/util.lua | |
| parent | 5a813160ae07570f9002bc55777f671f734fc2a4 (diff) | |
| parent | cd864748d3d5769315df354deacf9e20b615ec0c (diff) | |
| download | rneovim-04cde576edc1cb4795769ef2520416997c0f79c0.tar.gz rneovim-04cde576edc1cb4795769ef2520416997c0f79c0.tar.bz2 rneovim-04cde576edc1cb4795769ef2520416997c0f79c0.zip | |
Merge #15667 release-0.5: backports
Diffstat (limited to 'runtime/lua/vim/lsp/util.lua')
| -rw-r--r-- | runtime/lua/vim/lsp/util.lua | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua index 06afc2c5e2..18a2b60a7a 100644 --- a/runtime/lua/vim/lsp/util.lua +++ b/runtime/lua/vim/lsp/util.lua @@ -1,4 +1,5 @@ local protocol = require 'vim.lsp.protocol' +local snippet = require 'vim.lsp._snippet' local vim = vim local validate = vim.validate local api = vim.api @@ -579,9 +580,13 @@ end --@param input (string) unparsed snippet --@returns (string) parsed snippet function M.parse_snippet(input) - local res, _ = parse_snippet_rec(input, false) - - return res + local ok, parsed = pcall(function() + return tostring(snippet.parse(input)) + end) + if not ok then + return input + end + return parsed end --@private |