development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-20 11:08:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes #32816

Browse source
This commit is contained in:
Joao Moreno 2017-08-21 10:50:45 +02:00
parent e184b4d6f8
commit 469ba2a620
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
extensions/git/src/commands.ts
View file

@ -153,10 +153,10 @@ export class CommandCenter {
@command('git.openResource')
async openResource(resource: Resource): Promise<void> {
await this._openResource(resource);
await this._openResource(resource, undefined, true);
}
private async _openResource(resource: Resource, preview?: boolean): Promise<void> {
private async _openResource(resource: Resource, preview?: boolean, preserveFocus?: boolean): Promise<void> {
const left = this.getLeftResource(resource);
const right = this.getRightResource(resource);
const title = this.getTitle(resource);
@ -168,8 +168,8 @@ export class CommandCenter {
}
const opts: TextDocumentShowOptions = {
preserveFocus: true,
preview: preview,
preserveFocus,
preview,
viewColumn: window.activeTextEditor && window.activeTextEditor.viewColumn || ViewColumn.One
};
@ -311,6 +311,8 @@ export class CommandCenter {
@command('git.openFile')
async openFile(arg?: Resource | Uri, ...resourceStates: SourceControlResourceState[]): Promise<void> {
const preserveFocus = !!arg;
let uris: Uri[] | undefined;
if (arg instanceof Uri) {
@ -345,7 +347,7 @@ export class CommandCenter {
: undefined;
const opts: TextDocumentShowOptions = {
preserveFocus: true,
preserveFocus,
preview: preview,
viewColumn: activeTextEditor && activeTextEditor.viewColumn || ViewColumn.One
};
@ -387,6 +389,7 @@ export class CommandCenter {
@command('git.openChange')
async openChange(arg?: Resource | Uri, ...resourceStates: SourceControlResourceState[]): Promise<void> {
const preserveFocus = !!arg;
let resources: Resource[] | undefined = undefined;
if (arg instanceof Uri) {
@ -415,7 +418,7 @@ export class CommandCenter {
const preview = resources.length === 1 ? undefined : false;
for (const resource of resources) {
await this._openResource(resource, preview);
await this._openResource(resource, preview, preserveFocus);
}
}