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

fix: remove old state variables, migrate to vim.g

Browse source
This commit is contained in:
Barrett Ruth 2025-09-13 23:50:14 -05:00
parent 08242fafa8
commit e66c57530e
2 changed files with 29 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lua/cp/health.lua
View file

@ -64,10 +64,17 @@ local function check_config()
if cp.is_initialized() then if cp.is_initialized() then
vim.health.ok("Plugin initialized") vim.health.ok("Plugin initialized")
if vim.g.cp_contest then if vim.g.cp and vim.g.cp.platform then
vim.health.info("Current contest: " .. vim.g.cp_contest) local info = vim.g.cp.platform
if vim.g.cp.contest_id then
info = info .. " " .. vim.g.cp.contest_id
if vim.g.cp.problem_id then
info = info .. " " .. vim.g.cp.problem_id
end
end
vim.health.info("Current context: " .. info)
else else
vim.health.info("No contest mode set") vim.health.info("No contest context set")
end end
else else
vim.health.warn("Plugin not initialized - configuration may be incomplete") vim.health.warn("Plugin not initialized - configuration may be incomplete")

37
lua/cp/init.lua
View file

@ -44,17 +44,17 @@ local function setup_problem(contest_id, problem_id)
logger.log("failed to load contest metadata: " .. (metadata_result.error or "unknown error"), vim.log.levels.WARN) logger.log("failed to load contest metadata: " .. (metadata_result.error or "unknown error"), vim.log.levels.WARN)
end end
if vim.g.cp_diff_mode then if vim.g.cp and vim.g.cp.diff_mode then
vim.cmd.diffoff() vim.cmd.diffoff()
if vim.g.cp_saved_session then if vim.g.cp.saved_session then
vim.fn.delete(vim.g.cp_saved_session) vim.fn.delete(vim.g.cp.saved_session)
vim.g.cp_saved_session = nil vim.g.cp.saved_session = nil
end end
if vim.g.cp_temp_output then if vim.g.cp.temp_output then
vim.fn.delete(vim.g.cp_temp_output) vim.fn.delete(vim.g.cp.temp_output)
vim.g.cp_temp_output = nil vim.g.cp.temp_output = nil
end end
vim.g.cp_diff_mode = false vim.g.cp.diff_mode = false
end end
vim.cmd("silent only") vim.cmd("silent only")
@ -131,12 +131,12 @@ local function run_problem()
config.hooks.before_run(problem_id) config.hooks.before_run(problem_id)
end end
if not vim.g.cp_platform then if not vim.g.cp or not vim.g.cp.platform then
logger.log("no platform set", vim.log.levels.ERROR) logger.log("no platform set", vim.log.levels.ERROR)
return return
end end
local contest_config = config.contests[vim.g.cp_platform] local contest_config = config.contests[vim.g.cp.platform]
vim.schedule(function() vim.schedule(function()
local ctx = problem.create_context(vim.g.cp.platform, vim.g.cp.contest_id, vim.g.cp.problem_id, config) local ctx = problem.create_context(vim.g.cp.platform, vim.g.cp.contest_id, vim.g.cp.problem_id, config)
@ -155,12 +155,12 @@ local function debug_problem()
config.hooks.before_debug(problem_id) config.hooks.before_debug(problem_id)
end end
if not vim.g.cp_platform then if not vim.g.cp or not vim.g.cp.platform then
logger.log("no platform set", vim.log.levels.ERROR) logger.log("no platform set", vim.log.levels.ERROR)
return return
end end
local contest_config = config.contests[vim.g.cp_platform] local contest_config = config.contests[vim.g.cp.platform]
vim.schedule(function() vim.schedule(function()
local ctx = problem.create_context(vim.g.cp.platform, vim.g.cp.contest_id, vim.g.cp.problem_id, config) local ctx = problem.create_context(vim.g.cp.platform, vim.g.cp.contest_id, vim.g.cp.problem_id, config)
@ -170,11 +170,11 @@ local function debug_problem()
end end
local function diff_problem() local function diff_problem()
if vim.g.cp_diff_mode then if vim.g.cp and vim.g.cp.diff_mode then
local tile_fn = config.tile or window.default_tile local tile_fn = config.tile or window.default_tile
window.restore_layout(vim.g.cp_saved_layout, tile_fn) window.restore_layout(vim.g.cp.saved_layout, tile_fn)
vim.g.cp_diff_mode = false vim.g.cp.diff_mode = false
vim.g.cp_saved_layout = nil vim.g.cp.saved_layout = nil
logger.log("exited diff mode") logger.log("exited diff mode")
else else
local problem_id = get_current_problem() local problem_id = get_current_problem()
@ -189,14 +189,15 @@ local function diff_problem()
return return
end end
vim.g.cp_saved_layout = window.save_layout() vim.g.cp = vim.g.cp or {}
vim.g.cp.saved_layout = window.save_layout()
local result = vim.system({ "awk", "/^\\[[^]]*\\]:/ {exit} {print}", ctx.output_file }, { text = true }):wait() local result = vim.system({ "awk", "/^\\[[^]]*\\]:/ {exit} {print}", ctx.output_file }, { text = true }):wait()
local actual_output = result.stdout local actual_output = result.stdout
window.setup_diff_layout(actual_output, ctx.expected_file, ctx.input_file) window.setup_diff_layout(actual_output, ctx.expected_file, ctx.input_file)
vim.g.cp_diff_mode = true vim.g.cp.diff_mode = true
logger.log("entered diff mode") logger.log("entered diff mode")
end end
end end