From 0e2cfb716452b185de3eb248c8d6fbb5ef4a969d Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Tue, 5 Dec 2023 14:50:42 +0100
Subject: [PATCH] Minor improvements, reduce duplication

---
 src/vs/base/browser/canIUse.ts                |  2 +-
 .../browser/controller/pointerHandler.ts      | 64 +++++++------------
 2 files changed, 25 insertions(+), 41 deletions(-)

diff --git a/src/vs/base/browser/canIUse.ts b/src/vs/base/browser/canIUse.ts
index c126a33b45b..60261a974d0 100644
--- a/src/vs/base/browser/canIUse.ts
+++ b/src/vs/base/browser/canIUse.ts
@@ -43,5 +43,5 @@ export const BrowserFeatures = {
 	// 'ontouchstart' in window always evaluates to true with typescript's modern typings. This causes `window` to be
 	// `never` later in `window.navigator`. That's why we need the explicit `window as Window` cast
 	touch: 'ontouchstart' in mainWindow || navigator.maxTouchPoints > 0,
-	pointerEvents: mainWindow.PointerEvent && ('ontouchstart' in mainWindow || navigator.maxTouchPoints > 0 || navigator.maxTouchPoints > 0)
+	pointerEvents: mainWindow.PointerEvent && ('ontouchstart' in mainWindow || navigator.maxTouchPoints > 0)
 };
diff --git a/src/vs/editor/browser/controller/pointerHandler.ts b/src/vs/editor/browser/controller/pointerHandler.ts
index fb3aa645670..632156865be 100644
--- a/src/vs/editor/browser/controller/pointerHandler.ts
+++ b/src/vs/editor/browser/controller/pointerHandler.ts
@@ -59,27 +59,7 @@ export class PointerEventHandler extends MouseHandler {
 
 		event.preventDefault();
 		this.viewHelper.focusTextArea();
-		const target = this._createMouseTarget(new EditorMouseEvent(event, false, this.viewHelper.viewDomNode), false);
-
-		if (target.position) {
-			// this.viewController.moveTo(target.position);
-			this.viewController.dispatchMouse({
-				position: target.position,
-				mouseColumn: target.position.column,
-				startedOnLineNumbers: false,
-				revealType: NavigationCommandRevealType.Minimal,
-				mouseDownCount: event.tapCount,
-				inSelectionMode: false,
-				altKey: false,
-				ctrlKey: false,
-				metaKey: false,
-				shiftKey: false,
-
-				leftButton: false,
-				middleButton: false,
-				onInjectedText: target.type === MouseTargetType.CONTENT_TEXT && target.detail.injectedText !== null
-			});
-		}
+		this._dispatchGesture(event, /*inSelectionMode*/false);
 	}
 
 	private onChange(event: GestureEvent): void {
@@ -87,24 +67,28 @@ export class PointerEventHandler extends MouseHandler {
 			this._context.viewModel.viewLayout.deltaScrollNow(-event.translationX, -event.translationY);
 		}
 		if (this._lastPointerType === 'pen') {
-			const target = this._createMouseTarget(new EditorMouseEvent(event, false, this.viewHelper.viewDomNode), false);
-			if (target.position) {
-				this.viewController.dispatchMouse({
-					position: target.position,
-					mouseColumn: target.position.column,
-					startedOnLineNumbers: false,
-					revealType: NavigationCommandRevealType.Minimal,
-					mouseDownCount: event.tapCount,
-					inSelectionMode: true,
-					altKey: false,
-					ctrlKey: false,
-					metaKey: false,
-					shiftKey: false,
-					leftButton: false,
-					middleButton: false,
-					onInjectedText: target.type === MouseTargetType.CONTENT_TEXT && target.detail.injectedText !== null
-				});
-			}
+			this._dispatchGesture(event, /*inSelectionMode*/true);
+		}
+	}
+
+	private _dispatchGesture(event: GestureEvent, inSelectionMode: boolean): void {
+		const target = this._createMouseTarget(new EditorMouseEvent(event, false, this.viewHelper.viewDomNode), false);
+		if (target.position) {
+			this.viewController.dispatchMouse({
+				position: target.position,
+				mouseColumn: target.position.column,
+				startedOnLineNumbers: false,
+				revealType: NavigationCommandRevealType.Minimal,
+				mouseDownCount: event.tapCount,
+				inSelectionMode,
+				altKey: false,
+				ctrlKey: false,
+				metaKey: false,
+				shiftKey: false,
+				leftButton: false,
+				middleButton: false,
+				onInjectedText: target.type === MouseTargetType.CONTENT_TEXT && target.detail.injectedText !== null
+			});
 		}
 	}
 
@@ -156,7 +140,7 @@ export class PointerHandler extends Disposable {
 
 	constructor(context: ViewContext, viewController: ViewController, viewHelper: IPointerHandlerHelper) {
 		super();
-		if ((BrowserFeatures.pointerEvents)) {
+		if (BrowserFeatures.pointerEvents) {
 			this.handler = this._register(new PointerEventHandler(context, viewController, viewHelper));
 		} else if (mainWindow.TouchEvent) {
 			this.handler = this._register(new TouchHandler(context, viewController, viewHelper));