barrett/cp.nvim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 13

Merge pull request #35 from barrett-ruth/feat/expand-luasnip-integration

Browse source 
Improve LuaSnip Integration
This commit is contained in:
Barrett Ruth 2025-09-15 20:56:01 +02:00 • committed by GitHub
commit 13415f18d2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 36 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

34
lua/cp/init.lua
View file

@ -112,21 +112,18 @@ local function setup_problem(contest_id, problem_id, language)
if vim.api.nvim_buf_get_lines(0, 0, -1, true)[1] == "" then
local has_luasnip, luasnip = pcall(require, "luasnip")
if has_luasnip then
vim.api.nvim_buf_set_lines(0, 0, -1, false, { state.platform })
vim.api.nvim_win_set_cursor(0, { 1, #state.platform })
local prefixed_trigger = ("cp.nvim/%s.%s"):format(state.platform, language)
vim.api.nvim_buf_set_lines(0, 0, -1, false, { prefixed_trigger })
vim.api.nvim_win_set_cursor(0, { 1, #prefixed_trigger })
vim.cmd.startinsert({ bang = true })
vim.schedule(function()
print(
"Debug: platform="
.. state.platform
.. ", filetype="
.. vim.bo.filetype
.. ", expandable="
.. tostring(luasnip.expandable())
)
if luasnip.expandable() then
luasnip.expand()
else
vim.api.nvim_buf_set_lines(0, 0, 1, false, { "" })
vim.api.nvim_win_set_cursor(0, { 1, 0 })
end
vim.cmd.stopinsert()
end)
@ -214,6 +211,7 @@ local function diff_problem()
if state.diff_mode then
vim.cmd.diffoff()
if state.saved_session then
vim.cmd(("source %s"):format(state.saved_session))
vim.fn.delete(state.saved_session)
state.saved_session = nil
end
@ -242,13 +240,25 @@ local function diff_problem()
return
end
local output_lines = vim.fn.readfile(ctx.output_file)
local actual_output = {}
for i = 1, #output_lines do
if output_lines[i]:match("^%[code%]:") then
break
end
table.insert(actual_output, output_lines[i])
end
state.temp_output = vim.fn.tempname()
vim.fn.writefile(actual_output, state.temp_output)
state.saved_session = vim.fn.tempname()
vim.cmd(("mksession! %s"):format(state.saved_session))
vim.cmd("silent only")
vim.cmd(("edit %s"):format(ctx.expected_file))
vim.cmd(("edit %s"):format(state.temp_output))
vim.cmd.diffthis()
vim.cmd(("vertical diffsplit %s"):format(ctx.output_file))
vim.cmd(("vertical diffsplit %s"):format(ctx.expected_file))
state.diff_mode = true
end

17
lua/cp/snippets.lua
View file

@ -100,16 +100,27 @@ if __name__ == "__main__":
},
}
local user_overrides = {}
for _, snippet in ipairs(config.snippets or {}) do
user_overrides[snippet.trigger] = snippet
end
for language, template_set in pairs(template_definitions) do
local snippets = {}
local filetype = languages.canonical_filetypes[language]
for contest, template in pairs(template_set) do
table.insert(snippets, s(contest, fmt(template, { i(1) })))
local prefixed_trigger = ("cp.nvim/%s.%s"):format(contest, language)
if not user_overrides[prefixed_trigger] then
table.insert(snippets, s(prefixed_trigger, fmt(template, { i(1) })))
end
end
for _, snippet in ipairs(config.snippets or {}) do
table.insert(snippets, snippet)
for trigger, snippet in pairs(user_overrides) do
local prefix_match = trigger:match("^cp%.nvim/[^.]+%.(.+)$")
if prefix_match == language then
table.insert(snippets, snippet)
end
end
ls.add_snippets(filetype, snippets)