fix: inccommand highlights can exceed line length

vscode-neovim · May 19, 2024 · ef8d261 · ef8d261
1 parent 479638f
commit ef8d261
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/src/test/unit/highlights/highlight_grid.test.ts b/src/test/unit/highlights/highlight_grid.test.ts
@@ -630,6 +630,30 @@ describe("processHighlightCellsEvent", () => {
                 },
             ],
         },
+        {
+            testName: "virtual highlights can exceed line length",
+            events: [
+                {
+                    row: 2,
+                    vimCol: 6,
+                    validCells: [
+                        { hlId: 2, text: "!" },
+                    ],
+                    lineText: "hello",
+                    tabSize: 4,
+                },
+            ],
+            expectedRanges: [
+                {
+                    textType: "virtual" as const,
+                    highlights: [
+                        { hlId: 2, text: "!", virtText: "!" },
+                    ],
+                    line: 12,
+                    col: 6,
+                },
+           ],
+        },
     ].forEach(
         ({
             testName,

diff --git a/src/utils/text.ts b/src/utils/text.ts
@@ -21,6 +21,7 @@ export function calculateEditorColFromVimScreenCol(line: string, screenCol: numb
     if (screenCol === 0 || !line) {
         return 0;
     }
+
     let currentCharIdx = 0;
     let currentVimCol = 0;
     while (currentVimCol < screenCol) {
@@ -32,8 +33,8 @@ export function calculateEditorColFromVimScreenCol(line: string, screenCol: numb
             currentCharIdx++;
         }
 
-        if (currentCharIdx >= line.length) {
-            return currentCharIdx;
+        if (currentCharIdx >= wcswidth(line)) {
+            return currentCharIdx + (screenCol - currentVimCol);
         }
     }
     return currentCharIdx;