mirror of
https://github.com/microsoft/vscode.git
synced 2026-04-24 18:49:00 +01:00
IPluginService -> IExtensionService
This commit is contained in:
@@ -29,7 +29,7 @@ import URI from 'vs/base/common/uri';
|
||||
import Severity from 'vs/base/common/severity';
|
||||
import {IDisposable} from 'vs/base/common/lifecycle';
|
||||
import EditorCommon = require('vs/editor/common/editorCommon');
|
||||
import {IPluginService, IPluginDescription} from 'vs/platform/extensions/common/plugins';
|
||||
import {IExtensionService, IPluginDescription} from 'vs/platform/extensions/common/plugins';
|
||||
import {PluginHostPluginService} from 'vs/platform/extensions/common/nativePluginService';
|
||||
import {PluginsRegistry} from 'vs/platform/extensions/common/pluginsRegistry';
|
||||
import {TPromise} from 'vs/base/common/winjs.base';
|
||||
@@ -93,7 +93,7 @@ export class ExtHostAPIImplementation {
|
||||
|
||||
constructor(
|
||||
@IThreadService threadService: IThreadService,
|
||||
@IPluginService pluginService: IPluginService,
|
||||
@IExtensionService extensionService: IExtensionService,
|
||||
@IWorkspaceContextService contextService: IWorkspaceContextService,
|
||||
@ITelemetryService telemetryService: ITelemetryService
|
||||
) {
|
||||
@@ -374,11 +374,11 @@ export class ExtHostAPIImplementation {
|
||||
getExtension(extensionId: string):Extension<any> {
|
||||
let desc = PluginsRegistry.getPluginDescription(extensionId);
|
||||
if (desc) {
|
||||
return new Extension(<PluginHostPluginService> pluginService, desc);
|
||||
return new Extension(<PluginHostPluginService> extensionService, desc);
|
||||
}
|
||||
},
|
||||
get all():Extension<any>[] {
|
||||
return PluginsRegistry.getAllPluginDescriptions().map((desc) => new Extension(<PluginHostPluginService> pluginService, desc));
|
||||
return PluginsRegistry.getAllPluginDescriptions().map((desc) => new Extension(<PluginHostPluginService> extensionService, desc));
|
||||
}
|
||||
};
|
||||
|
||||
@@ -413,29 +413,29 @@ export class ExtHostAPIImplementation {
|
||||
|
||||
class Extension<T> implements vscode.Extension<T> {
|
||||
|
||||
private _pluginService: PluginHostPluginService;
|
||||
private _extensionService: PluginHostPluginService;
|
||||
|
||||
public id: string;
|
||||
public extensionPath: string;
|
||||
public packageJSON: any;
|
||||
|
||||
constructor(pluginService:PluginHostPluginService, description:IPluginDescription) {
|
||||
this._pluginService = pluginService;
|
||||
constructor(extensionService:PluginHostPluginService, description:IPluginDescription) {
|
||||
this._extensionService = extensionService;
|
||||
this.id = description.id;
|
||||
this.extensionPath = paths.normalize(description.extensionFolderPath, true);
|
||||
this.packageJSON = description;
|
||||
}
|
||||
|
||||
get isActive(): boolean {
|
||||
return this._pluginService.isActivated(this.id);
|
||||
return this._extensionService.isActivated(this.id);
|
||||
}
|
||||
|
||||
get exports(): T {
|
||||
return <T>this._pluginService.get(this.id);
|
||||
return <T>this._extensionService.get(this.id);
|
||||
}
|
||||
|
||||
activate(): Thenable<T> {
|
||||
return this._pluginService.activateAndGet(this.id).then(() => this.exports);
|
||||
return this._extensionService.activateAndGet(this.id).then(() => this.exports);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user