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

output: align extHostOutputService with new api

Browse Source
This commit is contained in:
isidor
2016-04-13 18:14:24 +02:00
parent 31473fe488
commit 283bfae1bb
1 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/vs/workbench/api/node/extHostOutputService.ts
View File

@@ -7,7 +7,7 @@
import {TPromise} from 'vs/base/common/winjs.base';
import {onUnexpectedError} from 'vs/base/common/errors';
import {Remotable, IThreadService} from 'vs/platform/thread/common/thread';
import {IOutputService, OUTPUT_EDITOR_INPUT_ID} from 'vs/workbench/parts/output/common/output';
import {IOutputService, OUTPUT_EDITOR_INPUT_ID, IOutputChannel} from 'vs/workbench/parts/output/common/output';
import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService';
export class ExtHostOutputChannel implements vscode.OutputChannel {
@@ -27,22 +27,21 @@ export class ExtHostOutputChannel implements vscode.OutputChannel {
dispose(): void {
if (!this._disposed) {
this._proxy.clear(this._name).then(() => {
this._disposed = true;
});
this._proxy.getOutputChannel(this._name).clear();
this._disposed = true;
}
}
append(value: string): void {
this._proxy.append(this._name, value);
this._proxy.getOutputChannel(this._name).append(value);
}
appendLine(value: string): void {
this.append(value + '\n');
this._proxy.getOutputChannel(this._name).append(value + '\n');
}
clear(): void {
this._proxy.clear(this._name);
this._proxy.getOutputChannel(this._name).clear();
}
show(columnOrPreserveFocus?: vscode.ViewColumn | boolean, preserveFocus?: boolean): void {
@@ -50,7 +49,7 @@ export class ExtHostOutputChannel implements vscode.OutputChannel {
preserveFocus = columnOrPreserveFocus;
}
this._proxy.reveal(this._name, preserveFocus);
this._proxy.getOutputChannel(this._name).show(preserveFocus);
}
hide(): void {
@@ -87,19 +86,8 @@ export class MainThreadOutputService {
this._editorService = editorService;
}
public append(channel: string, value: string): TPromise<void> {
this._outputService.getOutputChannel(channel).append(value);
return undefined;
}
public clear(channel: string): TPromise<void> {
this._outputService.getOutputChannel(channel).clear();
return undefined;
}
public reveal(channel: string, preserveFocus: boolean): TPromise<void> {
this._outputService.getOutputChannel(channel).show(preserveFocus);
return undefined;
public getOutputChannel(channelId): IOutputChannel {
return this._outputService.getOutputChannel(channelId);
}
public close(channel: string): TPromise<void> {