@lvce-editor/editor-worker 19.72.1 → 19.72.3

package/dist/editorWorkerMain.js

@@ -4155,18 +4155,15 @@ const getX = async (line, column, fontWeight, fontSize, fontFamily, isMonospaceF
   number(averageCharWidth);
   number(difference);
   if (column === 0) {
-    return 0;
+    return difference === 0 ? 0 : Math.min(width, difference);
   }
   // TODO support non-monospace font, emoji, tab character, zero width characters
-  if (column * averageCharWidth > width) {
-    return width;
-  }
   const normalize = shouldNormalizeText(line);
   const normalizedLine = normalizeText(line, normalize, tabSize);
   const tabCount = getTabCount(line.slice(0, column));
-  const partialText = normalizedLine.slice(0, column + tabCount);
+  const partialText = normalizedLine.slice(0, column + tabCount * (tabSize - 1));
   const textWidth = await measureTextWidth(partialText, fontWeight, fontSize, fontFamily, letterSpacing, isMonospaceFont, averageCharWidth);
-  return textWidth - halfCursorWidth + difference;
+  return Math.min(width, textWidth - halfCursorWidth + difference);
 };
 
 const px = value => {
@@ -4278,7 +4275,6 @@ const getVisible = async editor => {
     charWidth,
     cursorWidth,
     deltaY,
-    differences,
     focused,
     foldingRanges = [],
     fontFamily,
@@ -4307,7 +4303,7 @@ const getVisible = async editor => {
   const startVisualRow = itemHeight ? Math.floor(deltaY / itemHeight) : getVisualRow(minLineY);
   const endVisualRow = startVisualRow + (visibleViewLineIndices?.length || actualVisibleLineIndices.length);
   const getRelativeRow = rowIndex => getVisualRow(rowIndex) - startVisualRow;
-  const getDifference = rowIndex => differences[actualVisibleLineIndices.indexOf(rowIndex)];
+  const horizontalOffset = -(editor.deltaX ?? 0);
   for (let i = 0; i < selections.length; i += 4) {
     const [selectionStartRow, selectionStartColumn, selectionEndRow, selectionEndColumn, reversed] = getSelectionPairs(selections, i);
     const selectionStartVisualRow = getVisualRow(selectionStartRow);
@@ -4316,7 +4312,7 @@ const getVisible = async editor => {
       continue;
     }
     const relativeEndLineRow = getRelativeRow(selectionEndRow);
-    const endLineDifference = getDifference(selectionEndRow);
+    const endLineDifference = horizontalOffset;
     const endLine = lines[selectionEndRow];
     const endLineEndX = await getX(endLine, selectionEndColumn, fontWeight, fontSize, fontFamily, isMonospaceFont, letterSpacing, tabSize, halfCursorWidth, width, averageCharWidth, endLineDifference);
     const endLineY = relativeEndLineRow * rowHeight;
@@ -4326,7 +4322,7 @@ const getVisible = async editor => {
     }
     const startLineYRelative = getRelativeRow(selectionStartRow);
     const startLineY = startLineYRelative * rowHeight;
-    const startLineDifference = getDifference(selectionStartRow);
+    const startLineDifference = horizontalOffset;
     if (selectionStartRow === selectionEndRow) {
       const startX = await getX(endLine, selectionStartColumn, fontWeight, fontSize, fontFamily, isMonospaceFont, letterSpacing, tabSize, halfCursorWidth, width, averageCharWidth, startLineDifference);
       if (reversed) {
@@ -4353,7 +4349,7 @@ const getVisible = async editor => {
         const currentLine = lines[rowIndex];
         const relativeLine = getRelativeRow(rowIndex);
         const currentLineY = relativeLine * rowHeight;
-        const difference = getDifference(rowIndex);
+        const difference = horizontalOffset;
         const selectionWidth = await getX(currentLine, currentLine.length, fontWeight, fontSize, fontFamily, isMonospaceFont, letterSpacing, tabSize, halfCursorWidth, width, averageCharWidth, difference);
         visibleSelections.push(0, currentLineY, selectionWidth, rowHeight);
       }
@@ -5315,6 +5311,7 @@ const getVisibleDiagnostics = async (editor, diagnostics) => {
   const visibleDiagnostics = [];
   const {
     charWidth,
+    deltaX = 0,
     deltaY,
     fontFamily,
     fontSize,
@@ -5325,8 +5322,7 @@ const getVisibleDiagnostics = async (editor, diagnostics) => {
     lines,
     rowHeight,
     tabSize,
-    viewLineIndices,
-    width
+    viewLineIndices
   } = editor;
   const startVisualRow = itemHeight ? Math.floor(deltaY / itemHeight) : editor.minLineY || 0;
   for (const diagnostic of diagnostics) {
@@ -5335,10 +5331,10 @@ const getVisibleDiagnostics = async (editor, diagnostics) => {
       endColumnIndex,
       rowIndex
     } = diagnostic;
-    const endLineDifference = 0;
+    const endLineDifference = -deltaX;
     const halfCursorWidth = 0;
-    const x = await getX(lines[rowIndex], columnIndex, fontWeight, fontSize, fontFamily, isMonospaceFont, letterSpacing, tabSize, halfCursorWidth, width, charWidth, endLineDifference);
-    const endX = await getX(lines[rowIndex], endColumnIndex, fontWeight, fontSize, fontFamily, isMonospaceFont, letterSpacing, tabSize, halfCursorWidth, width, charWidth, endLineDifference);
+    const x = await getX(lines[rowIndex], columnIndex, fontWeight, fontSize, fontFamily, isMonospaceFont, letterSpacing, tabSize, halfCursorWidth, Infinity, charWidth, endLineDifference);
+    const endX = await getX(lines[rowIndex], endColumnIndex, fontWeight, fontSize, fontFamily, isMonospaceFont, letterSpacing, tabSize, halfCursorWidth, Infinity, charWidth, endLineDifference);
     const diagnosticWidth = Math.max(charWidth, endX - x);
     const visualRow = viewLineIndices ? getVisualRowForDocumentRow$1(rowIndex, viewLineIndices) : rowIndex;
     const y = (visualRow - startVisualRow) * rowHeight;
@@ -5417,10 +5413,10 @@ const updateHorizontalLayout = async state => {
 };
 
 const shouldUpdateDiagnosticData = (oldState, newState) => {
-  return oldState.diagnostics !== newState.diagnostics || (newState.diagnostics?.length ?? 0) > 0 && (oldState.minLineY !== newState.minLineY || oldState.charWidth !== newState.charWidth || oldState.fontFamily !== newState.fontFamily || oldState.fontSize !== newState.fontSize || oldState.fontWeight !== newState.fontWeight || oldState.isMonospaceFont !== newState.isMonospaceFont || oldState.letterSpacing !== newState.letterSpacing || oldState.lines !== newState.lines || oldState.rowHeight !== newState.rowHeight || oldState.tabSize !== newState.tabSize || oldState.width !== newState.width);
+  return oldState.diagnostics !== newState.diagnostics || (newState.diagnostics?.length ?? 0) > 0 && (oldState.deltaX !== newState.deltaX || oldState.minLineY !== newState.minLineY || oldState.charWidth !== newState.charWidth || oldState.fontFamily !== newState.fontFamily || oldState.fontSize !== newState.fontSize || oldState.fontWeight !== newState.fontWeight || oldState.isMonospaceFont !== newState.isMonospaceFont || oldState.letterSpacing !== newState.letterSpacing || oldState.lines !== newState.lines || oldState.rowHeight !== newState.rowHeight || oldState.tabSize !== newState.tabSize || oldState.width !== newState.width);
 };
 const shouldUpdateSelectionData = (oldState, newState) => {
-  return oldState.selections !== newState.selections || oldState.focused !== newState.focused || oldState.minLineY !== newState.minLineY || oldState.maxLineY !== newState.maxLineY || oldState.visibleViewLineIndices !== newState.visibleViewLineIndices || oldState.foldingRanges !== newState.foldingRanges || oldState.differences !== newState.differences || oldState.charWidth !== newState.charWidth || oldState.cursorWidth !== newState.cursorWidth || oldState.fontFamily !== newState.fontFamily || oldState.fontSize !== newState.fontSize || oldState.fontWeight !== newState.fontWeight || oldState.isMonospaceFont !== newState.isMonospaceFont || oldState.letterSpacing !== newState.letterSpacing || oldState.lines !== newState.lines || oldState.rowHeight !== newState.rowHeight || oldState.tabSize !== newState.tabSize || oldState.width !== newState.width;
+  return oldState.selections !== newState.selections || oldState.focused !== newState.focused || oldState.deltaX !== newState.deltaX || oldState.minLineY !== newState.minLineY || oldState.maxLineY !== newState.maxLineY || oldState.visibleViewLineIndices !== newState.visibleViewLineIndices || oldState.foldingRanges !== newState.foldingRanges || oldState.differences !== newState.differences || oldState.charWidth !== newState.charWidth || oldState.cursorWidth !== newState.cursorWidth || oldState.fontFamily !== newState.fontFamily || oldState.fontSize !== newState.fontSize || oldState.fontWeight !== newState.fontWeight || oldState.isMonospaceFont !== newState.isMonospaceFont || oldState.letterSpacing !== newState.letterSpacing || oldState.lines !== newState.lines || oldState.rowHeight !== newState.rowHeight || oldState.tabSize !== newState.tabSize || oldState.width !== newState.width;
 };
 const shouldUpdateBracketMatchData = (oldState, newState) => {
   if (!('bracketMatchInfos' in newState)) {
@@ -8319,7 +8315,7 @@ const cancelSelection = editor => {
   return scheduleSelections(editor, newSelections);
 };
 
-const colorPattern = /#[\dA-Fa-f]+/g;
+const colorPattern$2 = /#[\dA-Fa-f]+/g;
 const numberPattern = /(?<![\w.#])[+-]?(?:(?:\d+(?:\.\d*)?)|(?:\.\d+))(?:[eE][+-]?\d+)?(?![\d.])/g;
 const validColorLengths = new Set([4, 5, 7, 9]);
 const isColor = value => {
@@ -8402,7 +8398,7 @@ const findMatchAt = (line, columnIndex, pattern, predicate) => {
   return undefined;
 };
 const findValueAt = (line, columnIndex) => {
-  return findMatchAt(line, columnIndex, colorPattern, isColor) ?? findMatchAt(line, columnIndex, numberPattern, isNumber);
+  return findMatchAt(line, columnIndex, colorPattern$2, isColor) ?? findMatchAt(line, columnIndex, numberPattern, isNumber);
 };
 const getSelectionTarget = (editor, index) => {
   const selectionStartRow = editor.selections[index];
@@ -8770,7 +8766,7 @@ const openColorPicker = async editor => {
   const bounds = getColorPickerBounds(editor);
   const {
     getColorPickerRange
-  } = await import('./GetColorPickerRange-CsGZK202.js');
+  } = await Promise.resolve().then(function () { return GetColorPickerRange; });
   const range = await getColorPickerRange(editor);
   const createWidget = () => create$6(bounds, range, editor.undoStack.length);
   return addWidgetToEditor(ColorPicker$2, ColorPicker, editor, createWidget, newStateGenerator$5, fullFocus);
@@ -11413,10 +11409,17 @@ const continueScrollingAndMovingSelection = async editorUid => {
     return;
   }
   set$a(editor.uid, editor, derivedEditor);
+  await invoke$d('Editor.renderPending', editor.uid);
   if (derivedEditor.hasListener) {
     requestAnimationFrame(() => continueScrollingAndMovingSelection(editorUid));
   }
 };
+const scheduleInitialSelectionAutoScroll = editorUid => {
+  // Let the wrapped pointer-move command commit hasListener before the loop reads state.
+  requestAnimationFrame(() => {
+    requestAnimationFrame(() => continueScrollingAndMovingSelection(editorUid));
+  });
+};
 const moveSelectionPx = async (editor, x, y) => {
   object(editor);
   number(x);
@@ -11432,7 +11435,7 @@ const moveSelectionPx = async (editor, x, y) => {
     };
   }
   if (!editor.hasListener) {
-    requestAnimationFrame(() => continueScrollingAndMovingSelection(editor.uid));
+    scheduleInitialSelectionAutoScroll(editor.uid);
   }
   return {
     ...newEditor,
@@ -15393,6 +15396,20 @@ const getPositionAtCursor = editorUid => {
   const editor = getEditor$1(editorUid);
   return getPositionAtCursor$1(editor);
 };
+const getCompletionContext = (editorUid, includeLine = false) => {
+  const editor = getEditor$1(editorUid);
+  const position = getPositionAtCursor$1(editor);
+  if (!includeLine) {
+    return {
+      ...position,
+      wordBefore: getWordBefore(editor, position.rowIndex, position.columnIndex)
+    };
+  }
+  return {
+    ...position,
+    line: editor.lines[position.rowIndex] || ''
+  };
+};
 const getUri = editorUid => {
   const editor = getEditor$1(editorUid);
   return editor.uri;
@@ -18773,6 +18790,7 @@ const commandMap = {
   'Editor.fold': wrapCommand(fold$1),
   'Editor.format': wrapCommand(format),
   'Editor.getCommandIds': getCommandIds,
+  'Editor.getCompletionContext': getCompletionContext,
   'Editor.getDiagnostics': getDiagnostics,
   'Editor.getKeyBindings': getKeyBindings,
   'Editor.getKeys': getKeys,
@@ -19446,4 +19464,100 @@ const main = async () => {
 
 main();
 
-export { offsetAt as o };
+const noColorRange = {
+  endOffset: -1,
+  startOffset: -1,
+  value: ''
+};
+const colorPattern$1 = /#[\da-f]{3,8}\b|(?<![\w$])0x[\da-f]{6}(?![\w$])|\b(?:hsla?|rgba?)\([^)]*\)/gi;
+const getColorPickerRange = async editor => {
+  const {
+    lines,
+    selections
+  } = editor;
+  if (!selections || selections.length < 4) {
+    return noColorRange;
+  }
+  const selectionStartRow = selections[0];
+  const selectionEndRow = selections[2];
+  if (selectionStartRow !== selectionEndRow) {
+    return noColorRange;
+  }
+  const selectionStartColumn = selections[1];
+  const selectionEndColumn = selections[3];
+  const rowIndex = selectionEndRow;
+  const line = lines[rowIndex];
+  if (typeof line !== 'string') {
+    return noColorRange;
+  }
+  if (selectionStartColumn !== selectionEndColumn) {
+    const startColumn = Math.min(selectionStartColumn, selectionEndColumn);
+    const endColumn = Math.max(selectionStartColumn, selectionEndColumn);
+    return {
+      endOffset: offsetAt(editor, rowIndex, endColumn),
+      startOffset: offsetAt(editor, rowIndex, startColumn),
+      value: line.slice(startColumn, endColumn)
+    };
+  }
+  const columnIndex = selectionEndColumn;
+  for (const match of line.matchAll(colorPattern$1)) {
+    const startColumn = match.index;
+    const endColumn = startColumn + match[0].length;
+    if (columnIndex >= startColumn && columnIndex <= endColumn) {
+      return {
+        endOffset: offsetAt(editor, rowIndex, endColumn),
+        startOffset: offsetAt(editor, rowIndex, startColumn),
+        value: match[0]
+      };
+    }
+  }
+  const {
+    getNamedColorRange
+  } = await Promise.resolve().then(function () { return GetNamedColorRange; });
+  const namedColorRange = getNamedColorRange(line, columnIndex);
+  if (!namedColorRange) {
+    return noColorRange;
+  }
+  return {
+    endOffset: offsetAt(editor, rowIndex, namedColorRange.end),
+    startOffset: offsetAt(editor, rowIndex, namedColorRange.start),
+    value: namedColorRange.value
+  };
+};
+
+const GetColorPickerRange = {
+  __proto__: null,
+  getColorPickerRange
+};
+
+const colorPattern = /\b[a-z]+\b/gi;
+const getNamedColorRange = (line, columnIndex) => {
+  for (const match of line.matchAll(colorPattern)) {
+    const start = match.index;
+    const end = start + match[0].length;
+    if (columnIndex < start || columnIndex > end || line[start - 1] === '-' || line[end] === '-') {
+      continue;
+    }
+    const value = match[0];
+    if (value.toLowerCase() === 'currentcolor') {
+      return undefined;
+    }
+    const context = new OffscreenCanvas(1, 1).getContext('2d');
+    context.fillStyle = '#010203';
+    context.fillStyle = value;
+    if (context.fillStyle === '#010203') {
+      return undefined;
+    }
+    return {
+      end,
+      start,
+      value
+    };
+  }
+  return undefined;
+};
+
+const GetNamedColorRange = {
+  __proto__: null,
+  getNamedColorRange
+};

package/package.json

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

package/dist/GetColorPickerRange-CsGZK202.js

@@ -1,64 +0,0 @@
-import { o as offsetAt } from './editorWorkerMain.js';
-
-const noColorRange = {
-  endOffset: -1,
-  startOffset: -1,
-  value: ''
-};
-const colorPattern = /#[\da-f]{3,8}\b|(?<![\w$])0x[\da-f]{6}(?![\w$])|\b(?:hsla?|rgba?)\([^)]*\)/gi;
-const getColorPickerRange = async editor => {
-  const {
-    lines,
-    selections
-  } = editor;
-  if (!selections || selections.length < 4) {
-    return noColorRange;
-  }
-  const selectionStartRow = selections[0];
-  const selectionEndRow = selections[2];
-  if (selectionStartRow !== selectionEndRow) {
-    return noColorRange;
-  }
-  const selectionStartColumn = selections[1];
-  const selectionEndColumn = selections[3];
-  const rowIndex = selectionEndRow;
-  const line = lines[rowIndex];
-  if (typeof line !== 'string') {
-    return noColorRange;
-  }
-  if (selectionStartColumn !== selectionEndColumn) {
-    const startColumn = Math.min(selectionStartColumn, selectionEndColumn);
-    const endColumn = Math.max(selectionStartColumn, selectionEndColumn);
-    return {
-      endOffset: offsetAt(editor, rowIndex, endColumn),
-      startOffset: offsetAt(editor, rowIndex, startColumn),
-      value: line.slice(startColumn, endColumn)
-    };
-  }
-  const columnIndex = selectionEndColumn;
-  for (const match of line.matchAll(colorPattern)) {
-    const startColumn = match.index;
-    const endColumn = startColumn + match[0].length;
-    if (columnIndex >= startColumn && columnIndex <= endColumn) {
-      return {
-        endOffset: offsetAt(editor, rowIndex, endColumn),
-        startOffset: offsetAt(editor, rowIndex, startColumn),
-        value: match[0]
-      };
-    }
-  }
-  const {
-    getNamedColorRange
-  } = await import('./GetNamedColorRange-LJAB8ndU.js');
-  const namedColorRange = getNamedColorRange(line, columnIndex);
-  if (!namedColorRange) {
-    return noColorRange;
-  }
-  return {
-    endOffset: offsetAt(editor, rowIndex, namedColorRange.end),
-    startOffset: offsetAt(editor, rowIndex, namedColorRange.start),
-    value: namedColorRange.value
-  };
-};
-
-export { getColorPickerRange };

package/dist/GetNamedColorRange-LJAB8ndU.js

@@ -1,28 +0,0 @@
-const colorPattern = /\b[a-z]+\b/gi;
-const getNamedColorRange = (line, columnIndex) => {
-  for (const match of line.matchAll(colorPattern)) {
-    const start = match.index;
-    const end = start + match[0].length;
-    if (columnIndex < start || columnIndex > end || line[start - 1] === '-' || line[end] === '-') {
-      continue;
-    }
-    const value = match[0];
-    if (value.toLowerCase() === 'currentcolor') {
-      return undefined;
-    }
-    const context = new OffscreenCanvas(1, 1).getContext('2d');
-    context.fillStyle = '#010203';
-    context.fillStyle = value;
-    if (context.fillStyle === '#010203') {
-      return undefined;
-    }
-    return {
-      end,
-      start,
-      value
-    };
-  }
-  return undefined;
-};
-
-export { getNamedColorRange };