From 2e2e7d06ecd066e0de7c2f691a1c8a75fce29a94 Mon Sep 17 00:00:00 2001
From: Eric Amodio <eamodio@gmail.com>
Date: Fri, 23 Dec 2022 00:20:10 -0500
Subject: [PATCH] Opens file/diff to side if graph/rebase is active

---
 src/webviews/commitDetails/commitDetailsWebviewView.ts | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/webviews/commitDetails/commitDetailsWebviewView.ts b/src/webviews/commitDetails/commitDetailsWebviewView.ts
index 71ab970..c52514f 100644
--- a/src/webviews/commitDetails/commitDetailsWebviewView.ts
+++ b/src/webviews/commitDetails/commitDetailsWebviewView.ts
@@ -1,10 +1,11 @@
 import type {
 	CancellationToken,
 	ConfigurationChangeEvent,
+	TextDocumentShowOptions,
 	TreeViewSelectionChangeEvent,
 	TreeViewVisibilityChangeEvent,
 } from 'vscode';
-import { CancellationTokenSource, Disposable, Uri, window } from 'vscode';
+import { CancellationTokenSource, Disposable, Uri, ViewColumn, window } from 'vscode';
 import { serializeAutolink } from '../../annotations/autolinks';
 import type { CopyShaToClipboardCommandArgs } from '../../commands';
 import { executeGitCommand, GitActions } from '../../commands/gitCommands.actions';
@@ -848,7 +849,7 @@ export class CommitDetailsWebviewView extends WebviewViewBase<State, Serialized<
 		void GitActions.Commit.openChangesWithWorking(file.path, commit, {
 			preserveFocus: true,
 			preview: true,
-			...params.showOptions,
+			...this.getShowOptions(params),
 		});
 	}
 
@@ -862,7 +863,7 @@ export class CommitDetailsWebviewView extends WebviewViewBase<State, Serialized<
 		void GitActions.Commit.openChanges(file.path, commit, {
 			preserveFocus: true,
 			preview: true,
-			...params.showOptions,
+			...this.getShowOptions(params),
 		});
 	}
 
@@ -876,7 +877,7 @@ export class CommitDetailsWebviewView extends WebviewViewBase<State, Serialized<
 		void GitActions.Commit.openFile(file.path, commit, {
 			preserveFocus: true,
 			preview: true,
-			...params.showOptions,
+			...this.getShowOptions(params),
 		});
 	}
 
@@ -888,6 +889,12 @@ export class CommitDetailsWebviewView extends WebviewViewBase<State, Serialized<
 
 		void GitActions.Commit.openFileOnRemote(file.path, commit);
 	}
+
+	private getShowOptions(params: FileActionParams): TextDocumentShowOptions | undefined {
+		return getContext('gitlens:webview:graph:active') || getContext('gitlens:webview:rebaseEditor:active')
+			? { ...params.showOptions, viewColumn: ViewColumn.Beside }
+			: params.showOptions;
+	}
 }
 
 // async function summaryModel(commit: GitCommit): Promise<CommitSummary> {