Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-26 11:38:51 +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);

12
src/vs/workbench/node/pluginHostMain.ts
View File

@@ -14,7 +14,7 @@ import URI from 'vs/base/common/uri';
import {TPromise} from 'vs/base/common/winjs.base';
import paths = require('vs/base/common/paths');
import {IExtensionService, IExtensionDescription} from 'vs/platform/extensions/common/extensions';
import {ExtensionsRegistry, PluginsMessageCollector, IPluginsMessageCollector} from 'vs/platform/extensions/common/extensionsRegistry';
import {ExtensionsRegistry, ExtensionsMessageCollector, IExtensionsMessageCollector} from 'vs/platform/extensions/common/extensionsRegistry';
import {ExtHostAPIImplementation} from 'vs/workbench/api/node/extHost.api.impl';
import {IPluginsIPC} from 'vs/platform/extensions/common/ipcRemoteCom';
import {ExtHostModelService} from 'vs/workbench/api/node/extHostDocuments';
@@ -117,7 +117,7 @@ export class PluginHostMain {
this._isTerminating = true;
try {
let allExtensions = ExtensionsRegistry.getAllPluginDescriptions();
let allExtensions = ExtensionsRegistry.getAllExtensionDescriptions();
let allExtensionsIds = allExtensions.map(ext => ext.id);
let activatedExtensions = allExtensionsIds.filter(id => this._extensionService.isActivated(id));
@@ -135,7 +135,7 @@ export class PluginHostMain {
}
private readPlugins(): TPromise<void> {
let collector = new PluginsMessageCollector();
let collector = new ExtensionsMessageCollector();
let env = this._contextService.getConfiguration().env;
return PluginHostMain.scanPlugins(collector, BUILTIN_PLUGINS_PATH, !env.disablePlugins ? env.userPluginsHome : void 0, !env.disablePlugins ? env.pluginDevelopmentPath : void 0, env.version)
@@ -145,14 +145,14 @@ export class PluginHostMain {
})
.then(extensions => {
// Register & Signal done
ExtensionsRegistry.registerPlugins(extensions);
ExtensionsRegistry.registerExtensions(extensions);
this._extensionService.registrationDone(collector.getMessages());
})
.then(() => this.handleEagerPlugins())
.then(() => this.handlePluginTests());
}
private static scanPlugins(collector: IPluginsMessageCollector, builtinPluginsPath: string, userInstallPath: string, pluginDevelopmentPath: string, version: string): TPromise<IExtensionDescription[]> {
private static scanPlugins(collector: IExtensionsMessageCollector, builtinPluginsPath: string, userInstallPath: string, pluginDevelopmentPath: string, version: string): TPromise<IExtensionDescription[]> {
const builtinPlugins = PluginScanner.scanPlugins(version, collector, builtinPluginsPath, true);
const userPlugins = !userInstallPath ? TPromise.as([]) : PluginScanner.scanPlugins(version, collector, userInstallPath, false);
const developedPlugins = !pluginDevelopmentPath ? TPromise.as([]) : PluginScanner.scanOneOrMultiplePlugins(version, collector, pluginDevelopmentPath, false);
@@ -204,7 +204,7 @@ export class PluginHostMain {
[filename: string]: boolean;
} = {};
ExtensionsRegistry.getAllPluginDescriptions().forEach((desc) => {
ExtensionsRegistry.getAllExtensionDescriptions().forEach((desc) => {
let activationEvents = desc.activationEvents;
if (!activationEvents) {
return;