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

Merge pull request #23 from barrett-ruth/fix/problem-id

Browse source 
fix: ci
This commit is contained in:
Barrett Ruth 2025-09-14 02:47:46 +02:00 • committed by GitHub
commit 64c7559c78
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 21 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lua/cp/config.lua
View file

@ -87,11 +87,11 @@ function M.setup(user_config)
return config
end
local function default_filename(contest, problem_id, problem_letter)
local full_problem_id = problem_id:lower()
local function default_filename(contest, contest_id, problem_id)
local full_problem_id = contest_id:lower()
if contest == "atcoder" or contest == "codeforces" then
if problem_letter then
full_problem_id = full_problem_id .. problem_letter:lower()
if problem_id then
full_problem_id = full_problem_id .. problem_id:lower()
end
end
return full_problem_id .. ".cc"

13
lua/cp/init.lua
View file

@ -31,7 +31,7 @@ local function setup_contest(contest_type)
logger.log(("set up %s contest environment"):format(contest_type))
end
local function setup_problem(problem_id, problem_letter)
local function setup_problem(contest_id, problem_id)
if not vim.g.cp_contest then
logger.log("no contest mode set. run :CP <contest> first", vim.log.levels.ERROR)
return
@ -52,7 +52,10 @@ local function setup_problem(problem_id, problem_letter)
vim.cmd("silent only")
local ctx = problem.create_context(vim.g.cp_contest, problem_id, problem_letter, config)
vim.g.cp_contest_id = contest_id
vim.g.cp_problem_id = problem_id
local ctx = problem.create_context(vim.g.cp_contest, contest_id, problem_id, config)
local scrape_result = scrape.scrape_problem(ctx)
@ -128,7 +131,7 @@ local function run_problem()
local contest_config = config.contests[vim.g.cp_contest]
vim.schedule(function()
local ctx = problem.create_context(vim.g.cp_contest, problem_id, nil, config)
local ctx = problem.create_context(vim.g.cp_contest, vim.g.cp_contest_id, vim.g.cp_problem_id, config)
execute.run_problem(ctx, contest_config, false)
vim.cmd.checktime()
end)
@ -152,7 +155,7 @@ local function debug_problem()
local contest_config = config.contests[vim.g.cp_contest]
vim.schedule(function()
local ctx = problem.create_context(vim.g.cp_contest, problem_id, nil, config)
local ctx = problem.create_context(vim.g.cp_contest, vim.g.cp_contest_id, vim.g.cp_problem_id, config)
execute.run_problem(ctx, contest_config, true)
vim.cmd.checktime()
end)
@ -171,7 +174,7 @@ local function diff_problem()
return
end
local ctx = problem.create_context(vim.g.cp_contest, problem_id, nil, config)
local ctx = problem.create_context(vim.g.cp_contest, vim.g.cp_contest_id, vim.g.cp_problem_id, config)
if vim.fn.filereadable(ctx.expected_file) == 0 then
logger.log(("No expected output file found: %s"):format(ctx.expected_file), vim.log.levels.ERROR)

14
lua/cp/problem.lua
View file

@ -1,7 +1,7 @@
---@class ProblemContext
---@field contest string Contest name (e.g. "atcoder", "codeforces")
---@field problem_id string Raw problem ID (e.g. "abc123", "1933")
---@field problem_letter? string Problem letter for AtCoder/Codeforces (e.g. "a", "b")
---@field contest_id string Contest ID (e.g. "abc123", "1933")
---@field problem_id? string Problem ID for AtCoder/Codeforces (e.g. "a", "b")
---@field source_file string Source filename (e.g. "abc123a.cpp")
---@field binary_file string Binary output path (e.g. "build/abc123a")
---@field input_file string Input test file path (e.g. "io/abc123a.in")
@ -12,19 +12,19 @@
local M = {}
---@param contest string
---@param problem_id string
---@param problem_letter? string
---@param contest_id string
---@param problem_id? string
---@param config cp.Config
---@return ProblemContext
function M.create_context(contest, problem_id, problem_letter, config)
function M.create_context(contest, contest_id, problem_id, config)
local filename_fn = config.filename or require("cp.config").default_filename
local source_file = filename_fn(contest, problem_id, problem_letter)
local source_file = filename_fn(contest, contest_id, problem_id)
local base_name = vim.fn.fnamemodify(source_file, ":t:r")
return {
contest = contest,
contest_id = contest_id,
problem_id = problem_id,
problem_letter = problem_letter,
source_file = source_file,
binary_file = ("build/%s"):format(base_name),
input_file = ("io/%s.in"):format(base_name),

4
lua/cp/scrape.lua
View file

@ -59,9 +59,9 @@ function M.scrape_problem(ctx)
local args
if ctx.contest == "cses" then
args = { "uv", "run", scraper_path, ctx.problem_id }
args = { "uv", "run", scraper_path, ctx.contest_id }
else
args = { "uv", "run", scraper_path, ctx.problem_id, ctx.problem_letter }
args = { "uv", "run", scraper_path, ctx.contest_id, ctx.problem_id }
end
local result = vim.system(args, {