Skip to content

Commit

Permalink
Consistent naming for ext host <-> main process communication
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexdima
alexdima committed Jul 12, 2016
1 parent bdaa72b commit 217e0b5
Show file tree
Hide file tree
Showing 16 changed files with 109 additions and 109 deletions.
70 changes: 35 additions & 35 deletions src/vs/workbench/api/node/extHost.protocol.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,24 +90,24 @@ export abstract class MainThreadDiagnosticsShape {
}

export abstract class MainThreadDocumentsShape {
_tryOpenDocument(uri: URI): TPromise<any> { throw ni(); }
$tryOpenDocument(uri: URI): TPromise<any> { throw ni(); }
$registerTextContentProvider(handle:number, scheme: string): void { throw ni(); }
$onVirtualDocumentChange(uri: URI, value: string): void { throw ni(); }
$unregisterTextContentProvider(handle: number): void { throw ni(); }
_trySaveDocument(uri: URI): TPromise<boolean> { throw ni(); }
$trySaveDocument(uri: URI): TPromise<boolean> { throw ni(); }
}

export abstract class MainThreadEditorsShape {
_tryShowTextDocument(resource: URI, position: EditorPosition, preserveFocus: boolean): TPromise<string> { throw ni(); }
_registerTextEditorDecorationType(key: string, options: editorCommon.IDecorationRenderOptions): void { throw ni(); }
_removeTextEditorDecorationType(key: string): void { throw ni(); }
_tryShowEditor(id: string, position: EditorPosition): TPromise<void> { throw ni(); }
_tryHideEditor(id: string): TPromise<void> { throw ni(); }
_trySetOptions(id: string, options: ITextEditorConfigurationUpdate): TPromise<any> { throw ni(); }
_trySetDecorations(id: string, key: string, ranges: editorCommon.IDecorationOptions[]): TPromise<any> { throw ni(); }
_tryRevealRange(id: string, range: editorCommon.IRange, revealType: TextEditorRevealType): TPromise<any> { throw ni(); }
_trySetSelections(id: string, selections: editorCommon.ISelection[]): TPromise<any> { throw ni(); }
_tryApplyEdits(id: string, modelVersionId: number, edits: editorCommon.ISingleEditOperation[], setEndOfLine:EndOfLine): TPromise<boolean> { throw ni(); }
$tryShowTextDocument(resource: URI, position: EditorPosition, preserveFocus: boolean): TPromise<string> { throw ni(); }
$registerTextEditorDecorationType(key: string, options: editorCommon.IDecorationRenderOptions): void { throw ni(); }
$removeTextEditorDecorationType(key: string): void { throw ni(); }
$tryShowEditor(id: string, position: EditorPosition): TPromise<void> { throw ni(); }
$tryHideEditor(id: string): TPromise<void> { throw ni(); }
$trySetOptions(id: string, options: ITextEditorConfigurationUpdate): TPromise<any> { throw ni(); }
$trySetDecorations(id: string, key: string, ranges: editorCommon.IDecorationOptions[]): TPromise<any> { throw ni(); }
$tryRevealRange(id: string, range: editorCommon.IRange, revealType: TextEditorRevealType): TPromise<any> { throw ni(); }
$trySetSelections(id: string, selections: editorCommon.ISelection[]): TPromise<any> { throw ni(); }
$tryApplyEdits(id: string, modelVersionId: number, edits: editorCommon.ISingleEditOperation[], setEndOfLine:EndOfLine): TPromise<boolean> { throw ni(); }
}

