fix(scrapers): fix

lua/cp/runner/execute.lua

@@ -98,7 +98,6 @@ local function parse_and_strip_time_v(output)
   end
 
   local peak_mb = peak_kb / 1024.0
-  head = head:gsub('\n+$', '')
   return head, peak_mb
 end
 

lua/cp/runner/run.lua

@@ -58,6 +58,22 @@ local function load_constraints_from_cache(platform, contest_id, problem_id)
   return nil
 end
 
+--- Normalize raw problem output to a "canonical" version
+--- Usually, most contests ignore leading/trailing whitespace and empty lines
+---@param lines string
+local function normalize_lines(lines)
+  local normalized = {}
+  for _, line in
+    ipairs(vim.tbl_values(vim.split(((lines or ''):gsub('\r', '')), '\n', { plain = true })))
+  do
+    local trimmed_line = vim.trim(line)
+    if trimmed_line ~= '' then
+      table.insert(normalized, trimmed_line)
+    end
+  end
+  return table.concat(normalized, '\n')
+end
+
 ---@param test_cases TestCase[]
 ---@return RanTestCase[]
 local function create_sentinal_panel_data(test_cases)
@@ -106,8 +122,7 @@ local function run_single_test_case(contest_config, cp_config, test_case)
   local r = exec.run(cmd, stdin_content, timeout_ms, memory_mb)
 
   local ansi = require('cp.ui.ansi')
-  local out = (r.stdout or ''):gsub('\n$', '')
-
+  local out = r.stdout or ''
   local highlights = {}
   if out ~= '' then
     if cp_config.run_panel.ansi then
@@ -130,8 +145,8 @@ local function run_single_test_case(contest_config, cp_config, test_case)
     out = table.concat(trimmed, '\n')
   end
 
-  local expected = (test_case.expected or ''):gsub('\n$', '')
-  local ok = out == expected
+  local expected = test_case.expected or ''
+  local ok = normalize_lines(out) == normalize_lines(expected)
 
   local signal = r.signal
   if not signal and r.code and r.code >= 128 then

lua/cp/ui/ansi.lua

@@ -25,7 +25,7 @@ end
 ---@return AnsiParseResult
 function M.parse_ansi_text(text)
   local clean_text = text:gsub('\027%[[%d;]*[a-zA-Z]', '')
-  local lines = vim.split(clean_text, '\n', { plain = true, trimempty = false })
+  local lines = vim.split(clean_text, '\n', { plain = true })
 
   local highlights = {}
   local line_num = 0

lua/cp/ui/diff.lua

@@ -13,7 +13,7 @@ local M = {}
 local vim_backend = {
   name = 'vim',
   render = function(_, actual)
-    local actual_lines = vim.split(actual, '\n', { plain = true, trimempty = true })
+    local actual_lines = vim.split(actual, '\n', { plain = true })
 
     return {
       content = actual_lines,
@@ -27,7 +27,7 @@ local none_backend = {
   name = 'none',
   render = function(expected, actual)
     local expected_lines = vim.split(expected, '\n', { plain = true, trimempty = true })
-    local actual_lines = vim.split(actual, '\n', { plain = true, trimempty = true })
+    local actual_lines = vim.split(actual, '\n', { plain = true })
 
     return {
       content = { expected = expected_lines, actual = actual_lines },
@@ -64,7 +64,7 @@ local git_backend = {
 
     if result.code == 0 then
       return {
-        content = vim.split(actual, '\n', { plain = true, trimempty = true }),
+        content = vim.split(actual, '\n', { plain = true }),
         highlights = {},
       }
     else

lua/cp/ui/layouts.lua

@@ -22,7 +22,7 @@ local function create_none_diff_layout(parent_win, expected_content, actual_cont
   vim.api.nvim_set_option_value('winbar', 'Actual', { win = actual_win })
 
   local expected_lines = vim.split(expected_content, '\n', { plain = true, trimempty = true })
-  local actual_lines = vim.split(actual_content, '\n', { plain = true, trimempty = true })
+  local actual_lines = vim.split(actual_content, '\n', { plain = true })
 
   utils.update_buffer_content(expected_buf, expected_lines, {})
   utils.update_buffer_content(actual_buf, actual_lines, {})
@@ -59,7 +59,7 @@ local function create_vim_diff_layout(parent_win, expected_content, actual_conte
   vim.api.nvim_set_option_value('winbar', 'Actual', { win = actual_win })
 
   local expected_lines = vim.split(expected_content, '\n', { plain = true, trimempty = true })
-  local actual_lines = vim.split(actual_content, '\n', { plain = true, trimempty = true })
+  local actual_lines = vim.split(actual_content, '\n', { plain = true })
 
   utils.update_buffer_content(expected_buf, expected_lines, {})
   utils.update_buffer_content(actual_buf, actual_lines, {})
@@ -108,7 +108,7 @@ local function create_git_diff_layout(parent_win, expected_content, actual_conte
   if diff_result.raw_diff and diff_result.raw_diff ~= '' then
     highlight.parse_and_apply_diff(diff_buf, diff_result.raw_diff, diff_namespace)
   else
-    local lines = vim.split(actual_content, '\n', { plain = true, trimempty = true })
+    local lines = vim.split(actual_content, '\n', { plain = true })
     utils.update_buffer_content(diff_buf, lines, {})
   end
 
@@ -124,7 +124,7 @@ end
 
 local function create_single_layout(parent_win, content)
   local buf = utils.create_buffer_with_options()
-  local lines = vim.split(content, '\n', { plain = true, trimempty = true })
+  local lines = vim.split(content, '\n', { plain = true })
   utils.update_buffer_content(buf, lines, {})
 
   vim.api.nvim_set_current_win(parent_win)
@@ -218,7 +218,7 @@ function M.update_diff_panes(
     end
   else
     if desired_mode == 'single' then
-      local lines = vim.split(actual_content, '\n', { plain = true, trimempty = true })
+      local lines = vim.split(actual_content, '\n', { plain = true })
       utils.update_buffer_content(
         current_diff_layout.buffers[1],
         lines,
@@ -237,7 +237,7 @@ function M.update_diff_panes(
           diff_namespace
         )
       else
-        local lines = vim.split(actual_content, '\n', { plain = true, trimempty = true })
+        local lines = vim.split(actual_content, '\n', { plain = true })
         utils.update_buffer_content(
           current_diff_layout.buffers[1],
           lines,
@@ -247,7 +247,7 @@ function M.update_diff_panes(
       end
     elseif desired_mode == 'none' then
       local expected_lines = vim.split(expected_content, '\n', { plain = true, trimempty = true })
-      local actual_lines = vim.split(actual_content, '\n', { plain = true, trimempty = true })
+      local actual_lines = vim.split(actual_content, '\n', { plain = true })
       utils.update_buffer_content(current_diff_layout.buffers[1], expected_lines, {})
       utils.update_buffer_content(
         current_diff_layout.buffers[2],
@@ -257,7 +257,7 @@ function M.update_diff_panes(
       )
     else
       local expected_lines = vim.split(expected_content, '\n', { plain = true, trimempty = true })
-      local actual_lines = vim.split(actual_content, '\n', { plain = true, trimempty = true })
+      local actual_lines = vim.split(actual_content, '\n', { plain = true })
       utils.update_buffer_content(current_diff_layout.buffers[1], expected_lines, {})
       utils.update_buffer_content(
         current_diff_layout.buffers[2],