update tests

Author: olimorris

lua/codecompanion/diff/init.lua

@@ -159,21 +159,23 @@ function M._diff_lines(diff)
       row = row,
       col = 0,
       virt_lines_above = true,
-      virt_lines = diff_utils.extend_vl(data.virt_lines, "CodeCompanionDiffDelete"),
+      virt_lines = data.virt_lines,
     })
   end
 
   for row, data in pairs(adds) do
+    -- Add word-level highlighting for "change" hunks FIRST with higher priority
+    if data.hunk.kind == "change" then
+      M._diff_words(diff, row, data)
+    end
+
+    -- Add line background spanning to next row with lower priority
     table.insert(data.hunk.extmarks, {
       row = row,
       col = 0,
-      line_hl_group = "CodeCompanionDiffAdd",
+      end_row = row + 1,
+      hl_group = "CodeCompanionDiffAdd",
     })
-
-    -- Add word-level highlighting for "change" hunks
-    if data.hunk.kind == "change" then
-      M._diff_words(diff, row, data)
-    end
   end
 
   return diff
@@ -227,7 +229,6 @@ function M._diff_words(diff, row, data)
           col = start_col,
           end_col = end_col,
           hl_group = "CodeCompanionDiffChange",
-          priority = 110,
         })
       end
     end

lua/codecompanion/diff/utils.lua

@@ -157,17 +157,6 @@ function M.create_vl(source, opts)
   return ret
 end
 
----Extend virtual lines to full window width with background highlight
----@param vl CodeCompanion.Text[]
----@param hl_group string
----@return CodeCompanion.Text[]
-function M.extend_vl(vl, hl_group)
-  for _, vt in ipairs(vl) do
-    table.insert(vt, { string.rep(" ", vim.o.columns), hl_group })
-  end
-  return vl
-end
-
 ---Split a string into words and non-words with position tracking. UTF-8 aware
 ---@param str string
 ---@return { word: string, start_col: number, end_col: number }[]

tests/test_diff.lua

@@ -1,6 +1,5 @@
 local h = require("tests.helpers")
 
-local expect = MiniTest.expect
 local new_set = MiniTest.new_set
 
 local child = MiniTest.new_child_neovim()
