From 11511f27d5d8cfe9c23919c8a8bfaa9167f3a1b5 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Wed, 1 Nov 2017 09:21:13 -0600
Subject: [PATCH] Don't terminate selection dragging when a modifier key is
 pressed

This preserves the ability to add selections via ctrl- or cmd-click.
---
 spec/text-editor-component-spec.js | 21 +++++++++++++++++----
 src/text-editor-component.js       |  2 +-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/spec/text-editor-component-spec.js b/spec/text-editor-component-spec.js
index 5f0a28883..97fdf45c7 100644
--- a/spec/text-editor-component-spec.js
+++ b/spec/text-editor-component-spec.js
@@ -4428,11 +4428,14 @@ describe('TextEditorComponent', () => {
       const {component, editor} = buildComponent()
 
       let dragging = false
-      component.handleMouseDragUntilMouseUp({
-        didDrag: (event) => { dragging = true },
-        didStopDragging: () => { dragging = false }
-      })
+      function startDragging () {
+        component.handleMouseDragUntilMouseUp({
+          didDrag: (event) => { dragging = true },
+          didStopDragging: () => { dragging = false }
+        })
+      }
 
+      startDragging()
       window.dispatchEvent(new MouseEvent('mousemove'))
       await getNextAnimationFramePromise()
       expect(dragging).toBe(true)
@@ -4448,6 +4451,16 @@ describe('TextEditorComponent', () => {
       window.dispatchEvent(new MouseEvent('mousemove'))
       await getNextAnimationFramePromise()
       expect(dragging).toBe(false)
+
+      // Pressing a modifier key does not terminate dragging, (to ensure we can add new selections with the mouse)
+      startDragging()
+      window.dispatchEvent(new MouseEvent('mousemove'))
+      await getNextAnimationFramePromise()
+      expect(dragging).toBe(true)
+      component.didKeydown({key: 'Control'})
+      component.didKeydown({key: 'Alt'})
+      component.didKeydown({key: 'Meta'})
+      expect(dragging).toBe(true)
     })
 
     function getNextAnimationFramePromise () {
diff --git a/src/text-editor-component.js b/src/text-editor-component.js
index 4c639e532..bbb02bb7f 100644
--- a/src/text-editor-component.js
+++ b/src/text-editor-component.js
@@ -1666,7 +1666,7 @@ class TextEditorComponent {
     // Stop dragging when user interacts with the keyboard. This prevents
     // unwanted selections in the case edits are performed while selecting text
     // at the same time.
-    if (this.stopDragging) this.stopDragging()
+    if (this.stopDragging && event.key !== 'Control' && event.key !== 'Alt' && event.key !== 'Meta') this.stopDragging()
 
     if (this.lastKeydownBeforeKeypress != null) {
       if (this.lastKeydownBeforeKeypress.code === event.code) {