From 120ba4a15eb3c8b9023e357825778a40dd4bf7db Mon Sep 17 00:00:00 2001 From: Jean Pierre Date: Mon, 26 Oct 2020 08:08:40 -0500 Subject: [PATCH] Fixes cannot disable file auto save when configuration target is other than user (#109278) * Fixes #108932 * :lipstick: * clean up --- .../common/filesConfigurationService.ts | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.ts b/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.ts index 1cc2b478326..a2dbb755a97 100644 --- a/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.ts +++ b/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.ts @@ -8,9 +8,8 @@ import { registerSingleton } from 'vs/platform/instantiation/common/extensions'; import { Event, Emitter } from 'vs/base/common/event'; import { Disposable } from 'vs/base/common/lifecycle'; import { RawContextKey, IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; -import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration'; +import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { IFilesConfiguration, AutoSaveConfiguration, HotExitConfiguration } from 'vs/platform/files/common/files'; -import { isUndefinedOrNull } from 'vs/base/common/types'; import { equals } from 'vs/base/common/objects'; import { URI } from 'vs/base/common/uri'; import { isWeb } from 'vs/base/common/platform'; @@ -185,19 +184,15 @@ export class FilesConfigurationService extends Disposable implements IFilesConfi async toggleAutoSave(): Promise { const setting = this.configurationService.inspect('files.autoSave'); - let userAutoSaveConfig = setting.userValue; - if (isUndefinedOrNull(userAutoSaveConfig)) { - userAutoSaveConfig = setting.defaultValue; // use default if setting not defined - } let newAutoSaveValue: string; - if ([AutoSaveConfiguration.AFTER_DELAY, AutoSaveConfiguration.ON_FOCUS_CHANGE, AutoSaveConfiguration.ON_WINDOW_CHANGE].some(s => s === userAutoSaveConfig)) { + if ([AutoSaveConfiguration.AFTER_DELAY, AutoSaveConfiguration.ON_FOCUS_CHANGE, AutoSaveConfiguration.ON_WINDOW_CHANGE].some(s => s === setting.value)) { newAutoSaveValue = AutoSaveConfiguration.OFF; } else { newAutoSaveValue = AutoSaveConfiguration.AFTER_DELAY; } - return this.configurationService.updateValue('files.autoSave', newAutoSaveValue, ConfigurationTarget.USER); + return this.configurationService.updateValue('files.autoSave', newAutoSaveValue); } get isHotExitEnabled(): boolean { -- GitLab