From 2a82df9437f5c1d3e0302ff4910a5e7f51ea1756 Mon Sep 17 00:00:00 2001 From: Logan Ramos Date: Fri, 9 Jul 2021 13:08:08 -0400 Subject: [PATCH] Part of #125422 --- .../contrib/codeEditor/browser/untitledTextEditorHint.ts | 2 +- .../notebook/browser/contrib/outline/notebookOutline.ts | 4 ++-- .../contrib/notebook/browser/diff/notebookDiffActions.ts | 4 ++-- .../contrib/userDataSync/browser/userDataSync.ts | 2 +- .../extensions/electron-browser/extensionService.ts | 2 +- .../workbench/services/host/browser/browserHostService.ts | 2 +- .../common/textResourcePropertiesService.ts | 4 ++-- .../services/themes/browser/workbenchThemeService.ts | 8 ++++---- .../services/untitled/common/untitledTextEditorModel.ts | 2 +- .../services/workspaces/common/workspaceTrust.ts | 4 ++-- src/vs/workbench/test/common/workbenchTestServices.ts | 4 ++-- 11 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/vs/workbench/contrib/codeEditor/browser/untitledTextEditorHint.ts b/src/vs/workbench/contrib/codeEditor/browser/untitledTextEditorHint.ts index dc6d1ecb17c..57b644f5be7 100644 --- a/src/vs/workbench/contrib/codeEditor/browser/untitledTextEditorHint.ts +++ b/src/vs/workbench/contrib/codeEditor/browser/untitledTextEditorHint.ts @@ -47,7 +47,7 @@ export class UntitledTextEditorHintContribution implements IEditorContribution { private update(): void { this.untitledTextHintContentWidget?.dispose(); - const configValue = this.configurationService.getValue<'text' | 'hidden'>(untitledTextEditorHintSetting); + const configValue = this.configurationService.getValue(untitledTextEditorHintSetting); const model = this.editor.getModel(); if (model && model.uri.scheme === Schemas.untitled && model.getModeId() === PLAINTEXT_MODE_ID && configValue === 'text') { diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.ts b/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.ts index 0dc0380c832..fb3438d7024 100644 --- a/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.ts +++ b/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.ts @@ -177,7 +177,7 @@ class NotebookOutlineRenderer implements ITreeRenderer(OutlineConfigKeys.problemsBadges); + const useBadges = this._configurationService.getValue(OutlineConfigKeys.problemsBadges); if (!useBadges) { template.decoration.classList.remove('bubble'); template.decoration.innerText = ''; @@ -189,7 +189,7 @@ class NotebookOutlineRenderer implements ITreeRenderer 9 ? '9+' : String(markerInfo.count); } const color = this._themeService.getColorTheme().getColor(markerInfo.topSev === MarkerSeverity.Error ? listErrorForeground : listWarningForeground); - const useColors = this._configurationService.getValue(OutlineConfigKeys.problemsColors); + const useColors = this._configurationService.getValue(OutlineConfigKeys.problemsColors); if (!useColors) { template.container.style.removeProperty('--outline-element-color'); template.decoration.style.setProperty('--outline-element-color', color?.toString() ?? 'inherit'); diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffActions.ts b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffActions.ts index 7c0055bb36f..270d13d1446 100644 --- a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffActions.ts +++ b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffActions.ts @@ -230,12 +230,12 @@ class ToggleRenderAction extends Action2 { const configurationService = accessor.get(IConfigurationService); if (this.toggleOutputs !== undefined) { - const oldValue = configurationService.getValue('notebook.diff.ignoreOutputs'); + const oldValue = configurationService.getValue('notebook.diff.ignoreOutputs'); configurationService.updateValue('notebook.diff.ignoreOutputs', !oldValue); } if (this.toggleMetadata !== undefined) { - const oldValue = configurationService.getValue('notebook.diff.ignoreMetadata'); + const oldValue = configurationService.getValue('notebook.diff.ignoreMetadata'); configurationService.updateValue('notebook.diff.ignoreMetadata', !oldValue); } } diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts index ca730c23966..c6750120870 100644 --- a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts +++ b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts @@ -1274,7 +1274,7 @@ class AcceptChangesContribution extends Disposable implements IEditorContributio } if (syncResourceConflicts[1].some(({ remoteResource }) => isEqual(remoteResource, model.uri))) { - return this.configurationService.getValue('diffEditor.renderSideBySide'); + return this.configurationService.getValue('diffEditor.renderSideBySide'); } return false; diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts index 917f1aaeb3c..44b1e6022d0 100644 --- a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts +++ b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts @@ -111,7 +111,7 @@ export class ExtensionService extends AbstractExtensionService implements IExten } private _isLocalWebWorkerEnabled() { - if (this._configurationService.getValue(webWorkerExtHostConfig)) { + if (this._configurationService.getValue(webWorkerExtHostConfig)) { return true; } if (this._environmentService.isExtensionDevelopment && this._environmentService.extensionDevelopmentKind?.some(k => k === 'web')) { diff --git a/src/vs/workbench/services/host/browser/browserHostService.ts b/src/vs/workbench/services/host/browser/browserHostService.ts index 304e856f940..d98a5111249 100644 --- a/src/vs/workbench/services/host/browser/browserHostService.ts +++ b/src/vs/workbench/services/host/browser/browserHostService.ts @@ -138,7 +138,7 @@ export class BrowserHostService extends Disposable implements IHostService { // Unknown / Keyboard shows veto depending on setting case HostShutdownReason.Unknown: case HostShutdownReason.Keyboard: - const confirmBeforeClose = this.configurationService.getValue<'always' | 'keyboardOnly' | 'never'>('window.confirmBeforeClose'); + const confirmBeforeClose = this.configurationService.getValue('window.confirmBeforeClose'); if (confirmBeforeClose === 'always' || (confirmBeforeClose === 'keyboardOnly' && this.shutdownReason === HostShutdownReason.Keyboard)) { e.veto(true, 'veto.confirmBeforeClose'); } diff --git a/src/vs/workbench/services/textresourceProperties/common/textResourcePropertiesService.ts b/src/vs/workbench/services/textresourceProperties/common/textResourcePropertiesService.ts index 5d2978e9a6b..a655eb51da4 100644 --- a/src/vs/workbench/services/textresourceProperties/common/textResourcePropertiesService.ts +++ b/src/vs/workbench/services/textresourceProperties/common/textResourcePropertiesService.ts @@ -30,8 +30,8 @@ export class TextResourcePropertiesService implements ITextResourcePropertiesSer } getEOL(resource?: URI, language?: string): string { - const eol = this.configurationService.getValue('files.eol', { overrideIdentifier: language, resource }); - if (eol && eol !== 'auto') { + const eol = this.configurationService.getValue('files.eol', { overrideIdentifier: language, resource }); + if (eol && typeof eol === 'string' && eol !== 'auto') { return eol; } const os = this.getOS(resource); diff --git a/src/vs/workbench/services/themes/browser/workbenchThemeService.ts b/src/vs/workbench/services/themes/browser/workbenchThemeService.ts index 90e4c55366c..27d439869cc 100644 --- a/src/vs/workbench/services/themes/browser/workbenchThemeService.ts +++ b/src/vs/workbench/services/themes/browser/workbenchThemeService.ts @@ -380,10 +380,10 @@ export class WorkbenchThemeService implements IWorkbenchThemeService { } private getPreferredColorScheme(): ColorScheme | undefined { - if (this.configurationService.getValue(ThemeSettings.DETECT_HC) && this.hostColorService.highContrast) { + if (this.configurationService.getValue(ThemeSettings.DETECT_HC) && this.hostColorService.highContrast) { return ColorScheme.HIGH_CONTRAST; } - if (this.configurationService.getValue(ThemeSettings.DETECT_COLOR_SCHEME)) { + if (this.configurationService.getValue(ThemeSettings.DETECT_COLOR_SCHEME)) { return this.hostColorService.dark ? ColorScheme.DARK : ColorScheme.LIGHT; } return undefined; @@ -391,8 +391,8 @@ export class WorkbenchThemeService implements IWorkbenchThemeService { private async applyPreferredColorTheme(type: ColorScheme): Promise { const settingId = type === ColorScheme.DARK ? ThemeSettings.PREFERRED_DARK_THEME : type === ColorScheme.LIGHT ? ThemeSettings.PREFERRED_LIGHT_THEME : ThemeSettings.PREFERRED_HC_THEME; - const themeSettingId = this.configurationService.getValue(settingId); - if (themeSettingId) { + const themeSettingId = this.configurationService.getValue(settingId); + if (themeSettingId && typeof themeSettingId === 'string') { const theme = this.colorThemeRegistry.findThemeBySettingsId(themeSettingId, undefined); if (theme) { const configurationTarget = this.settings.findAutoConfigurationTarget(settingId); diff --git a/src/vs/workbench/services/untitled/common/untitledTextEditorModel.ts b/src/vs/workbench/services/untitled/common/untitledTextEditorModel.ts index 68f6f9122c3..952b55eccdb 100644 --- a/src/vs/workbench/services/untitled/common/untitledTextEditorModel.ts +++ b/src/vs/workbench/services/untitled/common/untitledTextEditorModel.ts @@ -162,7 +162,7 @@ export class UntitledTextEditorModel extends BaseTextEditorModel implements IUnt } // Label Format - const configuredLabelFormat = this.textResourceConfigurationService.getValue(this.resource, 'workbench.editor.untitled.labelFormat'); + const configuredLabelFormat = this.textResourceConfigurationService.getValue(this.resource, 'workbench.editor.untitled.labelFormat'); if (this.configuredLabelFormat !== configuredLabelFormat && (configuredLabelFormat === 'content' || configuredLabelFormat === 'name')) { this.configuredLabelFormat = configuredLabelFormat; diff --git a/src/vs/workbench/services/workspaces/common/workspaceTrust.ts b/src/vs/workbench/services/workspaces/common/workspaceTrust.ts index 6d80bb6db64..eb1b6f8fddb 100644 --- a/src/vs/workbench/services/workspaces/common/workspaceTrust.ts +++ b/src/vs/workbench/services/workspaces/common/workspaceTrust.ts @@ -80,7 +80,7 @@ export class WorkspaceTrustEnablementService extends Disposable implements IWork return false; } - return this.configurationService.getValue(WORKSPACE_TRUST_ENABLED) ?? false; + return !!this.configurationService.getValue(WORKSPACE_TRUST_ENABLED); } } @@ -308,7 +308,7 @@ export class WorkspaceTrustManagementService extends Disposable implements IWork } // User setting - return this.configurationService.getValue(WORKSPACE_TRUST_EMPTY_WINDOW) ?? false; + return !!this.configurationService.getValue(WORKSPACE_TRUST_EMPTY_WINDOW); } return this.getUrisTrust(this.getWorkspaceUris()); diff --git a/src/vs/workbench/test/common/workbenchTestServices.ts b/src/vs/workbench/test/common/workbenchTestServices.ts index f4450ecfcd5..4cf874d925d 100644 --- a/src/vs/workbench/test/common/workbenchTestServices.ts +++ b/src/vs/workbench/test/common/workbenchTestServices.ts @@ -34,8 +34,8 @@ export class TestTextResourcePropertiesService implements ITextResourcePropertie } getEOL(resource: URI, language?: string): string { - const eol = this.configurationService.getValue('files.eol', { overrideIdentifier: language, resource }); - if (eol && eol !== 'auto') { + const eol = this.configurationService.getValue('files.eol', { overrideIdentifier: language, resource }); + if (eol && typeof eol === 'string' && eol !== 'auto') { return eol; } return (isLinux || isMacintosh) ? '\n' : '\r\n'; -- GitLab