提交 949dc8c8 编写于 作者: A Alex Dima

Remove extraneous boolean (#14500)

上级 8e5cf5a9
...@@ -9,19 +9,19 @@ import { TPromise } from 'vs/base/common/winjs.base'; ...@@ -9,19 +9,19 @@ import { TPromise } from 'vs/base/common/winjs.base';
import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
export interface IExtensionDescription { export interface IExtensionDescription {
id: string; readonly id: string;
name: string; readonly name: string;
version: string; readonly version: string;
publisher: string; readonly publisher: string;
isBuiltin: boolean; readonly isBuiltin: boolean;
extensionFolderPath: string; readonly extensionFolderPath: string;
extensionDependencies?: string[]; readonly extensionDependencies?: string[];
activationEvents?: string[]; readonly activationEvents?: string[];
engines: { readonly engines: {
vscode: string; vscode: string;
}; };
main?: string; readonly main?: string;
contributes?: { [point: string]: any; }; readonly contributes?: { [point: string]: any; };
} }
export interface IActivationEventListener { export interface IActivationEventListener {
...@@ -69,10 +69,9 @@ export interface IExtensionsRuntimeService { ...@@ -69,10 +69,9 @@ export interface IExtensionsRuntimeService {
_serviceBrand: any; _serviceBrand: any;
/** /**
* if `includeDisabled` is `true` returns all extensions otherwise * Scans and returns only enabled extensions.
* returns only enabled extensions
*/ */
getExtensions(includeDisabled?: boolean): TPromise<IExtensionDescription[]>; getExtensions(): TPromise<IExtensionDescription[]>;
/** /**
* Returns `true` if given extension is disabled, otherwise `false`. * Returns `true` if given extension is disabled, otherwise `false`.
......
...@@ -198,7 +198,21 @@ class ExtensionManifestNLSReplacer extends ExtensionManifestHandler { ...@@ -198,7 +198,21 @@ class ExtensionManifestNLSReplacer extends ExtensionManifestHandler {
} }
class ExtensionManifestValidator extends ExtensionManifestHandler { class ExtensionManifestValidator extends ExtensionManifestHandler {
validate(extensionDescription: IExtensionDescription): IExtensionDescription { validate(_extensionDescription: IExtensionDescription): IExtensionDescription {
// Relax the readonly properties here, it is the one place where we check and normalize values
interface IRelaxedExtensionDescription {
id: string;
name: string;
version: string;
publisher: string;
isBuiltin: boolean;
extensionFolderPath: string;
engines: {
vscode: string;
};
main?: string;
}
let extensionDescription = <IRelaxedExtensionDescription>_extensionDescription;
extensionDescription.isBuiltin = this._isBuiltin; extensionDescription.isBuiltin = this._isBuiltin;
let notices: string[] = []; let notices: string[] = [];
......
...@@ -47,13 +47,10 @@ export class ExtensionsRuntimeService implements IExtensionsRuntimeService { ...@@ -47,13 +47,10 @@ export class ExtensionsRuntimeService implements IExtensionsRuntimeService {
extensionManagementService.onDidUninstallExtension(this.onDidUninstallExtension, this, this.disposables); extensionManagementService.onDidUninstallExtension(this.onDidUninstallExtension, this, this.disposables);
} }
public getExtensions(includeDisabled: boolean = false): TPromise<IExtensionDescription[]> { public getExtensions(): TPromise<IExtensionDescription[]> {
if (!this.installedExtensions) { if (!this.installedExtensions) {
this.installedExtensions = this.scanExtensions(); this.installedExtensions = this.scanExtensions();
} }
if (includeDisabled) {
return this.installedExtensions;
}
return this.installedExtensions.then(extensionDescriptions => { return this.installedExtensions.then(extensionDescriptions => {
const disabledExtensions = this.getDisabledExtensions(); const disabledExtensions = this.getDisabledExtensions();
return disabledExtensions.length ? extensionDescriptions.filter(e => disabledExtensions.indexOf(`${e.publisher}.${e.name}`) === -1) : extensionDescriptions; return disabledExtensions.length ? extensionDescriptions.filter(e => disabledExtensions.indexOf(`${e.publisher}.${e.name}`) === -1) : extensionDescriptions;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册