@shikijs/core 1.15.0 → 1.15.1

package/dist/index.mjs

@@ -6019,6 +6019,9 @@ function construct(pattern, options = {}) {
     );
   }
   const flagSet = new Set(Array.isArray(flags) ? flags : flags.split(""));
+  if (options.ignoreContiguousAnchors) {
+    pattern = pattern.replace(/\\G/g, "");
+  }
   pattern = pattern.replace(/\\A/g, "^").replace(/\\x\{([^}]*)\}/g, (m, hex) => `\\u${hex.padStart(4, "0")}`).replace(/\(\?(-)?(\w+):/g, (_, neg, flagStr) => {
     if (neg) {
       for (const flag of flagStr)
@@ -6069,8 +6072,8 @@ function onigurumaToRegexp(pattern, options = {}) {
   });
   return construct(converted, {
     original: pattern,
-    flags,
-    ...options
+    ...options,
+    flags: [.../* @__PURE__ */ new Set([...flags, ...options.flags || []])].join("")
   });
 }
 
@@ -6096,8 +6099,13 @@ class JavaScriptScanner {
             }
             try {
                 const regex = onigurumaToRegexp(p
+                    .replace(/\|\\G(\||\))/g, '$1')
+                    .replace(/(\(|\|)\\G\|/g, '$1')
                     // YAML specific handling; TODO: move to tm-grammars
-                    .replaceAll('[^\\s[-?:,\\[\\]{}#&*!|>\'"%@`]]', '[^\\s\\-?:,\\[\\]{}#&*!|>\'"%@`]'), { flags: 'dg' });
+                    .replaceAll('[^\\s[-?:,\\[\\]{}#&*!|>\'"%@`]]', '[^\\s\\-?:,\\[\\]{}#&*!|>\'"%@`]'), {
+                    flags: 'dgm',
+                    ignoreContiguousAnchors: true,
+                });
                 cache?.set(p, regex);
                 return regex;
             }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shikijs/core",
   "type": "module",
-  "version": "1.15.0",
+  "version": "1.15.1",
   "description": "Core of Shiki",
   "author": "Pine Wu <octref@gmail.com>; Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -64,7 +64,7 @@
   },
   "devDependencies": {
     "hast-util-to-html": "^9.0.2",
-    "oniguruma-to-js": "^0.2.3",
+    "oniguruma-to-js": "^0.2.4",
     "vscode-oniguruma": "^1.7.0"
   },
   "scripts": {