@shikijs/core 2.1.0 → 2.2.0

package/dist/index.mjs

@@ -384,7 +384,7 @@ function transformerDecorations() {
         return el;
       }
       const lineApplies = [];
-      const sorted = ctx.decorations.sort((a, b) => b.start.offset - a.start.offset);
+      const sorted = ctx.decorations.sort((a, b) => b.start.offset - a.start.offset || a.end.offset - b.end.offset);
       for (const decoration of sorted) {
         const { start, end } = decoration;
         if (start.line === end.line) {
@@ -407,12 +407,12 @@ function verifyIntersections(items) {
       throw new ShikiError(`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 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 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;
       if (isFooHasBarStart || isFooHasBarEnd || isBarHasFooStart || isBarHasFooEnd) {
-        if (isFooHasBarEnd && isFooHasBarEnd)
+        if (isFooHasBarStart && isFooHasBarEnd)
           continue;
         if (isBarHasFooStart && isBarHasFooEnd)
           continue;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shikijs/core",
   "type": "module",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "Core of Shiki",
   "author": "Pine Wu <octref@gmail.com>; Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -63,9 +63,9 @@
     "@shikijs/vscode-textmate": "^10.0.1",
     "@types/hast": "^3.0.4",
     "hast-util-to-html": "^9.0.4",
-    "@shikijs/engine-javascript": "2.1.0",
-    "@shikijs/engine-oniguruma": "2.1.0",
-    "@shikijs/types": "2.1.0"
+    "@shikijs/engine-javascript": "2.2.0",
+    "@shikijs/engine-oniguruma": "2.2.0",
+    "@shikijs/types": "2.2.0"
   },
   "scripts": {
     "build": "unbuild",