fix: file-saving dialog with dirty editors (#12864)

This commit fixes the issue where cancelling the file-saving dialog incorrectly closes the editor. Signed-off-by: Vlad Arama <[email protected]>
eclipse-theia · Oct 26, 2023 · d2a2bb6 · d2a2bb6
1 parent 39935ec
commit d2a2bb6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/examples/api-tests/src/saveable.spec.js b/examples/api-tests/src/saveable.spec.js
@@ -245,7 +245,7 @@ describe('Saveable', function () {
             shouldSave: () => true
         });
         assert.isTrue(outOfSync, 'file should be out of sync');
-        assert.isTrue(widget.isDisposed, 'model should be disposed after close');
+        assert.isFalse(widget.isDisposed, 'model should not be disposed after close when we reject the save');
         const state = await fileService.read(fileUri);
         assert.equal(state.value, 'foo2', 'fs should NOT be updated');
     });

diff --git a/packages/core/src/browser/saveable.ts b/packages/core/src/browser/saveable.ts
@@ -164,8 +164,12 @@ export namespace Saveable {
                 if (typeof result === 'boolean') {
                     if (result) {
                         await (doSave?.(this) ?? Saveable.save(this));
+                        if (!isDirty(this)) {
+                            await this.closeWithoutSaving();
+                        }
+                    } else {
+                        await this.closeWithoutSaving();
                     }
-                    await this.closeWithoutSaving();
                 }
             } finally {
                 closing = false;