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

fix: defer to previous problem language

Browse source
This commit is contained in:
Barrett Ruth 2025-10-24 11:49:48 -04:00
parent 9d848eba22
commit 9bf3438466
1 changed files with 45 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

53
lua/cp/setup.lua
View file

@ -9,7 +9,7 @@ local scraper = require('cp.scraper')
local state = require('cp.state') local state = require('cp.state')
---Get the language of the current file from cache ---Get the language of the current file from cache
---@return string|nil ---@return string?
local function get_current_file_language() local function get_current_file_language()
local current_file = vim.fn.expand('%:p') local current_file = vim.fn.expand('%:p')
if current_file == '' then if current_file == '' then
@ -20,6 +20,34 @@ local function get_current_file_language()
return file_state and file_state.language or nil return file_state and file_state.language or nil
end end
---Check if a problem file exists for any enabled language
---@param platform string
---@param contest_id string
---@param problem_id string
---@return string?
local function get_existing_problem_language(platform, contest_id, problem_id)
local config = config_module.get_config()
local platform_config = config.platforms[platform]
if not platform_config then
return nil
end
for _, lang_id in ipairs(platform_config.enabled_languages) do
local effective = config.runtime.effective[platform][lang_id]
if effective and effective.extension then
local basename = config.filename
and config.filename(platform, contest_id, problem_id, config, lang_id)
or config_module.default_filename(contest_id, problem_id)
local filepath = basename .. '.' .. effective.extension
if vim.fn.filereadable(filepath) == 1 then
return lang_id
end
end
end
return nil
end
---@class TestCaseLite ---@class TestCaseLite
---@field input string ---@field input string
---@field expected string ---@field expected string
@ -306,19 +334,28 @@ function M.navigate_problem(direction, language)
require('cp.ui.views').disable() require('cp.ui.views').disable()
end end
local lang = nil
if language then if language then
local lang_result = config_module.get_language_for_platform(platform, language) local lang_result = config_module.get_language_for_platform(platform, language)
if not lang_result.valid then if not lang_result.valid then
logger.log(lang_result.error, vim.log.levels.ERROR) logger.log(lang_result.error, vim.log.levels.ERROR)
return return
end end
end lang = language
else
local lang = language or get_current_file_language() local existing_lang =
if lang and not language then get_existing_problem_language(platform, contest_id, problems[new_index].id)
local lang_result = config_module.get_language_for_platform(platform, lang) if existing_lang then
if not lang_result.valid then lang = existing_lang
lang = nil else
lang = get_current_file_language()
if lang then
local lang_result = config_module.get_language_for_platform(platform, lang)
if not lang_result.valid then
lang = nil
end
end
end end
end end