Strict null check welcomePage.ts

mjbvz · mjbvz · commit f8a93ddc74b2 · 2018-12-17T11:12:19.000-08:00
diff --git a/src/tsconfig.strictNullChecks.json b/src/tsconfig.strictNullChecks.json
@@ -667,6 +667,8 @@
 		"./vs/workbench/parts/welcome/gettingStarted/electron-browser/gettingStarted.ts",
 		"./vs/workbench/parts/welcome/gettingStarted/test/common/gettingStarted.test.ts",
 		"./vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.ts",
+		"./vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.ts",
+		"./vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts",
 		"./vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.ts",
 		"./vs/workbench/parts/welcome/walkThrough/node/walkThroughContentProvider.ts",
 		"./vs/workbench/parts/welcome/walkThrough/node/walkThroughInput.ts",
diff --git a/src/vs/base/common/labels.ts b/src/vs/base/common/labels.ts
@@ -70,7 +70,9 @@ export function getPathLabel(resource: URI | string, userHomeProvider?: IUserHom
 	return res;
 }
 
-export function getBaseLabel(resource: URI | string): string | undefined {
+export function getBaseLabel(resource: URI | string): string;
+export function getBaseLabel(resource: URI | string | undefined): string | undefined;
+export function getBaseLabel(resource: URI | string | undefined): string | undefined {
 	if (!resource) {
 		return undefined;
 	}
diff --git a/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts b/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts
@@ -24,7 +24,7 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment'
 import { Schemas } from 'vs/base/common/network';
 import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
 import { getInstalledExtensions, IExtensionStatus, onExtensionChanged, isKeymapExtension } from 'vs/workbench/parts/extensions/electron-browser/extensionsUtils';
-import { IExtensionEnablementService, IExtensionManagementService, IExtensionGalleryService, IExtensionTipsService, EnablementState, LocalExtensionType } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { IExtensionEnablementService, IExtensionManagementService, IExtensionGalleryService, IExtensionTipsService, EnablementState, LocalExtensionType, ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { used } from 'vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page';
 import { ILifecycleService, StartupKind } from 'vs/platform/lifecycle/common/lifecycle';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
@@ -309,6 +309,9 @@ class WelcomePage {
 				return;
 			}
 			const ul = container.querySelector('.recent ul');
+			if (!ul) {
+				return;
+			}
 			const before = ul.firstElementChild;
 			workspaces.slice(0, 5).forEach(workspace => {
 				let label: string;
@@ -328,7 +331,7 @@ class WelcomePage {
 
 				const a = document.createElement('a');
 				let name = label;
-				let parentFolderPath: string;
+				let parentFolderPath: string | undefined;
 
 				if (resource.scheme === Schemas.file) {
 					let parentFolder = path.dirname(resource.fsPath);
@@ -456,7 +459,7 @@ class WelcomePage {
 				return;
 			}
 			const foundAndInstalled = installedExtension ? Promise.resolve(installedExtension.local) : this.extensionGalleryService.query({ names: [extensionSuggestion.id], source: telemetryFrom })
-				.then(result => {
+				.then((result): null | Promise<ILocalExtension | null> => {
 					const [extension] = result.firstPage;
 					if (!extension) {
 						return null;

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,9 @@ export function getPathLabel(resource: URI \| string, userHomeProvider?: IUserHom`
`70`	`70`	`return res;`
`71`	`71`	`}`
`72`	`72`
`73`		`-export function getBaseLabel(resource: URI \| string): string \| undefined {`
	`73`	`+export function getBaseLabel(resource: URI \| string): string;`
	`74`	`+export function getBaseLabel(resource: URI \| string \| undefined): string \| undefined;`
	`75`	`+export function getBaseLabel(resource: URI \| string \| undefined): string \| undefined {`
`74`	`76`	`if (!resource) {`
`75`	`77`	`return undefined;`
`76`	`78`	`}`