Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-07-13 15:35:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes #28506

Browse Source
This commit is contained in:
Joao Moreno
2017-06-16 10:00:52 +02:00
parent a0cf115d01
commit fd2dac6d58
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/git/src/commands.ts
+16 -5
View File
@@ -5,7 +5,7 @@
'use strict';
import { Uri, commands, scm, Disposable, window, workspace, QuickPickItem, OutputChannel, Range, WorkspaceEdit, Position, LineChange, SourceControlResourceState } from 'vscode';
import { Uri, commands, scm, Disposable, window, workspace, QuickPickItem, OutputChannel, Range, WorkspaceEdit, Position, LineChange, SourceControlResourceState, TextDocumentShowOptions, ViewColumn } from 'vscode';
import { Ref, RefType, Git, GitErrorCodes } from './git';
import { Model, Resource, Status, CommitOptions, WorkingTreeGroup, IndexGroup, MergeGroup } from './model';
import { toGitUri, fromGitUri } from './uri';
@@ -145,11 +145,18 @@ export class CommandCenter {
return;
}
const viewColumn = window.activeTextEditor && window.activeTextEditor.viewColumn || ViewColumn.One;
if (!left) {
return await commands.executeCommand<void>('vscode.open', right);
return await commands.executeCommand<void>('vscode.open', right, viewColumn);
}
return await commands.executeCommand<void>('vscode.diff', left, right, title, { preview: true });
const opts: TextDocumentShowOptions = {
preview: true,
viewColumn
};
return await commands.executeCommand<void>('vscode.diff', left, right, title, opts);
}
private getLeftResource(resource: Resource): Uri | undefined {
@@ -289,7 +296,9 @@ export class CommandCenter {
return;
}
return await commands.executeCommand<void>('vscode.open', uri);
const viewColumn = window.activeTextEditor && window.activeTextEditor.viewColumn || ViewColumn.One;
return await commands.executeCommand<void>('vscode.open', uri, viewColumn);
}
@command('git.openChange')
@@ -329,7 +338,9 @@ export class CommandCenter {
return;
}
return await commands.executeCommand<void>('vscode.open', uriToOpen);
const viewColumn = window.activeTextEditor && window.activeTextEditor.viewColumn || ViewColumn.One;
return await commands.executeCommand<void>('vscode.open', uriToOpen, viewColumn);
}
@command('git.stage')