@shikijs/core 3.2.2 → 3.3.0

package/dist/index.mjs

@@ -1167,12 +1167,16 @@ function codeToHast(internal, code, options, transformerContext = {
     grammarState
   } = codeToTokens(internal, input, options);
   const {
-    mergeWhitespaces = true
+    mergeWhitespaces = true,
+    mergeSameStyleTokens = false
   } = options;
   if (mergeWhitespaces === true)
     tokens = mergeWhitespaceTokens(tokens);
   else if (mergeWhitespaces === "never")
     tokens = splitWhitespaceTokens(tokens);
+  if (mergeSameStyleTokens) {
+    tokens = mergeAdjacentStyledTokens(tokens);
+  }
   const contextSource = {
     ...transformerContext,
     get source() {
@@ -1382,6 +1386,28 @@ function splitWhitespaceTokens(tokens) {
     });
   });
 }
+function mergeAdjacentStyledTokens(tokens) {
+  return tokens.map((line) => {
+    const newLine = [];
+    for (const token of line) {
+      if (newLine.length === 0) {
+        newLine.push({ ...token });
+        continue;
+      }
+      const prevToken = newLine[newLine.length - 1];
+      const prevStyle = prevToken.htmlStyle || stringifyTokenStyle(getTokenStyleObject(prevToken));
+      const currentStyle = token.htmlStyle || stringifyTokenStyle(getTokenStyleObject(token));
+      const isPrevDecorated = prevToken.fontStyle && (prevToken.fontStyle & FontStyle.Underline || prevToken.fontStyle & FontStyle.Strikethrough);
+      const isDecorated = token.fontStyle && (token.fontStyle & FontStyle.Underline || token.fontStyle & FontStyle.Strikethrough);
+      if (!isPrevDecorated && !isDecorated && prevStyle === currentStyle) {
+        prevToken.content += token.content;
+      } else {
+        newLine.push({ ...token });
+      }
+    }
+    return newLine;
+  });
+}
 
 const hastToHtml = toHtml;
 function codeToHtml(internal, code, options) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shikijs/core",
   "type": "module",
-  "version": "3.2.2",
+  "version": "3.3.0",
   "description": "Core of Shiki",
   "author": "Pine Wu <octref@gmail.com>; Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -39,7 +39,7 @@
     "@shikijs/vscode-textmate": "^10.0.2",
     "@types/hast": "^3.0.4",
     "hast-util-to-html": "^9.0.5",
-    "@shikijs/types": "3.2.2"
+    "@shikijs/types": "3.3.0"
   },
   "scripts": {
     "build": "unbuild",