Fix token splitting

Author: pomber

.changeset/hip-swans-listen.md

@@ -0,0 +1,5 @@
+---
+"@code-hike/lighter": patch
+---
+
+Fix token splitting

lib/dist/index.cjs.js

@@ -2649,7 +2649,7 @@ function reannotateLine(annotatedLine, annotation) {
         return newAnnotatedLine;
     }
     const lastGroup = annotatedLine[i];
-    if (lastGroup.toColumn > toColumn) {
+    if (lastGroup.fromColumn <= toColumn) {
         // we need to split the last group in two
         const [firstHalf, secondHalf] = splitGroup$1(lastGroup, toColumn + 1);
         newGroup.tokens.push(firstHalf);
@@ -2757,7 +2757,7 @@ function reannotateLines(annotatedLines, annotation) {
         return newAnnotatedLines;
     }
     const lastGroup = annotatedLines[i];
-    if (lastGroup.toLineNumber > toLineNumber) {
+    if (lastGroup.fromLineNumber <= toLineNumber) {
         const [firstHalf, secondHalf] = splitGroup(lastGroup, toLineNumber + 1);
         newGroup.lines.push(firstHalf);
         newAnnotatedLines.push(secondHalf);

lib/dist/index.esm.mjs

@@ -98,7 +98,7 @@ function reannotateLine(
   }
 
   const lastGroup = annotatedLine[i];
-  if (lastGroup.toColumn > toColumn) {
+  if (lastGroup.fromColumn <= toColumn) {
     // we need to split the last group in two
 
     const [firstHalf, secondHalf] = splitGroup(lastGroup, toColumn + 1);

lib/src/annotations.inline.ts

@@ -104,7 +104,7 @@ function reannotateLines(
   }
 
   const lastGroup = annotatedLines[i];
-  if (lastGroup.toLineNumber > toLineNumber) {
+  if (lastGroup.fromLineNumber <= toLineNumber) {
     const [firstHalf, secondHalf] = splitGroup(lastGroup, toLineNumber + 1);
     newGroup.lines.push(firstHalf);
     newAnnotatedLines.push(secondHalf);

lib/src/annotations.multiline.ts

@@ -8,11 +8,8 @@ const test1 = `
 const x = 1; /* bar x */ more /* notannotated */ code`;
 
 const code = `
-// mark(2:3) first
-// mark(1:2) second
-foo1
-foo2
-foo3
+// mark[4:7]
+console.log(1)
 `.trim();
 // const code = `// foo `;
 const alias = "js";