From 0006fe7a3c5128daaf0f56887f4c9f4838bfe0c5 Mon Sep 17 00:00:00 2001 From: Folke Lemaitre Date: Mon, 20 May 2024 20:03:08 +0200 Subject: [PATCH] refactor(cmp): snippet_resolve => snippet_preview --- lua/lazyvim/util/cmp.lua | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/lua/lazyvim/util/cmp.lua b/lua/lazyvim/util/cmp.lua index d0e5b48f..fd836d4e 100644 --- a/lua/lazyvim/util/cmp.lua +++ b/lua/lazyvim/util/cmp.lua @@ -12,16 +12,19 @@ function M.snippet_replace(snippet, fn) end -- This function resolves nested placeholders in a snippet. -function M.snippet_resolve(snippet) - return M.snippet_replace(snippet, function(placeholder) - return M.snippet_resolve(placeholder.text) +---@param snippet string +---@return string +function M.snippet_preview(snippet) + local ret = M.snippet_replace(snippet, function(placeholder) + return M.snippet_preview(placeholder.text) end):gsub("%$0", "") + return ret end -- This function replaces nested placeholders in a snippet with LSP placeholders. function M.snippet_fix(snippet) return M.snippet_replace(snippet, function(placeholder) - return "${" .. placeholder.n .. ":" .. M.snippet_resolve(placeholder.text) .. "}" + return "${" .. placeholder.n .. ":" .. M.snippet_preview(placeholder.text) .. "}" end) end @@ -53,7 +56,7 @@ function M.add_missing_snippet_docs(window) if not item.documentation and item.insertText then item.documentation = { kind = cmp.lsp.MarkupKind.Markdown, - value = string.format("```%s\n%s\n```", vim.bo.filetype, M.snippet_resolve(item.insertText)), + value = string.format("```%s\n%s\n```", vim.bo.filetype, M.snippet_preview(item.insertText)), } end end