export abstract class MainThreadErrorsShape {
Expand All @@ -134,18 +134,18 @@ export abstract class MainThreadLanguageFeaturesShape {
}

export abstract class MainThreadLanguagesShape {
_getLanguages(): TPromise<string[]> { throw ni(); }
$getLanguages(): TPromise<string[]> { throw ni(); }
}

export abstract class MainThreadMessageServiceShape {
$showMessage(severity: Severity, message: string, commands: { title: string; isCloseAffordance: boolean; handle: number; }[]): Thenable<number> { throw ni(); }
}

export abstract class MainThreadOutputServiceShape {
append(channelId: string, label: string, value: string): TPromise<void> { throw ni(); }
clear(channelId: string, label: string): TPromise<void> { throw ni(); }
reveal(channelId: string, label: string, preserveFocus: boolean): TPromise<void> { throw ni(); }
close(channelId: string): TPromise<void> { throw ni(); }
$append(channelId: string, label: string, value: string): TPromise<void> { throw ni(); }
$clear(channelId: string, label: string): TPromise<void> { throw ni(); }
$reveal(channelId: string, label: string, preserveFocus: boolean): TPromise<void> { throw ni(); }
$close(channelId: string): TPromise<void> { throw ni(); }
}

export interface MyQuickPickItems extends IPickOpenEntry {
Expand All @@ -159,13 +159,13 @@ export abstract class MainThreadQuickOpenShape {
}

export abstract class MainThreadStatusBarShape {
setEntry(id: number, text: string, tooltip: string, command: string, color: string, alignment: MainThreadStatusBarAlignment, priority: number): void { throw ni(); }
dispose(id: number) { throw ni(); }
$setEntry(id: number, text: string, tooltip: string, command: string, color: string, alignment: MainThreadStatusBarAlignment, priority: number): void { throw ni(); }
$dispose(id: number) { throw ni(); }
}

export abstract class MainThreadStorageShape {
getValue<T>(shared: boolean, key: string): TPromise<T> { throw ni(); }
setValue(shared: boolean, key: string, value: any): TPromise<any> { throw ni(); }
$getValue<T>(shared: boolean, key: string): TPromise<T> { throw ni(); }
$setValue(shared: boolean, key: string, value: any): TPromise<any> { throw ni(); }
}

export abstract class MainThreadTelemetryShape {
Expand Down Expand Up @@ -211,13 +211,13 @@ export interface IModelAddedData {
}
export abstract class ExtHostDocumentsShape {
$provideTextDocumentContent(handle: number, uri: URI): TPromise<string> { throw ni(); }
_acceptModelAdd(initData: IModelAddedData): void { throw ni(); }
_acceptModelModeChanged(strURL: string, oldModeId: string, newModeId: string): void { throw ni(); }
_acceptModelSaved(strURL: string): void { throw ni(); }
_acceptModelDirty(strURL: string): void { throw ni(); }
_acceptModelReverted(strURL: string): void { throw ni(); }
_acceptModelRemoved(strURL: string): void { throw ni(); }
_acceptModelChanged(strURL: string, events: editorCommon.IModelContentChangedEvent2[]): void { throw ni(); }
$acceptModelAdd(initData: IModelAddedData): void { throw ni(); }
$acceptModelModeChanged(strURL: string, oldModeId: string, newModeId: string): void { throw ni(); }
$acceptModelSaved(strURL: string): void { throw ni(); }
$acceptModelDirty(strURL: string): void { throw ni(); }
$acceptModelReverted(strURL: string): void { throw ni(); }
$acceptModelRemoved(strURL: string): void { throw ni(); }
$acceptModelChanged(strURL: string, events: editorCommon.IModelContentChangedEvent2[]): void { throw ni(); }
}

export interface ITextEditorAddData {
Expand All @@ -231,12 +231,12 @@ export interface ITextEditorPositionData {
[id: string]: EditorPosition;
}
export abstract class ExtHostEditorsShape {
_acceptTextEditorAdd(data: ITextEditorAddData): void { throw ni(); }
_acceptOptionsChanged(id: string, opts: IResolvedTextEditorConfiguration): void { throw ni(); }
_acceptSelectionsChanged(id: string, _selections: editorCommon.ISelection[]): void { throw ni(); }
_acceptActiveEditorAndVisibleEditors(id: string, visibleIds: string[]): void { throw ni(); }
_acceptEditorPositionData(data: ITextEditorPositionData): void { throw ni(); }
_acceptTextEditorRemove(id: string): void { throw ni(); }
$acceptTextEditorAdd(data: ITextEditorAddData): void { throw ni(); }
$acceptOptionsChanged(id: string, opts: IResolvedTextEditorConfiguration): void { throw ni(); }
$acceptSelectionsChanged(id: string, _selections: editorCommon.ISelection[]): void { throw ni(); }
$acceptActiveEditorAndVisibleEditors(id: string, visibleIds: string[]): void { throw ni(); }
$acceptEditorPositionData(data: ITextEditorPositionData): void { throw ni(); }
$acceptTextEditorRemove(id: string): void { throw ni(); }
}

export abstract class ExtHostExtensionServiceShape {
Expand All @@ -250,7 +250,7 @@ export interface FileSystemEvents {
deleted: URI[];
}
export abstract class ExtHostFileSystemEventServiceShape {
_onFileEvent(events: FileSystemEvents) { throw ni(); }
$onFileEvent(events: FileSystemEvents) { throw ni(); }
}

export abstract class ExtHostLanguageFeaturesShape {
Expand Down
18 changes: 9 additions & 9 deletions src/vs/workbench/api/node/extHostDocuments.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export class ExtHostDocuments extends ExtHostDocumentsShape {

let promise = this._documentLoader[uri.toString()];
if (!promise) {
promise = this._proxy._tryOpenDocument(uri).then(() => {
promise = this._proxy.$tryOpenDocument(uri).then(() => {
delete this._documentLoader[uri.toString()];
return this._documentData[uri.toString()];
}, err => {
Expand Down Expand Up @@ -153,7 +153,7 @@ export class ExtHostDocuments extends ExtHostDocumentsShape {
return asWinJsPromise(token => provider.provideTextDocumentContent(uri, token));
}

public _acceptModelAdd(initData: IModelAddedData): void {
public $acceptModelAdd(initData: IModelAddedData): void {
let data = new ExtHostDocumentData(this._proxy, initData.url, initData.value.lines, initData.value.EOL, initData.modeId, initData.versionId, initData.isDirty);
let key = data.document.uri.toString();
if (this._documentData[key]) {
Expand All @@ -163,7 +163,7 @@ export class ExtHostDocuments extends ExtHostDocumentsShape {
this._onDidAddDocumentEventEmitter.fire(data.document);
}

public _acceptModelModeChanged(strURL: string, oldModeId: string, newModeId: string): void {
public $acceptModelModeChanged(strURL: string, oldModeId: string, newModeId: string): void {
let data = this._documentData[strURL];

// Treat a mode change as a remove + add
Expand All @@ -173,23 +173,23 @@ export class ExtHostDocuments extends ExtHostDocumentsShape {
this._onDidAddDocumentEventEmitter.fire(data.document);
}

public _acceptModelSaved(strURL: string): void {
public $acceptModelSaved(strURL: string): void {
let data = this._documentData[strURL];
data._acceptIsDirty(false);
this._onDidSaveDocumentEventEmitter.fire(data.document);
}

public _acceptModelDirty(strURL: string): void {
public $acceptModelDirty(strURL: string): void {
let document = this._documentData[strURL];
document._acceptIsDirty(true);
}

public _acceptModelReverted(strURL: string): void {
public $acceptModelReverted(strURL: string): void {
let document = this._documentData[strURL];
document._acceptIsDirty(false);
}

public _acceptModelRemoved(strURL: string): void {
public $acceptModelRemoved(strURL: string): void {
if (!this._documentData[strURL]) {
throw new Error('Document `' + strURL + '` does not exist.');
}
Expand All @@ -199,7 +199,7 @@ export class ExtHostDocuments extends ExtHostDocumentsShape {
data.dispose();
}

public _acceptModelChanged(strURL: string, events: editorCommon.IModelContentChangedEvent2[]): void {
public $acceptModelChanged(strURL: string, events: editorCommon.IModelContentChangedEvent2[]): void {
let data = this._documentData[strURL];
data.onEvents(events);
this._onDidChangeDocumentEventEmitter.fire({
Expand Down Expand Up @@ -253,7 +253,7 @@ export class ExtHostDocumentData extends MirrorModel2 {
get languageId() { return data._languageId; },
get version() { return data._versionId; },
get isDirty() { return data._isDirty; },
save() { return data._proxy._trySaveDocument(data._uri); },
save() { return data._proxy.$trySaveDocument(data._uri); },
getText(range?) { return range ? data._getTextInRange(range) : data.getText(); },
get lineCount() { return data._lines.length; },
lineAt(lineOrPos) { return data.lineAt(lineOrPos); },
Expand Down
36 changes: 18 additions & 18 deletions src/vs/workbench/api/node/extHostEditors.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export class ExtHostEditors extends ExtHostEditorsShape {
}

showTextDocument(document: TextDocument, column: ViewColumn, preserveFocus: boolean): TPromise<vscode.TextEditor> {
return this._proxy._tryShowTextDocument(<URI> document.uri, TypeConverters.fromViewColumn(column), preserveFocus).then(id => {
return this._proxy.$tryShowTextDocument(<URI> document.uri, TypeConverters.fromViewColumn(column), preserveFocus).then(id => {
let editor = this._editors[id];
if (editor) {
return editor;
Expand All @@ -87,13 +87,13 @@ export class ExtHostEditors extends ExtHostEditorsShape {

// --- called from main thread

_acceptTextEditorAdd(data: ITextEditorAddData): void {
$acceptTextEditorAdd(data: ITextEditorAddData): void {
let document = this._extHostDocuments.getDocumentData(data.document);
let newEditor = new ExtHostTextEditor(this._proxy, data.id, document, data.selections.map(TypeConverters.toSelection), data.options, TypeConverters.toViewColumn(data.editorPosition));
this._editors[data.id] = newEditor;
}

_acceptOptionsChanged(id: string, opts: IResolvedTextEditorConfiguration): void {
$acceptOptionsChanged(id: string, opts: IResolvedTextEditorConfiguration): void {
let editor = this._editors[id];
editor._acceptOptions(opts);
this._onDidChangeTextEditorOptions.fire({
Expand All @@ -102,7 +102,7 @@ export class ExtHostEditors extends ExtHostEditorsShape {
});
}

_acceptSelectionsChanged(id: string, _selections: ISelection[]): void {
$acceptSelectionsChanged(id: string, _selections: ISelection[]): void {
let selections = _selections.map(TypeConverters.toSelection);
let editor = this._editors[id];
editor._acceptSelections(selections);
Expand All @@ -112,7 +112,7 @@ export class ExtHostEditors extends ExtHostEditorsShape {
});
}

_acceptActiveEditorAndVisibleEditors(id: string, visibleIds: string[]): void {
$acceptActiveEditorAndVisibleEditors(id: string, visibleIds: string[]): void {
this._visibleEditorIds = visibleIds;

if (this._activeEditorId === id) {
Expand All @@ -123,7 +123,7 @@ export class ExtHostEditors extends ExtHostEditorsShape {
this._onDidChangeActiveTextEditor.fire(this.getActiveTextEditor());
}

_acceptEditorPositionData(data: ITextEditorPositionData): void {
$acceptEditorPositionData(data: ITextEditorPositionData): void {
for (let id in data) {
let textEditor = this._editors[id];
let viewColumn = TypeConverters.toViewColumn(data[id]);
Expand All @@ -134,15 +134,15 @@ export class ExtHostEditors extends ExtHostEditorsShape {
}
}

_acceptTextEditorRemove(id: string): void {
$acceptTextEditorRemove(id: string): void {
// make sure the removed editor is not visible
let newVisibleEditors = this._visibleEditorIds.filter(visibleEditorId => visibleEditorId !== id);

if (this._activeEditorId === id) {
// removing the current active editor
this._acceptActiveEditorAndVisibleEditors(undefined, newVisibleEditors);
this.$acceptActiveEditorAndVisibleEditors(undefined, newVisibleEditors);
} else {
this._acceptActiveEditorAndVisibleEditors(this._activeEditorId, newVisibleEditors);
this.$acceptActiveEditorAndVisibleEditors(this._activeEditorId, newVisibleEditors);
}

let editor = this._editors[id];
Expand All @@ -161,11 +161,11 @@ class TextEditorDecorationType implements vscode.TextEditorDecorationType {
constructor(proxy: MainThreadEditorsShape, options: vscode.DecorationRenderOptions) {
this.key = TextEditorDecorationType._Keys.nextId();
this._proxy = proxy;
this._proxy._registerTextEditorDecorationType(this.key, <any>options);
this._proxy.$registerTextEditorDecorationType(this.key, <any>options);
}

public dispose(): void {
this._proxy._removeTextEditorDecorationType(this.key);
this._proxy.$removeTextEditorDecorationType(this.key);
}
}

Expand Down Expand Up @@ -293,11 +293,11 @@ class ExtHostTextEditor implements vscode.TextEditor {
}

@deprecated('TextEditor.show') show(column: vscode.ViewColumn) {
this._proxy._tryShowEditor(this._id, TypeConverters.fromViewColumn(column));
this._proxy.$tryShowEditor(this._id, TypeConverters.fromViewColumn(column));
}

@deprecated('TextEditor.hide') hide() {
this._proxy._tryHideEditor(this._id);
this._proxy.$tryHideEditor(this._id);
}

// ---- the document
Expand All @@ -319,7 +319,7 @@ class ExtHostTextEditor implements vscode.TextEditor {
set options(value: TextEditorOptions) {
this._options = value;
this._runOnProxy(() => {
return this._proxy._trySetOptions(this._id, this._options);
return this._proxy.$trySetOptions(this._id, this._options);
}, true);
}

Expand Down Expand Up @@ -369,7 +369,7 @@ class ExtHostTextEditor implements vscode.TextEditor {

setDecorations(decorationType: vscode.TextEditorDecorationType, ranges: Range[] | vscode.DecorationOptions[]): void {
this._runOnProxy(
() => this._proxy._trySetDecorations(
() => this._proxy.$trySetDecorations(
this._id,
decorationType.key,
TypeConverters.fromRangeOrRangeWithMessage(ranges)
Expand All @@ -380,7 +380,7 @@ class ExtHostTextEditor implements vscode.TextEditor {

revealRange(range: Range, revealType: vscode.TextEditorRevealType): void {
this._runOnProxy(
() => this._proxy._tryRevealRange(
() => this._proxy.$tryRevealRange(
this._id,
TypeConverters.fromRange(range),
revealType || TextEditorRevealType.Default
Expand All @@ -391,7 +391,7 @@ class ExtHostTextEditor implements vscode.TextEditor {

private _trySetSelection(silent: boolean): TPromise<vscode.TextEditor> {
let selection = this._selections.map(TypeConverters.fromSelection);
return this._runOnProxy(() => this._proxy._trySetSelections(this._id, selection), silent);
return this._runOnProxy(() => this._proxy.$trySetSelections(this._id, selection), silent);
}

_acceptSelections(selections: Selection[]): void {
Expand All @@ -418,7 +418,7 @@ class ExtHostTextEditor implements vscode.TextEditor {
};
});

return this._proxy._tryApplyEdits(this._id, editData.documentVersionId, edits, editData.setEndOfLine);
return this._proxy.$tryApplyEdits(this._id, editData.documentVersionId, edits, editData.setEndOfLine);
}

// ---- util
Expand Down
2 changes: 1 addition & 1 deletion src/vs/workbench/api/node/extHostLanguages.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export class ExtHostLanguages {
}

getLanguages(): TPromise<string[]> {
return this._proxy._getLanguages();
return this._proxy.$getLanguages();
}
}

10 changes: 5 additions & 5 deletions src/vs/workbench/api/node/extHostOutputService.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,34 +28,34 @@ export class ExtHostOutputChannel implements vscode.OutputChannel {

dispose(): void {
if (!this._disposed) {
this._proxy.clear(this._id, this._name).then(() => {
this._proxy.$clear(this._id, this._name).then(() => {
this._disposed = true;
});
}
}

append(value: string): void {
this._proxy.append(this._id, this._name, value);
this._proxy.$append(this._id, this._name, value);
}

appendLine(value: string): void {
this.append(value + '\n');
}

clear(): void {
this._proxy.clear(this._id, this._name);
this._proxy.$clear(this._id, this._name);
}

show(columnOrPreserveFocus?: vscode.ViewColumn | boolean, preserveFocus?: boolean): void {
if (typeof columnOrPreserveFocus === 'boolean') {
preserveFocus = columnOrPreserveFocus;
}

this._proxy.reveal(this._id, this._name, preserveFocus);
this._proxy.$reveal(this._id, this._name, preserveFocus);
}

hide(): void {
this._proxy.close(this._id);
this._proxy.$close(this._id);
}
}

Expand Down
Loading

0 comments on commit 217e0b5

Please sign in to comment.