Merge pull request #61 from barrett-ruth/feat/trim-lines

Trim line user config
This commit is contained in:
Barrett Ruth 2025-09-20 01:45:23 +02:00 committed by GitHub
commit ad4d040431
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 29 additions and 6 deletions

View file

@ -117,6 +117,7 @@ Here's an example configuration with lazy.nvim: >
next_test_key = "<c-n>",
prev_test_key = "<c-p>",
toggle_diff_key = "t",
max_output_lines = 50,
},
diff = {
git = {
@ -177,6 +178,7 @@ Here's an example configuration with lazy.nvim: >
• {next_test_key} (`string`, default: `"<c-n>"`) Key to navigate to next test case.
• {prev_test_key} (`string`, default: `"<c-p>"`) Key to navigate to previous test case.
• {toggle_diff_key} (`string`, default: `"t"`) Key to toggle diff mode between vim and git.
• {max_output_lines} (`number`, default: `50`) Maximum lines of test output to display.
*cp.DiffConfig*

View file

@ -36,6 +36,7 @@
---@field next_test_key string Key to navigate to next test case
---@field prev_test_key string Key to navigate to previous test case
---@field toggle_diff_key string Key to toggle diff mode
---@field max_output_lines number Maximum lines of test output to display
---@class DiffGitConfig
---@field command string Git executable name
@ -84,6 +85,7 @@ M.defaults = {
next_test_key = '<c-n>',
prev_test_key = '<c-p>',
toggle_diff_key = 't',
max_output_lines = 50,
},
diff = {
git = {
@ -203,6 +205,13 @@ function M.setup(user_config)
end,
'toggle_diff_key must be a non-empty string',
},
max_output_lines = {
config.run_panel.max_output_lines,
function(value)
return type(value) == 'number' and value > 0 and value == math.floor(value)
end,
'max_output_lines must be a positive integer',
},
})
vim.validate({

View file

@ -470,7 +470,7 @@ local function toggle_run_panel(is_debug)
local execute_module = require('cp.execute')
local contest_config = config.contests[state.platform]
if execute_module.compile_problem(ctx, contest_config, is_debug) then
test_module.run_all_test_cases(ctx, contest_config)
test_module.run_all_test_cases(ctx, contest_config, config)
end
refresh_run_panel()

View file

@ -118,7 +118,7 @@ end
---@param contest_config ContestConfig
---@param test_case TestCase
---@return table
local function run_single_test_case(ctx, contest_config, test_case)
local function run_single_test_case(ctx, contest_config, cp_config, test_case)
local language = vim.fn.fnamemodify(ctx.source_file, ':e')
local language_name = constants.filetype_to_language[language] or contest_config.default_language
local language_config = contest_config[language_name]
@ -187,6 +187,18 @@ local function run_single_test_case(ctx, contest_config, test_case)
local execution_time = (vim.uv.hrtime() - start_time) / 1000000
local actual_output = (result.stdout or ''):gsub('\n$', '')
local max_lines = cp_config.run_panel.max_output_lines
local output_lines = vim.split(actual_output, '\n')
if #output_lines > max_lines then
local trimmed_lines = {}
for i = 1, max_lines do
table.insert(trimmed_lines, output_lines[i])
end
table.insert(trimmed_lines, string.format('... (output trimmed after %d lines)', max_lines))
actual_output = table.concat(trimmed_lines, '\n')
end
local expected_output = test_case.expected:gsub('\n$', '')
local ok = actual_output == expected_output
@ -238,7 +250,7 @@ end
---@param contest_config ContestConfig
---@param index number
---@return boolean
function M.run_test_case(ctx, contest_config, index)
function M.run_test_case(ctx, contest_config, cp_config, index)
local test_case = run_panel_state.test_cases[index]
if not test_case then
return false
@ -247,7 +259,7 @@ function M.run_test_case(ctx, contest_config, index)
logger.log(('running test case %d'):format(index))
test_case.status = 'running'
local result = run_single_test_case(ctx, contest_config, test_case)
local result = run_single_test_case(ctx, contest_config, cp_config, test_case)
test_case.status = result.status
test_case.actual = result.actual
@ -264,10 +276,10 @@ end
---@param ctx ProblemContext
---@param contest_config ContestConfig
---@return TestCase[]
function M.run_all_test_cases(ctx, contest_config)
function M.run_all_test_cases(ctx, contest_config, cp_config)
local results = {}
for i, _ in ipairs(run_panel_state.test_cases) do
M.run_test_case(ctx, contest_config, i)
M.run_test_case(ctx, contest_config, cp_config, i)
table.insert(results, run_panel_state.test_cases[i])
end
return results