feat: support overwrite when editor save (#2846)

opensumi · Jun 28, 2023 · ece937c · ece937c
1 parent 056e778
commit ece937c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/packages/editor/src/browser/doc-model/editor-document-model.ts b/packages/editor/src/browser/doc-model/editor-document-model.ts
@@ -394,11 +394,15 @@ export class EditorDocumentModel extends Disposable implements IEditorDocumentMo
       }
       return false;
     } else if (res.state === SaveTaskResponseState.DIFF) {
+      const diffAndSave = localize('doc.saveError.diffAndSave');
+      const overwrite = localize('doc.saveError.overwrite');
       this.messageService
-        .error(formatLocalize('doc.saveError.diff', this.uri.toString()), [localize('doc.saveError.diffAndSave')])
+        .error(formatLocalize('doc.saveError.diff', this.uri.toString()), [diffAndSave, overwrite])
         .then((res) => {
-          if (res) {
+          if (res === diffAndSave) {
             this.compareAndSave();
+          } else if (res === overwrite) {
+            this.save(true);
           }
         });
       this.logger.error('The file cannot be saved, the version is inconsistent with the disk');

diff --git a/packages/i18n/src/common/en-US.lang.ts b/packages/i18n/src/common/en-US.lang.ts
@@ -1166,6 +1166,7 @@ export const localizationBundle = {
     'doc.saveError.failed': 'File Saving Failed. Reason: ',
     'doc.saveError.diff': '{0} cannot be saved because it has been modified by other editors.',
     'doc.saveError.diffAndSave': 'Compare...',
+    'doc.saveError.overwrite': 'Overwrite',
     'editor.compareAndSave.title': '{0} (on Disk) <=> {1} (Editing) ',
 
     'workspace.openDirectory': 'Open Directory',

diff --git a/packages/i18n/src/common/zh-CN.lang.ts b/packages/i18n/src/common/zh-CN.lang.ts
@@ -794,6 +794,7 @@ export const localizationBundle = {
     'doc.saveError.failed': '文件保存失败， 原因:',
     'doc.saveError.diff': '{0} 已经在磁盘上被修改，不能保存',
     'doc.saveError.diffAndSave': '进行比较',
+    'doc.saveError.overwrite': '覆盖',
     'editor.compareAndSave.title': '{0} (在磁盘上) <=> {1} (编辑中) ',
 
     'outline.title': '大纲',