@@ -11,41 +10,6 @@ T = new_set({
       child.lua([[
         diff = require("codecompanion.diff")
       ]])
-
-      local before = [[
-async fn run_cargo_build_json() -> io::Result<Option<String>> {
-    let mut child = Command::new("cargo")
-        .args(["build", "--message-format=json"])
-        .stdout(Stdio::piped())
-}
-]]
-      local after = [[
-async fn rn_crgo_build_jsons() -> io::Result<Option<String>> {
-    let mut childddd = Command::new("cargo")
-        .ars(["build", "--message-format=json"])
-        .stddddouttt(Stdio::piped())
-}
-]]
-
-      child.lua(string.format(
-        [[
-          before_tbl = vim.split(%q, "\n", { plain = true })
-          after_tbl = vim.split(%q, "\n", { plain = true })
-
-          -- Create a scratch buffer with the new, after, content
-          local bufnr = vim.api.nvim_create_buf(false, true)
-          vim.api.nvim_buf_set_option(bufnr, "filetype", "rust")
-          vim.api.nvim_buf_set_lines(bufnr, 0, -1, false, after_tbl)
-
-          before = %q
-          after = %q
-          diff_buffer = bufnr
-        ]],
-        before,
-        after,
-        before,
-        after
-      ))
     end,
     post_once = child.stop,
   },
@@ -67,13 +31,13 @@ end
 T["Diff"]["Creates diff with hunks and extmarks"] = function()
   local result = child.lua([[
     local bufnr = vim.api.nvim_create_buf(false, true)
-    vim.api.nvim_buf_set_option(bufnr, "filetype", "rust")
+    vim.api.nvim_buf_set_option(bufnr, "filetype", "lua")
 
     local diff_obj = diff.create({
       bufnr = bufnr,
-      from_lines = before_tbl,
-      to_lines = after_tbl,
-      ft = "rust"
+      from_lines = { "function foo()", "  print('old')", "end" },
+      to_lines = { "function foo()", "  print('new')", "end" },
+      ft = "lua"
     })
 
     return {
@@ -97,7 +61,6 @@ T["Diff"]["Detects correct hunk indices"] = function()
   ]])
 
   h.eq(1, #result, "Should have 1 hunk")
-  -- Format: {a_start, a_count, b_start, b_count}
   h.eq({ 2, 2, 2, 2 }, result[1], "Should detect lines 2-3 changed")
 end
 
@@ -153,7 +116,7 @@ T["Diff"]["Generates correct extmarks for changes"] = function()
   h.eq(1, result.hunk_count, "Should have 1 hunk")
   h.eq("change", result.hunk.kind, "Should be change type")
   h.eq({ 1, 0 }, result.hunk.pos, "Should be at row 1, col 0")
-  h.eq(2, result.extmark_count, "Should have 2 extmarks (deletion + addition)")
+  h.eq(3, result.extmark_count, "Should have 2 extmarks (deletion + addition + change)")
 end
 
 T["Diff"]["Applies extmarks to buffer"] = function()
@@ -164,7 +127,6 @@ T["Diff"]["Applies extmarks to buffer"] = function()
     local from = {"line1", "old", "line3"}
     local to = {"line1", "new", "line3"}
 
-    -- Set buffer to "after" content
     vim.api.nvim_buf_set_lines(bufnr, 0, -1, false, to)
 
     local diff_obj = diff.create({
@@ -174,10 +136,8 @@ T["Diff"]["Applies extmarks to buffer"] = function()
       ft = "lua"
     })
 
-    -- Apply the diff
     diff.apply(diff_obj)
 
-    -- Check what extmarks were actually set
     local extmarks = vim.api.nvim_buf_get_extmarks(
       bufnr,
       diff_obj.namespace,
@@ -195,4 +155,133 @@ T["Diff"]["Applies extmarks to buffer"] = function()
   h.is_true(result.extmark_count > 0, "Should have applied extmarks to buffer")
 end
 
+T["Diff"]["Word-level diff creates word change extmarks"] = function()
+  local result = child.lua([[
+    local bufnr = vim.api.nvim_create_buf(false, true)
+    vim.api.nvim_buf_set_option(bufnr, "filetype", "lua")
+
+    local from = {"local function calculate_total(items)"}
+    local to = {"local function compute_sum(elements)"}
+
+    local diff_obj = diff.create({
+      bufnr = bufnr,
+      from_lines = from,
+      to_lines = to,
+      ft = "lua"
+    })
+
+    local word_extmarks = 0
+    for _, hunk in ipairs(diff_obj.hunks) do
+      for _, extmark in ipairs(hunk.extmarks) do
+        if extmark.end_col and extmark.hl_group == "CodeCompanionDiffChange" then
+          word_extmarks = word_extmarks + 1
+        end
+      end
+    end
+
+    return {
+      hunk_kind = diff_obj.hunks[1].kind,
+      word_extmark_count = word_extmarks,
+    }
+  ]])
+
+  h.eq("change", result.hunk_kind, "Should be a change hunk")
+  h.is_true(result.word_extmark_count > 0, "Should create word-level change extmarks")
+end
+
+T["Diff"]["Word-level diff handles empty lines"] = function()
+  local result = child.lua([[
+    local bufnr = vim.api.nvim_create_buf(false, true)
+    vim.api.nvim_buf_set_option(bufnr, "filetype", "lua")
+
+    local from = {"line1", "", "line3"}
+    local to = {"line1", "new_line", "line3"}
+
+    local diff_obj = diff.create({
+      bufnr = bufnr,
+      from_lines = from,
+      to_lines = to,
+      ft = "lua"
+    })
+
+    return {
+      hunk_count = #diff_obj.hunks,
+      hunk_kind = diff_obj.hunks[1].kind,
+    }
+  ]])
+
+  h.eq(1, result.hunk_count, "Should handle empty line changes")
+  h.eq("change", result.hunk_kind, "Should be a change hunk")
+end
+
+T["Diff"]["Clears extmarks from buffer"] = function()
+  local result = child.lua([[
+    local bufnr = vim.api.nvim_create_buf(false, true)
+    vim.api.nvim_buf_set_option(bufnr, "filetype", "lua")
+
+    local from = {"line1", "old", "line3"}
+    local to = {"line1", "new", "line3"}
+
+    vim.api.nvim_buf_set_lines(bufnr, 0, -1, false, to)
+
+    local diff_obj = diff.create({
+      bufnr = bufnr,
+      from_lines = from,
+      to_lines = to,
+      ft = "lua"
+    })
+
+    diff.apply(diff_obj)
+
+    local extmarks_before = vim.api.nvim_buf_get_extmarks(
+      bufnr,
+      diff_obj.namespace,
+      0,
+      -1,
+      {}
+    )
+
+    diff.clear(diff_obj)
+
+    local extmarks_after = vim.api.nvim_buf_get_extmarks(
+      bufnr,
+      diff_obj.namespace,
+      0,
+      -1,
+      {}
+    )
+
+    return {
+      before_count = #extmarks_before,
+      after_count = #extmarks_after,
+    }
+  ]])
+
+  h.is_true(result.before_count > 0, "Should have extmarks before clear")
+  h.eq(0, result.after_count, "Should have no extmarks after clear")
+end
+
+T["Diff"]["Handles multiple hunks"] = function()
+  local result = child.lua([[
+    local bufnr = vim.api.nvim_create_buf(false, true)
+    vim.api.nvim_buf_set_option(bufnr, "filetype", "lua")
+
+    local from = {"line1", "line2", "line3", "line4", "line5"}
+    local to = {"line1", "modified2", "line3", "modified4", "line5"}
+
+    local diff_obj = diff.create({
+      bufnr = bufnr,
+      from_lines = from,
+      to_lines = to,
+      ft = "lua"
+    })
+
+    return {
+      hunk_count = #diff_obj.hunks,
+    }
+  ]])
+
+  h.eq(2, result.hunk_count, "Should detect 2 separate change hunks")
+end
+
 return T