Fix strict null checks

roblourens · roblourens · commit 8cccc98d917c · 2018-10-28T10:36:49.000-07:00
diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts
@@ -330,9 +330,9 @@ export interface IExtensionManagementServer {
 
 export interface IExtensionManagementServerService {
 	_serviceBrand: any;
-	readonly localExtensionManagementServer: IExtensionManagementServer;
-	readonly otherExtensionManagementServer: IExtensionManagementServer;
-	getExtensionManagementServer(location: URI): IExtensionManagementServer;
+	readonly localExtensionManagementServer: IExtensionManagementServer | null;
+	readonly otherExtensionManagementServer: IExtensionManagementServer | null;
+	getExtensionManagementServer(location: URI): IExtensionManagementServer | null;
 }
 
 export const enum EnablementState {
diff --git a/src/vs/workbench/services/extensions/node/extensionManagementServerService.ts b/src/vs/workbench/services/extensions/node/extensionManagementServerService.ts
@@ -22,11 +22,11 @@ export class ExtensionManagementServerService implements IExtensionManagementSer
 		this.localExtensionManagementServer = { extensionManagementService: localExtensionManagementService, authority: localExtensionManagementServerAuthority, label: localize('local', "Local") };
 	}
 
-	getExtensionManagementServer(location: URI): IExtensionManagementServer {
+	getExtensionManagementServer(location: URI): IExtensionManagementServer | null {
 		return this.localExtensionManagementServer;
 	}
 
-	get otherExtensionManagementServer(): IExtensionManagementServer {
+	get otherExtensionManagementServer(): IExtensionManagementServer | null {
 		return null;
 	}
 }
@@ -41,16 +41,16 @@ export class SingleServerExtensionManagementServerService implements IExtensionM
 	) {
 	}
 
-	getExtensionManagementServer(location: URI): IExtensionManagementServer {
+	getExtensionManagementServer(location: URI): IExtensionManagementServer | null {
 		const authority = location.scheme === Schemas.file ? localExtensionManagementServerAuthority : location.authority;
 		return this.extensionManagementServer.authority === authority ? this.extensionManagementServer : null;
 	}
 
-	get localExtensionManagementServer(): IExtensionManagementServer {
+	get localExtensionManagementServer(): IExtensionManagementServer | null {
 		return this.extensionManagementServer.authority === localExtensionManagementServerAuthority ? this.extensionManagementServer : null;
 	}
 
-	get otherExtensionManagementServer(): IExtensionManagementServer {
+	get otherExtensionManagementServer(): IExtensionManagementServer | null {
 		return this.extensionManagementServer.authority !== localExtensionManagementServerAuthority ? this.extensionManagementServer : null;
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,11 @@ export class ExtensionManagementServerService implements IExtensionManagementSer`
`22`	`22`	`this.localExtensionManagementServer = { extensionManagementService: localExtensionManagementService, authority: localExtensionManagementServerAuthority, label: localize('local', "Local") };`
`23`	`23`	`}`
`24`	`24`
`25`		`- getExtensionManagementServer(location: URI): IExtensionManagementServer {`
	`25`	`+ getExtensionManagementServer(location: URI): IExtensionManagementServer \| null {`
`26`	`26`	`return this.localExtensionManagementServer;`
`27`	`27`	`}`
`28`	`28`
`29`		`- get otherExtensionManagementServer(): IExtensionManagementServer {`
	`29`	`+ get otherExtensionManagementServer(): IExtensionManagementServer \| null {`
`30`	`30`	`return null;`
`31`	`31`	`}`
`32`	`32`	`}`
`@@ -41,16 +41,16 @@ export class SingleServerExtensionManagementServerService implements IExtensionM`
`41`	`41`	`) {`
`42`	`42`	`}`
`43`	`43`
`44`		`- getExtensionManagementServer(location: URI): IExtensionManagementServer {`
	`44`	`+ getExtensionManagementServer(location: URI): IExtensionManagementServer \| null {`
`45`	`45`	`const authority = location.scheme === Schemas.file ? localExtensionManagementServerAuthority : location.authority;`
`46`	`46`	`return this.extensionManagementServer.authority === authority ? this.extensionManagementServer : null;`
`47`	`47`	`}`
`48`	`48`
`49`		`- get localExtensionManagementServer(): IExtensionManagementServer {`
	`49`	`+ get localExtensionManagementServer(): IExtensionManagementServer \| null {`
`50`	`50`	`return this.extensionManagementServer.authority === localExtensionManagementServerAuthority ? this.extensionManagementServer : null;`
`51`	`51`	`}`
`52`	`52`
`53`		`- get otherExtensionManagementServer(): IExtensionManagementServer {`
	`53`	`+ get otherExtensionManagementServer(): IExtensionManagementServer \| null {`
`54`	`54`	`return this.extensionManagementServer.authority !== localExtensionManagementServerAuthority ? this.extensionManagementServer : null;`
`55`	`55`	`}`
`56`	`56`	`}`