@lvce-editor/editor-worker 19.50.0 → 19.50.1

package/dist/editorWorkerMain.js

@@ -3176,6 +3176,34 @@ const getDifference = (start, averageCharWidth, deltaX) => {
   const difference = beforeWidth - deltaX;
   return difference;
 };
+const appendTokenRange = (resultTokens, resultTokenMap, tokens, tokenMap, rangeStart, rangeEnd) => {
+  let tokenStart = 0;
+  for (let i = 0; i < tokens.length; i += 2) {
+    const tokenType = tokens[i];
+    const tokenEnd = tokenStart + tokens[i + 1];
+    const start = Math.max(tokenStart, rangeStart);
+    const end = Math.min(tokenEnd, rangeEnd);
+    if (start < end) {
+      const resultTokenType = resultTokens.length / 2;
+      resultTokens.push(resultTokenType, end - start);
+      resultTokenMap[resultTokenType] = tokenMap[tokenType] || 'Unknown';
+    }
+    tokenStart = tokenEnd;
+  }
+};
+const mergeEmbeddedTokens = (line, tokenResults, embeddedResult, tokenMap) => {
+  const embeddedStart = Math.max(0, Math.min(line.length, tokenResults.embeddedLanguageStart));
+  const embeddedEnd = Math.max(embeddedStart, Math.min(line.length, tokenResults.embeddedLanguageEnd));
+  const tokens = [];
+  const mergedTokenMap = Object.create(null);
+  appendTokenRange(tokens, mergedTokenMap, tokenResults.tokens, tokenMap, 0, embeddedStart);
+  appendTokenRange(tokens, mergedTokenMap, embeddedResult.result.tokens, embeddedResult.TokenMap, 0, embeddedEnd - embeddedStart);
+  appendTokenRange(tokens, mergedTokenMap, tokenResults.tokens, tokenMap, embeddedEnd, line.length);
+  return {
+    tokenMap: mergedTokenMap,
+    tokens
+  };
+};
 const getLineInfoDefault = (line, tokenResults, embeddedResults, decorations, TokenMap, lineOffset, normalize, tabSize, width, deltaX, averageCharWidth, minOffset, maxOffset) => {
   const lineInfo = [];
 
@@ -3275,6 +3303,10 @@ const getLineInfo$1 = (line, tokenResults, embeddedResults, decorations, TokenMa
     if (embeddedResult?.isFull) {
       return getLineInfoEmbeddedFull(embeddedResults, tokenResults, line, decorations, lineOffset, normalize, tabSize, width, deltaX, averageCharWidth, minOffset, maxOffset);
     }
+    if (embeddedResult?.result?.tokens) {
+      const merged = mergeEmbeddedTokens(line, tokenResults, embeddedResult, TokenMap);
+      return getLineInfoDefault(line, merged, embeddedResults, decorations, merged.tokenMap, lineOffset, normalize, tabSize, width, deltaX, averageCharWidth, minOffset, maxOffset);
+    }
   }
   return getLineInfoDefault(line, tokenResults, embeddedResults, decorations, TokenMap, lineOffset, normalize, tabSize, width, deltaX, averageCharWidth, minOffset, maxOffset);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/editor-worker",
-  "version": "19.50.0",
+  "version": "19.50.1",
   "repository": {
     "type": "git",
     "url": "git@github.com:lvce-editor/editor-worker.git"