Better annotation splitting

Author: pomber

.changeset/new-feet-sell.md

@@ -0,0 +1,5 @@
+---
+"@code-hike/lighter": patch
+---
+
+Better annotation splitting

lib/dist/index.cjs.js

@@ -2637,14 +2637,22 @@ function reannotateLine(annotatedLine, annotation) {
         // we need to split the first group in two
         const [firstHalf, secondHalf] = splitGroup$1(firstGroup, fromColumn);
         newAnnotatedLine.push(firstHalf);
-        newGroup.tokens.push(secondHalf);
+        newAnnotatedLine.push(newGroup);
+        if (secondHalf.toColumn > toColumn) {
+            // we need to split the second half in two
+            const [secondFirstHalf, secondSecondHalf] = splitGroup$1(secondHalf, toColumn + 1);
+            newGroup.tokens.push(secondFirstHalf);
+            newAnnotatedLine.push(secondSecondHalf);
+        }
+        else {
+            newGroup.tokens.push(secondHalf);
+        }
         i++;
     }
     while (i < annotatedLine.length && annotatedLine[i].toColumn < toColumn) {
         newGroup.tokens.push(annotatedLine[i]);
         i++;
     }
-    newAnnotatedLine.push(newGroup);
     if (i === annotatedLine.length) {
         return newAnnotatedLine;
     }
@@ -2744,15 +2752,22 @@ function reannotateLines(annotatedLines, annotation) {
     if (firstGroup.fromLineNumber < fromLineNumber) {
         const [firstHalf, secondHalf] = splitGroup(firstGroup, fromLineNumber);
         newAnnotatedLines.push(firstHalf);
-        newGroup.lines.push(secondHalf);
+        newAnnotatedLines.push(newGroup);
+        if (secondHalf.toLineNumber > toLineNumber) {
+            const [secondFirstHalf, secondSecondHalf] = splitGroup(secondHalf, toLineNumber + 1);
+            newGroup.lines.push(secondFirstHalf);
+            newAnnotatedLines.push(secondSecondHalf);
+        }
+        else {
+            newGroup.lines.push(secondHalf);
+        }
         i++;
     }
     while (i < annotatedLines.length &&
         annotatedLines[i].toLineNumber <= toLineNumber) {
         newGroup.lines.push(annotatedLines[i]);
         i++;
     }
-    newAnnotatedLines.push(newGroup);
     if (i === annotatedLines.length) {
         return newAnnotatedLines;
     }

lib/dist/index.esm.mjs

@@ -82,7 +82,20 @@ function reannotateLine(
     const [firstHalf, secondHalf] = splitGroup(firstGroup, fromColumn);
 
     newAnnotatedLine.push(firstHalf);
-    newGroup.tokens.push(secondHalf);
+    newAnnotatedLine.push(newGroup);
+
+    if (secondHalf.toColumn > toColumn) {
+      // we need to split the second half in two
+      const [secondFirstHalf, secondSecondHalf] = splitGroup(
+        secondHalf,
+        toColumn + 1
+      );
+
+      newGroup.tokens.push(secondFirstHalf);
+      newAnnotatedLine.push(secondSecondHalf);
+    } else {
+      newGroup.tokens.push(secondHalf);
+    }
     i++;
   }
 
@@ -91,8 +104,6 @@ function reannotateLine(
     i++;
   }
 
-  newAnnotatedLine.push(newGroup);
-
   if (i === annotatedLine.length) {
     return newAnnotatedLine;
   }

lib/src/annotations.inline.ts

@@ -85,7 +85,18 @@ function reannotateLines(
   if (firstGroup.fromLineNumber < fromLineNumber) {
     const [firstHalf, secondHalf] = splitGroup(firstGroup, fromLineNumber);
     newAnnotatedLines.push(firstHalf);
-    newGroup.lines.push(secondHalf);
+    newAnnotatedLines.push(newGroup);
+
+    if (secondHalf.toLineNumber > toLineNumber) {
+      const [secondFirstHalf, secondSecondHalf] = splitGroup(
+        secondHalf,
+        toLineNumber + 1
+      );
+      newGroup.lines.push(secondFirstHalf);
+      newAnnotatedLines.push(secondSecondHalf);
+    } else {
+      newGroup.lines.push(secondHalf);
+    }
     i++;
   }
 
@@ -97,8 +108,6 @@ function reannotateLines(
     i++;
   }
 
-  newAnnotatedLines.push(newGroup);
-
   if (i === annotatedLines.length) {
     return newAnnotatedLines;
   }

lib/src/annotations.multiline.ts

@@ -9,7 +9,7 @@ const x = 1; /* bar x */ more /* notannotated */ code`;
 
 const code = `
 // mark[4:7]
-console.log(1)
+consolessssssssss
 `.trim();
 // const code = `// foo `;
 const alias = "js";