fix: improve matching pair detection accuracy

tris203 · Dec 19, 2024 · aa38e49 · aa38e49
1 parent 0b3511d
commit aa38e49
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/lua/precognition/sim.lua b/lua/precognition/sim.lua
@@ -31,11 +31,14 @@ local function check_pos(string, col, default_config)
     for _, motion_name in ipairs(locations) do
         local motion_key = default_config[motion_name].text
         vim.fn.setcursorcharpos(2, col)
+        local start_col = vim.fn.getcursorcharpos(0)[3]
         vim.api.nvim_feedkeys(motion_key, "x", true)
         local cur_pos = vim.fn.getcursorcharpos(0)
         if cur_pos[2] == 2 then
-            if motion_name == "MatchingPair" and cur_pos[3] ~= col then
-                result[motion_name] = cur_pos[3]
+            if motion_name == "MatchingPair" then
+                if cur_pos[3] ~= start_col then
+                    result[motion_name] = cur_pos[3]
+                end
             else
                 result[motion_name] = cur_pos[3]
             end
@@ -47,7 +50,8 @@ end
 
 M.check = function(line, col)
     local remote = get_remote()
-    return remote.lua_func(check_pos, line, col, require("precognition").default_hint_config)
+    local result = remote.lua_func(check_pos, line, col, require("precognition").default_hint_config)
+    return result
 end
 
 return M
diff --git a/tests/precognition/e2e_spec.lua b/tests/precognition/e2e_spec.lua
@@ -63,7 +63,7 @@ describe("e2e tests", function()
         end
 
         eq(vim.api.nvim_win_get_cursor(0)[1] - 1, extmarks[1])
-        eq("b%  e w                  $", extmarks[3].virt_lines[1][1][1])
+        eq("b   e w                  $", extmarks[3].virt_lines[1][1][1])
         eq("PrecognitionHighlight", extmarks[3].virt_lines[1][1][2])
         eq({ link = "Comment" }, vim.api.nvim_get_hl(0, { name = extmarks[3].virt_lines[1][1][2] }))
 
@@ -75,7 +75,7 @@ describe("e2e tests", function()
         })
 
         eq(vim.api.nvim_win_get_cursor(0)[1] - 1, extmarks[1])
-        eq("b     %   e w            $", extmarks[3].virt_lines[1][1][1])
+        eq("b         e w            $", extmarks[3].virt_lines[1][1][1])
 
         vim.api.nvim_win_set_cursor(0, { 2, 1 })
         precognition.on_cursor_moved()
@@ -101,7 +101,7 @@ describe("e2e tests", function()
         end
 
         eq(vim.api.nvim_win_get_cursor(0)[1] - 1, extmarks[1])
-        eq("b% e w", extmarks[3].virt_lines[1][1][1])
+        eq("b  e w", extmarks[3].virt_lines[1][1][1])
 
         vim.api.nvim_win_set_cursor(0, { 4, 1 })
         precognition.on_cursor_moved()
@@ -166,7 +166,7 @@ describe("e2e tests", function()
         end
 
         eq(vim.api.nvim_win_get_cursor(0)[1] - 1, extmarks[1])
-        eq("b%  e w                  $", extmarks[3].virt_lines[1][1][1])
+        eq("b   e w                  $", extmarks[3].virt_lines[1][1][1])
         eq("PrecognitionHighlight", extmarks[3].virt_lines[1][1][2])
         eq({ link = "Function" }, vim.api.nvim_get_hl(0, { name = extmarks[3].virt_lines[1][1][2] }))
     end)
@@ -219,7 +219,7 @@ describe("e2e tests", function()
         end
 
         eq(vim.api.nvim_win_get_cursor(0)[1] - 1, extmarks[1])
-        eq("b%  e w                  $", extmarks[3].virt_lines[1][1][1])
+        eq("b   e w                  $", extmarks[3].virt_lines[1][1][1])
         eq("PrecognitionHighlight", extmarks[3].virt_lines[1][1][2])
         eq(customMark, vim.api.nvim_get_hl(0, { name = extmarks[3].virt_lines[1][1][2] }))
     end)

diff --git a/tests/precognition/inlay_hints_spec.lua b/tests/precognition/inlay_hints_spec.lua
@@ -134,7 +134,7 @@ describe("lsp based tests", function()
             details = true,
         })
 
-        eq("b% e w         $", extmarks[3].virt_lines[1][1][1])
+        eq("b  e w         $", extmarks[3].virt_lines[1][1][1])
 
         vim.lsp.inlay_hint.enable(true, { bufnr = buf })
         -- NOTE:The test LSP replies with an inlay hint, that suggest "foo" as line 1, position 4
@@ -146,7 +146,7 @@ describe("lsp based tests", function()
             details = true,
         })
 
-        eq("b%     e w         $", extmarks[3].virt_lines[1][1][1])
+        eq("b      e w         $", extmarks[3].virt_lines[1][1][1])
     end)
 
     after_each(function()