@shikijs/core 1.6.3 → 1.6.5

package/dist/index.mjs

@@ -537,6 +537,26 @@ function tokenizeWithTheme(code, grammar, theme, colorMap, options) {
     let ruleStack = INITIAL;
     let actual = [];
     const final = [];
+    const themeSettingsSelectors = [];
+    if (options.includeExplanation) {
+        for (const setting of theme.settings) {
+            let selectors;
+            switch (typeof setting.scope) {
+                case 'string':
+                    selectors = setting.scope.split(/,/).map(scope => scope.trim());
+                    break;
+                case 'object':
+                    selectors = setting.scope;
+                    break;
+                default:
+                    continue;
+            }
+            themeSettingsSelectors.push({
+                settings: setting,
+                selectors: selectors.map(selector => selector.split(/ /)),
+            });
+        }
+    }
     for (let i = 0, len = lines.length; i < len; i++) {
         const [line, lineOffset] = lines[i];
         if (line === '') {
@@ -588,7 +608,7 @@ function tokenizeWithTheme(code, grammar, theme, colorMap, options) {
                     offset += tokenWithScopesText.length;
                     token.explanation.push({
                         content: tokenWithScopesText,
-                        scopes: explainThemeScopes(theme, tokenWithScopes.scopes),
+                        scopes: explainThemeScopes(themeSettingsSelectors, tokenWithScopes.scopes),
                     });
                     tokensWithScopesIndex += 1;
                 }
@@ -601,31 +621,29 @@ function tokenizeWithTheme(code, grammar, theme, colorMap, options) {
     }
     return final;
 }
-function explainThemeScopes(theme, scopes) {
+function explainThemeScopes(themeSelectors, scopes) {
     const result = [];
     for (let i = 0, len = scopes.length; i < len; i++) {
         const parentScopes = scopes.slice(0, i);
         const scope = scopes[i];
         result[i] = {
             scopeName: scope,
-            themeMatches: explainThemeScope(theme, scope, parentScopes),
+            themeMatches: explainThemeScope(themeSelectors, scope, parentScopes),
         };
     }
     return result;
 }
 function matchesOne(selector, scope) {
-    const selectorPrefix = `${selector}.`;
-    if (selector === scope || scope.substring(0, selectorPrefix.length) === selectorPrefix)
-        return true;
-    return false;
+    return selector === scope
+        || (scope.substring(0, selector.length) === selector && scope[selector.length] === '.');
 }
-function matches(selector, selectorParentScopes, scope, parentScopes) {
-    if (!matchesOne(selector, scope))
+function matches(selectors, scope, parentScopes) {
+    if (!matchesOne(selectors[selectors.length - 1], scope))
         return false;
-    let selectorParentIndex = selectorParentScopes.length - 1;
+    let selectorParentIndex = selectors.length - 2;
     let parentIndex = parentScopes.length - 1;
     while (selectorParentIndex >= 0 && parentIndex >= 0) {
-        if (matchesOne(selectorParentScopes[selectorParentIndex], parentScopes[parentIndex]))
+        if (matchesOne(selectors[selectorParentIndex], parentScopes[parentIndex]))
             selectorParentIndex -= 1;
         parentIndex -= 1;
     }
@@ -633,28 +651,13 @@ function matches(selector, selectorParentScopes, scope, parentScopes) {
         return true;
     return false;
 }
-function explainThemeScope(theme, scope, parentScopes) {
+function explainThemeScope(themeSettingsSelectors, scope, parentScopes) {
     const result = [];
-    let resultLen = 0;
-    for (let i = 0, len = theme.settings.length; i < len; i++) {
-        const setting = theme.settings[i];
-        let selectors;
-        if (typeof setting.scope === 'string')
-            selectors = setting.scope.split(/,/).map(scope => scope.trim());
-        else if (Array.isArray(setting.scope))
-            selectors = setting.scope;
-        else
-            continue;
-        for (let j = 0, lenJ = selectors.length; j < lenJ; j++) {
-            const rawSelector = selectors[j];
-            const rawSelectorPieces = rawSelector.split(/ /);
-            const selector = rawSelectorPieces[rawSelectorPieces.length - 1];
-            const selectorParentScopes = rawSelectorPieces.slice(0, rawSelectorPieces.length - 1);
-            if (matches(selector, selectorParentScopes, scope, parentScopes)) {
-                // match!
-                result[resultLen++] = setting;
-                // break the loop
-                j = lenJ;
+    for (const { selectors, settings } of themeSettingsSelectors) {
+        for (const selectorPieces of selectors) {
+            if (matches(selectorPieces, scope, parentScopes)) {
+                result.push(settings);
+                break; // continue to the next theme settings
             }
         }
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shikijs/core",
   "type": "module",
-  "version": "1.6.3",
+  "version": "1.6.5",
   "description": "Core of Shiki",
   "author": "Pine Wu <octref@gmail.com>; Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",