More parts of #125422

microsoft · Jul 9, 2021 · a08a485 · yo1dog · Aug 27, 2021 · lramos15
1 parent c9b3120
commit a08a485
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 18 deletions.
diff --git a/src/vs/platform/list/browser/listService.ts b/src/vs/platform/list/browser/listService.ts
@@ -1156,7 +1156,7 @@ class WorkbenchTreeInternals<TInput, T, TFilterData> {
 					newOptions = { ...newOptions, renderIndentGuides };
 				}
 				if (e.affectsConfiguration(listSmoothScrolling)) {
-					const smoothScrolling = Boolean(configurationService.getValue<boolean>(listSmoothScrolling));
+					const smoothScrolling = Boolean(!!configurationService.getValue(listSmoothScrolling));
 					newOptions = { ...newOptions, smoothScrolling };
 				}
 				if (e.affectsConfiguration(keyboardNavigationSettingKey)) {
@@ -1166,7 +1166,7 @@ class WorkbenchTreeInternals<TInput, T, TFilterData> {
 					newOptions = { ...newOptions, automaticKeyboardNavigation: getAutomaticKeyboardNavigation() };
 				}
 				if (e.affectsConfiguration(horizontalScrollingKey) && options.horizontalScrolling === undefined) {
-					const horizontalScrolling = Boolean(configurationService.getValue<boolean>(horizontalScrollingKey));
+					const horizontalScrolling = Boolean(!!configurationService.getValue(horizontalScrollingKey));
 					newOptions = { ...newOptions, horizontalScrolling };
 				}
 				if (e.affectsConfiguration(treeExpandMode) && options.expandOnlyOnTwistieClick === undefined) {

diff --git a/src/vs/platform/terminal/node/terminalProfiles.ts b/src/vs/platform/terminal/node/terminalProfiles.ts
@@ -37,7 +37,7 @@ export function detectAvailableProfiles(
 			includeDetectedProfiles,
 			fsProvider,
 			logService,
-			configurationService.getValue<boolean>(TerminalSettingId.UseWslProfiles) !== false,
+			configurationService.getValue(TerminalSettingId.UseWslProfiles) !== false,
 			profiles && typeof profiles === 'object' ? { ...profiles } : configurationService.getValue<{ [key: string]: ITerminalProfileObject }>(TerminalSettingId.ProfilesWindows),
 			typeof defaultProfile === 'string' ? defaultProfile : configurationService.getValue<string>(TerminalSettingId.DefaultProfileWindows),
 			testPwshSourcePaths,

diff --git a/src/vs/platform/update/electron-main/updateService.win32.ts b/src/vs/platform/update/electron-main/updateService.win32.ts
@@ -149,7 +149,7 @@ export class Win32UpdateService extends AbstractUpdateService {
 								.then(() => updatePackagePath);
 						});
 					}).then(packagePath => {
-						const fastUpdatesEnabled = this.configurationService.getValue<boolean>('update.enableWindowsBackgroundUpdates');
+						const fastUpdatesEnabled = this.configurationService.getValue('update.enableWindowsBackgroundUpdates');
 
 						this.availableUpdate = { packagePath };
 

diff --git a/src/vs/platform/userDataSync/common/keybindingsSync.ts b/src/vs/platform/userDataSync/common/keybindingsSync.ts
@@ -331,15 +331,15 @@ export class KeybindingsSynchroniser extends AbstractJsonFileSynchroniser implem
 	}
 
 	private syncKeybindingsPerPlatform(): boolean {
-		let userValue = this.configurationService.inspect<boolean>('settingsSync.keybindingsPerPlatform').userValue;
+		let userValue = !!this.configurationService.inspect('settingsSync.keybindingsPerPlatform').userValue;
 		if (userValue !== undefined) {
 			return userValue;
 		}
-		userValue = this.configurationService.inspect<boolean>('sync.keybindingsPerPlatform').userValue;
+		userValue = !!this.configurationService.inspect('sync.keybindingsPerPlatform').userValue;
 		if (userValue !== undefined) {
 			return userValue;
 		}
-		return this.configurationService.getValue<boolean>('settingsSync.keybindingsPerPlatform');
+		return !!this.configurationService.getValue('settingsSync.keybindingsPerPlatform');
 	}
 
 }

