Skip to content

Attempt at displaying regTrig snippets in completion menu #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Attempt at displaying regTrig snippets in completion menu #46

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f56d12
initial first pass to get regTrig snips displaying properly
zdcthomas Jun 15, 2022
1e22f3b
slight refactor to use params context
zdcthomas Jun 15, 2022
3a1c114
preserves caching and only removes item from list
zdcthomas Jun 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 48 additions & 22 deletions lua/cmp_luasnip/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ local defaults = {
-- the options are being passed via cmp.setup.sources, e.g.
-- require('cmp').setup { sources = { { name = 'luasnip', opts = {...} } } }
local function init_options(params)
params.option = vim.tbl_deep_extend('keep', params.option, defaults)
params.option = vim.tbl_deep_extend("keep", params.option, defaults)
vim.validate({
use_show_condition = { params.option.use_show_condition, 'boolean' },
use_show_condition = { params.option.use_show_condition, "boolean" },
})
end

Expand Down Expand Up @@ -48,7 +48,8 @@ source.new = function()
end

source.get_keyword_pattern = function()
return "\\%([^[:alnum:][:blank:]]\\|\\w\\+\\)"
-- This should probably be more descerning, but I'm not sure what it should be
return [[.]]
end

function source:is_available()
Expand All @@ -61,37 +62,45 @@ function source:get_debug_name()
end

function source:complete(params, callback)
local line = require("luasnip.util.util").get_current_line_to_cursor()
init_options(params)

local filetypes = require("luasnip.util.util").get_snippet_filetypes()
local items = {}

for i = 1, #filetypes do
-- Right now, we need to update the regTrig snips on every keypress
-- potentially, but we should avoid that if we can
local ft = filetypes[i]
if not snip_cache[ft] then
-- ft not yet in cache.
local ft_items = {}
local ft_table = require("luasnip").get_snippets(ft, {
type = "snippets"
})
local ft_table = require("luasnip").get_snippets(ft, { type = "snippets" })
if ft_table then
for j, snip in pairs(ft_table) do
if not snip.hidden then
ft_items[#ft_items + 1] = {
local stored_snip = {
word = snip.trigger,
label = snip.trigger,
kind = cmp.lsp.CompletionItemKind.Snippet,
data = {
filetype = ft,
snip_id = snip.id,
show_condition = snip.show_condition,
regTrig = snip.regTrig,
},
isIncomplete = false,
}
if snip.regTrig then
stored_snip.isIncomplete = true
end
table.insert(ft_items, stored_snip)
end
end
snip_cache[ft] = ft_items
end
snip_cache[ft] = ft_items
end
--
vim.list_extend(items, snip_cache[ft])
end

Expand All @@ -103,17 +112,33 @@ function source:complete(params, callback)
end, items)
end

for _, snip in ipairs(items) do
if snip.data.regTrig then
local expand_params = require("luasnip").get_id_snippet(snip.data.snip_id):matches(
params.context.cursor_before_line
)
if expand_params then
snip.word = expand_params.trigger
snip.label = expand_params.trigger
snip.isIncomplete = false
else
snip.isIncomplete = true
end
end
end

items = vim.tbl_filter(function(i)
return not i.isIncomplete
end, items)

callback(items)
end

function source:resolve(completion_item, callback)
local item_snip_id = completion_item.data.snip_id
local snip = require("luasnip").get_id_snippet(item_snip_id)
local documentation
if
doc_cache[completion_item.data.filetype]
and doc_cache[completion_item.data.filetype][item_snip_id]
then
if doc_cache[completion_item.data.filetype] and doc_cache[completion_item.data.filetype][item_snip_id] then
documentation = doc_cache[completion_item.data.filetype][item_snip_id]
else
documentation = get_documentation(snip, completion_item.data)
Expand All @@ -128,28 +153,29 @@ end
function source:execute(completion_item, callback)
local snip = require("luasnip").get_id_snippet(completion_item.data.snip_id)

-- if trigger is a pattern, expand "pattern" instead of actual snippet.
if snip.regTrig then
snip = snip:get_pattern_expand_helper()
end

local cursor = vim.api.nvim_win_get_cursor(0)
-- get_cursor returns (1,0)-indexed position, clear_region expects (0,0)-indexed.
cursor[1] = cursor[1] - 1

-- text cannot be cleared before, as TM_CURRENT_LINE and
-- TM_CURRENT_WORD couldn't be set correctly.
require("luasnip").snip_expand(snip, {
local args = {
-- clear word inserted into buffer by cmp.
-- cursor is currently behind word.
clear_region = {
from = {
cursor[1],
cursor[2]-#completion_item.word
cursor[2] - #completion_item.word,
},
to = cursor
}
})
to = cursor,
},
}
if snip.regTrig then
local line = require("luasnip.util.util").get_current_line_to_cursor()
args.expand_params = snip:matches(line)
end

require("luasnip").snip_expand(snip, args)
callback(completion_item)
end

Expand Down