include scratchpads for save all on shutdown

Author: amunger

src/vs/workbench/common/editor/editorInput.ts

@@ -185,6 +185,13 @@ export abstract class EditorInput extends AbstractEditorInput {
 		return false;
 	}
 
+	/**
+	 * Returns if the input has unsaved changes.
+	 */
+	isModified(): boolean {
+		return this.isDirty();
+	}
+
 	/**
 	 * Returns if this input is currently being saved or soon to be
 	 * saved. Based on this assumption the editor may for example

src/vs/workbench/contrib/interactive/browser/interactiveEditorInput.ts

@@ -219,6 +219,10 @@ export class InteractiveEditorInput extends EditorInput implements ICompositeNot
 		return basename.substr(0, basename.length - paths.extname(p).length);
 	}
 
+	override isModified() {
+		return true;
+	}
+
 	override dispose() {
 		// we support closing the interactive window without prompt, so the editor model should not be dirty
 		this._editorModelReference?.revert({ soft: true });

src/vs/workbench/services/editor/browser/editorService.ts

@@ -980,7 +980,7 @@ export class EditorService extends Disposable implements EditorServiceImpl {
 	}
 
 	saveAll(options?: ISaveAllEditorsOptions): Promise<ISaveEditorsResult> {
-		return this.save(this.getAllDirtyEditors(options), options);
+		return this.save(this.getAllModifiedEditors(options), options);
 	}
 
 	async revert(editors: IEditorIdentifier | IEditorIdentifier[], options?: IRevertOptions): Promise<boolean> {
@@ -1006,15 +1006,19 @@ export class EditorService extends Disposable implements EditorServiceImpl {
 	}
 
 	async revertAll(options?: IRevertAllEditorsOptions): Promise<boolean> {
-		return this.revert(this.getAllDirtyEditors(options), options);
+		return this.revert(this.getAllModifiedEditors(options), options);
 	}
 
-	private getAllDirtyEditors(options?: IBaseSaveRevertAllEditorOptions): IEditorIdentifier[] {
+	private getAllModifiedEditors(options?: IBaseSaveRevertAllEditorOptions): IEditorIdentifier[] {
 		const editors: IEditorIdentifier[] = [];
 
 		for (const group of this.editorGroupService.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE)) {
 			for (const editor of group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)) {
-				if (!editor.isDirty()) {
+				if (!editor.isModified()) {
+					continue;
+				}
+
+				if (!options?.includeScratchpad && editor.hasCapability(EditorInputCapabilities.Scratchpad)) {
 					continue;
 				}
 

src/vs/workbench/services/editor/common/editorService.ts

@@ -82,6 +82,12 @@ export interface IBaseSaveRevertAllEditorOptions {
 	 */
 	readonly includeUntitled?: boolean;
 
+	/**
+	 * Whether to include scratchpad editors.
+	 * if set to true, `includeUntitled` should also be true.
+	 */
+	readonly includeScratchpad?: boolean;
+
 	/**
 	 * Whether to exclude sticky editors.
 	 */

src/vs/workbench/services/workingCopy/electron-sandbox/workingCopyBackupTracker.ts

@@ -323,7 +323,11 @@ export class NativeWorkingCopyBackupTracker extends WorkingCopyBackupTracker imp
 
 			let result: boolean | undefined = undefined;
 			if (typeof arg1 === 'boolean' || modifiedWorkingCopies.length === this.workingCopyService.modifiedCount) {
-				result = (await this.editorService.saveAll({ includeUntitled: typeof arg1 === 'boolean' ? arg1 : true, ...saveOptions })).success;
+				result = (await this.editorService.saveAll({
+					includeScratchpad: true,
+					includeUntitled: typeof arg1 === 'boolean' ? arg1 : true,
+					...saveOptions
+				})).success;
 			}
 
 			// If we still have modified working copies, save those directly