@lvce-editor/editor-worker 19.72.6 → 19.72.8

package/dist/editorWorkerMain.js

@@ -2370,45 +2370,43 @@ const getHorizontalScrollDimensions = ({
 
 const defaultThreshold = 500;
 const getSegments = line => {
-  if ('Segmenter' in Intl) {
+  if (typeof Intl.Segmenter === 'function') {
     // @ts-ignore
-    return [...new Intl.Segmenter(undefined, {
+    return [...Array.from(new Intl.Segmenter(undefined, {
       granularity: 'grapheme'
-    }).segment(line)];
+    }).segment(line), ({
+      index
+    }) => index), line.length];
   }
-  const segments = [];
+  const segments = [0];
   let index = 0;
   for (const segment of line) {
-    segments.push({
-      index,
-      segment
-    });
     index += segment.length;
+    segments.push(index);
   }
   return segments;
 };
-const getCharacterWidth = (character, tabSize) => {
-  if (character === '\t') {
+const getCharacterWidth = (line, start, end, tabSize) => {
+  if (end - start === 1 && line.codePointAt(start) === 9) {
     return tabSize;
   }
   // Grapheme clusters such as combining characters and ZWJ emoji are indivisible.
   // Treat each cluster as one display column; the extra cluster below is a safe overscan.
   return 1;
 };
-const getHorizontalDisplayColumn = (line, sourceColumn, tabSize) => {
+const getHorizontalDisplayColumn = (line, sourceColumn, tabSize, segments = getSegments(line)) => {
   let displayColumn = 0;
-  for (const {
-    index,
-    segment
-  } of getSegments(line)) {
-    if (index + segment.length > sourceColumn) {
+  for (let i = 0; i < segments.length - 1; i++) {
+    const start = segments[i];
+    const end = segments[i + 1];
+    if (end > sourceColumn) {
       break;
     }
-    displayColumn += segment === '\t' ? tabSize : segment.length;
+    displayColumn += end - start === 1 && line.codePointAt(start) === 9 ? tabSize : end - start;
   }
   return displayColumn;
 };
-const getHorizontalVisibleRange = (line, deltaX, width, averageCharWidth, tabSize, threshold = defaultThreshold) => {
+const getHorizontalVisibleRange = (line, deltaX, width, averageCharWidth, tabSize, threshold = defaultThreshold, segments = getSegments(line)) => {
   if (line.length <= threshold) {
     return {
       end: line.length,
@@ -2424,15 +2422,13 @@ const getHorizontalVisibleRange = (line, deltaX, width, averageCharWidth, tabSiz
   let index = 0;
   let start = 0;
   let started = false;
-  const segments = getSegments(line);
-  for (const {
-    index: segmentIndex,
-    segment
-  } of segments) {
-    const nextColumn = column + getCharacterWidth(segment, tabSize);
+  for (let i = 0; i < segments.length - 1; i++) {
+    const segmentIndex = segments[i];
+    const segmentEnd = segments[i + 1];
+    const nextColumn = column + getCharacterWidth(line, segmentIndex, segmentEnd, tabSize);
     if (!started && nextColumn <= targetStart) {
       column = nextColumn;
-      index = segmentIndex + segment.length;
+      index = segmentEnd;
       start = index;
       continue;
     }
@@ -2440,7 +2436,7 @@ const getHorizontalVisibleRange = (line, deltaX, width, averageCharWidth, tabSiz
       start = segmentIndex;
       started = true;
     }
-    index = segmentIndex + segment.length;
+    index = segmentEnd;
     column = nextColumn;
     if (column >= targetEnd) {
       break;
@@ -2451,11 +2447,9 @@ const getHorizontalVisibleRange = (line, deltaX, width, averageCharWidth, tabSiz
   }
   // Keep one extra complete grapheme to cover fractional offsets and avoid a blank edge.
   if (index < line.length) {
-    const nextSegment = segments.find(({
-      index: segmentIndex
-    }) => segmentIndex >= index);
-    if (nextSegment) {
-      index = nextSegment.index + nextSegment.segment.length;
+    const nextSegmentIndex = segments.findIndex(segmentIndex => segmentIndex >= index);
+    if (nextSegmentIndex !== -1 && nextSegmentIndex < segments.length - 1) {
+      index = segments[nextSegmentIndex + 1];
     }
   }
   return {
@@ -2465,10 +2459,11 @@ const getHorizontalVisibleRange = (line, deltaX, width, averageCharWidth, tabSiz
 };
 const getHorizontalVisibleRangesMeasured = async (requests, measureWidths) => {
   const fallback = request => {
-    const range = getHorizontalVisibleRange(request.line, request.deltaX, request.width, request.averageCharWidth, request.tabSize, request.threshold);
+    const segments = request.segments || getSegments(request.line);
+    const range = getHorizontalVisibleRange(request.line, request.deltaX, request.width, request.averageCharWidth, request.tabSize, request.threshold, segments);
     return {
       ...range,
-      difference: getHorizontalVisibleDifference(request.line, range.start, request.deltaX, request.averageCharWidth, request.tabSize)
+      difference: getHorizontalVisibleDifference(request.line, range.start, request.deltaX, request.averageCharWidth, request.tabSize, segments)
     };
   };
   const results = requests.map(request => fallback(request));
@@ -2480,11 +2475,7 @@ const getHorizontalVisibleRangesMeasured = async (requests, measureWidths) => {
     if (request.line.length <= request.threshold) {
       continue;
     }
-    const segments = getSegments(request.line);
-    const boundaries = [0, ...segments.map(({
-      index,
-      segment
-    }) => index + segment.length)];
+    const boundaries = request.segments || getSegments(request.line);
     boundariesByLine[lineIndex] = boundaries;
     measurementsByLine[lineIndex] = new Map([[0, 0]]);
     const scrollOffset = Math.max(0, Number.isFinite(request.deltaX) ? request.deltaX : 0);
@@ -2590,10 +2581,10 @@ const getHorizontalVisibleRangesMeasured = async (requests, measureWidths) => {
   }
   return results;
 };
-const getHorizontalVisibleDifference = (line, start, deltaX, averageCharWidth, tabSize) => {
+const getHorizontalVisibleDifference = (line, start, deltaX, averageCharWidth, tabSize, segments) => {
   const charWidth = averageCharWidth > 0 ? averageCharWidth : 1;
   const scrollOffset = Number.isFinite(deltaX) ? deltaX : 0;
-  return getHorizontalDisplayColumn(line, start, tabSize) * charWidth - scrollOffset;
+  return getHorizontalDisplayColumn(line, start, tabSize, segments) * charWidth - scrollOffset;
 };
 
 // Large files have no token cache. Only materialize the text inside the horizontal viewport.
@@ -3244,6 +3235,13 @@ const positionAt = (textDocument, offset) => {
 };
 
 const maxTokenizerLoadPasses$1 = 10;
+const getGraphemeSegments = async lines => {
+  try {
+    return await invoke$e('TextMeasurement.getGraphemeSegments', lines);
+  } catch {
+    return undefined;
+  }
+};
 
 // const getTokensIncremental = (editor, min, max) => {
 //   const currentLength = editor.lineStateCache.length
@@ -3569,10 +3567,13 @@ const getLineInfosViewport = async (editor, tokens, embeddedResults, minLineY, m
   const tokenMap = get$5(languageId);
   let offset = minLineOffset;
   const tabSize = editor.tabSize ?? 2;
-  const measuredRanges = await getHorizontalVisibleRangesMeasured(lines.slice(minLineY, maxLineY).map(line => ({
+  const visibleLines = lines.slice(minLineY, maxLineY);
+  const graphemeSegments = await getGraphemeSegments(visibleLines);
+  const measuredRanges = await getHorizontalVisibleRangesMeasured(visibleLines.map((line, index) => ({
     averageCharWidth,
     deltaX,
     line,
+    segments: graphemeSegments?.[index],
     tabSize,
     threshold: horizontalVirtualizationThreshold,
     width
@@ -3604,6 +3605,7 @@ const getLineInfosViewport = async (editor, tokens, embeddedResults, minLineY, m
     horizontalVisibleRanges.push({
       end: measuredRange.end,
       rowIndex: i,
+      segments: graphemeSegments?.[i - minLineY],
       start: measuredRange.start
     });
     offset += line.length + 1;
@@ -17706,16 +17708,16 @@ const mergeConflictActions = [{
   action: 'both',
   label: 'Accept Both Changes'
 }];
-const getUnnecessaryRanges = (diagnostics, rowIndex, textLength, visibleStartColumn, line, hasLine, tabSize) => {
-  const visibleStart = hasLine ? getHorizontalDisplayColumn(line, visibleStartColumn, tabSize) : visibleStartColumn;
+const getUnnecessaryRanges = (diagnostics, rowIndex, textLength, visibleStartColumn, line, hasLine, tabSize, segments) => {
+  const visibleStart = hasLine ? getHorizontalDisplayColumn(line, visibleStartColumn, tabSize, segments) : visibleStartColumn;
   return diagnostics.filter(diagnostic => diagnostic.tags?.includes(DiagnosticTag.Unnecessary)).flatMap(diagnostic => {
     if (rowIndex < diagnostic.rowIndex || rowIndex > diagnostic.endRowIndex) {
       return [];
     }
     const diagnosticStart = rowIndex === diagnostic.rowIndex ? diagnostic.columnIndex : 0;
     const diagnosticEnd = rowIndex === diagnostic.endRowIndex ? diagnostic.endColumnIndex : line.length;
-    const startColumn = hasLine ? getHorizontalDisplayColumn(line, diagnosticStart, tabSize) : diagnosticStart;
-    const endColumn = hasLine ? getHorizontalDisplayColumn(line, diagnosticEnd, tabSize) : diagnosticEnd;
+    const startColumn = hasLine ? getHorizontalDisplayColumn(line, diagnosticStart, tabSize, segments) : diagnosticStart;
+    const endColumn = hasLine ? getHorizontalDisplayColumn(line, diagnosticEnd, tabSize, segments) : diagnosticEnd;
     const start = Math.max(0, startColumn - visibleStart);
     const end = Math.min(textLength, endColumn - visibleStart);
     return start < end ? [{
@@ -17799,7 +17801,7 @@ const getEditorRowsVirtualDom$1 = (textInfos, differences, lineNumbers = true, h
     for (let index = 0; index < textInfo.length; index += 2) {
       rowTextLength += textInfo[index].length;
     }
-    const tokenParts = getTokenParts(textInfo, getUnnecessaryRanges(diagnostics, rowIndex, rowTextLength, visibleRange.start, line, lines[rowIndex] !== undefined, tabSize));
+    const tokenParts = getTokenParts(textInfo, getUnnecessaryRanges(diagnostics, rowIndex, rowTextLength, visibleRange.start, line, lines[rowIndex] !== undefined, tabSize, visibleRange.segments));
     let className = EditorRow;
     if (rowIndex === highlightedLine) {
       className = mergeClassNames(className, EditorRowHighlighted);
@@ -18768,7 +18770,7 @@ const renderEventListeners = () => {
     preventDefault: true
   }, {
     name: HandlePaste,
-    params: ['paste', 'event.clipboardData ? event.clipboardData.getData("text/plain") : ""'],
+    params: ['paste', 'event.clipboardData.text'],
     preventDefault: true
   }, {
     name: HandleMouseDown,

package/package.json

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