Preserve focus on tree on file select, #198

Author: Rachel Macfarlane

src/commands.ts

@@ -128,6 +128,6 @@ export function registerCommands(context: vscode.ExtensionContext, prManager: IP
 				base: true
 			})
 		});
-		return vscode.commands.executeCommand('vscode.diff', previousFileUri, fileChange.filePath, `${fileChange.fileName} from ${commit.substr(0, 8)}`);
+		return vscode.commands.executeCommand('vscode.diff', previousFileUri, fileChange.filePath, `${fileChange.fileName} from ${commit.substr(0, 8)}`, { preserveFocus: true });
 	}));
 }

src/github/pullRequestOverview.ts

@@ -34,7 +34,7 @@ export class PullRequestOverviewPanel {
 		// If we already have a panel, show it.
 		// Otherwise, create a new panel.
 		if (PullRequestOverviewPanel.currentPanel) {
-			PullRequestOverviewPanel.currentPanel._panel.reveal(column);
+			PullRequestOverviewPanel.currentPanel._panel.reveal(column, true);
 			PullRequestOverviewPanel.currentPanel._panel.title = title;
 		} else {
 			PullRequestOverviewPanel.currentPanel = new PullRequestOverviewPanel(extensionPath, column || vscode.ViewColumn.One, title, pullRequestManager);

src/view/treeNodes/fileChangeNode.ts

@@ -72,7 +72,10 @@ export class FileChangeNode extends TreeNode implements vscode.TreeItem {
 		}
 		this.resourceUri = this.filePath;
 
-		let opts = {};
+		let opts: vscode.TextDocumentShowOptions = {
+			preserveFocus: true
+		};
+
 		if (this.comments && this.comments.length) {
 			let sortedActiveComments = this.comments.filter(comment => comment.position).sort((a, b) => {
 				return a.position - b.position;
@@ -85,9 +88,7 @@ export class FileChangeNode extends TreeNode implements vscode.TreeItem {
 				if (diffLine) {
 					// If the diff is a deletion, the new line number is invalid so use the old line number. Ensure the line number is positive.
 					let lineNumber = Math.max(getZeroBased(diffLine.type === DiffChangeType.Delete ? diffLine.oldLineNumber : diffLine.newLineNumber), 0);
-					opts = {
-						selection: new vscode.Range(lineNumber, 0, lineNumber, 0)
-					};
+					opts.selection = new vscode.Range(lineNumber, 0, lineNumber, 0);
 				}
 			}
 		}