@lvce-editor/editor-worker 19.72.2 → 19.72.4

package/dist/editorWorkerMain.js

@@ -5445,7 +5445,7 @@ const mergeConflictsEqual$1 = (oldState, newState) => {
     return conflict.startRowIndex === other.startRowIndex && conflict.endRowIndex === other.endRowIndex;
   });
 };
-const updateDerivedState = async (oldState, newState) => {
+const updateDerivedState = async (oldState, newState, deferGutterDecorations = false) => {
   const horizontalState = oldState.initial || oldState.lines !== newState.lines || oldState.width !== newState.width || 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.tabSize !== newState.tabSize || oldState.lineNumbers !== newState.lineNumbers || oldState.breakPoints !== newState.breakPoints || oldState.gutterDecorations !== newState.gutterDecorations || oldState.lightBulbRowIndex !== newState.lightBulbRowIndex ? await updateHorizontalLayout(newState) : newState;
   const layoutState = oldState.lines !== newState.lines && 'foldingRanges' in newState ? updateLayout(horizontalState, []) : horizontalState;
   const nextState = mergeConflictsEqual$1(oldState, layoutState) ? layoutState : {
@@ -5513,7 +5513,7 @@ const updateDerivedState = async (oldState, newState) => {
       lightBulbRowIndex: await getLightBulbRowIndex(finalState)
     };
   }
-  if (oldState.lines !== nextState.lines || oldState.uri !== nextState.uri) {
+  if (!deferGutterDecorations && (oldState.lines !== nextState.lines || oldState.uri !== nextState.uri)) {
     finalState = {
       ...finalState,
       gutterDecorations: await getEditorGutterDecorations(finalState)
@@ -6259,7 +6259,7 @@ const run = async (uid, token, save) => {
   }
   await save(token);
 };
-const schedule = (uid, save) => {
+const schedule$1 = (uid, save) => {
   dispose$4(uid);
   const token = ++state$7.nextToken;
   const timeout = setTimeout(run, autoSaveDelay, uid, token, save);
@@ -7900,6 +7900,70 @@ const editorDiagnosticEffect = {
   isActive: (oldEditor, newEditor) => !oldEditor.initial && !newEditor.loadError && newEditor.diagnosticsEnabled && (oldEditor.lines !== newEditor.lines || oldEditor.languageId !== newEditor.languageId)
 };
 
+const refreshes = new WeakMap();
+const isCurrent = (editor, snapshot) => Boolean(editor && editor.lifecycle === snapshot.lifecycle && !editor.lifecycle?.disposed && editor.lines === snapshot.lines && editor.gutterDecorations === snapshot.gutterDecorations && editor.uri === snapshot.uri && editor.languageId === snapshot.languageId && editor.applicationId === snapshot.applicationId);
+const refresh = async request => {
+  try {
+    while (request.pending) {
+      const snapshot = request.pending;
+      request.pending = undefined;
+      if (snapshot.lifecycle?.disposed) {
+        continue;
+      }
+      const gutterDecorations = await getEditorGutterDecorations(snapshot);
+      const changed = await enqueue(snapshot.uid, async () => {
+        const current = get$8(snapshot.uid)?.newState;
+        if (!isCurrent(current, snapshot) || current.gutterDecorations.length === gutterDecorations.length && gutterDecorations.every((item, index) => item.rowIndex === current.gutterDecorations[index].rowIndex && item.type === current.gutterDecorations[index].type)) {
+          return false;
+        }
+        const next = await updateDerivedState(current, {
+          ...current,
+          gutterDecorations
+        });
+        // Derived state may await layout RPCs while an asynchronous render consumes the baseline.
+        const latest = get$8(snapshot.uid);
+        if (!isCurrent(latest?.newState, snapshot)) {
+          return false;
+        }
+        set$a(snapshot.uid, latest.oldState, next);
+        return true;
+      });
+      if (changed) {
+        await invoke$d('Editor.renderPending', snapshot.uid);
+      }
+    }
+  } catch (error) {
+    console.warn('Failed to refresh gutter decorations:', error);
+  } finally {
+    request.running = false;
+    if (request.pending) {
+      request.running = true;
+      void refresh(request);
+    }
+  }
+};
+const schedule = editor => {
+  const {
+    lifecycle
+  } = editor;
+  if (!lifecycle || lifecycle.disposed) {
+    return;
+  }
+  let request = refreshes.get(lifecycle);
+  if (!request) {
+    request = {
+      pending: undefined,
+      running: false
+    };
+    refreshes.set(lifecycle, request);
+  }
+  request.pending = editor;
+  if (!request.running) {
+    request.running = true;
+    void refresh(request);
+  }
+};
+
 const cursorUndoLimit = 100;
 const selectionsEqual = (left, right) => {
   if (left === right) {
@@ -7983,7 +8047,8 @@ const wrapCommand$1 = (fn, preservesTypingCoalescing = false, returnState = true
     if (state === newEditor) {
       return returnState ? newEditor : undefined;
     }
-    const newEditorWithDerivedState = await updateDerivedState(state, newEditor);
+    const deferGutterDecorations = !initial && uri === newEditor.uri && lines !== newEditor.lines && Boolean(newEditor.lifecycle);
+    const newEditorWithDerivedState = await updateDerivedState(state, newEditor, deferGutterDecorations);
     // Another command can commit before the renderer consumes this edit.
     // Keep its last rendered baseline, including renders completed while we awaited derived state.
     const renderedState = get$8(uid)?.oldState ?? oldInstance.oldState;
@@ -7993,6 +8058,9 @@ const wrapCommand$1 = (fn, preservesTypingCoalescing = false, returnState = true
       void editorDiagnosticEffect.apply(newEditorWithDerivedState);
     }
     const finalEditor = newEditorWithDerivedState;
+    if (deferGutterDecorations) {
+      schedule(finalEditor);
+    }
     await notifyEditorStatusChange(state, finalEditor);
     if (!initial && uri === finalEditor.uri && (endOfLine !== finalEditor.endOfLine || insertSpaces !== finalEditor.insertSpaces || lines !== finalEditor.lines || modified !== finalEditor.modified || redoStack !== finalEditor.redoStack || undoStack !== finalEditor.undoStack)) {
       for (const key of getKeys$2()) {
@@ -8015,15 +8083,18 @@ const wrapCommand$1 = (fn, preservesTypingCoalescing = false, returnState = true
           redoStack: finalEditor.redoStack,
           undoStack: finalEditor.undoStack,
           visualDecorations: finalEditor.visualDecorations
-        });
+        }, deferGutterDecorations);
         set$a(otherUid, instance.oldState, synchronizedEditor);
+        if (deferGutterDecorations) {
+          schedule(synchronizedEditor);
+        }
         if (editorDiagnosticEffect.isActive(editor, synchronizedEditor)) {
           void editorDiagnosticEffect.apply(synchronizedEditor);
         }
       }
     }
     if (lines !== finalEditor.lines && !isUntitledFile(finalEditor.uri)) {
-      schedule(uid, token => saveAfterDelay(uid, token));
+      schedule$1(uid, token => saveAfterDelay(uid, token));
     } else if (modified && !finalEditor.modified) {
       dispose$4(uid);
     }
@@ -8315,7 +8386,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 => {
@@ -8398,7 +8469,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];
@@ -8766,7 +8837,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);
@@ -11409,10 +11480,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);
@@ -11428,7 +11506,7 @@ const moveSelectionPx = async (editor, x, y) => {
     };
   }
   if (!editor.hasListener) {
-    requestAnimationFrame(() => continueScrollingAndMovingSelection(editor.uid));
+    scheduleInitialSelectionAutoScroll(editor.uid);
   }
   return {
     ...newEditor,
@@ -15389,6 +15467,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;
@@ -18769,6 +18861,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,
@@ -19442,4 +19535,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.2",
+  "version": "19.72.4",
   "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 };