Merge from vscode 011858832762aaff245b2336fb1c38166e7a10fb (#4663)

src/vs/workbench/contrib/preferences/browser/keybindingsEditor.ts

@@ -376,7 +376,7 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor
 				if (action.id === this.recordKeysAction.id) {
 					return new CheckboxActionItem(null, action);
 				}
-				return null;
+				return undefined;
 			}
 		}));
 

src/vs/workbench/contrib/preferences/browser/preferencesWidgets.ts

@@ -424,7 +424,7 @@ export class FolderSettingsActionItem extends BaseActionItem {
 		this.contextMenuService.showContextMenu({
 			getAnchor: () => this.container,
 			getActions: () => this.getDropdownMenuActions(),
-			getActionItem: () => null,
+			getActionItem: () => undefined,
 			onHide: () => {
 				this.anchorElement.blur();
 			}
@@ -495,7 +495,7 @@ export class SettingsTargetsWidget extends Widget {
 			orientation: ActionsOrientation.HORIZONTAL,
 			ariaLabel: localize('settingsSwitcherBarAriaLabel', "Settings Switcher"),
 			animated: false,
-			actionItemProvider: (action: Action) => action.id === 'folderSettings' ? this.folderSettings : null
+			actionItemProvider: (action: Action) => action.id === 'folderSettings' ? this.folderSettings : undefined
 		}));
 
 		this.userSettings = new Action('userSettings', localize('userSettings', "User Settings"), '.settings-tab', true, () => this.updateTarget(ConfigurationTarget.USER));

src/vs/workbench/contrib/preferences/browser/settingsTree.ts

@@ -439,7 +439,7 @@ export abstract class AbstractSettingRenderer implements ITreeRenderer<SettingsT
 			}
 		}
 
-		const onChange = value => this._onDidChangeSetting.fire({ key: element.setting.key, value, type: template.context!.valueType });
+		const onChange = (value: any) => this._onDidChangeSetting.fire({ key: element.setting.key, value, type: template.context!.valueType });
 		template.deprecationWarningElement.innerText = element.setting.deprecationMessage || '';
 		this.renderValue(element, <ISettingItemTemplate>template, onChange);
 
@@ -698,7 +698,7 @@ export class SettingExcludeRenderer extends AbstractSettingRenderer implements I
 				}
 			}
 
-			const sortKeys = (obj) => {
+			const sortKeys = (obj: Object) => {
 				const keyArray = Object.keys(obj)
 					.map(key => ({ key, val: obj[key] }))
 					.sort((a, b) => a.key.localeCompare(b.key));
@@ -901,7 +901,7 @@ export class SettingNumberRenderer extends AbstractSettingRenderer implements IT
 			? parseInt : parseFloat;
 
 		const nullNumParseFn = (dataElement.valueType === 'nullable-integer' || dataElement.valueType === 'nullable-number')
-			? (v => v === '' ? null : numParseFn(v)) : numParseFn;
+			? ((v: string) => v === '' ? null : numParseFn(v)) : numParseFn;
 
 		const label = this.setElementAriaLabels(dataElement, SETTINGS_NUMBER_TEMPLATE_ID, template);
 

src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as arrays from 'vs/base/common/arrays';
-import { isArray } from 'vs/base/common/types';
+import { isArray, withUndefinedAsNull } from 'vs/base/common/types';
 import { URI } from 'vs/base/common/uri';
 import { localize } from 'vs/nls';
 import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -262,11 +262,11 @@ export class SettingsTreeModel {
 	}
 
 	getElementById(id: string): SettingsTreeElement | null {
-		return this._treeElementsById.get(id) || null;
+		return withUndefinedAsNull(this._treeElementsById.get(id));
 	}
 
 	getElementsByName(name: string): SettingsTreeSettingElement[] | null {
-		return this._treeElementsBySettingName.get(name) || null;
+		return withUndefinedAsNull(this._treeElementsBySettingName.get(name));
 	}
 
 	updateElementsByName(name: string): void {
@@ -378,7 +378,7 @@ function wordifyKey(key: string): string {
 }
 
 function trimCategoryForGroup(category: string, groupId: string): string {
-	const doTrim = forward => {
+	const doTrim = (forward: boolean) => {
 		const parts = groupId.split('.');
 		while (parts.length) {
 			const reg = new RegExp(`^${parts.join('\\.')}(\\.|$)`, 'i');

src/vs/workbench/contrib/preferences/browser/settingsWidgets.ts

@@ -403,7 +403,7 @@ export class ExcludeSettingWidget extends Disposable {
 	private renderEditItem(item: IExcludeViewItem): HTMLElement {
 		const rowElement = $('.setting-exclude-edit-row');
 
-		const onSubmit = edited => {
+		const onSubmit = (edited: boolean) => {
 			this.model.setEditKey(null);
 			const pattern = patternInput.value.trim();
 			if (edited && pattern) {