Skip to content

Commit d641ef8

Browse files
committed
null checks
1 parent 388d29d commit d641ef8

2 files changed

Lines changed: 11 additions & 4 deletions

File tree

src/tsconfig.strictNullChecks.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@
104104
"./vs/base/node/request.ts",
105105
"./vs/base/parts/contextmenu/common/contextmenu.ts",
106106
"./vs/base/parts/contextmenu/electron-main/contextmenu.ts",
107+
"./vs/base/parts/ipc/node/ipc.ts",
107108
"./vs/base/parts/quickopen/common/quickOpen.ts",
108109
"./vs/base/test/common/utils.ts",
109110
"./vs/base/test/node/uri.test.perf.ts",
@@ -371,6 +372,7 @@
371372
"./vs/platform/environment/common/environment.ts",
372373
"./vs/platform/extensionManagement/common/extensionManagement.ts",
373374
"./vs/platform/extensionManagement/common/extensionNls.ts",
375+
"./vs/platform/extensionManagement/node/extensionManagementIpc.ts",
374376
"./vs/platform/extensions/common/extensionHost.ts",
375377
"./vs/platform/extensions/common/extensions.ts",
376378
"./vs/platform/extensions/node/extensionValidator.ts",
@@ -508,6 +510,7 @@
508510
"./vs/workbench/services/keybinding/common/macLinuxKeyboardMapper.ts",
509511
"./vs/workbench/services/keybinding/common/windowsKeyboardMapper.ts",
510512
"./vs/workbench/services/mode/common/workbenchModeService.ts",
513+
511514
"./vs/workbench/services/panel/common/panelService.ts",
512515
"./vs/workbench/services/progress/common/progress.ts",
513516
"./vs/workbench/services/scm/common/scm.ts",

src/vs/platform/extensionManagement/node/extensionManagementIpc.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export interface IExtensionManagementChannel extends IChannel {
2121
call(command: 'installFromGallery', args: [IGalleryExtension]): Thenable<void>;
2222
call(command: 'uninstall', args: [ILocalExtension, boolean]): Thenable<void>;
2323
call(command: 'reinstallFromGallery', args: [ILocalExtension]): Thenable<void>;
24-
call(command: 'getInstalled', args: [LocalExtensionType]): Thenable<ILocalExtension[]>;
24+
call(command: 'getInstalled', args: [LocalExtensionType | null]): Thenable<ILocalExtension[]>;
2525
call(command: 'getExtensionsReport'): Thenable<IReportedExtension[]>;
2626
call(command: 'updateMetadata', args: [ILocalExtension, IGalleryMetadata]): Thenable<ILocalExtension>;
2727
}
@@ -100,7 +100,7 @@ export class ExtensionManagementChannelClient implements IExtensionManagementSer
100100
}
101101

102102
uninstall(extension: ILocalExtension, force = false): Promise<void> {
103-
return Promise.resolve(this.channel.call('uninstall', [this._transformOutgoing(extension), force]));
103+
return Promise.resolve(this.channel.call('uninstall', [this._transformOutgoing(extension)!, force]));
104104
}
105105

106106
reinstallFromGallery(extension: ILocalExtension): Promise<void> {
@@ -121,11 +121,15 @@ export class ExtensionManagementChannelClient implements IExtensionManagementSer
121121
return Promise.resolve(this.channel.call('getExtensionsReport'));
122122
}
123123

124-
private _transformIncoming(extension: ILocalExtension): ILocalExtension {
124+
private _transformIncoming(extension: ILocalExtension): ILocalExtension;
125+
private _transformIncoming(extension: ILocalExtension | undefined): ILocalExtension | undefined;
126+
private _transformIncoming(extension: ILocalExtension | undefined): ILocalExtension | undefined {
125127
return extension ? { ...extension, ...{ location: URI.revive(this.uriTransformer.transformIncoming(extension.location)) } } : extension;
126128
}
127129

128-
private _transformOutgoing(extension: ILocalExtension): ILocalExtension {
130+
private _transformOutgoing(extension: ILocalExtension): ILocalExtension;
131+
private _transformOutgoing(extension: ILocalExtension | undefined): ILocalExtension | undefined;
132+
private _transformOutgoing(extension: ILocalExtension | undefined): ILocalExtension | undefined {
129133
return extension ? { ...extension, ...{ location: this.uriTransformer.transformOutgoing(extension.location) } } : extension;
130134
}
131135

0 commit comments

Comments
 (0)