Fix microsoft#59429

sandy081 · sandy081 · commit ef1a74cdb719 · 2018-09-26T10:57:25.000+02:00
diff --git a/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts b/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
@@ -741,7 +741,7 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService,
 	}
 
 	private checkAndEnableDisabledDependencies(extensionIdentifier: IExtensionIdentifier): TPromise<void> {
-		const extension = this.local.filter(e => areSameExtensions(extensionIdentifier, e.local.identifier))[0];
+		const extension = this.local.filter(e => (e.local || e.gallery) && areSameExtensions(extensionIdentifier, e.local ? e.local.identifier : e.gallery.identifier))[0];
 		if (extension) {
 			const disabledDepencies = this.getExtensionsRecursively([extension], this.local, EnablementState.Enabled, { dependencies: true, pack: false });
 			if (disabledDepencies.length) {

Original file line number	Diff line number	Diff line change
`@@ -741,7 +741,7 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService,`
`741`	`741`	`}`
`742`	`742`
`743`	`743`	`private checkAndEnableDisabledDependencies(extensionIdentifier: IExtensionIdentifier): TPromise<void> {`
`744`		`- const extension = this.local.filter(e => areSameExtensions(extensionIdentifier, e.local.identifier))[0];`
	`744`	`+ const extension = this.local.filter(e => (e.local \|\| e.gallery) && areSameExtensions(extensionIdentifier, e.local ? e.local.identifier : e.gallery.identifier))[0];`
`745`	`745`	`if (extension) {`
`746`	`746`	`const disabledDepencies = this.getExtensionsRecursively([extension], this.local, EnablementState.Enabled, { dependencies: true, pack: false });`
`747`	`747`	`if (disabledDepencies.length) {`