@lvce-editor/static-server 0.123.3 → 0.123.5

package/static/{89dd0c8 → 59165ee}/css/parts/ViewletExtensions.css

@@ -215,7 +215,7 @@
   height: 16px;
   contain: strict;
   background: #c5c5c5;
-  mask: url(/89dd0c8/icons/settings-gear.svg) 50% 50% / 16px no-repeat;
+  mask: url(/59165ee/icons/settings-gear.svg) 50% 50% / 16px no-repeat;
 }
 
 .Extensions.Small .ExtensionListItemIcon {

package/static/{89dd0c8 → 59165ee}/css/parts/ViewletRunningExtensions.css

@@ -130,7 +130,7 @@
   flex: none;
   height: 112px;
   margin-bottom: 26px;
-  mask: url(/89dd0c8/icons/extensions.svg) 50% 50% / contain no-repeat;
+  mask: url(/59165ee/icons/extensions.svg) 50% 50% / contain no-repeat;
   width: 112px;
 }
 

package/static/{89dd0c8 → 59165ee}/css/parts/ViewletSimpleBrowser.css

@@ -193,7 +193,7 @@
 
 .SimpleBrowserTabHistoryFavicon {
   background-color: currentColor;
-  mask-image: url(/89dd0c8/icons/history.svg);
+  mask-image: url(/59165ee/icons/history.svg);
   mask-position: center;
   mask-repeat: no-repeat;
   mask-size: 16px;

package/static/{89dd0c8 → 59165ee}/css/parts/ViewletTerminalTabs.css

@@ -117,7 +117,7 @@
   width: 16px;
   height: 16px;
   background: currentcolor;
-  mask-image: url(/89dd0c8/icons/trash.svg);
+  mask-image: url(/59165ee/icons/trash.svg);
   mask-position: 50% 50%;
   mask-repeat: no-repeat;
   mask-size: 16px;

package/static/{89dd0c8 → 59165ee}/manifest.json

@@ -12,13 +12,13 @@
   "display_override": ["window-controls-overlay", "minimal-ui"],
   "icons": [
     {
-      "src": "/89dd0c8/icons/pwa-icon-192.png",
+      "src": "/59165ee/icons/pwa-icon-192.png",
       "type": "image/png",
       "sizes": "192x192",
       "purpose": "any maskable"
     },
     {
-      "src": "/89dd0c8/icons/pwa-icon-512.png",
+      "src": "/59165ee/icons/pwa-icon-512.png",
       "type": "image/png",
       "sizes": "512x512",
       "purpose": "any maskable"

package/static/{89dd0c8 → 59165ee}/packages/editor-worker/dist/editorWorkerMain.js

@@ -5557,6 +5557,54 @@ const getEditorGutterDecorations = async editor => {
   }
 };
 
+const isValidEditorTextDecoration = (value, lines) => {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) {
+    return false;
+  }
+  const {
+    color,
+    endColumnIndex,
+    endRowIndex,
+    startColumnIndex,
+    startRowIndex,
+    thickness = 2
+  } = value;
+  return [startRowIndex, startColumnIndex, endRowIndex, endColumnIndex].every(item => Number.isSafeInteger(item) && item >= 0) && endRowIndex >= startRowIndex && (endRowIndex !== startRowIndex || endColumnIndex >= startColumnIndex) && endRowIndex < lines.length && startColumnIndex <= lines[startRowIndex].length && endColumnIndex <= lines[endRowIndex].length && typeof color === 'string' && /^#[\da-f]{6}$/i.test(color) && Number.isSafeInteger(thickness) && thickness >= 1 && thickness <= 4;
+};
+const getEditorTextDecorations = async editor => {
+  if (editor.largeFile) {
+    return [];
+  }
+  const selections = [];
+  for (let index = 0; index < (editor.selections || []).length; index += 4) {
+    const [startRowIndex, startColumnIndex, endRowIndex, endColumnIndex] = getSelectionPairs(editor.selections, index);
+    selections.push({
+      endColumnIndex,
+      endRowIndex,
+      startColumnIndex,
+      startRowIndex
+    });
+  }
+  try {
+    const results = await invoke$8(editor.applicationId, 'Extensions.executeProvidersByEvent', 'onEditorTextDecoration', 'ExtensionApi.executeEditorTextDecorationProvider', {
+      languageId: editor.languageId,
+      selections,
+      text: getText$1(editor),
+      uri: editor.uri
+    });
+    if (!Array.isArray(results)) {
+      return [];
+    }
+    return results.flatMap(result => Array.isArray(result) ? result.filter(item => isValidEditorTextDecoration(item, editor.lines)) : []);
+  } catch {
+    return [];
+  }
+};
+const refreshTextDecorations = async editor => ({
+  ...editor,
+  textDecorations: await getEditorTextDecorations(editor)
+});
+
 const diagnosticContainsPosition = (diagnostic, rowIndex, columnIndex) => {
   const {
     columnIndex: startColumnIndex,
@@ -5651,6 +5699,80 @@ const getMinimapLines = async (editor, syncIncremental) => {
   return result.tokens.map((lineState, index) => getLine(lineState, result.embeddedResults, tokenMap, lines[index].length));
 };
 
+const mergeClassNames = (...classNames) => {
+  return classNames.filter(Boolean).join(' ');
+};
+
+const Button$1 = 1;
+const Div = 4;
+const Input = 6;
+const Span = 8;
+const Text = 12;
+const Img = 17;
+const Nav = 40;
+const TextArea = 62;
+
+const getTextDecorationsVirtualDom = async editor => {
+  const dom = [];
+  const {
+    deltaY,
+    foldingRanges = [],
+    itemHeight,
+    lines,
+    maxLineY,
+    minLineY,
+    rowHeight,
+    textDecorations = [],
+    viewLineIndices
+  } = editor;
+  const visibleRows = editor.visibleLineIndices || Array.from({
+    length: Math.max(0, maxLineY - minLineY)
+  }, (_, index) => minLineY + index);
+  const getVisualRow = row => viewLineIndices ? getVisualRowForDocumentRow$1(row, viewLineIndices) : getVisualRowForDocumentRow(row, foldingRanges);
+  const startVisualRow = itemHeight ? Math.floor(deltaY / itemHeight) : getVisualRow(minLineY);
+  for (const [decorationIndex, decoration] of textDecorations.entries()) {
+    const {
+      endColumnIndex,
+      endRowIndex,
+      startColumnIndex,
+      startRowIndex,
+      thickness = 2
+    } = decoration;
+    const addRow = async row => {
+      if (row < startRowIndex || row > endRowIndex || row >= lines.length) {
+        return;
+      }
+      const start = row === startRowIndex ? startColumnIndex : 0;
+      const end = row === endRowIndex ? endColumnIndex : lines[row].length;
+      if (end <= start) {
+        return;
+      }
+      const getX$1 = column => getX(lines[row], column, editor.fontWeight, editor.fontSize, editor.fontFamily, editor.isMonospaceFont, editor.letterSpacing, editor.tabSize, 0, Infinity, editor.charWidth, -(editor.deltaX || 0));
+      const x = await getX$1(start);
+      const endX = await getX$1(end);
+      const left = Math.max(0, x);
+      const right = Math.min(editor.width - (editor.gutterWidth || 0), endX);
+      if (right <= left) {
+        return;
+      }
+      const top = (getVisualRow(row) - startVisualRow + 1) * rowHeight - thickness;
+      dom.push({
+        childCount: 0,
+        className: mergeClassNames('EditorTextDecoration', `EditorTextDecoration${decorationIndex}`),
+        height: thickness,
+        left,
+        top,
+        type: Div,
+        width: right - left
+      });
+    };
+    for (const row of visibleRows) {
+      await addRow(row);
+    }
+  }
+  return dom;
+};
+
 const closingBrackets = {
   '(': ')',
   '[': ']',
@@ -6042,6 +6164,12 @@ const updateDerivedState = async (oldState, newState, deferGutterDecorations = f
     incrementalEdits: emptyIncrementalEdits
   };
   let finalState = nextState;
+  if (oldState.lines !== nextState.lines || oldState.uri !== nextState.uri) {
+    finalState = {
+      ...finalState,
+      textDecorations: await getEditorTextDecorations(nextState)
+    };
+  }
   if (nextState.breadcrumbsEnabled && oldState.lines !== nextState.lines && oldState.documentSymbols === nextState.documentSymbols) {
     finalState = {
       ...finalState,
@@ -6108,6 +6236,12 @@ const updateDerivedState = async (oldState, newState, deferGutterDecorations = f
       gutterDecorations: await getEditorGutterDecorations(finalState)
     };
   }
+  if ((finalState.textDecorations?.length || 0) > 0 || (oldState.textDecorationDom?.length || 0) > 0) {
+    finalState = {
+      ...finalState,
+      textDecorationDom: await getTextDecorationsVirtualDom(finalState)
+    };
+  }
   if (!shouldUpdateSelectionData(oldState, nextState)) {
     return finalState;
   }
@@ -6772,7 +6906,7 @@ const isEqual$5 = (oldState, newState) => {
 };
 
 const isEqual$4 = (oldState, newState) => {
-  return oldState.rowHeight === newState.rowHeight && oldState.deltaY === newState.deltaY && oldState.finalDeltaY === newState.finalDeltaY && oldState.height === newState.height && oldState.deltaX === newState.deltaX && oldState.gutterWidth === newState.gutterWidth && oldState.longestLineWidth === newState.longestLineWidth && oldState.minimumSliderSize === newState.minimumSliderSize && oldState.width === newState.width && oldState.scrollBarHeight === newState.scrollBarHeight;
+  return oldState.rowHeight === newState.rowHeight && oldState.textDecorations === newState.textDecorations && oldState.deltaY === newState.deltaY && oldState.finalDeltaY === newState.finalDeltaY && oldState.height === newState.height && oldState.deltaX === newState.deltaX && oldState.gutterWidth === newState.gutterWidth && oldState.longestLineWidth === newState.longestLineWidth && oldState.minimumSliderSize === newState.minimumSliderSize && oldState.width === newState.width && oldState.scrollBarHeight === newState.scrollBarHeight;
 };
 
 const isEqual$3 = (oldState, newState) => {
@@ -6789,7 +6923,7 @@ const isEqual$3 = (oldState, newState) => {
 };
 
 const isEqual$2 = (oldState, newState) => {
-  return oldState.breadcrumbFileIcon === newState.breadcrumbFileIcon && oldState.breadcrumbsEnabled === newState.breadcrumbsEnabled && oldState.breakPoints === newState.breakPoints && oldState.bracketMatchInfos === newState.bracketMatchInfos && oldState.cursorInfos === newState.cursorInfos && oldState.diagnostics === newState.diagnostics && oldState.documentSymbols === newState.documentSymbols && oldState.endOfLineDecorations === newState.endOfLineDecorations && oldState.focused === newState.focused && oldState.gutterDecorations === newState.gutterDecorations && oldState.highlightActiveLineNumber === newState.highlightActiveLineNumber && oldState.highlightedLine === newState.highlightedLine && oldState.problemsHighlightedRow === newState.problemsHighlightedRow && oldState.lineNumbers === newState.lineNumbers && oldState.loadError === newState.loadError && oldState.textInfos === newState.textInfos && oldState.visibleViewLineIndices === newState.visibleViewLineIndices && oldState.differences === newState.differences && oldState.initial === newState.initial && oldState.scrollBarHeight === newState.scrollBarHeight && oldState.width === newState.width && oldState.gutterWidth === newState.gutterWidth && oldState.longestLineWidth === newState.longestLineWidth && oldState.minimumSliderSize === newState.minimumSliderSize && oldState.selectionInfos === newState.selectionInfos && oldState.selections === newState.selections && oldState.workspaceUri === newState.workspaceUri;
+  return oldState.textDecorationDom === newState.textDecorationDom && oldState.breadcrumbFileIcon === newState.breadcrumbFileIcon && oldState.breadcrumbsEnabled === newState.breadcrumbsEnabled && oldState.breakPoints === newState.breakPoints && oldState.bracketMatchInfos === newState.bracketMatchInfos && oldState.cursorInfos === newState.cursorInfos && oldState.diagnostics === newState.diagnostics && oldState.documentSymbols === newState.documentSymbols && oldState.endOfLineDecorations === newState.endOfLineDecorations && oldState.focused === newState.focused && oldState.gutterDecorations === newState.gutterDecorations && oldState.highlightActiveLineNumber === newState.highlightActiveLineNumber && oldState.highlightedLine === newState.highlightedLine && oldState.problemsHighlightedRow === newState.problemsHighlightedRow && oldState.lineNumbers === newState.lineNumbers && oldState.loadError === newState.loadError && oldState.textInfos === newState.textInfos && oldState.visibleViewLineIndices === newState.visibleViewLineIndices && oldState.differences === newState.differences && oldState.initial === newState.initial && oldState.scrollBarHeight === newState.scrollBarHeight && oldState.width === newState.width && oldState.gutterWidth === newState.gutterWidth && oldState.longestLineWidth === newState.longestLineWidth && oldState.minimumSliderSize === newState.minimumSliderSize && oldState.selectionInfos === newState.selectionInfos && oldState.selections === newState.selections && oldState.workspaceUri === newState.workspaceUri;
 };
 
 const isEqual$1 = (oldState, newState) => {
@@ -8629,6 +8763,7 @@ const wrapCommand$1 = (fn, preservesTypingCoalescing = false, returnState = true
       initial,
       insertSpaces,
       isSelecting,
+      lifecycle,
       lines,
       modified,
       redoStack,
@@ -8653,11 +8788,14 @@ const wrapCommand$1 = (fn, preservesTypingCoalescing = false, returnState = true
         cursorUndoStack: [...previousCursorUndoStack.slice(1 - cursorUndoLimit), new Uint32Array(selections)]
       };
     }
-    if (state === newEditor) {
+    if (state === newEditor || !get$8(uid) || lifecycle?.disposed || get$8(uid).newState.lifecycle !== lifecycle) {
       return returnState ? newEditor : undefined;
     }
     const deferGutterDecorations = !initial && uri === newEditor.uri && lines !== newEditor.lines && Boolean(newEditor.lifecycle);
     const newEditorWithDerivedState = await updateDerivedState(state, newEditor, deferGutterDecorations);
+    if (!get$8(uid) || lifecycle?.disposed || get$8(uid).newState.lifecycle !== lifecycle) {
+      return returnState ? newEditorWithDerivedState : undefined;
+    }
     // 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;
@@ -8693,7 +8831,11 @@ const wrapCommand$1 = (fn, preservesTypingCoalescing = false, returnState = true
           undoStack: finalEditor.undoStack,
           visualDecorations: finalEditor.visualDecorations
         }, deferGutterDecorations);
-        set$a(otherUid, instance.oldState, synchronizedEditor);
+        const latest = get$8(otherUid);
+        if (!latest || editor.lifecycle?.disposed || latest.newState.lifecycle !== editor.lifecycle) {
+          continue;
+        }
+        set$a(otherUid, latest.oldState, synchronizedEditor);
         if (deferGutterDecorations) {
           schedule(synchronizedEditor);
         }
@@ -14801,7 +14943,7 @@ const toggleCompletion = async editor => {
 };
 
 const type = async (editor, text) => {
-  const changes = editorReplaceSelections(editor, [text], EditorType);
+  const changes = editorReplaceSelections(editor, splitLines(text), EditorType);
   return scheduleDocumentAndCursorsSelections(editor, changes);
 };
 
@@ -15336,15 +15478,6 @@ const HandleMouseOut = 38;
 const HandleMouseOver = 39;
 const HandleHoverMouseDown = 40;
 
-const Button$1 = 1;
-const Div = 4;
-const Input = 6;
-const Span = 8;
-const Text = 12;
-const Img = 17;
-const Nav = 40;
-const TextArea = 62;
-
 const text = data => {
   return {
     childCount: 0,
@@ -15635,10 +15768,6 @@ const getLineInfosVirtualDom = lineInfos => {
   return dom;
 };
 
-const mergeClassNames = (...classNames) => {
-  return classNames.filter(Boolean).join(' ');
-};
-
 const Focusable = 0;
 
 const hoverProblemMessage = {
@@ -17754,6 +17883,10 @@ ${editorSelector} .EditorGutterDecorationDeleted {
   top: calc(50% - 1px);
 }
 ${editorSelector} .R{background-color:#add6ff40}
+${editorSelector} .EditorTextDecoration {
+  position: absolute;
+  pointer-events: none;
+}
 ${editorSelector} .BracketMatch {
   position: absolute;
   box-sizing: border-box;
@@ -17791,7 +17924,10 @@ const renderCss$1 = (oldState, newState) => {
   const scrollBarTop = getScrollBarY(deltaY, finalDeltaY, height, scrollBarHeight);
   const scrollBarWidth = getScrollBarSize(width, longestLineWidth, minimumSliderSize);
   const scrollBarLeft = getScrollBarOffset(deltaX, Math.max(0, longestLineWidth - width), width, scrollBarWidth);
-  const css = getCss(uid, rowHeight, scrollBarHeight, scrollBarTop, scrollBarWidth, scrollBarLeft, deltaY);
+  const decorationCss = (newState.textDecorations || []).map(({
+    color
+  }, index) => `.Editor[data-uid="${uid}"] .EditorTextDecoration${index} { background-color: ${color}; }`).join('\n');
+  const css = decorationCss + getCss(uid, rowHeight, scrollBarHeight, scrollBarTop, scrollBarWidth, scrollBarLeft, deltaY);
   return [SetCss$1, uid, gutterWidth ? `${css}\n.Editor[data-uid="${uid}"] .Gutter { width: ${gutterWidth}px; }\n` : css];
 };
 
@@ -18050,14 +18186,14 @@ const getDiagnosticsVirtualDom = diagnostics => {
   return dom;
 };
 
-const getEditorDiagnosticsVirtualDom = (diagnostics, bracketMatchInfos = []) => {
+const getEditorDiagnosticsVirtualDom = (diagnostics, bracketMatchInfos = [], textDecorationDom = []) => {
   const diagnosticsDom = getDiagnosticsVirtualDom([...diagnostics]);
   const bracketMatchesDom = getBracketMatchesVirtualDom(bracketMatchInfos);
   return [{
-    childCount: diagnostics.length + bracketMatchInfos.length,
+    childCount: diagnostics.length + bracketMatchInfos.length + textDecorationDom.length,
     className: 'LayerDiagnostics',
     type: Div
-  }, ...diagnosticsDom, ...bracketMatchesDom];
+  }, ...diagnosticsDom, ...bracketMatchesDom, ...textDecorationDom];
 };
 
 const DiagnosticTag = {
@@ -18302,8 +18438,8 @@ const editorLayersNode = {
   className: 'EditorLayers',
   type: Div
 };
-const getEditorLayersVirtualDom = (selectionInfos, textInfos, differences, lineNumbers = true, highlightedLine = -1, cursorInfos = [], diagnostics = [], visibleLineIndices = [], endOfLineDecorations = [], bracketMatchInfos = [], focused = true, visibleViewLineIndices = [], problemsHighlightedRow = -1, roundedSelection = false, unnecessaryDiagnostics = [], horizontalVisibleRanges = [], lines = [], tabSize = 2) => {
-  return [editorLayersNode, ...getEditorSelectionsVirtualDom(selectionInfos, focused, roundedSelection), ...getEditorRowsVirtualDom(textInfos, differences, lineNumbers, highlightedLine, visibleLineIndices, endOfLineDecorations, visibleViewLineIndices, problemsHighlightedRow, unnecessaryDiagnostics, horizontalVisibleRanges, lines, tabSize), ...getEditorCursorsVirtualDom(cursorInfos, focused), ...getEditorDiagnosticsVirtualDom(diagnostics, bracketMatchInfos)];
+const getEditorLayersVirtualDom = (selectionInfos, textInfos, differences, lineNumbers = true, highlightedLine = -1, cursorInfos = [], diagnostics = [], visibleLineIndices = [], endOfLineDecorations = [], bracketMatchInfos = [], focused = true, visibleViewLineIndices = [], problemsHighlightedRow = -1, roundedSelection = false, unnecessaryDiagnostics = [], horizontalVisibleRanges = [], lines = [], tabSize = 2, textDecorationDom = []) => {
+  return [editorLayersNode, ...getEditorSelectionsVirtualDom(selectionInfos, focused, roundedSelection), ...getEditorRowsVirtualDom(textInfos, differences, lineNumbers, highlightedLine, visibleLineIndices, endOfLineDecorations, visibleViewLineIndices, problemsHighlightedRow, unnecessaryDiagnostics, horizontalVisibleRanges, lines, tabSize), ...getEditorCursorsVirtualDom(cursorInfos, focused), ...getEditorDiagnosticsVirtualDom(diagnostics, bracketMatchInfos, textDecorationDom)];
 };
 
 const getEditorScrollBarDiagnosticsVirtualDom = scrollBarDiagnostics => {
@@ -18386,6 +18522,7 @@ const getEditorContentVirtualDom = ({
   scrollBarWidth = 0,
   selectionInfos = [],
   tabSize = 2,
+  textDecorationDom = [],
   textInfos,
   unnecessaryDiagnostics = [],
   visibleLineIndices = [],
@@ -18394,7 +18531,7 @@ const getEditorContentVirtualDom = ({
   return [{
     ...editorContentNode,
     className: breadcrumbsEnabled ? 'EditorContent EditorBreadcrumbsOffset' : 'EditorContent'
-  }, ...getEditorInputVirtualDom(), ...getEditorLayersVirtualDom(selectionInfos, textInfos, differences, lineNumbers, highlightedLine, cursorInfos, diagnostics, visibleLineIndices, endOfLineDecorations, bracketMatchInfos, focused, visibleViewLineIndices, problemsHighlightedRow, roundedSelection, unnecessaryDiagnostics, horizontalVisibleRanges, lines, tabSize), ...getEditorScrollBarDiagnosticsVirtualDom(scrollBarDiagnostics), ...getScrollBarVirtualDom(scrollBarHeight, scrollBarWidth)];
+  }, ...getEditorInputVirtualDom(), ...getEditorLayersVirtualDom(selectionInfos, textInfos, differences, lineNumbers, highlightedLine, cursorInfos, diagnostics, visibleLineIndices, endOfLineDecorations, bracketMatchInfos, focused, visibleViewLineIndices, problemsHighlightedRow, roundedSelection, unnecessaryDiagnostics, horizontalVisibleRanges, lines, tabSize, textDecorationDom), ...getEditorScrollBarDiagnosticsVirtualDom(scrollBarDiagnostics), ...getScrollBarVirtualDom(scrollBarHeight, scrollBarWidth)];
 };
 
 const getGutterInfoVirtualDom = (gutterInfo, activeLineNumber) => {
@@ -18566,6 +18703,7 @@ const getEditorVirtualDom = ({
   selectionInfos = [],
   selections = new Uint32Array(),
   tabSize = 2,
+  textDecorationDom = [],
   textInfos,
   uid,
   unnecessaryDiagnostics = [],
@@ -18628,6 +18766,7 @@ const getEditorVirtualDom = ({
     scrollBarWidth,
     selectionInfos,
     tabSize,
+    textDecorationDom,
     textInfos: combineWhitespaceTokens$1 ? textInfos.map(combineWhitespaceTokens) : textInfos,
     unnecessaryDiagnostics,
     visibleLineIndices: visibleLineIndices || [],
@@ -18732,7 +18871,7 @@ const canRenderPlainTextAppend = (oldState, newState) => {
   if (oldState.initial || newState.initial || !oldState.focused || !newState.focused || oldState.uid !== newState.uid || oldTextInfos[0][1] !== newTextInfos[0][1] || oldState.cursorInfos.length !== 1 || newState.cursorInfos.length !== 1 || oldState.selectionInfos.length > 0 || newState.selectionInfos.length > 0 || oldState.selections.length !== 4 || newState.selections.length !== 4 || oldState.selections[0] !== 0 || oldState.selections[1] !== oldLine.length || oldState.selections[2] !== 0 || oldState.selections[3] !== oldLine.length || newState.selections[0] !== 0 || newState.selections[1] !== newLine.length || newState.selections[2] !== 0 || newState.selections[3] !== newLine.length) {
     return false;
   }
-  if (oldState.breadcrumbsEnabled || newState.breadcrumbsEnabled || oldState.minimapEnabled || newState.minimapEnabled || oldState.lineNumbers !== newState.lineNumbers || oldState.highlightActiveLineNumber !== newState.highlightActiveLineNumber || oldState.highlightedLine !== newState.highlightedLine || oldState.problemsHighlightedRow !== newState.problemsHighlightedRow || oldState.focused !== newState.focused || oldState.roundedSelection !== newState.roundedSelection || oldState.width !== newState.width || oldState.height !== newState.height || oldState.minimumSliderSize !== newState.minimumSliderSize || getScrollBarSize(oldState.width, oldState.longestLineWidth, oldState.minimumSliderSize) !== getScrollBarSize(newState.width, newState.longestLineWidth, newState.minimumSliderSize) || oldState.minLineY !== newState.minLineY || oldState.maxLineY !== newState.maxLineY || !sameValues(oldState.visibleLineIndices, newState.visibleLineIndices) || !sameValues(oldState.visibleViewLineIndices, newState.visibleViewLineIndices) || oldState.differences !== newState.differences && !sameValues(oldState.differences, newState.differences) || oldState.scrollBarHeight !== newState.scrollBarHeight || oldState.uri !== newState.uri || oldState.workspaceUri !== newState.workspaceUri || oldState.assetDir !== newState.assetDir || oldState.loadError !== newState.loadError || oldState.combineWhitespaceTokens !== newState.combineWhitespaceTokens || oldState.widgets?.length > 0 || newState.widgets?.length > 0 || oldState.mergeConflicts.length > 0 || newState.mergeConflicts.length > 0 || !isEmpty(oldState.diagnostics) || !isEmpty(newState.diagnostics) || !isEmpty(oldState.visualDecorations) || !isEmpty(newState.visualDecorations) || !isEmpty(oldState.bracketMatchInfos) || !isEmpty(newState.bracketMatchInfos) || !isEmpty(oldState.endOfLineDecorations) || !isEmpty(newState.endOfLineDecorations) || !isEmpty(oldState.gutterDecorations) || !isEmpty(newState.gutterDecorations) || !isEmpty(oldState.breakPoints) || !isEmpty(newState.breakPoints)) {
+  if (oldState.breadcrumbsEnabled || newState.breadcrumbsEnabled || oldState.minimapEnabled || newState.minimapEnabled || oldState.lineNumbers !== newState.lineNumbers || oldState.highlightActiveLineNumber !== newState.highlightActiveLineNumber || oldState.highlightedLine !== newState.highlightedLine || oldState.problemsHighlightedRow !== newState.problemsHighlightedRow || oldState.focused !== newState.focused || oldState.roundedSelection !== newState.roundedSelection || oldState.width !== newState.width || oldState.height !== newState.height || oldState.minimumSliderSize !== newState.minimumSliderSize || getScrollBarSize(oldState.width, oldState.longestLineWidth, oldState.minimumSliderSize) !== getScrollBarSize(newState.width, newState.longestLineWidth, newState.minimumSliderSize) || oldState.minLineY !== newState.minLineY || oldState.maxLineY !== newState.maxLineY || !sameValues(oldState.visibleLineIndices, newState.visibleLineIndices) || !sameValues(oldState.visibleViewLineIndices, newState.visibleViewLineIndices) || oldState.differences !== newState.differences && !sameValues(oldState.differences, newState.differences) || oldState.scrollBarHeight !== newState.scrollBarHeight || oldState.uri !== newState.uri || oldState.workspaceUri !== newState.workspaceUri || oldState.assetDir !== newState.assetDir || oldState.loadError !== newState.loadError || oldState.combineWhitespaceTokens !== newState.combineWhitespaceTokens || oldState.widgets?.length > 0 || newState.widgets?.length > 0 || oldState.mergeConflicts.length > 0 || newState.mergeConflicts.length > 0 || !isEmpty(oldState.diagnostics) || !isEmpty(newState.diagnostics) || !isEmpty(oldState.textDecorationDom) || !isEmpty(newState.textDecorationDom) || !isEmpty(oldState.visualDecorations) || !isEmpty(newState.visualDecorations) || !isEmpty(oldState.bracketMatchInfos) || !isEmpty(newState.bracketMatchInfos) || !isEmpty(oldState.endOfLineDecorations) || !isEmpty(newState.endOfLineDecorations) || !isEmpty(oldState.gutterDecorations) || !isEmpty(newState.gutterDecorations) || !isEmpty(oldState.breakPoints) || !isEmpty(newState.breakPoints)) {
     return false;
   }
   return true;
@@ -19019,12 +19158,13 @@ const renderAdditionalFocusContext = {
 };
 const renderDecorations = {
   apply(oldState, newState) {
+    const textDecorationsDom = newState.textDecorationDom || [];
     const diagnosticsDom = getDiagnosticsVirtualDom(newState.visualDecorations || []);
     const bracketMatchesDom = getBracketMatchesVirtualDom(newState.bracketMatchInfos || []);
-    const dom = [...diagnosticsDom, ...bracketMatchesDom];
+    const dom = [...diagnosticsDom, ...bracketMatchesDom, ...textDecorationsDom];
     return ['setDecorationsDom', dom];
   },
-  isEqual: (oldState, newState) => oldState.visualDecorations === newState.visualDecorations && oldState.bracketMatchInfos === newState.bracketMatchInfos
+  isEqual: (oldState, newState) => oldState.visualDecorations === newState.visualDecorations && oldState.bracketMatchInfos === newState.bracketMatchInfos && oldState.textDecorationDom === newState.textDecorationDom
 };
 const renderGutterInfo = {
   apply(oldState, newState) {
@@ -19530,6 +19670,7 @@ const commandMap = {
   'Editor.redo': wrapCommand(redo),
   'Editor.refreshGutterDecorations': wrapCommand(refreshGutterDecorations),
   'Editor.refreshGutterDecorationsAll': refreshGutterDecorationsAll,
+  'Editor.refreshTextDecorations': wrapCommand(refreshTextDecorations),
   'Editor.render': renderEditor,
   'Editor.render2': render2,
   'Editor.renderEventListeners': renderEventListeners,

package/static/{89dd0c8 → 59165ee}/packages/menu-worker/dist/menuWorkerMain.js

@@ -1503,7 +1503,7 @@ const getLatestTimestamp = () => {
 
 const invoke$1 = async (method, ...params) => {
   // @ts-ignore
-  await invoke$2('WebView.compatRendererProcessInvoke', method, ...params);
+  return invoke$2('WebView.compatRendererProcessInvoke', method, ...params);
 };
 
 const closeSubMenu = async () => {
@@ -1513,6 +1513,34 @@ const closeSubMenu = async () => {
   await invoke$1(/* Menu.hideSubMenu */7903, /* parentIndex */parentMenu.focusedIndex);
 };
 
+const Separator$1 = 1;
+const None = 0;
+const SubMenu = 4;
+const Checked = 2;
+const Unchecked = 3;
+const Disabled = 5;
+const RestoreFocus = 6;
+const Ignore = 7;
+
+// TODO lazyload menuEntries and use Command.execute (maybe)
+const CONTEXT_MENU_ITEM_HEIGHT = 26;
+const CONTEXT_MENU_SEPARATOR_HEIGHT = 11;
+const CONTEXT_MENU_PADDING = 8;
+const getMenuHeight = items => {
+  let height = CONTEXT_MENU_PADDING;
+  for (const item of items) {
+    switch (item.flags) {
+      case Separator$1:
+        height += CONTEXT_MENU_SEPARATOR_HEIGHT;
+        break;
+      default:
+        height += CONTEXT_MENU_ITEM_HEIGHT;
+        break;
+    }
+  }
+  return height;
+};
+
 const send = port => {
   return sendMessagePortToTextMeasurementWorker(port);
 };
@@ -1561,16 +1589,6 @@ const getMenuMeasuredWidth = async items => {
   return Math.ceil(Math.max(MENU_MIN_WIDTH, maxLabelWidth + MENU_ITEM_HORIZONTAL_PADDING + MENU_ITEM_HORIZONTAL_MARGIN));
 };
 
-const Separator$1 = 1;
-const None = 0;
-const SubMenu = 4;
-const Checked = 2;
-const Unchecked = 3;
-const Disabled = 5;
-const RestoreFocus = 6;
-const Ignore = 7;
-
-// TODO lazyload menuEntries and use Command.execute (maybe)
 const MENU_TARGET_GAP = 5;
 
 // TODO difference between focusing with mouse or keyboard
@@ -1585,42 +1603,30 @@ const MENU_TARGET_GAP = 5;
 
 // TODO more tests
 
-const CONTEXT_MENU_ITEM_HEIGHT$1 = 26;
-const CONTEXT_MENU_SEPARATOR_HEIGHT$1 = 11;
-const CONTEXT_MENU_PADDING$1 = 8;
-const getMenuHeight$1 = items => {
-  let height = CONTEXT_MENU_PADDING$1;
-  for (const item of items) {
-    switch (item.flags) {
-      case Separator$1:
-        height += CONTEXT_MENU_SEPARATOR_HEIGHT$1;
-        break;
-      default:
-        height += CONTEXT_MENU_ITEM_HEIGHT$1;
-        break;
-    }
-  }
-  return height;
+const unboundedViewport = {
+  height: Infinity,
+  width: Infinity,
+  x: 0,
+  y: 0
 };
-const getMenuBounds = async (x, y, items, openBelow = false) => {
+const getMenuBounds = async (x, y, items, openBelow = false, viewport = unboundedViewport) => {
   const menuWidth = await getMenuMeasuredWidth(items);
-  const menuHeight = getMenuHeight$1(items);
-  const layoutState = {
-    points: [0, 0]
-  };
-  const windowWidth = layoutState.points[0];
-  const windowHeight = layoutState.points[1];
+  const menuHeight = getMenuHeight(items);
+  const right = viewport.x + viewport.width;
+  const bottom = viewport.y + viewport.height;
   // TODO maybe only send labels and keybindings to ui (id not needed on ui)
   // TODO what about separators?
 
-  if (x + menuWidth > windowWidth) {
+  if (x + menuWidth > right) {
     x -= menuWidth + MENU_TARGET_GAP;
-    x = Math.max(x, 0);
+    x = Math.max(x, viewport.x);
   }
-  if (!openBelow && y + menuHeight > windowHeight) {
+  if (!openBelow && y + menuHeight > bottom) {
     y -= menuHeight;
-    y = Math.max(y, 0);
+    y = Math.max(y, viewport.y);
   }
+  x = Math.max(viewport.x, Math.min(x, right - menuWidth));
+  if (!openBelow) y = Math.max(viewport.y, Math.min(y, bottom - menuHeight));
   return {
     height: menuHeight,
     width: menuWidth,
@@ -2406,6 +2412,7 @@ const arrowRight = {
   className: MenuItemSubMenuArrowRight,
   type: Div
 };
+const menuItemSubMenuClassName = mergeClassNames(MenuItem, MenuItemSubMenu);
 const getMenuItemSubMenuDom = menuItem => {
   const {
     isExpanded,
@@ -2413,7 +2420,7 @@ const getMenuItemSubMenuDom = menuItem => {
     label,
     level
   } = menuItem;
-  let className = mergeClassNames(MenuItem, MenuItemSubMenu);
+  let className = menuItemSubMenuClassName;
   if (isFocused) {
     className = mergeClassNames(className, MenuItemFocused);
   }
@@ -2504,25 +2511,6 @@ const getVisible = (items, focusedIndex, expanded, level) => {
   return visibleItems;
 };
 
-// TODO lazyload menuEntries and use Command.execute (maybe)
-const CONTEXT_MENU_ITEM_HEIGHT = 26;
-const CONTEXT_MENU_SEPARATOR_HEIGHT = 11;
-const CONTEXT_MENU_PADDING = 8;
-const getMenuHeight = items => {
-  let height = CONTEXT_MENU_PADDING;
-  for (const item of items) {
-    switch (item.flags) {
-      case Separator$1:
-        height += CONTEXT_MENU_SEPARATOR_HEIGHT;
-        break;
-      default:
-        height += CONTEXT_MENU_ITEM_HEIGHT;
-        break;
-    }
-  }
-  return height;
-};
-
 const getMenuHideCommands = async (restoreFocus = true) => {
   if (getCount() === 0) {
     return {
@@ -2562,13 +2550,16 @@ const MENU_WIDTH = 150;
 
 const show$2 = async (x, y, id, mouseBlocking = false, ...args) => {
   const items = await getMenuEntriesWithKeyBindings(id, ...args);
-  const bounds = await getMenuBounds(x, y, items);
+  const viewport = await invoke$1('Menu.getViewport');
+  const bounds = await getMenuBounds(x, y, items, false, viewport);
   const menu = addMenuInternal({
     args,
     focusedIndex: -1,
     id,
     items,
     level: getCount(),
+    viewport,
+    width: bounds.width,
     x: bounds.x,
     y: bounds.y
   });
@@ -2578,7 +2569,8 @@ const show$2 = async (x, y, id, mouseBlocking = false, ...args) => {
 };
 const show2Internal = async (uid, menuId, x, y, mouseBlocking, openBelow, ...args) => {
   const items = await getMenuEntriesWithKeyBindings2(uid, menuId, ...args);
-  const bounds = await getMenuBounds(x, y, items, openBelow);
+  const viewport = await invoke$1('Menu.getViewport', uid);
+  const bounds = await getMenuBounds(x + viewport.x, y + viewport.y, items, openBelow, viewport);
   const menu = addMenuInternal({
     args,
     focusedIndex: -1,
@@ -2586,6 +2578,8 @@ const show2Internal = async (uid, menuId, x, y, mouseBlocking, openBelow, ...arg
     items,
     level: getCount(),
     uid,
+    viewport,
+    width: bounds.width,
     x: bounds.x,
     y: bounds.y
   });
@@ -2893,12 +2887,15 @@ const getMenuEntries = (id, platform) => {
 // TODO more tests
 
 const getMenuShowCommands = async (items, menuId, x, y, mouseBlocking = false) => {
-  const bounds = await getMenuBounds(x, y, items);
+  const viewport = await invoke$1('Menu.getViewport');
+  const bounds = await getMenuBounds(x, y, items, false, viewport);
   const menu = addMenuInternal({
     focusedIndex: -1,
     id: menuId,
     items,
     level: getCount(),
+    viewport,
+    width: bounds.width,
     x: bounds.x,
     y: bounds.y
   });
@@ -2960,6 +2957,13 @@ const showSubMenuAtEnter = async (level, index, enterX, enterY) => {
   const subMenuItems = await getSubMenuItems(parentMenu, item);
   const openSubMenuToLeft = getOpenSubMenuToLeft(parentMenu);
   const width = await getMenuMeasuredWidth(subMenuItems);
+  const parentWidth = parentMenu.width ?? MENU_WIDTH;
+  const itemOffset = getMenuHeight(parentMenu.items.slice(0, index)) - 8;
+  const requestedX = openSubMenuToLeft ? parentMenu.x - width : parentMenu.x + parentWidth;
+  const bounds = await getMenuBounds(requestedX, parentMenu.y + itemOffset, subMenuItems, false, parentMenu.viewport);
+  if (!openSubMenuToLeft && bounds.x !== requestedX) {
+    bounds.x = Math.max(parentMenu.viewport?.x ?? 0, parentMenu.x - width);
+  }
   const subMenu = addMenuInternal({
     args: item.args || parentMenu.args || [],
     enterX,
@@ -2971,8 +2975,10 @@ const showSubMenuAtEnter = async (level, index, enterX, enterY) => {
     openSubMenuToLeft,
     parentIndex: index,
     uid: parentMenu.uid,
-    x: openSubMenuToLeft ? Math.max(0, parentMenu.x - width) : parentMenu.x + MENU_WIDTH,
-    y: parentMenu.y + index * 25
+    viewport: parentMenu.viewport,
+    width,
+    x: bounds.x,
+    y: bounds.y
   });
   const height = getMenuHeight(subMenuItems);
   const visible = getVisible(subMenu.items, -1, false, subMenu.level);