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

debt - rename PluginHostXYZ to ExtHostXYZ, do the same for filenames

Browse Source
This commit is contained in:
Johannes Rieken
2015-12-21 11:34:59 +01:00
parent 74f7a2b276
commit 8aadd81678
25 changed files with 167 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/vs/workbench/api/browser/pluginHost.api.impl.ts → src/vs/workbench/api/browser/extHost.api.impl.ts
View File

@@ -8,23 +8,23 @@ import {MainInplaceReplaceSupport, ReplaceSupport, IBracketElectricCharacterCont
import {score} from 'vs/editor/common/modes/languageSelector';
import {Remotable, IThreadService} from 'vs/platform/thread/common/thread';
import * as errors from 'vs/base/common/errors';
import {PluginHostFileSystemEventService} from 'vs/workbench/api/common/pluginHostFileSystemEventService';
import {PluginHostModelService, setWordDefinitionFor} from 'vs/workbench/api/common/pluginHostDocuments';
import {PluginHostConfiguration} from 'vs/workbench/api/common/pluginHostConfiguration';
import {PluginHostDiagnostics} from 'vs/workbench/api/common/pluginHostDiagnostics';
import {PluginHostWorkspace} from 'vs/workbench/api/common/pluginHostWorkspace';
import {PluginHostQuickOpen} from 'vs/workbench/api/browser/pluginHostQuickOpen';
import {PluginHostStatusBar} from 'vs/workbench/api/browser/pluginHostStatusBar';
import {PluginHostCommands} from 'vs/workbench/api/common/pluginHostCommands';
import {ExtHostFileSystemEventService} from 'vs/workbench/api/common/extHostFileSystemEventService';
import {ExtHostModelService, setWordDefinitionFor} from 'vs/workbench/api/common/extHostDocuments';
import {ExtHostConfiguration} from 'vs/workbench/api/common/extHostConfiguration';
import {ExtHostDiagnostics} from 'vs/workbench/api/common/extHostDiagnostics';
import {ExtHostWorkspace} from 'vs/workbench/api/common/extHostWorkspace';
import {ExtHostQuickOpen} from 'vs/workbench/api/browser/extHostQuickOpen';
import {ExtHostStatusBar} from 'vs/workbench/api/browser/extHostStatusBar';
import {ExtHostCommands} from 'vs/workbench/api/common/extHostCommands';
import {ExtHostOutputService} from 'vs/workbench/api/common/extHostOutputService';
import {PluginHostMessageService} from 'vs/workbench/api/common/pluginHostMessageService';
import {PluginHostTelemetryService} from 'vs/workbench/api/common/pluginHostTelemetry';
import {PluginHostEditors} from 'vs/workbench/api/common/pluginHostEditors';
import {ExtHostMessageService} from 'vs/workbench/api/common/extHostMessageService';
import {ExtHostEditors} from 'vs/workbench/api/common/extHostEditors';
import {ExtHostLanguages} from 'vs/workbench/api/common/extHostLanguages';
import {ExtHostLanguageFeatures} from 'vs/workbench/api/common/extHostLanguageFeatures';
import {ExtHostApiCommands} from 'vs/workbench/api/common/extHostApiCommands';
import * as extHostTypes from 'vs/workbench/api/common/pluginHostTypes';
import * as extHostTypes from 'vs/workbench/api/common/extHostTypes';
import 'vs/workbench/api/common/pluginHostTypes.marshalling';
import * as TypeConverters from 'vs/workbench/api/common/extHostTypeConverters';
import {wrapAsWinJSPromise} from 'vs/base/common/async';
import Modes = require('vs/editor/common/modes');
import {IModelService} from 'vs/editor/common/services/modelService';
@@ -39,7 +39,6 @@ import {IPluginService, IPluginDescription} from 'vs/platform/plugins/common/plu
import {PluginsRegistry} from 'vs/platform/plugins/common/pluginsRegistry';
import {relative} from 'path';
import {TPromise} from 'vs/base/common/winjs.base';
import * as TypeConverters from 'vs/workbench/api/common/pluginHostTypeConverters';
import {IWorkspaceContextService} from 'vs/platform/workspace/common/workspace';
import {CancellationTokenSource} from 'vs/base/common/cancellation';
import vscode = require('vscode');
@@ -50,11 +49,11 @@ import * as paths from 'vs/base/common/paths';
* This class implements the API described in vscode.d.ts,
* for the case of the extensionHost host process
*/
export class PluginHostAPIImplementation {
export class ExtHostAPIImplementation {
private static _LAST_REGISTER_TOKEN = 0;
private static generateDisposeToken(): string {
return String(++PluginHostAPIImplementation._LAST_REGISTER_TOKEN);
return String(++ExtHostAPIImplementation._LAST_REGISTER_TOKEN);
}
private _threadService: IThreadService;
@@ -137,7 +136,7 @@ export class PluginHostAPIImplementation {
this._proxy.onUnexpectedPluginHostError(errors.transformErrorForSerialization(err));
});
const pluginHostCommands = this._threadService.getRemotable(PluginHostCommands);
const pluginHostCommands = this._threadService.getRemotable(ExtHostCommands);
this.commands = {
registerCommand<T>(id: string, command: <T>(...args: any[]) => T | Thenable<T>, thisArgs?: any): vscode.Disposable {
return pluginHostCommands.registerCommand(id, command, thisArgs);
@@ -153,11 +152,10 @@ export class PluginHostAPIImplementation {
}
};
const pluginHostEditors = this._threadService.getRemotable(PluginHostEditors);
const pluginHostMessageService = new PluginHostMessageService(this._threadService, this.commands);
const pluginHostQuickOpen = new PluginHostQuickOpen(this._threadService);
const pluginHostStatusBar = new PluginHostStatusBar(this._threadService);
const pluginHostTelemetryService = new PluginHostTelemetryService(threadService);
const pluginHostEditors = this._threadService.getRemotable(ExtHostEditors);
const pluginHostMessageService = new ExtHostMessageService(this._threadService, this.commands);
const pluginHostQuickOpen = new ExtHostQuickOpen(this._threadService);
const pluginHostStatusBar = new ExtHostStatusBar(this._threadService);
const extHostOutputService = new ExtHostOutputService(this._threadService);
this.window = {
get activeTextEditor() {
@@ -206,9 +204,9 @@ export class PluginHostAPIImplementation {
//
const workspacePath = contextService.getWorkspace() ? contextService.getWorkspace().resource.fsPath : undefined;
const pluginHostFileSystemEvent = threadService.getRemotable(PluginHostFileSystemEventService);
const pluginHostWorkspace = new PluginHostWorkspace(this._threadService, workspacePath);
const pluginHostDocuments = this._threadService.getRemotable(PluginHostModelService);
const pluginHostFileSystemEvent = threadService.getRemotable(ExtHostFileSystemEventService);
const pluginHostWorkspace = new ExtHostWorkspace(this._threadService, workspacePath);
const pluginHostDocuments = this._threadService.getRemotable(ExtHostModelService);
this.workspace = Object.freeze({
get rootPath() {
return pluginHostWorkspace.getPath();
@@ -265,9 +263,9 @@ export class PluginHostAPIImplementation {
//
const languages = new ExtHostLanguages(this._threadService);
const pluginHostDiagnostics = new PluginHostDiagnostics(this._threadService);
const pluginHostDiagnostics = new ExtHostDiagnostics(this._threadService);
const languageFeatures = threadService.getRemotable(ExtHostLanguageFeatures);
const languageFeatureCommand = new ExtHostApiCommands(threadService.getRemotable(PluginHostCommands));
const languageFeatureCommand = new ExtHostApiCommands(threadService.getRemotable(ExtHostCommands));
this.languages = {
createDiagnosticCollection(name?: string): vscode.DiagnosticCollection {
@@ -326,7 +324,7 @@ export class PluginHostAPIImplementation {
}
};
var pluginHostConfiguration = threadService.getRemotable(PluginHostConfiguration);
var pluginHostConfiguration = threadService.getRemotable(ExtHostConfiguration);
//
this.extensions = {
@@ -339,7 +337,6 @@ export class PluginHostAPIImplementation {
get all():Extension<any>[] {
return PluginsRegistry.getAllPluginDescriptions().map((desc) => new Extension(pluginService, desc));
}
// getTelemetryInfo: pluginHostTelemetryService.getTelemetryInfo.bind(pluginHostTelemetryService)
}
// Intentionally calling a function for typechecking purposes
@@ -426,31 +423,31 @@ export class PluginHostAPIImplementation {
}
private Modes_CommentsSupport_register(modeId: string, commentsSupport: ICommentsSupportContribution): IDisposable {
let disposeToken = PluginHostAPIImplementation.generateDisposeToken();
let disposeToken = ExtHostAPIImplementation.generateDisposeToken();
this._proxy.Modes_CommentsSupport_register(disposeToken, modeId, commentsSupport);
return this._disposableFromToken(disposeToken);
}
private Modes_TokenTypeClassificationSupport_register(modeId: string, tokenTypeClassificationSupport:ITokenTypeClassificationSupportContribution): IDisposable {
let disposeToken = PluginHostAPIImplementation.generateDisposeToken();
let disposeToken = ExtHostAPIImplementation.generateDisposeToken();
this._proxy.Modes_TokenTypeClassificationSupport_register(disposeToken, modeId, tokenTypeClassificationSupport);
return this._disposableFromToken(disposeToken);
}
private Modes_ElectricCharacterSupport_register(modeId: string, electricCharacterSupport:IBracketElectricCharacterContribution): IDisposable {
let disposeToken = PluginHostAPIImplementation.generateDisposeToken();
let disposeToken = ExtHostAPIImplementation.generateDisposeToken();
this._proxy.Modes_ElectricCharacterSupport_register(disposeToken, modeId, electricCharacterSupport);
return this._disposableFromToken(disposeToken);
}
private Modes_CharacterPairSupport_register(modeId: string, characterPairSupport:Modes.ICharacterPairContribution): IDisposable {
let disposeToken = PluginHostAPIImplementation.generateDisposeToken();
let disposeToken = ExtHostAPIImplementation.generateDisposeToken();
this._proxy.Modes_CharacterPairSupport_register(disposeToken, modeId, characterPairSupport);
return this._disposableFromToken(disposeToken);
}
private Modes_OnEnterSupport_register(modeId: string, opts: IOnEnterSupportOptions): IDisposable {
let disposeToken = PluginHostAPIImplementation.generateDisposeToken();
let disposeToken = ExtHostAPIImplementation.generateDisposeToken();
this._proxy.Modes_OnEnterSupport_register(disposeToken, modeId, opts);
return this._disposableFromToken(disposeToken);
}

2
src/vs/workbench/api/browser/pluginHostQuickOpen.ts → src/vs/workbench/api/browser/extHostQuickOpen.ts
View File

@@ -15,7 +15,7 @@ export interface MyQuickPickItems extends IPickOpenEntryItem {
export type Item = string | QuickPickItem;
export class PluginHostQuickOpen {
export class ExtHostQuickOpen {
private _proxy: MainThreadQuickOpen;

12
src/vs/workbench/api/browser/pluginHostStatusBar.ts → src/vs/workbench/api/browser/extHostStatusBar.ts
View File

@@ -9,10 +9,10 @@ import {Remotable, IThreadService} from 'vs/platform/thread/common/thread';
import {IStatusbarService} from 'vs/workbench/services/statusbar/statusbarService';
import {IDisposable, disposeAll} from 'vs/base/common/lifecycle';
import {StatusbarAlignment as MainThreadStatusBarAlignment} from 'vs/workbench/browser/parts/statusbar/statusbar';
import {StatusBarAlignment as ExtHostStatusBarAlignment, Disposable} from '../common/pluginHostTypes';
import {StatusBarAlignment as ExtHostStatusBarAlignment, Disposable} from '../common/extHostTypes';
import {StatusBarItem, StatusBarAlignment} from 'vscode';
export class PluginHostStatusBarEntry implements StatusBarItem {
export class ExtHostStatusBarEntry implements StatusBarItem {
private static ID_GEN = 0;
private _id: number;
@@ -30,7 +30,7 @@ export class PluginHostStatusBarEntry implements StatusBarItem {
private _proxy: MainThreadStatusBar;
constructor(proxy: MainThreadStatusBar, alignment: ExtHostStatusBarAlignment = ExtHostStatusBarAlignment.Left, priority?: number) {
this._id = PluginHostStatusBarEntry.ID_GEN++;
this._id = ExtHostStatusBarEntry.ID_GEN++;
this._proxy = proxy;
this._alignment = alignment;
this._priority = priority;
@@ -125,7 +125,7 @@ class StatusBarMessage {
private _item: StatusBarItem;
private _messages: {message:string}[] = [];
constructor(statusBar: PluginHostStatusBar) {
constructor(statusBar: ExtHostStatusBar) {
this._item = statusBar.createStatusBarEntry(ExtHostStatusBarAlignment.Left, Number.MIN_VALUE);
}
@@ -158,7 +158,7 @@ class StatusBarMessage {
}
}
export class PluginHostStatusBar {
export class ExtHostStatusBar {
private _proxy: MainThreadStatusBar;
private _statusMessage: StatusBarMessage;
@@ -169,7 +169,7 @@ export class PluginHostStatusBar {
}
createStatusBarEntry(alignment?: ExtHostStatusBarAlignment, priority?: number): StatusBarItem {
return new PluginHostStatusBarEntry(this._proxy, alignment, priority);
return new ExtHostStatusBarEntry(this._proxy, alignment, priority);
}
setStatusBarMessage(text: string, timeoutOrThenable?: number | Thenable<any>): Disposable {