debt - use onAutoSaveConfigurationChange

src/vs/workbench/contrib/backup/common/backupModelTracker.ts

@@ -6,11 +6,10 @@
 import { URI as Uri } from 'vs/base/common/uri';
 import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
 import { Disposable } from 'vs/base/common/lifecycle';
-import { ITextFileService, TextFileModelChangeEvent, StateChange } from 'vs/workbench/services/textfile/common/textfiles';
+import { ITextFileService, TextFileModelChangeEvent, StateChange, IAutoSaveConfiguration } from 'vs/workbench/services/textfile/common/textfiles';
 import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IFilesConfiguration, AutoSaveConfiguration, CONTENT_CHANGE_EVENT_BUFFER_DELAY } from 'vs/platform/files/common/files';
+import { CONTENT_CHANGE_EVENT_BUFFER_DELAY } from 'vs/platform/files/common/files';
 
 const AUTO_SAVE_AFTER_DELAY_DISABLED_TIME = CONTENT_CHANGE_EVENT_BUFFER_DELAY + 500;
 
@@ -22,7 +21,6 @@ export class BackupModelTracker extends Disposable implements IWorkbenchContribu
 		@IBackupFileService private readonly backupFileService: IBackupFileService,
 		@ITextFileService private readonly textFileService: ITextFileService,
 		@IUntitledEditorService private readonly untitledEditorService: IUntitledEditorService,
-		@IConfigurationService private readonly configurationService: IConfigurationService
 	) {
 		super();
 
@@ -32,26 +30,20 @@ export class BackupModelTracker extends Disposable implements IWorkbenchContribu
 	private registerListeners() {
 
 		// Listen for text file model changes
-		this._register(this.textFileService.models.onModelContentChanged((e) => this.onTextFileModelChanged(e)));
-		this._register(this.textFileService.models.onModelSaved((e) => this.discardBackup(e.resource)));
-		this._register(this.textFileService.models.onModelDisposed((e) => this.discardBackup(e)));
+		this._register(this.textFileService.models.onModelContentChanged(e => this.onTextFileModelChanged(e)));
+		this._register(this.textFileService.models.onModelSaved(e => this.discardBackup(e.resource)));
+		this._register(this.textFileService.models.onModelDisposed(e => this.discardBackup(e)));
 
 		// Listen for untitled model changes
-		this._register(this.untitledEditorService.onDidChangeContent((e) => this.onUntitledModelChanged(e)));
-		this._register(this.untitledEditorService.onDidDisposeModel((e) => this.discardBackup(e)));
+		this._register(this.untitledEditorService.onDidChangeContent(e => this.onUntitledModelChanged(e)));
+		this._register(this.untitledEditorService.onDidDisposeModel(e => this.discardBackup(e)));
 
 		// Listen to config changes
-		this._register(this.configurationService.onDidChangeConfiguration(e => this.onConfigurationChange(this.configurationService.getValue<IFilesConfiguration>())));
+		this._register(this.textFileService.onAutoSaveConfigurationChange(c => this.onAutoSaveConfigurationChange(c)));
 	}
 
-	private onConfigurationChange(configuration: IFilesConfiguration): void {
-		if (!configuration || !configuration.files) {
-			this.configuredAutoSaveAfterDelay = false;
-
-			return;
-		}
-
-		this.configuredAutoSaveAfterDelay = (configuration.files.autoSave === AutoSaveConfiguration.AFTER_DELAY && configuration.files.autoSaveDelay <= AUTO_SAVE_AFTER_DELAY_DISABLED_TIME);
+	private onAutoSaveConfigurationChange(configuration: IAutoSaveConfiguration): void {
+		this.configuredAutoSaveAfterDelay = typeof configuration.autoSaveDelay === 'number' && configuration.autoSaveDelay < AUTO_SAVE_AFTER_DELAY_DISABLED_TIME;
 	}
 
 	private onTextFileModelChanged(event: TextFileModelChangeEvent): void {