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

Add preserveFocus flag to showTextDocument and OutputChannel.show, fixes #1045

Browse Source
This commit is contained in:
Johannes Rieken
2015-12-23 11:03:51 +01:00
parent 0444705b2f
commit 1da94d28ee
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vs/workbench/api/common/extHost.api.impl.ts
View File

@@ -160,8 +160,8 @@ export class ExtHostAPIImplementation {
get visibleTextEditors() {
return pluginHostEditors.getVisibleTextEditors();
},
showTextDocument(document: vscode.TextDocument, column: vscode.ViewColumn): TPromise<vscode.TextEditor> {
return pluginHostEditors.showTextDocument(document, column);
showTextDocument(document: vscode.TextDocument, column?: vscode.ViewColumn, preserveFocus?: boolean): TPromise<vscode.TextEditor> {
return pluginHostEditors.showTextDocument(document, column, preserveFocus);
},
createTextEditorDecorationType(options:vscode.DecorationRenderOptions): vscode.TextEditorDecorationType {
return pluginHostEditors.createTextEditorDecorationType(options);

8
src/vs/workbench/api/common/extHostEditors.ts
View File

@@ -75,8 +75,8 @@ export class ExtHostEditors {
return this._onDidChangeActiveTextEditor && this._onDidChangeActiveTextEditor.event;
}
showTextDocument(document: TextDocument, column: ViewColumn): TPromise<vscode.TextEditor> {
return this._proxy._tryShowTextDocument(<URI> document.uri, TypeConverters.fromViewColumn(column)).then(id => {
showTextDocument(document: TextDocument, column: ViewColumn, preserveFocus: boolean): TPromise<vscode.TextEditor> {
return this._proxy._tryShowTextDocument(<URI> document.uri, TypeConverters.fromViewColumn(column), preserveFocus).then(id => {
let editor = this._editors[id];
if (editor) {
return editor;
@@ -525,12 +525,12 @@ export class MainThreadEditors {
// --- from plugin host process
_tryShowTextDocument(resource: URI, position: EditorPosition): TPromise<string> {
_tryShowTextDocument(resource: URI, position: EditorPosition, preserveFocus: boolean): TPromise<string> {
// the input we want to open
let input = {
resource,
options: { preserveFocus: false }
options: { preserveFocus }
};
return this._workbenchEditorService.openEditor(input, position).then(editor => {

8
src/vs/workbench/api/common/extHostOutputService.ts
View File

@@ -47,8 +47,8 @@ export class ExtHostOutputChannel implements vscode.OutputChannel {
this._proxy.clear(this._name);
}
show(column?: vscode.ViewColumn): void {
this._proxy.reveal(this._name, TypeConverters.fromViewColumn(column));
show(column?: vscode.ViewColumn, preserveFocus?: boolean): void {
this._proxy.reveal(this._name, TypeConverters.fromViewColumn(column), preserveFocus);
}
hide(): void {
@@ -95,8 +95,8 @@ export class MainThreadOutputService {
return undefined;
}
public reveal(channel: string, position: Position): TPromise<void> {
this._outputService.showOutput(channel, position);
public reveal(channel: string, position: Position, preserveFocus: boolean): TPromise<void> {
this._outputService.showOutput(channel, position, preserveFocus);
return undefined;
}