Fixing a few more strict null check errors

mjbvz · mjbvz · commit a6ee11199d4f · 2018-10-16T17:10:43.000-07:00
microsoft#60565
diff --git a/src/tsconfig.strictNullChecks.json b/src/tsconfig.strictNullChecks.json
@@ -315,7 +315,9 @@
 		"./vs/platform/editor/common/editor.ts",
 		"./vs/platform/environment/common/environment.ts",
 		"./vs/platform/environment/node/argv.ts",
+		"./vs/platform/extensionManagement/common/extensionEnablementService.ts",
 		"./vs/platform/extensionManagement/common/extensionManagement.ts",
+		"./vs/platform/extensionManagement/common/extensionManagementUtil.ts",
 		"./vs/platform/extensionManagement/common/extensionNls.ts",
 		"./vs/platform/extensionManagement/node/extensionLifecycle.ts",
 		"./vs/platform/extensionManagement/node/extensionManagementIpc.ts",
@@ -371,6 +373,7 @@
 		"./vs/platform/telemetry/common/telemetryUtils.ts",
 		"./vs/platform/telemetry/node/telemetryNodeUtils.ts",
 		"./vs/platform/theme/common/colorRegistry.ts",
+		"./vs/platform/theme/common/styler.ts",
 		"./vs/platform/theme/common/themeService.ts",
 		"./vs/platform/theme/test/common/testThemeService.ts",
 		"./vs/platform/update/common/update.ts",
@@ -382,9 +385,12 @@
 		"./vs/platform/workspace/test/common/testWorkspace.ts",
 		"./vs/platform/workspaces/common/workspaces.ts",
 		"./vs/platform/workspaces/node/workspaces.ts",
+		"./vs/vscode.d.ts",
+		"./vs/vscode.proposed.d.ts",
 		"./vs/workbench/api/shared/tasks.ts",
 		"./vs/workbench/browser/part.ts",
 		"./vs/workbench/browser/parts/quickinput/quickInputUtils.ts",
+		"./vs/workbench/browser/parts/quickopen/quickopen.ts",
 		"./vs/workbench/browser/parts/statusbar/statusbar.ts",
 		"./vs/workbench/common/activity.ts",
 		"./vs/workbench/common/component.ts",
diff --git a/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts b/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
@@ -98,7 +98,7 @@ export function getGalleryExtensionTelemetryData(extension: IGalleryExtension):
 		publisherId: extension.publisherId,
 		publisherName: extension.publisher,
 		publisherDisplayName: extension.publisherDisplayName,
-		dependencies: extension.properties.dependencies.length > 0,
+		dependencies: !!(extension.properties.dependencies && extension.properties.dependencies.length > 0),
 		...extension.telemetryData
 	};
 }
diff --git a/src/vs/platform/theme/common/styler.ts b/src/vs/platform/theme/common/styler.ts
@@ -9,10 +9,10 @@ import { IDisposable } from 'vs/base/common/lifecycle';
 import { Color } from 'vs/base/common/color';
 import { mixin } from 'vs/base/common/objects';
 
-export type styleFn = (colors: { [name: string]: Color }) => void;
+export type styleFn = (colors: { [name: string]: Color | null }) => void;
 
 export interface IStyleOverrides {
-	[color: string]: ColorIdentifier;
+	[color: string]: ColorIdentifier | undefined;
 }
 
 export interface IThemable {
@@ -24,7 +24,7 @@ export interface IColorMapping {
 }
 
 export interface IComputedStyles {
-	[color: string]: Color;
+	[color: string]: Color | null;
 }
 
 export function computeStyles(theme: ITheme, styleMap: IColorMapping): IComputedStyles {
diff --git a/src/vs/workbench/browser/parts/quickopen/quickopen.ts b/src/vs/workbench/browser/parts/quickopen/quickopen.ts
@@ -23,7 +23,7 @@ export const QUICKOPEN_ACION_LABEL = nls.localize('quickOpen', "Go to File...");
 CommandsRegistry.registerCommand(QUICKOPEN_ACTION_ID, function (accessor: ServicesAccessor, prefix: string | null = null) {
 	const quickOpenService = accessor.get(IQuickOpenService);
 
-	return quickOpenService.show(typeof prefix === 'string' ? prefix : null).then(() => {
+	return quickOpenService.show(typeof prefix === 'string' ? prefix : undefined).then(() => {
 		return void 0;
 	});
 });
@@ -32,7 +32,7 @@ export const QUICKOPEN_FOCUS_SECONDARY_ACTION_ID = 'workbench.action.quickOpenPr
 CommandsRegistry.registerCommand(QUICKOPEN_FOCUS_SECONDARY_ACTION_ID, function (accessor: ServicesAccessor, prefix: string | null = null) {
 	const quickOpenService = accessor.get(IQuickOpenService);
 
-	return quickOpenService.show(null, { autoFocus: { autoFocusSecondEntry: true } }).then(() => {
+	return quickOpenService.show(undefined, { autoFocus: { autoFocusSecondEntry: true } }).then(() => {
 		return void 0;
 	});
 });
@@ -71,8 +71,8 @@ export function getQuickNavigateHandler(id: string, next?: boolean): ICommandHan
 		const keys = keybindingService.lookupKeybindings(id);
 		const quickNavigate = { keybindings: keys };
 
-		quickOpenService.navigate(next, quickNavigate);
-		quickInputService.navigate(next, quickNavigate);
+		quickOpenService.navigate(!!next, quickNavigate);
+		quickInputService.navigate(!!next, quickNavigate);
 	};
 }
 

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ export function getGalleryExtensionTelemetryData(extension: IGalleryExtension):`
`98`	`98`	`publisherId: extension.publisherId,`
`99`	`99`	`publisherName: extension.publisher,`
`100`	`100`	`publisherDisplayName: extension.publisherDisplayName,`
`101`		`- dependencies: extension.properties.dependencies.length > 0,`
	`101`	`+ dependencies: !!(extension.properties.dependencies && extension.properties.dependencies.length > 0),`
`102`	`102`	`...extension.telemetryData`
`103`	`103`	`};`
`104`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,10 +9,10 @@ import { IDisposable } from 'vs/base/common/lifecycle';`
`9`	`9`	`import { Color } from 'vs/base/common/color';`
`10`	`10`	`import { mixin } from 'vs/base/common/objects';`
`11`	`11`
`12`		`-export type styleFn = (colors: { [name: string]: Color }) => void;`
	`12`	`+export type styleFn = (colors: { [name: string]: Color \| null }) => void;`
`13`	`13`
`14`	`14`	`export interface IStyleOverrides {`
`15`		`- [color: string]: ColorIdentifier;`
	`15`	`+ [color: string]: ColorIdentifier \| undefined;`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`export interface IThemable {`
`@@ -24,7 +24,7 @@ export interface IColorMapping {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`export interface IComputedStyles {`
`27`		`- [color: string]: Color;`
	`27`	`+ [color: string]: Color \| null;`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`export function computeStyles(theme: ITheme, styleMap: IColorMapping): IComputedStyles {`