Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-26 19:44:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

More plugin -> extension renames

Browse Source
This commit is contained in:
Alex Dima
2016-03-01 12:44:26 +01:00
parent 3942260bd4
commit c867beb5fe
10 changed files with 169 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/vs/workbench/node/extensionPoints.ts
View File

@@ -12,7 +12,7 @@ import {groupBy, values} from 'vs/base/common/collections';
import paths = require('vs/base/common/paths');
import json = require('vs/base/common/json');
import Types = require('vs/base/common/types');
import {IPluginsMessageCollector, IExtensionMessageCollector} from 'vs/platform/extensions/common/extensionsRegistry';
import {IExtensionsMessageCollector, IExtensionMessageCollector} from 'vs/platform/extensions/common/extensionsRegistry';
import {isValidPluginDescription} from 'vs/platform/extensions/node/pluginVersionValidator';
import * as semver from 'semver';
@@ -108,7 +108,7 @@ export class PluginScanner {
*/
public static scanPlugin(
version: string,
collector: IPluginsMessageCollector,
collector: IExtensionsMessageCollector,
absoluteFolderPath:string,
isBuiltin:boolean
) : TPromise<IExtensionDescription>
@@ -193,7 +193,7 @@ export class PluginScanner {
*/
public static scanPlugins(
version: string,
collector: IPluginsMessageCollector,
collector: IExtensionsMessageCollector,
absoluteFolderPath:string,
isBuiltin:boolean
) : TPromise<IExtensionDescription[]>
@@ -229,18 +229,18 @@ export class PluginScanner {
*/
public static scanOneOrMultiplePlugins(
version: string,
collector: IPluginsMessageCollector,
collector: IExtensionsMessageCollector,
absoluteFolderPath:string,
isBuiltin:boolean
) : TPromise<IExtensionDescription[]>
{
return pfs.fileExists(paths.join(absoluteFolderPath, MANIFEST_FILE)).then((exists) => {
if (exists) {
return this.scanPlugin(version, collector, absoluteFolderPath, isBuiltin).then((pluginDescription) => {
if (pluginDescription === null) {
return this.scanPlugin(version, collector, absoluteFolderPath, isBuiltin).then((extensionDescription) => {
if (extensionDescription === null) {
return [];
}
return [pluginDescription];
return [extensionDescription];
});
}
return this.scanPlugins(version, collector, absoluteFolderPath, isBuiltin);