Better patch

Author: AndreasArvidsson

packages/cursorless-org-docs/src/docs/components/calculateHighlights.ts

@@ -159,13 +159,18 @@ function combineHighlightStyles(range: Range, highlights: Highlight[]): Style {
 
 function getUniquePositions(highlights: Highlight[]): Position[] {
   const result: Position[] = [];
+  const emptyHighlights = highlights.filter((h) => h.range.isEmpty);
   const positions = highlights
     .flatMap((h) => [h.range.start, h.range.end])
     .sort((a, b) =>
       a.line === b.line ? a.character - b.character : a.line - b.line,
     );
   for (let i = 0; i < positions.length; i++) {
-    if (i === 0 || !positions[i].isEqual(positions[i - 1])) {
+    if (
+      i === 0 ||
+      !positions[i].isEqual(positions[i - 1]) ||
+      emptyHighlights.some((h) => h.range.start.isEqual(positions[i]))
+    ) {
       result.push(positions[i]);
     }
   }

patches/@shikijs__core.patch

@@ -1,17 +1,15 @@
 diff --git a/dist/index.mjs b/dist/index.mjs
-index 5ba9a077425954c8099a26820a3411b017093b0d..28a0d61a7c36c4f796f66fe0ada874b264bc5930 100644
+index 5ba9a077425954c8099a26820a3411b017093b0d..6f19e2251ffb3e69abeeadcb16f18399599300c9 100644
 --- a/dist/index.mjs
 +++ b/dist/index.mjs
-@@ -441,10 +441,10 @@ function verifyIntersections(items) {
-       throw new ShikiError$1(`Invalid decoration range: ${JSON.stringify(foo.start)} - ${JSON.stringify(foo.end)}`);
-     for (let j = i + 1; j < items.length; j++) {
-       const bar = items[j];
--      const isFooHasBarStart = foo.start.offset <= bar.start.offset && bar.start.offset < foo.end.offset;
-+      const isFooHasBarStart = foo.start.offset <= bar.start.offset && bar.start.offset <= foo.end.offset;
-       const isFooHasBarEnd = foo.start.offset < bar.end.offset && bar.end.offset <= foo.end.offset;
-       const isBarHasFooStart = bar.start.offset <= foo.start.offset && foo.start.offset < bar.end.offset;
--      const isBarHasFooEnd = bar.start.offset < foo.end.offset && foo.end.offset <= bar.end.offset;
-+      const isBarHasFooEnd = bar.start.offset <= foo.end.offset && foo.end.offset <= bar.end.offset;
-       if (isFooHasBarStart || isFooHasBarEnd || isBarHasFooStart || isBarHasFooEnd) {
-         if (isFooHasBarStart && isFooHasBarEnd)
+@@ -450,6 +450,10 @@ function verifyIntersections(items) {
            continue;
+         if (isBarHasFooStart && isBarHasFooEnd)
+           continue;
++        if (isBarHasFooStart && foo.start.offset === foo.end.offset)
++          continue // leading adjacent empty
++        if (isFooHasBarEnd && bar.start.offset === bar.end.offset)
++          continue // trailing adjacent empty
+         throw new ShikiError$1(`Decorations ${JSON.stringify(foo.start)} and ${JSON.stringify(bar.start)} intersect.`);
+       }
+     }