@lvce-editor/editor-worker 19.59.1 → 19.60.0

package/dist/editorWorkerMain.js

@@ -4987,7 +4987,8 @@ const updateDerivedState = async (oldState, newState) => {
   if (oldState.lines !== nextState.lines) {
     finalState = {
       ...finalState,
-      lightBulbRowIndex: -1
+      lightBulbRowIndex: -1,
+      problemsHighlightedRow: -1
     };
   } else if (shouldUpdateLightBulb(oldState, nextState)) {
     finalState = {
@@ -5187,6 +5188,7 @@ const createEditor2 = (id, uri, x, y, width, height, platform, assetDir, _langua
     outerWidth: width,
     platform,
     primarySelectionIndex: 0,
+    problemsHighlightedRow: -1,
     redoStack: [],
     rowHeight: 0,
     savedSelections: [],
@@ -5267,6 +5269,7 @@ const emptyEditor = {
   minLineY: 0,
   outerHeight: 0,
   outerWidth: 0,
+  problemsHighlightedRow: -1,
   redoStack: [],
   scrollBarHeight: 0,
   selectionAnchorPosition: {
@@ -5460,6 +5463,7 @@ const createEditor = async ({
     fontFamily,
     fontSize,
     fontWeight,
+    formatOnSave,
     gutterDecorations: [],
     gutterWidth: 0,
     handleOffset: 0,
@@ -5665,7 +5669,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.focused === newState.focused && oldState.gutterDecorations === newState.gutterDecorations && oldState.highlightActiveLineNumber === newState.highlightActiveLineNumber && oldState.highlightedLine === newState.highlightedLine && 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.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.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.selectionInfos === newState.selectionInfos && oldState.selections === newState.selections && oldState.workspaceUri === newState.workspaceUri;
 };
 
 const isEqual$1 = (oldState, newState) => {
@@ -6439,8 +6443,10 @@ const format = async editor => {
   }
 };
 
-// @ts-ignore
 const getNewEditor = async editor => {
+  if (editor.formatOnSave) {
+    return format(editor);
+  }
   return editor;
 };
 
@@ -6519,7 +6525,7 @@ const save = async editor => {
     if (isUntitledFile(uri)) {
       const pickedFilePath = await saveUntitledFile(uri, content, platform, applicationId);
       if (pickedFilePath) {
-        if (editor.modified) {
+        if (newEditor.modified) {
           await notifyTabModifiedStatusChange(uri, false, applicationId);
         }
         return {
@@ -6531,7 +6537,7 @@ const save = async editor => {
       return newEditor;
     }
     await saveNormalFile(uri, content, applicationId);
-    if (editor.modified) {
+    if (newEditor.modified) {
       await notifyTabModifiedStatusChange(uri, false, applicationId);
     }
     return {
@@ -8822,14 +8828,15 @@ const handleDoubleClick = async (editor, modifier, x, y) => {
 };
 
 const handleFocus$1 = editor => {
-  if (editor.focused && editor.focus === FocusEditorText$1) {
+  if (editor.focused && editor.focus === FocusEditorText$1 && editor.problemsHighlightedRow === -1) {
     return editor;
   }
   return {
     ...editor,
     additionalFocus: 0,
     focus: FocusEditorText$1,
-    focused: true
+    focused: true,
+    problemsHighlightedRow: -1
   };
 };
 
@@ -14188,6 +14195,7 @@ const kTabSize = 'editor.tabSize';
 const kInsertSpaces = 'editor.insertSpaces';
 const kLineNumbers = 'editor.lineNumbers';
 const kHighlightActiveLineNumber = 'editor.highlightActiveLineNumber';
+const kFormatOnSave = 'editor.formatOnSave';
 const kDiagnostics = 'editor.diagnostics';
 const kQuickSuggestions = 'editor.quickSuggestions';
 const kAutoClosingQuotes = 'editor.autoClosingQuotes';
@@ -14246,6 +14254,9 @@ const getHighlightActiveLineNumber = async () => {
 const getCompletionTriggerCharacters = async () => {
   return ['.', '/'];
 };
+const getFormatOnSave = async () => {
+  return (await get$3(kFormatOnSave)) ?? false;
+};
 const diagnosticsEnabled = async () => {
   return (await get$3(kDiagnostics)) ?? false;
 };
@@ -14263,7 +14274,7 @@ const getBreadcrumbsEnabled = async () => {
 };
 
 const getEditorPreferences = async () => {
-  const [diagnosticsEnabled$1, fontFamily, fontSize, fontWeight, hoverEnabled, isAutoClosingBracketsEnabled$1, isAutoClosingQuotesEnabled$1, isAutoClosingTagsEnabled$1, isQuickSuggestionsEnabled$1, lineNumbers, highlightActiveLineNumber, rowHeight, tabSize, letterSpacing, completionTriggerCharacters, minimapEnabled, mergeConflictActionsEnabled, breadcrumbsEnabled, insertSpaces, dragAndDropEnabled] = await Promise.all([diagnosticsEnabled(), getFontFamily(), getFontSize(), getFontWeight(), getHoverEnabled(), isAutoClosingBracketsEnabled(), isAutoClosingQuotesEnabled(), isAutoClosingTagsEnabled(), isQuickSuggestionsEnabled(), getLineNumbers(), getHighlightActiveLineNumber(), getRowHeight(), getTabSize(), getLetterSpacing(), getCompletionTriggerCharacters(), getMinimapEnabled(), getMergeConflictActionsEnabled(), getBreadcrumbsEnabled(), getInsertSpaces(), getDragAndDropEnabled()]);
+  const [diagnosticsEnabled$1, fontFamily, fontSize, fontWeight, formatOnSave, hoverEnabled, isAutoClosingBracketsEnabled$1, isAutoClosingQuotesEnabled$1, isAutoClosingTagsEnabled$1, isQuickSuggestionsEnabled$1, lineNumbers, highlightActiveLineNumber, rowHeight, tabSize, letterSpacing, completionTriggerCharacters, minimapEnabled, mergeConflictActionsEnabled, breadcrumbsEnabled, insertSpaces, dragAndDropEnabled] = await Promise.all([diagnosticsEnabled(), getFontFamily(), getFontSize(), getFontWeight(), getFormatOnSave(), getHoverEnabled(), isAutoClosingBracketsEnabled(), isAutoClosingQuotesEnabled(), isAutoClosingTagsEnabled(), isQuickSuggestionsEnabled(), getLineNumbers(), getHighlightActiveLineNumber(), getRowHeight(), getTabSize(), getLetterSpacing(), getCompletionTriggerCharacters(), getMinimapEnabled(), getMergeConflictActionsEnabled(), getBreadcrumbsEnabled(), getInsertSpaces(), getDragAndDropEnabled()]);
   return {
     breadcrumbsEnabled,
     completionTriggerCharacters,
@@ -14272,6 +14283,7 @@ const getEditorPreferences = async () => {
     fontFamily,
     fontSize,
     fontWeight,
+    formatOnSave,
     highlightActiveLineNumber,
     hoverEnabled,
     insertSpaces,
@@ -14614,6 +14626,7 @@ const loadContent = async (state, savedState) => {
     fontFamily,
     fontSize,
     fontWeight,
+    formatOnSave,
     highlightActiveLineNumber,
     hoverEnabled,
     insertSpaces,
@@ -14648,6 +14661,7 @@ const loadContent = async (state, savedState) => {
     fontFamily,
     fontSize,
     fontWeight,
+    formatOnSave,
     highlightActiveLineNumber,
     hoverEnabled,
     insertSpaces,
@@ -14900,6 +14914,11 @@ ${editorSelector} .MergeConflictAction:focus-visible {
   outline: none;
   text-decoration: underline;
 }
+${editorSelector} .EditorProblemsHighlightedRow {
+  background: var(--EditorRangeHighlightBackground, rgba(128, 128, 128, 0.18));
+  outline: 1px solid var(--EditorRangeHighlightBorder, rgba(128, 128, 128, 0.35));
+  outline-offset: -1px;
+}
 ${editorSelector} .EditorLineDecoration {
   color: var(--EditorInlineBlameForeground, rgba(255, 255, 255, 0.5));
   font-style: italic;
@@ -15230,7 +15249,7 @@ const addMergeConflictActions = (dom, rowIndex) => {
     }, text(label));
   }
 };
-const getEditorRowsVirtualDom$1 = (textInfos, differences, lineNumbers = true, highlightedLine = -1, visibleLineIndices = [], endOfLineDecorations = [], visibleViewLineIndices = []) => {
+const getEditorRowsVirtualDom$1 = (textInfos, differences, lineNumbers = true, highlightedLine = -1, visibleLineIndices = [], endOfLineDecorations = [], visibleViewLineIndices = [], problemsHighlightedRow = -1) => {
   const dom = [];
   const actualViewRows = visibleViewLineIndices.length === 0 ? Array.from({
     length: textInfos.length
@@ -15249,6 +15268,9 @@ const getEditorRowsVirtualDom$1 = (textInfos, differences, lineNumbers = true, h
     if (rowIndex === highlightedLine) {
       className = mergeClassNames(className, EditorRowHighlighted);
     }
+    if (rowIndex === problemsHighlightedRow) {
+      className = mergeClassNames(className, 'EditorProblemsHighlightedRow');
+    }
     dom.push({
       childCount: textInfo.length / 2 + rowDecorations.length,
       className,
@@ -15272,8 +15294,8 @@ const getEditorRowsVirtualDom$1 = (textInfos, differences, lineNumbers = true, h
   return dom;
 };
 
-const getEditorRowsVirtualDom = (textInfos, differences, lineNumbers = true, highlightedLine = -1, visibleLineIndices = [], endOfLineDecorations = [], visibleViewLineIndices = []) => {
-  const rowsDom = getEditorRowsVirtualDom$1(textInfos, differences, lineNumbers, highlightedLine, visibleLineIndices, endOfLineDecorations, visibleViewLineIndices);
+const getEditorRowsVirtualDom = (textInfos, differences, lineNumbers = true, highlightedLine = -1, visibleLineIndices = [], endOfLineDecorations = [], visibleViewLineIndices = [], problemsHighlightedRow = -1) => {
+  const rowsDom = getEditorRowsVirtualDom$1(textInfos, differences, lineNumbers, highlightedLine, visibleLineIndices, endOfLineDecorations, visibleViewLineIndices, problemsHighlightedRow);
   return [{
     childCount: visibleViewLineIndices.length || textInfos.length,
     className: 'EditorRows',
@@ -15318,8 +15340,8 @@ const editorLayersNode = {
   className: 'EditorLayers',
   type: Div
 };
-const getEditorLayersVirtualDom = (selectionInfos, textInfos, differences, lineNumbers = true, highlightedLine = -1, cursorInfos = [], diagnostics = [], visibleLineIndices = [], endOfLineDecorations = [], bracketMatchInfos = [], focused = true, visibleViewLineIndices = []) => {
-  return [editorLayersNode, ...getEditorSelectionsVirtualDom(selectionInfos, focused), ...getEditorRowsVirtualDom(textInfos, differences, lineNumbers, highlightedLine, visibleLineIndices, endOfLineDecorations, visibleViewLineIndices), ...getEditorCursorsVirtualDom(cursorInfos), ...getEditorDiagnosticsVirtualDom(diagnostics, bracketMatchInfos)];
+const getEditorLayersVirtualDom = (selectionInfos, textInfos, differences, lineNumbers = true, highlightedLine = -1, cursorInfos = [], diagnostics = [], visibleLineIndices = [], endOfLineDecorations = [], bracketMatchInfos = [], focused = true, visibleViewLineIndices = [], problemsHighlightedRow = -1) => {
+  return [editorLayersNode, ...getEditorSelectionsVirtualDom(selectionInfos, focused), ...getEditorRowsVirtualDom(textInfos, differences, lineNumbers, highlightedLine, visibleLineIndices, endOfLineDecorations, visibleViewLineIndices, problemsHighlightedRow), ...getEditorCursorsVirtualDom(cursorInfos), ...getEditorDiagnosticsVirtualDom(diagnostics, bracketMatchInfos)];
 };
 
 const getEditorScrollBarDiagnosticsVirtualDom = scrollBarDiagnostics => {
@@ -15384,13 +15406,14 @@ const getEditorContentVirtualDom = ({
   focused = true,
   highlightedLine = -1,
   lineNumbers = true,
+  problemsHighlightedRow = -1,
   scrollBarDiagnostics = [],
   selectionInfos = [],
   textInfos,
   visibleLineIndices = [],
   visibleViewLineIndices = []
 }) => {
-  return [editorContentNode, ...getEditorInputVirtualDom(), ...getEditorLayersVirtualDom(selectionInfos, textInfos, differences, lineNumbers, highlightedLine, cursorInfos, diagnostics, visibleLineIndices, endOfLineDecorations, bracketMatchInfos, focused, visibleViewLineIndices), ...getEditorScrollBarDiagnosticsVirtualDom(scrollBarDiagnostics), ...getScrollBarVirtualDom()];
+  return [editorContentNode, ...getEditorInputVirtualDom(), ...getEditorLayersVirtualDom(selectionInfos, textInfos, differences, lineNumbers, highlightedLine, cursorInfos, diagnostics, visibleLineIndices, endOfLineDecorations, bracketMatchInfos, focused, visibleViewLineIndices, problemsHighlightedRow), ...getEditorScrollBarDiagnosticsVirtualDom(scrollBarDiagnostics), ...getScrollBarVirtualDom()];
 };
 
 const getGutterInfoVirtualDom = (gutterInfo, activeLineNumber) => {
@@ -15544,6 +15567,7 @@ const getEditorVirtualDom = ({
   minimapLines = [],
   minLineY = 0,
   primarySelectionIndex = 0,
+  problemsHighlightedRow = -1,
   scrollBarDiagnostics = [],
   selectionInfos = [],
   selections = new Uint32Array(),
@@ -15595,6 +15619,7 @@ const getEditorVirtualDom = ({
     focused,
     highlightedLine,
     lineNumbers,
+    problemsHighlightedRow,
     scrollBarDiagnostics,
     selectionInfos,
     textInfos,
@@ -15800,10 +15825,10 @@ const renderLines = {
       visibleLineIndices,
       visibleViewLineIndices
     } = newState;
-    const dom = getEditorRowsVirtualDom$1(textInfos, differences, true, highlightedLine, visibleLineIndices, endOfLineDecorations, visibleViewLineIndices);
+    const dom = getEditorRowsVirtualDom$1(textInfos, differences, true, highlightedLine, visibleLineIndices, endOfLineDecorations, visibleViewLineIndices, newState.problemsHighlightedRow);
     return [/* method */'setText', dom];
   },
-  isEqual: (oldState, newState) => oldState.lines === newState.lines && oldState.foldingRanges === newState.foldingRanges && oldState.visibleViewLineIndices === newState.visibleViewLineIndices && oldState.tokenizerId === newState.tokenizerId && oldState.minLineY === newState.minLineY && oldState.decorations === newState.decorations && oldState.embeds === newState.embeds && oldState.endOfLineDecorations === newState.endOfLineDecorations && oldState.deltaX === newState.deltaX && oldState.width === newState.width && oldState.highlightedLine === newState.highlightedLine && oldState.debugEnabled === newState.debugEnabled
+  isEqual: (oldState, newState) => oldState.lines === newState.lines && oldState.foldingRanges === newState.foldingRanges && oldState.visibleViewLineIndices === newState.visibleViewLineIndices && oldState.tokenizerId === newState.tokenizerId && oldState.minLineY === newState.minLineY && oldState.decorations === newState.decorations && oldState.embeds === newState.embeds && oldState.endOfLineDecorations === newState.endOfLineDecorations && oldState.deltaX === newState.deltaX && oldState.width === newState.width && oldState.highlightedLine === newState.highlightedLine && oldState.problemsHighlightedRow === newState.problemsHighlightedRow && oldState.debugEnabled === newState.debugEnabled
 };
 const renderSelections = {
   apply: (oldState, newState) => {
@@ -15994,6 +16019,21 @@ const renderEventListeners = () => {
   }];
 };
 
+const revealProblem = (editor, rowIndex, columnIndex) => {
+  if (!Number.isSafeInteger(rowIndex) || !Number.isSafeInteger(columnIndex)) {
+    return editor;
+  }
+  const row = Math.max(0, Math.min(rowIndex, editor.lines.length - 1));
+  const column = Math.max(0, Math.min(columnIndex, editor.lines[row]?.length ?? 0));
+  const foldingRanges = editor.foldingRanges.filter(range => row <= range.start || row > range.end);
+  const unfolded = foldingRanges.length === editor.foldingRanges.length ? editor : updateLayout(editor, foldingRanges);
+  return {
+    ...cursorSet(unfolded, row, column),
+    focused: false,
+    problemsHighlightedRow: row
+  };
+};
+
 const saveState = (state, savedState) => {
   const {
     lines,
@@ -16384,6 +16424,19 @@ const wrapCommand = (fn, preservesTypingCoalescing = false) => async (uid, ...ar
     return finalEditor;
   });
 };
+const wrapFocusCommand = fn => {
+  const command = wrapCommand((editor, widgetRevision) => {
+    if (editor.widgetRevision !== widgetRevision && editor.focus !== FocusEditorText$1) {
+      return editor;
+    }
+    return fn(editor);
+  });
+  return uid => {
+    // DOM focus events can arrive while a queued command is still opening a widget.
+    const widgetRevision = get$8(uid)?.newState.widgetRevision;
+    return command(uid, widgetRevision);
+  };
+};
 
 const executeViewletCommand = (uid, commandId, ...args) => {
   return executeViewletCommand$1(commandMap, uid, commandId, ...args);
@@ -16492,7 +16545,7 @@ const commandMap = {
   'Editor.handleClickAtPosition': wrapCommand(handleClickAtPosition),
   'Editor.handleContextMenu': wrapCommand(handleContextMenu),
   'Editor.handleDoubleClick': wrapCommand(handleDoubleClick),
-  'Editor.handleFocus': wrapCommand(handleFocus$1),
+  'Editor.handleFocus': wrapFocusCommand(handleFocus$1),
   'Editor.handleKeyUp': wrapCommand(handleKeyUp, true),
   'Editor.handleMergeConflictActionsMouseDown': wrapCommand(handleMergeConflictActionsMouseDown),
   'Editor.handleMouseDown': wrapCommand(handleMouseDown),
@@ -16554,6 +16607,7 @@ const commandMap = {
   'Editor.replaceRange': wrapCommand(replaceRange),
   'Editor.rerender': wrapCommand(rerender),
   'Editor.resize': wrapCommand(resize),
+  'Editor.revealProblem': wrapCommand(revealProblem),
   'Editor.save': wrapCommand(save),
   'Editor.saveState': wrapGetter(saveState),
   'Editor.scrollByLines': wrapCommand(scrollByLines),

package/package.json

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