From c6f93701f542862f1534c57795146b62b004125f Mon Sep 17 00:00:00 2001
From: Martin Sander <mrt.sander@gmail.com>
Date: Sat, 16 Jan 2021 10:06:55 +0100
Subject: [PATCH] fire onSelectionChange on right click select

fixes #3216.
---
 src/browser/Clipboard.ts                 |  4 ++--
 src/browser/services/SelectionService.ts | 11 +++++++++--
 src/browser/services/Services.ts         |  3 +--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/browser/Clipboard.ts b/src/browser/Clipboard.ts
index b0b42022..29e865c8 100644
--- a/src/browser/Clipboard.ts
+++ b/src/browser/Clipboard.ts
@@ -89,8 +89,8 @@ export function moveTextAreaUnderMouseCursor(ev: MouseEvent, textarea: HTMLTextA
 export function rightClickHandler(ev: MouseEvent, textarea: HTMLTextAreaElement, screenElement: HTMLElement, selectionService: ISelectionService, shouldSelectWord: boolean): void {
   moveTextAreaUnderMouseCursor(ev, textarea, screenElement);
 
-  if (shouldSelectWord && !selectionService.isClickInSelection(ev)) {
-    selectionService.selectWordAtCursor(ev);
+  if (shouldSelectWord) {
+    selectionService.rightClickSelect(ev);
   }
 
   // Get textarea ready to copy from the context menu
diff --git a/src/browser/services/SelectionService.ts b/src/browser/services/SelectionService.ts
index f4c8f58c..7feaf9eb 100644
--- a/src/browser/services/SelectionService.ts
+++ b/src/browser/services/SelectionService.ts
@@ -293,7 +293,7 @@ export class SelectionService extends Disposable implements ISelectionService {
    * Checks if the current click was inside the current selection
    * @param event The mouse event
    */
-  public isClickInSelection(event: MouseEvent): boolean {
+  private _isClickInSelection(event: MouseEvent): boolean {
     const coords = this._getMouseBufferCoords(event);
     const start = this._model.finalSelectionStart;
     const end = this._model.finalSelectionEnd;
@@ -316,7 +316,7 @@ export class SelectionService extends Disposable implements ISelectionService {
    * Selects word at the current mouse event coordinates.
    * @param event The mouse event.
    */
-  public selectWordAtCursor(event: MouseEvent): void {
+  private _selectWordAtCursor(event: MouseEvent): void {
     const coords = this._getMouseBufferCoords(event);
     if (coords) {
       this._selectWordAt(coords, false);
@@ -759,6 +759,13 @@ export class SelectionService extends Disposable implements ISelectionService {
     this.refresh();
   }
 
+  public rightClickSelect(ev: MouseEvent): void {
+    if (!this._isClickInSelection(ev)) {
+      this._selectWordAtCursor(ev);
+      this._fireIfSelectionChanged();
+    }
+  }
+
   /**
    * Gets positional information for the word at the coordinated specified.
    * @param coords The coordinates to get the word at.
diff --git a/src/browser/services/Services.ts b/src/browser/services/Services.ts
index 1c71d387..f06e320b 100644
--- a/src/browser/services/Services.ts
+++ b/src/browser/services/Services.ts
@@ -91,8 +91,7 @@ export interface ISelectionService {
   selectAll(): void;
   selectLines(start: number, end: number): void;
   clearSelection(): void;
-  isClickInSelection(event: MouseEvent): boolean;
-  selectWordAtCursor(event: MouseEvent): void;
+  rightClickSelect(event: MouseEvent): void;
   shouldColumnSelect(event: KeyboardEvent | MouseEvent): boolean;
   shouldForceSelection(event: MouseEvent): boolean;
   refresh(isLinuxMouseSelection?: boolean): void;