diff --git a/src/vs/workbench/browser/actions/developerActions.ts b/src/vs/workbench/browser/actions/developerActions.ts
@@ -207,7 +207,7 @@ class ToggleScreencastModeAction extends Action2 {
 			const event = new StandardKeyboardEvent(e);
 			const shortcut = keybindingService.softDispatch(event, event.target);
 
-			if (shortcut || !configurationService.getValue<boolean>('screencastMode.onlyKeyboardShortcuts')) {
+			if (shortcut || !configurationService.getValue('screencastMode.onlyKeyboardShortcuts')) {
 				if (
 					event.ctrlKey || event.altKey || event.metaKey || event.shiftKey
 					|| length > 20

diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts
@@ -394,13 +394,13 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 		if (!this.state.zenMode.active) {
 
 			// Statusbar visibility
-			const newStatusbarHiddenValue = !this.configurationService.getValue<boolean>(Settings.STATUSBAR_VISIBLE);
+			const newStatusbarHiddenValue = !this.configurationService.getValue(Settings.STATUSBAR_VISIBLE);
 			if (newStatusbarHiddenValue !== this.state.statusBar.hidden) {
 				this.setStatusBarHidden(newStatusbarHiddenValue, skipLayout);
 			}
 
 			// Activitybar visibility
-			const newActivityBarHiddenValue = !this.configurationService.getValue<boolean>(Settings.ACTIVITYBAR_VISIBLE);
+			const newActivityBarHiddenValue = !this.configurationService.getValue(Settings.ACTIVITYBAR_VISIBLE);
 			if (newActivityBarHiddenValue !== this.state.activityBar.hidden) {
 				this.setActivityBarHidden(newActivityBarHiddenValue, skipLayout);
 			}

diff --git a/src/vs/workbench/browser/parts/editor/editorCommands.ts b/src/vs/workbench/browser/parts/editor/editorCommands.ts
@@ -352,14 +352,14 @@ function registerDiffEditorCommands(): void {
 	function toggleDiffSideBySide(accessor: ServicesAccessor): void {
 		const configurationService = accessor.get(IConfigurationService);
 
-		const newValue = !configurationService.getValue<boolean>('diffEditor.renderSideBySide');
+		const newValue = !configurationService.getValue('diffEditor.renderSideBySide');
 		configurationService.updateValue('diffEditor.renderSideBySide', newValue);
 	}
 
 	function toggleDiffIgnoreTrimWhitespace(accessor: ServicesAccessor): void {
 		const configurationService = accessor.get(IConfigurationService);
 
-		const newValue = !configurationService.getValue<boolean>('diffEditor.ignoreTrimWhitespace');
+		const newValue = !configurationService.getValue('diffEditor.ignoreTrimWhitespace');
 		configurationService.updateValue('diffEditor.ignoreTrimWhitespace', newValue);
 	}
 
@@ -948,7 +948,7 @@ function registerOtherEditorCommands(): void {
 		handler: accessor => {
 			const configurationService = accessor.get(IConfigurationService);
 
-			const currentSetting = configurationService.getValue<boolean>('workbench.editor.enablePreview');
+			const currentSetting = configurationService.getValue('workbench.editor.enablePreview');
 			const newSetting = currentSetting === true ? false : true;
 			configurationService.updateValue('workbench.editor.enablePreview', newSetting);
 		}

diff --git a/src/vs/workbench/browser/parts/editor/editorPane.ts b/src/vs/workbench/browser/parts/editor/editorPane.ts
@@ -216,7 +216,7 @@ export class EditorMemento<T> implements IEditorMemento<T> {
 	}
 
 	private updateConfiguration(): void {
-		this.shareEditorState = this.configurationService.getValue<boolean>(undefined, 'workbench.editor.sharedViewState') === true;
+		this.shareEditorState = this.configurationService.getValue(undefined, 'workbench.editor.sharedViewState') === true;
 	}
 
 	saveEditorState(group: IEditorGroup, resource: URI, state: T): void;

diff --git a/...rkbench/services/extensionManagement/electron-sandbox/remoteExtensionManagementService.ts b/...rkbench/services/extensionManagement/electron-sandbox/remoteExtensionManagementService.ts
@@ -54,7 +54,7 @@ export class NativeRemoteExtensionManagementService extends WebRemoteExtensionMa
 	}
 
 	private async doInstallFromGallery(extension: IGalleryExtension, installOptions?: InstallOptions): Promise<ILocalExtension> {
-		if (this.configurationService.getValue<boolean>('remote.downloadExtensionsLocally')) {
+		if (this.configurationService.getValue('remote.downloadExtensionsLocally')) {
 			this.logService.trace(`Download '${extension.identifier.id}' extension locally and install`);
 			return this.downloadCompatibleAndInstall(extension);
 		}

diff --git a/src/vs/workbench/services/untitled/common/untitledTextEditorModel.ts b/src/vs/workbench/services/untitled/common/untitledTextEditorModel.ts
@@ -152,8 +152,8 @@ export class UntitledTextEditorModel extends BaseTextEditorModel implements IUnt
 	private onConfigurationChange(fromEvent: boolean): void {
 
 		// Encoding
-		const configuredEncoding = this.textResourceConfigurationService.getValue<string>(this.resource, 'files.encoding');
-		if (this.configuredEncoding !== configuredEncoding) {
+		const configuredEncoding = this.textResourceConfigurationService.getValue(this.resource, 'files.encoding');
+		if (this.configuredEncoding !== configuredEncoding && typeof configuredEncoding === 'string') {
 			this.configuredEncoding = configuredEncoding;
 
 			if (fromEvent && !this.preferredEncoding) {

diff --git a/src/vs/workbench/services/userDataSync/common/userDataSyncUtil.ts b/src/vs/workbench/services/userDataSync/common/userDataSyncUtil.ts
@@ -46,7 +46,7 @@ class UserDataSyncUtilService implements IUserDataSyncUtilService {
 		}
 		return {
 			eol: this.textResourcePropertiesService.getEOL(resource),
-			insertSpaces: this.textResourceConfigurationService.getValue<boolean>(resource, 'editor.insertSpaces'),
+			insertSpaces: !!this.textResourceConfigurationService.getValue(resource, 'editor.insertSpaces'),
 			tabSize: this.textResourceConfigurationService.getValue(resource, 'editor.tabSize')
 		};
 	}