feat: start lang refactor
This commit is contained in:
Barrett Ruth
parent
ce12ab0e1a
commit
bd30fb626c
7 changed files with 229 additions and 45 deletions
|
|
@ -18,6 +18,7 @@ local actions = constants.ACTIONS
|
|||
---@field interactor_cmd? string
|
||||
---@field test_index? integer
|
||||
---@field debug? boolean
|
||||
---@field language? string
|
||||
|
||||
--- Turn raw args into normalized structure to later dispatch
|
||||
---@param args string[] The raw command-line mode args
|
||||
|
|
@ -79,7 +80,16 @@ local function parse_command(args)
|
|||
|
||||
return { type = 'action', action = first, test_index = test_index, debug = debug }
|
||||
else
|
||||
return { type = 'action', action = first }
|
||||
local language = nil
|
||||
if #args >= 3 and args[2] == '--lang' then
|
||||
language = args[3]
|
||||
elseif #args >= 2 and args[2] ~= nil and args[2]:sub(1, 2) ~= '--' then
|
||||
return {
|
||||
type = 'error',
|
||||
message = ("Unknown argument '%s' for action '%s'"):format(args[2], first),
|
||||
}
|
||||
end
|
||||
return { type = 'action', action = first, language = language }
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -95,13 +105,18 @@ local function parse_command(args)
|
|||
platform = first,
|
||||
contest = args[2],
|
||||
}
|
||||
elseif #args == 3 then
|
||||
elseif #args == 4 and args[3] == '--lang' then
|
||||
return {
|
||||
type = 'error',
|
||||
message = 'Setup contests with :CP <platform> <contest_id>.',
|
||||
type = 'contest_setup',
|
||||
platform = first,
|
||||
contest = args[2],
|
||||
language = args[4],
|
||||
}
|
||||
else
|
||||
return { type = 'error', message = 'Too many arguments' }
|
||||
return {
|
||||
type = 'error',
|
||||
message = 'Invalid arguments. Usage: :CP <platform> <contest> [--lang <language>]',
|
||||
}
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -110,6 +125,12 @@ local function parse_command(args)
|
|||
type = 'problem_jump',
|
||||
problem_id = first,
|
||||
}
|
||||
elseif #args == 3 and args[2] == '--lang' then
|
||||
return {
|
||||
type = 'problem_jump',
|
||||
problem_id = first,
|
||||
language = args[3],
|
||||
}
|
||||
end
|
||||
|
||||
return { type = 'error', message = 'Unknown command or no contest context.' }
|
||||
|
|
@ -139,12 +160,12 @@ function M.handle_command(opts)
|
|||
elseif cmd.action == 'panel' then
|
||||
ui.toggle_panel({ debug = cmd.debug, test_index = cmd.test_index })
|
||||
elseif cmd.action == 'next' then
|
||||
setup.navigate_problem(1)
|
||||
setup.navigate_problem(1, cmd.language)
|
||||
elseif cmd.action == 'prev' then
|
||||
setup.navigate_problem(-1)
|
||||
setup.navigate_problem(-1, cmd.language)
|
||||
elseif cmd.action == 'pick' then
|
||||
local picker = require('cp.commands.picker')
|
||||
picker.handle_pick_action()
|
||||
picker.handle_pick_action(cmd.language)
|
||||
end
|
||||
elseif cmd.type == 'problem_jump' then
|
||||
local platform = state.get_platform()
|
||||
|
|
@ -173,13 +194,13 @@ function M.handle_command(opts)
|
|||
end
|
||||
|
||||
local setup = require('cp.setup')
|
||||
setup.setup_contest(platform, contest_id, problem_id)
|
||||
setup.setup_contest(platform, contest_id, problem_id, cmd.language)
|
||||
elseif cmd.type == 'cache' then
|
||||
local cache_commands = require('cp.commands.cache')
|
||||
cache_commands.handle_cache_command(cmd)
|
||||
elseif cmd.type == 'contest_setup' then
|
||||
local setup = require('cp.setup')
|
||||
setup.setup_contest(cmd.platform, cmd.contest, nil)
|
||||
setup.setup_contest(cmd.platform, cmd.contest, nil, cmd.language)
|
||||
return
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -4,8 +4,9 @@ local config_module = require('cp.config')
|
|||
local logger = require('cp.log')
|
||||
|
||||
--- Dispatch `:CP pick` to appropriate picker
|
||||
---@param language? string
|
||||
---@return nil
|
||||
function M.handle_pick_action()
|
||||
function M.handle_pick_action(language)
|
||||
local config = config_module.get_config()
|
||||
|
||||
if not (config.ui and config.ui.picker) then
|
||||
|
|
@ -53,7 +54,7 @@ function M.handle_pick_action()
|
|||
picker = fzf_picker
|
||||
end
|
||||
|
||||
picker.pick()
|
||||
picker.pick(language)
|
||||
end
|
||||
|
||||
return M
|
||||
|
|
|
|||
|
|
@ -351,6 +351,50 @@ function M.get_config()
|
|||
return current_config or M.defaults
|
||||
end
|
||||
|
||||
---Validate and get effective language config for a platform
|
||||
---@param platform_id string
|
||||
---@param language_id string
|
||||
---@return { valid: boolean, effective?: CpLanguage, extension?: string, error?: string }
|
||||
function M.get_language_for_platform(platform_id, language_id)
|
||||
local cfg = M.get_config()
|
||||
|
||||
if not cfg.platforms[platform_id] then
|
||||
return { valid = false, error = string.format("Unknown platform '%s'", platform_id) }
|
||||
end
|
||||
|
||||
if not cfg.languages[language_id] then
|
||||
return { valid = false, error = string.format("Unknown language '%s'", language_id) }
|
||||
end
|
||||
|
||||
local platform = cfg.platforms[platform_id]
|
||||
if not vim.tbl_contains(platform.enabled_languages, language_id) then
|
||||
local available = table.concat(platform.enabled_languages, ', ')
|
||||
return {
|
||||
valid = false,
|
||||
error = string.format(
|
||||
"Language '%s' not enabled for %s. Available: %s",
|
||||
language_id,
|
||||
platform_id,
|
||||
available
|
||||
),
|
||||
}
|
||||
end
|
||||
|
||||
local effective = cfg.runtime.effective[platform_id][language_id]
|
||||
if not effective then
|
||||
return {
|
||||
valid = false,
|
||||
error = string.format('No effective config for %s/%s', platform_id, language_id),
|
||||
}
|
||||
end
|
||||
|
||||
return {
|
||||
valid = true,
|
||||
effective = effective,
|
||||
extension = effective.extension,
|
||||
}
|
||||
end
|
||||
|
||||
---@param contest_id string
|
||||
---@param problem_id? string
|
||||
---@return string
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ local picker_utils = require('cp.pickers')
|
|||
|
||||
local M = {}
|
||||
|
||||
local function contest_picker(platform, refresh)
|
||||
local function contest_picker(platform, refresh, language)
|
||||
local constants = require('cp.constants')
|
||||
local platform_display_name = constants.PLATFORM_DISPLAY_NAMES[platform]
|
||||
local fzf = require('fzf-lua')
|
||||
|
|
@ -42,19 +42,24 @@ local function contest_picker(platform, refresh)
|
|||
|
||||
if contest then
|
||||
local cp = require('cp')
|
||||
cp.handle_command({ fargs = { platform, contest.id } })
|
||||
local fargs = { platform, contest.id }
|
||||
if language then
|
||||
table.insert(fargs, '--lang')
|
||||
table.insert(fargs, language)
|
||||
end
|
||||
cp.handle_command({ fargs = fargs })
|
||||
end
|
||||
end,
|
||||
['ctrl-r'] = function()
|
||||
local cache = require('cp.cache')
|
||||
cache.clear_contest_list(platform)
|
||||
contest_picker(platform, true)
|
||||
contest_picker(platform, true, language)
|
||||
end,
|
||||
},
|
||||
})
|
||||
end
|
||||
|
||||
function M.pick()
|
||||
function M.pick(language)
|
||||
local fzf = require('fzf-lua')
|
||||
local platforms = picker_utils.get_platforms()
|
||||
local entries = vim.tbl_map(function(platform)
|
||||
|
|
@ -79,7 +84,7 @@ function M.pick()
|
|||
end
|
||||
|
||||
if platform then
|
||||
contest_picker(platform.id)
|
||||
contest_picker(platform.id, false, language)
|
||||
end
|
||||
end,
|
||||
},
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ local picker_utils = require('cp.pickers')
|
|||
|
||||
local M = {}
|
||||
|
||||
local function contest_picker(opts, platform, refresh)
|
||||
local function contest_picker(opts, platform, refresh, language)
|
||||
local constants = require('cp.constants')
|
||||
local platform_display_name = constants.PLATFORM_DISPLAY_NAMES[platform]
|
||||
local contests = picker_utils.get_platform_contests(platform, refresh)
|
||||
|
|
@ -43,13 +43,18 @@ local function contest_picker(opts, platform, refresh)
|
|||
|
||||
if selection then
|
||||
local cp = require('cp')
|
||||
cp.handle_command({ fargs = { platform, selection.value.id } })
|
||||
local fargs = { platform, selection.value.id }
|
||||
if language then
|
||||
table.insert(fargs, '--lang')
|
||||
table.insert(fargs, language)
|
||||
end
|
||||
cp.handle_command({ fargs = fargs })
|
||||
end
|
||||
end)
|
||||
|
||||
map('i', '<c-r>', function()
|
||||
actions.close(prompt_bufnr)
|
||||
contest_picker(opts, platform, true)
|
||||
contest_picker(opts, platform, true, language)
|
||||
end)
|
||||
|
||||
return true
|
||||
|
|
@ -58,9 +63,8 @@ local function contest_picker(opts, platform, refresh)
|
|||
:find()
|
||||
end
|
||||
|
||||
function M.pick(opts)
|
||||
opts = opts or {}
|
||||
|
||||
function M.pick(language)
|
||||
local opts = {}
|
||||
local platforms = picker_utils.get_platforms()
|
||||
|
||||
pickers
|
||||
|
|
@ -83,7 +87,7 @@ function M.pick(opts)
|
|||
actions.close(prompt_bufnr)
|
||||
|
||||
if selection then
|
||||
contest_picker(opts, selection.value.id)
|
||||
contest_picker(opts, selection.value.id, false, language)
|
||||
end
|
||||
end)
|
||||
return true
|
||||
|
|
|
|||
|
|
@ -8,6 +8,18 @@ local logger = require('cp.log')
|
|||
local scraper = require('cp.scraper')
|
||||
local state = require('cp.state')
|
||||
|
||||
---Get the language of the current file from cache
|
||||
---@return string|nil
|
||||
local function get_current_file_language()
|
||||
local current_file = vim.fn.expand('%:p')
|
||||
if current_file == '' then
|
||||
return nil
|
||||
end
|
||||
cache.load()
|
||||
local file_state = cache.get_file_state(current_file)
|
||||
return file_state and file_state.language or nil
|
||||
end
|
||||
|
||||
---@class TestCaseLite
|
||||
---@field input string
|
||||
---@field expected string
|
||||
|
|
@ -86,6 +98,14 @@ function M.setup_contest(platform, contest_id, problem_id, language)
|
|||
state.set_platform(platform)
|
||||
state.set_contest_id(contest_id)
|
||||
|
||||
if language then
|
||||
local lang_result = config_module.get_language_for_platform(platform, language)
|
||||
if not lang_result.valid then
|
||||
logger.log(lang_result.error, vim.log.levels.ERROR)
|
||||
return
|
||||
end
|
||||
end
|
||||
|
||||
local is_new_contest = old_platform ~= platform and old_contest_id ~= contest_id
|
||||
|
||||
cache.load()
|
||||
|
|
@ -173,6 +193,15 @@ function M.setup_problem(problem_id, language)
|
|||
local config = config_module.get_config()
|
||||
local lang = language
|
||||
or (config.platforms[platform] and config.platforms[platform].default_language)
|
||||
|
||||
if language then
|
||||
local lang_result = config_module.get_language_for_platform(platform, language)
|
||||
if not lang_result.valid then
|
||||
logger.log(lang_result.error, vim.log.levels.ERROR)
|
||||
return
|
||||
end
|
||||
end
|
||||
|
||||
local source_file = state.get_source_file(lang)
|
||||
if not source_file then
|
||||
return
|
||||
|
|
@ -235,7 +264,8 @@ function M.setup_problem(problem_id, language)
|
|||
end
|
||||
|
||||
---@param direction integer
|
||||
function M.navigate_problem(direction)
|
||||
---@param language? string
|
||||
function M.navigate_problem(direction, language)
|
||||
if direction == 0 then
|
||||
return
|
||||
end
|
||||
|
|
@ -274,7 +304,15 @@ function M.navigate_problem(direction)
|
|||
require('cp.ui.views').disable()
|
||||
end
|
||||
|
||||
M.setup_contest(platform, contest_id, problems[new_index].id)
|
||||
local lang = language or 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
|
||||
|
||||
M.setup_contest(platform, contest_id, problems[new_index].id, lang)
|
||||
end
|
||||
|
||||
return M
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue