Use shouldAutoSave when closing widget (#15502)

colin-grant-work · web-flow · commit c97e3112d32b · 2025-05-14T06:41:00.000-06:00
diff --git a/packages/core/src/browser/saveable-service.ts b/packages/core/src/browser/saveable-service.ts
@@ -222,7 +222,12 @@ export class SaveableService implements FrontendApplicationContribution {
         if (!Saveable.isDirty(widget)) {
             return false;
         }
-        if (this.autoSave !== 'off') {
+        const saveable = Saveable.get(widget);
+        if (!saveable) {
+            console.warn('Saveable.get returned undefined on a known saveable widget. This is unexpected.');
+        }
+        // Enter branch if saveable absent since we cannot check autosaveability more definitely.
+        if (this.autoSave !== 'off' && (!saveable || this.shouldAutoSave(widget, saveable))) {
             return true;
         }
         const notLastWithDocument = !Saveable.closingWidgetWouldLoseSaveable(widget, Array.from(this.saveThrottles.keys()));

Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,12 @@ export class SaveableService implements FrontendApplicationContribution {`
`222`	`222`	`if (!Saveable.isDirty(widget)) {`
`223`	`223`	`return false;`
`224`	`224`	`}`
`225`		`- if (this.autoSave !== 'off') {`
	`225`	`+ const saveable = Saveable.get(widget);`
	`226`	`+ if (!saveable) {`
	`227`	`+ console.warn('Saveable.get returned undefined on a known saveable widget. This is unexpected.');`
	`228`	`+ }`
	`229`	`+ // Enter branch if saveable absent since we cannot check autosaveability more definitely.`
	`230`	`+ if (this.autoSave !== 'off' && (!saveable \|\| this.shouldAutoSave(widget, saveable))) {`
`226`	`231`	`return true;`
`227`	`232`	`}`
`228`	`233`	`const notLastWithDocument = !Saveable.closingWidgetWouldLoseSaveable(widget, Array.from(this.saveThrottles.keys()));`