Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-30 21:41:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix #30674 for real

Browse Source
This commit is contained in:
Benjamin Pasero
2017-08-29 14:38:56 +02:00
parent 514704975e
commit c25c8d41e3
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
extensions/git/src/commands.ts
View File

@@ -362,23 +362,18 @@ export class CommandCenter {
const preview = uris.length === 1 ? true : false;
const activeTextEditor = window.activeTextEditor;
for (const uri of uris) {
// If the active editor matches the current uri, get its selection
const selections = activeTextEditor && activeTextEditor.document.uri.toString() === uri.toString()
? activeTextEditor.selections
: undefined;
const opts: TextDocumentShowOptions = {
preserveFocus,
preview: preview,
viewColumn: activeTextEditor && activeTextEditor.viewColumn || ViewColumn.One
};
if (activeTextEditor && activeTextEditor.document.uri.toString() === uri.toString()) {
opts.selection = activeTextEditor.selection;
}
const document = await workspace.openTextDocument(uri);
await window.showTextDocument(document, opts);
if (selections && window.activeTextEditor) {
window.activeTextEditor.selections = selections;
}
}
}