From 275fb51519bd68ad9853575dbf5ad58d61bcfd85 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Fri, 15 Mar 2019 10:37:57 +0100 Subject: [PATCH] change missing deps to take only single dep --- .../api/electron-browser/mainThreadExtensionService.ts | 2 +- src/vs/workbench/api/node/extHostExtensionActivator.ts | 4 ++-- src/vs/workbench/services/extensions/common/extensions.ts | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/vs/workbench/api/electron-browser/mainThreadExtensionService.ts b/src/vs/workbench/api/electron-browser/mainThreadExtensionService.ts index 7ecf4e2bd5f..39ebe4816f4 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadExtensionService.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadExtensionService.ts @@ -69,7 +69,7 @@ export class MainThreadExtensionService implements MainThreadExtensionServiceSha if (typeof activationError === 'string') { this._extensionService._logOrShowMessage(Severity.Error, activationError); } else { - this._handleMissingDependency(extensionId, activationError.dependencies[0]); + this._handleMissingDependency(extensionId, activationError.dependency); } } diff --git a/src/vs/workbench/api/node/extHostExtensionActivator.ts b/src/vs/workbench/api/node/extHostExtensionActivator.ts index 15cac8c86b9..801af835289 100644 --- a/src/vs/workbench/api/node/extHostExtensionActivator.ts +++ b/src/vs/workbench/api/node/extHostExtensionActivator.ts @@ -7,7 +7,7 @@ import * as nls from 'vs/nls'; import { IDisposable } from 'vs/base/common/lifecycle'; import { ExtensionDescriptionRegistry } from 'vs/workbench/services/extensions/node/extensionDescriptionRegistry'; import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions'; -import { ExtensionActivationError, MissingDependenciesError } from 'vs/workbench/services/extensions/common/extensions'; +import { ExtensionActivationError, MissingDependencyError } from 'vs/workbench/services/extensions/common/extensions'; const NO_OP_VOID_PROMISE = Promise.resolve(undefined); @@ -305,7 +305,7 @@ export class ExtensionsActivator { } // Error condition 1: unknown dependency - this._host.onExtensionActivationError(currentExtension.identifier, new MissingDependenciesError([depId])); + this._host.onExtensionActivationError(currentExtension.identifier, new MissingDependencyError(depId)); const error = new Error(`Unknown dependency '${depId}'`); this._activatedExtensions.set(ExtensionIdentifier.toKey(currentExtension.identifier), new FailedExtension(error)); return; diff --git a/src/vs/workbench/services/extensions/common/extensions.ts b/src/vs/workbench/services/extensions/common/extensions.ts index 7c864520b92..0f5a9baf23f 100644 --- a/src/vs/workbench/services/extensions/common/extensions.ts +++ b/src/vs/workbench/services/extensions/common/extensions.ts @@ -46,9 +46,9 @@ export interface IExtensionsStatus { runtimeErrors: Error[]; } -export type ExtensionActivationError = string | MissingDependenciesError; -export class MissingDependenciesError { - constructor(readonly dependencies: string[]) { } +export type ExtensionActivationError = string | MissingDependencyError; +export class MissingDependencyError { + constructor(readonly dependency: string) { } } /** -- GitLab