@lvce-editor/editor-worker 19.59.1 → 19.59.2

package/dist/editorWorkerMain.js

@@ -5460,6 +5460,7 @@ const createEditor = async ({
     fontFamily,
     fontSize,
     fontWeight,
+    formatOnSave,
     gutterDecorations: [],
     gutterWidth: 0,
     handleOffset: 0,
@@ -6439,8 +6440,10 @@ const format = async editor => {
   }
 };
 
-// @ts-ignore
 const getNewEditor = async editor => {
+  if (editor.formatOnSave) {
+    return format(editor);
+  }
   return editor;
 };
 
@@ -6519,7 +6522,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 +6534,7 @@ const save = async editor => {
       return newEditor;
     }
     await saveNormalFile(uri, content, applicationId);
-    if (editor.modified) {
+    if (newEditor.modified) {
       await notifyTabModifiedStatusChange(uri, false, applicationId);
     }
     return {
@@ -14188,6 +14191,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 +14250,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 +14270,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 +14279,7 @@ const getEditorPreferences = async () => {
     fontFamily,
     fontSize,
     fontWeight,
+    formatOnSave,
     highlightActiveLineNumber,
     hoverEnabled,
     insertSpaces,
@@ -14614,6 +14622,7 @@ const loadContent = async (state, savedState) => {
     fontFamily,
     fontSize,
     fontWeight,
+    formatOnSave,
     highlightActiveLineNumber,
     hoverEnabled,
     insertSpaces,
@@ -14648,6 +14657,7 @@ const loadContent = async (state, savedState) => {
     fontFamily,
     fontSize,
     fontWeight,
+    formatOnSave,
     highlightActiveLineNumber,
     hoverEnabled,
     insertSpaces,
@@ -16384,6 +16394,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 +16515,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),

package/package.json

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