working copy - reduce dirty listeners and support "save all" action enablement (#84672)

Author: bpasero

src/vs/workbench/browser/parts/editor/editorActions.ts

@@ -1274,8 +1274,6 @@ export class BaseQuickOpenEditorInGroupAction extends Action {
 	run(): Promise<any> {
 		const keys = this.keybindingService.lookupKeybindings(this.id);
 
-
-
 		this.quickOpenService.show(NAVIGATE_IN_ACTIVE_GROUP_PREFIX, { quickNavigateConfiguration: { keybindings: keys } });
 
 		return Promise.resolve(true);

src/vs/workbench/contrib/files/browser/fileActions.ts

@@ -19,7 +19,6 @@ import { ITextFileService } from 'vs/workbench/services/textfile/common/textfile
 import { IFileService } from 'vs/platform/files/common/files';
 import { toResource, SideBySideEditor } from 'vs/workbench/common/editor';
 import { ExplorerViewlet } from 'vs/workbench/contrib/files/browser/explorerViewlet';
-import { IUntitledTextEditorService } from 'vs/workbench/services/untitled/common/untitledTextEditorService';
 import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
@@ -47,6 +46,7 @@ import { onUnexpectedError, getErrorMessage } from 'vs/base/common/errors';
 import { asDomUri, triggerDownload } from 'vs/base/browser/dom';
 import { mnemonicButtonLabel } from 'vs/base/common/labels';
 import { IAutoSaveConfigurationService } from 'vs/workbench/services/autoSaveConfiguration/common/autoSaveConfigurationService';
+import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
 
 export const NEW_FILE_COMMAND_ID = 'explorer.newFile';
 export const NEW_FILE_LABEL = nls.localize('newFile', "New File");
@@ -512,38 +512,30 @@ export abstract class BaseSaveAllAction extends Action {
 	constructor(
 		id: string,
 		label: string,
-		@ITextFileService private readonly textFileService: ITextFileService,
-		@IUntitledTextEditorService private readonly untitledTextEditorService: IUntitledTextEditorService,
 		@ICommandService protected commandService: ICommandService,
 		@INotificationService private notificationService: INotificationService,
+		@IWorkingCopyService private readonly workingCopyService: IWorkingCopyService
 	) {
 		super(id, label);
 
-		this.lastIsDirty = this.textFileService.isDirty();
+		this.lastIsDirty = this.workingCopyService.hasDirty;
 		this.enabled = this.lastIsDirty;
 
 		this.registerListeners();
 	}
 
-	protected abstract includeUntitled(): boolean;
 	protected abstract doRun(context: any): Promise<any>;
 
 	private registerListeners(): void {
 
-		// listen to files being changed locally
-		this._register(this.textFileService.models.onModelsDirty(e => this.updateEnablement(true)));
-		this._register(this.textFileService.models.onModelsSaved(e => this.updateEnablement(false)));
-		this._register(this.textFileService.models.onModelsReverted(e => this.updateEnablement(false)));
-		this._register(this.textFileService.models.onModelsSaveError(e => this.updateEnablement(true)));
-
-		if (this.includeUntitled()) {
-			this._register(this.untitledTextEditorService.onDidChangeDirty(resource => this.updateEnablement(this.untitledTextEditorService.isDirty(resource))));
-		}
+		// update enablement based on working copy changes
+		this._register(this.workingCopyService.onDidChangeDirty(() => this.updateEnablement()));
 	}
 
-	private updateEnablement(isDirty: boolean): void {
-		if (this.lastIsDirty !== isDirty) {
-			this.enabled = this.textFileService.isDirty();
+	private updateEnablement(): void {
+		const hasDirty = this.workingCopyService.hasDirty;
+		if (this.lastIsDirty !== hasDirty) {
+			this.enabled = hasDirty;
 			this.lastIsDirty = this.enabled;
 		}
 	}
@@ -569,10 +561,6 @@ export class SaveAllAction extends BaseSaveAllAction {
 	protected doRun(context: any): Promise<any> {
 		return this.commandService.executeCommand(SAVE_ALL_COMMAND_ID);
 	}
-
-	protected includeUntitled(): boolean {
-		return true;
-	}
 }
 
 export class SaveAllInGroupAction extends BaseSaveAllAction {
@@ -587,10 +575,6 @@ export class SaveAllInGroupAction extends BaseSaveAllAction {
 	protected doRun(context: any): Promise<any> {
 		return this.commandService.executeCommand(SAVE_ALL_IN_GROUP_COMMAND_ID, {}, context);
 	}
-
-	protected includeUntitled(): boolean {
-		return true;
-	}
 }
 
 export class CloseGroupAction extends Action {

src/vs/workbench/contrib/search/browser/searchView.ts

@@ -178,7 +178,7 @@ export class SearchView extends ViewletPanel {
 		this.viewletState = this.memento.getMemento(StorageScope.WORKSPACE);
 
 		this._register(this.fileService.onFileChanges(e => this.onFilesChanged(e)));
-		this._register(this.untitledTextEditorService.onDidChangeDirty(e => this.onUntitledDidChangeDirty(e)));
+		this._register(this.untitledTextEditorService.onDidDisposeModel(e => this.onUntitledDidDispose(e)));
 		this._register(this.contextService.onDidChangeWorkbenchState(() => this.onDidChangeWorkbenchState()));
 		this._register(this.searchHistoryService.onDidClearHistory(() => this.clearHistory()));
 
@@ -1581,18 +1581,16 @@ export class SearchView extends ViewletPanel {
 		return undefined;
 	}
 
-	private onUntitledDidChangeDirty(resource: URI): void {
+	private onUntitledDidDispose(resource: URI): void {
 		if (!this.viewModel) {
 			return;
 		}
 
 		// remove search results from this resource as it got disposed
-		if (!this.untitledTextEditorService.isDirty(resource)) {
-			const matches = this.viewModel.searchResult.matches();
-			for (let i = 0, len = matches.length; i < len; i++) {
-				if (resource.toString() === matches[i].resource.toString()) {
-					this.viewModel.searchResult.remove(matches[i]);
-				}
+		const matches = this.viewModel.searchResult.matches();
+		for (let i = 0, len = matches.length; i < len; i++) {
+			if (resource.toString() === matches[i].resource.toString()) {
+				this.viewModel.searchResult.remove(matches[i]);
 			}
 		}
 	}

src/vs/workbench/services/untitled/common/untitledTextEditorService.ts

@@ -117,17 +117,17 @@ export class UntitledTextEditorService extends Disposable implements IUntitledTe
 	private mapResourceToInput = new ResourceMap<UntitledTextEditorInput>();
 	private mapResourceToAssociatedFilePath = new ResourceMap<boolean>();
 
-	private readonly _onDidChangeContent: Emitter<URI> = this._register(new Emitter<URI>());
-	readonly onDidChangeContent: Event<URI> = this._onDidChangeContent.event;
+	private readonly _onDidChangeContent = this._register(new Emitter<URI>());
+	readonly onDidChangeContent = this._onDidChangeContent.event;
 
-	private readonly _onDidChangeDirty: Emitter<URI> = this._register(new Emitter<URI>());
-	readonly onDidChangeDirty: Event<URI> = this._onDidChangeDirty.event;
+	private readonly _onDidChangeDirty = this._register(new Emitter<URI>());
+	readonly onDidChangeDirty = this._onDidChangeDirty.event;
 
-	private readonly _onDidChangeEncoding: Emitter<URI> = this._register(new Emitter<URI>());
-	readonly onDidChangeEncoding: Event<URI> = this._onDidChangeEncoding.event;
+	private readonly _onDidChangeEncoding = this._register(new Emitter<URI>());
+	readonly onDidChangeEncoding = this._onDidChangeEncoding.event;
 
-	private readonly _onDidDisposeModel: Emitter<URI> = this._register(new Emitter<URI>());
-	readonly onDidDisposeModel: Event<URI> = this._onDidDisposeModel.event;
+	private readonly _onDidDisposeModel = this._register(new Emitter<URI>());
+	readonly onDidDisposeModel = this._onDidDisposeModel.event;
 
 	constructor(
 		@IInstantiationService private readonly instantiationService: IInstantiationService,