From 9a02ce1440fa3ab7f0a48cea0fcab5cb521fff3f Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Fri, 26 Jul 2024 06:12:29 -0700
Subject: [PATCH] Don't action right click when target is scroll bar

Fixes #223358
---
 src/vs/workbench/contrib/terminal/browser/terminalEditor.ts | 6 +++++-
 .../contrib/terminal/browser/terminalTabbedView.ts          | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/terminal/browser/terminalEditor.ts b/src/vs/workbench/contrib/terminal/browser/terminalEditor.ts
index 06e6be5305e4c..26e9a97395423 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalEditor.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalEditor.ts
@@ -124,7 +124,11 @@ export class TerminalEditor extends EditorPane {
 		}
 		this._register(dom.addDisposableListener(this._editorInstanceElement, 'mousedown', async (event: MouseEvent) => {
 			const terminal = this._terminalEditorService.activeInstance;
-			if (this._terminalEditorService.instances.length === 0 || !terminal) {
+			if (
+				this._terminalEditorService.instances.length === 0 ||
+				!terminal ||
+				dom.isHTMLElement(event.target) && event.target.classList.contains('scrollbar')
+			) {
 				return;
 			}
 
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalTabbedView.ts b/src/vs/workbench/contrib/terminal/browser/terminalTabbedView.ts
index 285c7a72ec148..f77a09fa7857c 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalTabbedView.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalTabbedView.ts
@@ -332,7 +332,11 @@ export class TerminalTabbedView extends Disposable {
 		}));
 		this._register(dom.addDisposableListener(terminalContainer, 'mousedown', async (event: MouseEvent) => {
 			const terminal = this._terminalGroupService.activeInstance;
-			if (this._terminalGroupService.instances.length === 0 || !terminal) {
+			if (
+				this._terminalGroupService.instances.length === 0 ||
+				!terminal ||
+				dom.isHTMLElement(event.target) && event.target.classList.contains('scrollbar')
+			) {
 				this._cancelContextMenu = true;
 				return;
 			}