diff --git a/src/vs/platform/configuration/common/configuration.ts b/src/vs/platform/configuration/common/configuration.ts index 8d8472df4eb53..c12b9bac4a011 100644 --- a/src/vs/platform/configuration/common/configuration.ts +++ b/src/vs/platform/configuration/common/configuration.ts @@ -297,19 +297,6 @@ export function merge(base: any, add: any, overwrite: boolean): void { }); } -export function getMigratedSettingValue(configurationService: IConfigurationService, currentSettingName: string, legacySettingName: string): T { - const setting = configurationService.inspect(currentSettingName); - const legacySetting = configurationService.inspect(legacySettingName); - - if (typeof setting.userValue !== 'undefined' || typeof setting.workspaceValue !== 'undefined' || typeof setting.workspaceFolderValue !== 'undefined') { - return setting.value!; - } else if (typeof legacySetting.userValue !== 'undefined' || typeof legacySetting.workspaceValue !== 'undefined' || typeof legacySetting.workspaceFolderValue !== 'undefined') { - return legacySetting.value!; - } else { - return setting.defaultValue!; - } -} - export function getLanguageTagSettingPlainKey(settingKey: string) { return settingKey.replace(/[\[\]]/g, ''); } diff --git a/src/vs/platform/update/electron-main/abstractUpdateService.ts b/src/vs/platform/update/electron-main/abstractUpdateService.ts index 0658b1981419a..63ef7d614c000 100644 --- a/src/vs/platform/update/electron-main/abstractUpdateService.ts +++ b/src/vs/platform/update/electron-main/abstractUpdateService.ts @@ -6,7 +6,7 @@ import { timeout } from 'vs/base/common/async'; import { CancellationToken } from 'vs/base/common/cancellation'; import { Emitter, Event } from 'vs/base/common/event'; -import { getMigratedSettingValue, IConfigurationService } from 'vs/platform/configuration/common/configuration'; +import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { IEnvironmentMainService } from 'vs/platform/environment/electron-main/environmentMainService'; import { ILifecycleMainService } from 'vs/platform/lifecycle/electron-main/lifecycleMainService'; import { ILogService } from 'vs/platform/log/common/log'; @@ -74,7 +74,7 @@ export abstract class AbstractUpdateService implements IUpdateService { return; } - const updateMode = this.getUpdateMode(); + const updateMode = this.configurationService.getValue<'none' | 'manual' | 'start' | 'default'>('update.mode'); const quality = this.getProductQuality(updateMode); if (!quality) { @@ -106,10 +106,6 @@ export abstract class AbstractUpdateService implements IUpdateService { } } - protected getUpdateMode(): 'none' | 'manual' | 'start' | 'default' { - return getMigratedSettingValue<'none' | 'manual' | 'start' | 'default'>(this.configurationService, 'update.mode', 'update.channel'); - } - private getProductQuality(updateMode: string): string | undefined { return updateMode === 'none' ? undefined : this.productService.quality; } @@ -188,7 +184,7 @@ export abstract class AbstractUpdateService implements IUpdateService { return undefined; } - const mode = await this.getUpdateMode(); + const mode = this.configurationService.getValue<'none' | 'manual' | 'start' | 'default'>('update.mode'); if (mode === 'none') { return false;