@lvce-editor/editor-worker 19.44.0 → 19.46.0

package/dist/editorWorkerMain.js

@@ -4361,6 +4361,44 @@ const updateColorPickerValue$1 = async (editor, value) => {
   };
 };
 
+const validTypes = new Set(['added', 'deleted', 'modified']);
+const isProviderDecoration$1 = value => {
+  return Boolean(value) && typeof value === 'object' && !Array.isArray(value);
+};
+const getProviderDecorations$1 = results => {
+  if (!Array.isArray(results)) {
+    return [];
+  }
+  const decorations = [];
+  for (const result of results) {
+    if (!Array.isArray(result)) {
+      continue;
+    }
+    for (const decoration of result) {
+      if (isProviderDecoration$1(decoration) && Number.isSafeInteger(decoration.rowIndex) && decoration.rowIndex >= 0 && typeof decoration.type === 'string' && validTypes.has(decoration.type)) {
+        decorations.push({
+          rowIndex: decoration.rowIndex,
+          type: decoration.type
+        });
+      }
+    }
+  }
+  return decorations;
+};
+const getEditorGutterDecorations = async editor => {
+  const textDocument = {
+    languageId: editor.languageId,
+    text: getText$1(editor),
+    uri: editor.uri
+  };
+  try {
+    const results = await invoke$d('Extensions.executeProvidersByEvent', 'onEditorGutterDecoration', 'ExtensionApi.executeEditorGutterDecorationProvider', textDocument);
+    return getProviderDecorations$1(results);
+  } catch {
+    return [];
+  }
+};
+
 const diagnosticContainsPosition = (diagnostic, rowIndex, columnIndex) => {
   const {
     columnIndex: startColumnIndex,
@@ -4838,6 +4876,12 @@ const updateDerivedState = async (oldState, newState) => {
       lightBulbRowIndex: await getLightBulbRowIndex(finalState)
     };
   }
+  if (oldState.lines !== nextState.lines || oldState.uri !== nextState.uri) {
+    finalState = {
+      ...finalState,
+      gutterDecorations: await getEditorGutterDecorations(finalState)
+    };
+  }
   if (!shouldUpdateSelectionData(oldState, nextState)) {
     return finalState;
   }
@@ -4977,6 +5021,7 @@ const createEditor2 = (id, uri, x, y, width, height, platform, assetDir) => {
     fontFamily: '',
     fontSize: 0,
     fontWeight: 0,
+    gutterDecorations: [],
     gutterWidth: 0,
     handleOffset: 0,
     handleOffsetX: 0,
@@ -5067,6 +5112,7 @@ const emptyEditor = {
   endOfLineDecorations: [],
   focused: false,
   foldingRanges: [],
+  gutterDecorations: [],
   hasListener: false,
   height: 0,
   highlightedLine: -1,
@@ -5261,6 +5307,7 @@ const createEditor = async ({
     fontFamily,
     fontSize,
     fontWeight,
+    gutterDecorations: [],
     gutterWidth: 0,
     handleOffset: 0,
     handleOffsetX: 0,
@@ -5455,7 +5502,7 @@ const isEqual$3 = (oldState, newState) => {
 };
 
 const isEqual$2 = (oldState, newState) => {
-  return 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.highlightedLine === newState.highlightedLine && oldState.lineNumbers === newState.lineNumbers && oldState.loadError === newState.loadError && oldState.textInfos === newState.textInfos && oldState.differences === newState.differences && oldState.initial === newState.initial && oldState.selectionInfos === newState.selectionInfos && oldState.selections === newState.selections && oldState.workspaceUri === newState.workspaceUri;
+  return 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.gutterDecorations === newState.gutterDecorations && oldState.highlightedLine === newState.highlightedLine && oldState.lineNumbers === newState.lineNumbers && oldState.loadError === newState.loadError && oldState.textInfos === newState.textInfos && oldState.differences === newState.differences && oldState.initial === newState.initial && oldState.selectionInfos === newState.selectionInfos && oldState.selections === newState.selections && oldState.workspaceUri === newState.workspaceUri;
 };
 
 const isEqual$1 = (oldState, newState) => {
@@ -13610,11 +13657,15 @@ const handleSettingsChanged = async state => {
   } else if (!state.breadcrumbsEnabled) {
     [documentSymbols, workspaceUri] = await Promise.all([getDocumentSymbols(editorWithUpdatedSettings), getWorkspaceUri$1()]);
   }
-  return resize({
+  const resizedEditor = resize({
     ...editorWithUpdatedSettings,
     documentSymbols,
     workspaceUri
   }, {}, charWidth);
+  return {
+    ...resizedEditor,
+    gutterDecorations: await getEditorGutterDecorations(resizedEditor)
+  };
 };
 
 const applyTabCompletion = (editor, result) => {
@@ -14087,6 +14138,31 @@ const moveLineUp = editor => {
   return moveLines(editor, -1);
 };
 
+const refreshGutterDecorations = async editor => {
+  const gutterDecorations = await getEditorGutterDecorations(editor);
+  return {
+    ...editor,
+    gutterDecorations
+  };
+};
+const refreshGutterDecorationsAll = async () => {
+  for (const key of getKeys$2()) {
+    const editor = get$8(Number(key))?.newState;
+    if (editor) {
+      const refreshedEditor = await refreshGutterDecorations(editor);
+      const latest = get$8(editor.id);
+      if (!latest) {
+        continue;
+      }
+      set$8(editor.id, latest.oldState, {
+        ...latest.newState,
+        gutterDecorations: refreshedEditor.gutterDecorations
+      });
+      await invoke$a('Editor.renderPending', editor.id);
+    }
+  }
+};
+
 /**
  * Register a listener for editor events
  * @param listenerType - The type of event to listen for (from ListenerType enum)
@@ -14124,6 +14200,28 @@ ${editorSelector} .EditorLineDecoration {
   margin-left: 2em;
   user-select: none;
 }
+${editorSelector} .LineNumber {
+  position: relative;
+}
+${editorSelector} .EditorGutterDecoration {
+  bottom: 0;
+  left: 0;
+  pointer-events: none;
+  position: absolute;
+  top: 0;
+  width: 3px;
+}
+${editorSelector} .EditorGutterDecorationAdded {
+  background: var(--EditorGutterAddedBackground, #2ea043);
+}
+${editorSelector} .EditorGutterDecorationModified {
+  background: var(--EditorGutterModifiedBackground, #0078d4);
+}
+${editorSelector} .EditorGutterDecorationDeleted {
+  background: var(--EditorGutterDeletedBackground, #f85149);
+  height: 3px;
+  top: calc(50% - 1px);
+}
 ${editorSelector} .R{background-color:#add6ff40}
 ${editorSelector} .BracketMatch {
   position: absolute;
@@ -14809,11 +14907,19 @@ const getEditorContentVirtualDom = ({
   return [editorContentNode, ...getEditorInputVirtualDom(), ...getEditorLayersVirtualDom(selectionInfos, textInfos, differences, lineNumbers, highlightedLine, cursorInfos, diagnostics, visibleLineIndices, endOfLineDecorations, bracketMatchInfos), ...getEditorScrollBarDiagnosticsVirtualDom(scrollBarDiagnostics), ...getScrollBarVirtualDom()];
 };
 
-const getGutterInfoVirtualDom = gutterInfo => {
+const getGutterInfoVirtualDom = (gutterInfo, activeLineNumber) => {
   const isBreakpoint = typeof gutterInfo === 'object' && gutterInfo.isBreakpoint;
   const isLightBulb = typeof gutterInfo === 'object' && gutterInfo.isLightBulb;
   const lineNumber = typeof gutterInfo === 'object' ? gutterInfo.lineNumber : gutterInfo;
+  const gutterDecorations = typeof gutterInfo === 'object' ? gutterInfo.gutterDecorations || [] : [];
+  const showLineNumber = typeof gutterInfo !== 'object' || gutterInfo.showLineNumber !== false;
   const label = isLightBulb ? `Show Code Actions on line ${lineNumber}` : `Breakpoint on line ${lineNumber}`;
+  let className = lineNumber === activeLineNumber ? 'LineNumber LineNumberActive' : 'LineNumber';
+  if (isLightBulb) {
+    className += ' LineNumberLightBulb MaskIconLightBulb';
+  } else if (isBreakpoint) {
+    className += ' LineNumberBreakpoint';
+  }
   return [{
     ...((isBreakpoint || isLightBulb) && {
       ariaLabel: label,
@@ -14822,22 +14928,28 @@ const getGutterInfoVirtualDom = gutterInfo => {
     ...(isBreakpoint && !isLightBulb && {
       style: 'color:var(--DebugIconBreakpointForeground,#e51400)'
     }),
-    childCount: 1,
-    className: isLightBulb ? 'LineNumber LineNumberLightBulb MaskIconLightBulb' : isBreakpoint ? 'LineNumber LineNumberBreakpoint' : 'LineNumber',
+    childCount: gutterDecorations.length + 1,
+    className,
     ...(isLightBulb && {
       onClick: HandleLightBulbClick,
       role: Button
     }),
     type: Span
-  }, text(isLightBulb ? '' : isBreakpoint ? '●' : lineNumber)];
+  }, ...gutterDecorations.map(decoration => ({
+    ariaLabel: `${decoration.type[0].toUpperCase()}${decoration.type.slice(1)} line ${lineNumber}`,
+    childCount: 0,
+    className: mergeClassNames('EditorGutterDecoration', `EditorGutterDecoration${decoration.type[0].toUpperCase()}${decoration.type.slice(1)}`),
+    title: `${decoration.type[0].toUpperCase()}${decoration.type.slice(1)} line ${lineNumber}`,
+    type: Span
+  })), text(isLightBulb ? '' : isBreakpoint ? '●' : showLineNumber ? lineNumber : '')];
 };
-const getEditorGutterVirtualDom$1 = gutterInfos => {
-  const dom = gutterInfos.flatMap(getGutterInfoVirtualDom);
+const getEditorGutterVirtualDom$1 = (gutterInfos, activeLineNumber = -1) => {
+  const dom = gutterInfos.flatMap(gutterInfo => getGutterInfoVirtualDom(gutterInfo, activeLineNumber));
   return dom;
 };
 
-const getEditorGutterVirtualDom = gutterInfos => {
-  const gutterDom = getEditorGutterVirtualDom$1([...gutterInfos]);
+const getEditorGutterVirtualDom = (gutterInfos, activeLineNumber = -1) => {
+  const gutterDom = getEditorGutterVirtualDom$1([...gutterInfos], activeLineNumber);
   return [{
     childCount: gutterInfos.length,
     className: 'Gutter',
@@ -14845,7 +14957,7 @@ const getEditorGutterVirtualDom = gutterInfos => {
   }, ...gutterDom];
 };
 
-const getGutterInfos = (minLineY, maxLineY, breakPoints, showLineNumbers = true, lineIndices, lightBulbRowIndex = -1) => {
+const getGutterInfos = (minLineY, maxLineY, breakPoints, showLineNumbers = true, lineIndices, lightBulbRowIndex = -1, gutterDecorations = []) => {
   const gutterInfos = [];
   const rows = lineIndices || Array.from({
     length: maxLineY - minLineY
@@ -14854,17 +14966,30 @@ const getGutterInfos = (minLineY, maxLineY, breakPoints, showLineNumbers = true,
     const lineNumber = rowIndex + 1;
     const isBreakpoint = breakPoints.includes(rowIndex);
     const isLightBulb = rowIndex === lightBulbRowIndex;
+    const rowDecorations = gutterDecorations.filter(decoration => decoration.rowIndex === rowIndex);
     if (isLightBulb) {
       gutterInfos.push({
+        ...(rowDecorations.length > 0 && {
+          gutterDecorations: rowDecorations
+        }),
         isBreakpoint,
         isLightBulb: true,
         lineNumber
       });
     } else if (isBreakpoint) {
       gutterInfos.push({
+        ...(rowDecorations.length > 0 && {
+          gutterDecorations: rowDecorations
+        }),
         isBreakpoint: true,
         lineNumber
       });
+    } else if (rowDecorations.length > 0) {
+      gutterInfos.push({
+        gutterDecorations: rowDecorations,
+        lineNumber,
+        showLineNumber: showLineNumbers
+      });
     } else {
       gutterInfos.push(showLineNumbers ? lineNumber : '');
     }
@@ -14872,6 +14997,10 @@ const getGutterInfos = (minLineY, maxLineY, breakPoints, showLineNumbers = true,
   return gutterInfos;
 };
 
+const getPrimaryCursorRowIndex = (selections, primarySelectionIndex = 0) => {
+  return selections?.[primarySelectionIndex + 2] ?? -1;
+};
+
 const textEditorErrorIconNode = {
   childCount: 0,
   className: mergeClassNames('EditorTextIcon', 'EditorTextIconError', 'MaskIcon', 'MaskIconError'),
@@ -14904,6 +15033,7 @@ const getEditorVirtualDom = ({
   differences,
   documentSymbols = [],
   endOfLineDecorations = [],
+  gutterDecorations = [],
   gutterInfos = [],
   highlightedLine = -1,
   lightBulbRowIndex = -1,
@@ -14933,9 +15063,10 @@ const getEditorVirtualDom = ({
       type: Div
     }, textEditorErrorIconNode, textEditorErrorMessageNode, text(loadError)];
   }
-  const visibleGutterInfos = breakPoints.length > 0 || visibleLineIndices ? getGutterInfos(minLineY, maxLineY, breakPoints, lineNumbers, visibleLineIndices, lightBulbRowIndex) : gutterInfos;
-  const showGutter = lineNumbers || breakPoints.length > 0 || lightBulbRowIndex >= 0;
-  const gutterDom = showGutter ? getEditorGutterVirtualDom(visibleGutterInfos) : [];
+  const visibleGutterInfos = breakPoints.length > 0 || gutterDecorations.length > 0 || visibleLineIndices ? getGutterInfos(minLineY, maxLineY, breakPoints, lineNumbers, visibleLineIndices, lightBulbRowIndex, gutterDecorations) : gutterInfos;
+  const showGutter = lineNumbers || breakPoints.length > 0 || lightBulbRowIndex >= 0 || gutterDecorations.length > 0;
+  const primaryCursorRowIndex = getPrimaryCursorRowIndex(selections, primarySelectionIndex);
+  const gutterDom = showGutter ? getEditorGutterVirtualDom(visibleGutterInfos, primaryCursorRowIndex + 1) : [];
   const minimapDom = getMinimapVirtualDom(minimapEnabled, minimapLines, minLineY);
   const breadcrumbsDom = breadcrumbsEnabled ? getEditorBreadcrumbsVirtualDom({
     breadcrumbsEnabled,
@@ -15199,20 +15330,24 @@ const renderGutterInfo = {
   apply(oldState, newState) {
     const {
       breakPoints,
+      gutterDecorations,
       lightBulbRowIndex,
       lineNumbers,
       maxLineY,
       minLineY,
+      primarySelectionIndex,
+      selections,
       visibleLineIndices
     } = newState;
-    if (!lineNumbers && breakPoints.length === 0 && lightBulbRowIndex === -1) {
+    if (!lineNumbers && breakPoints.length === 0 && lightBulbRowIndex === -1 && gutterDecorations.length === 0) {
       return ['renderGutter', []];
     }
-    const gutterInfos = getGutterInfos(minLineY, maxLineY, breakPoints, lineNumbers, visibleLineIndices, lightBulbRowIndex);
-    const dom = getEditorGutterVirtualDom$1(gutterInfos);
+    const gutterInfos = getGutterInfos(minLineY, maxLineY, breakPoints, lineNumbers, visibleLineIndices, lightBulbRowIndex, gutterDecorations);
+    const primaryCursorRowIndex = getPrimaryCursorRowIndex(selections, primarySelectionIndex);
+    const dom = getEditorGutterVirtualDom$1(gutterInfos, primaryCursorRowIndex + 1);
     return ['renderGutter', dom];
   },
-  isEqual: (oldState, newState) => oldState.breakPoints === newState.breakPoints && oldState.lightBulbRowIndex === newState.lightBulbRowIndex && oldState.foldingRanges === newState.foldingRanges && oldState.lineNumbers === newState.lineNumbers && oldState.minLineY === newState.minLineY && oldState.maxLineY === newState.maxLineY
+  isEqual: (oldState, newState) => oldState.breakPoints === newState.breakPoints && oldState.gutterDecorations === newState.gutterDecorations && oldState.lightBulbRowIndex === newState.lightBulbRowIndex && oldState.foldingRanges === newState.foldingRanges && oldState.lineNumbers === newState.lineNumbers && oldState.minLineY === newState.minLineY && oldState.maxLineY === newState.maxLineY && getPrimaryCursorRowIndex(oldState.selections, oldState.primarySelectionIndex) === getPrimaryCursorRowIndex(newState.selections, newState.primarySelectionIndex)
 };
 const renderWidgets = {
   apply: renderWidgets$1,
@@ -15810,6 +15945,8 @@ const commandMap = {
   'Editor.pasteText': wrapCommand(pasteText),
   'Editor.previousDiagnostic': wrapCommand(previousDiagnostic),
   'Editor.redo': wrapCommand(redo),
+  'Editor.refreshGutterDecorations': wrapCommand(refreshGutterDecorations),
+  'Editor.refreshGutterDecorationsAll': refreshGutterDecorationsAll,
   'Editor.render': renderEditor,
   'Editor.render2': render2,
   'Editor.renderEventListeners': renderEventListeners,

package/package.json

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