Merge pull request #14987 from atom/ns-fix-mousedown

Fix regressions handling mousedown on Linux and macOS

spec/text-editor-component-spec.js

@@ -2412,10 +2412,13 @@ describe('TextEditorComponent', () => {
             ctrlKey: true
           })
         )
-        expect(editor.getCursorScreenPositions()).toEqual([[1, 4]])
+        expect(editor.getSelectedScreenRanges()).toEqual([
+          [[1, 16], [1, 16]]
+        ])
 
         // ctrl-click adds cursors on platforms *other* than macOS
         component.props.platform = 'win32'
+        editor.setCursorScreenPosition([1, 4])
         component.didMouseDownOnContent(
           Object.assign(clientPositionForCharacter(component, 1, 16), {
             detail: 1,
@@ -2675,42 +2678,18 @@ describe('TextEditorComponent', () => {
         expect(component.getScrollLeft()).toBe(maxScrollLeft)
       })
 
-      it('pastes the previously selected text when clicking the middle mouse button on Linux', async () => {
-        spyOn(electron.ipcRenderer, 'send').andCallFake(function (eventName, selectedText) {
-          if (eventName === 'write-text-to-selection-clipboard') {
-            clipboard.writeText(selectedText, 'selection')
-          }
-        })
-
+      it('positions the cursor on clicking the middle mouse button on Linux', async () => {
+        // The browser synthesizes the paste as a textInput event on mouseup
+        // so it is not possible to test it here.
         const {component, editor} = buildComponent({platform: 'linux'})
 
-        // Middle mouse pasting.
         editor.setSelectedBufferRange([[1, 6], [1, 10]])
-        await conditionPromise(() => TextEditor.clipboard.read() === 'sort')
         component.didMouseDownOnContent({
           button: 1,
           clientX: clientLeftForCharacter(component, 10, 0),
           clientY: clientTopForLine(component, 10)
         })
-        expect(TextEditor.clipboard.read()).toBe('sort')
-        expect(editor.lineTextForBufferRow(10)).toBe('sort')
-        editor.undo()
-
-        // Ensure left clicks don't interfere.
-        editor.setSelectedBufferRange([[1, 2], [1, 5]])
-        await conditionPromise(() => TextEditor.clipboard.read() === 'var')
-        component.didMouseDownOnContent({
-          button: 0,
-          detail: 1,
-          clientX: clientLeftForCharacter(component, 10, 0),
-          clientY: clientTopForLine(component, 10)
-        })
-        component.didMouseDownOnContent({
-          button: 1,
-          clientX: clientLeftForCharacter(component, 10, 0),
-          clientY: clientTopForLine(component, 10)
-        })
-        expect(editor.lineTextForBufferRow(10)).toBe('var')
+        expect(editor.getSelectedBufferRange()).toEqual([[10, 0], [10, 0]])
       })
     })
 

src/text-editor-component.js

@@ -5,7 +5,6 @@ const {Point, Range} = require('text-buffer')
 const LineTopIndex = require('line-top-index')
 const TextEditor = require('./text-editor')
 const {isPairedCharacter} = require('./text-utils')
-const clipboard = require('./safe-clipboard')
 const electron = require('electron')
 const $ = etch.dom
 
@@ -1645,10 +1644,23 @@ class TextEditorComponent {
   didMouseDownOnContent (event) {
     const {model} = this.props
     const {target, button, detail, ctrlKey, shiftKey, metaKey} = event
+    const platform = this.getPlatform()
+
+    // On Linux, position the cursor on middle mouse button click. A
+    // textInput event with the contents of the selection clipboard will be
+    // dispatched by the browser automatically on mouseup.
+    if (platform === 'linux' && button === 1) {
+      const screenPosition = this.screenPositionForMouseEvent(event)
+      model.setCursorScreenPosition(screenPosition, {autoscroll: false})
+      return
+    }
 
     // Only handle mousedown events for left mouse button (or the middle mouse
     // button on Linux where it pastes the selection clipboard).
-    if (!(button === 0 || (this.getPlatform() === 'linux' && button === 1))) return
+    if (button !== 0) return
+
+    // Ctrl-click brings up the context menu on macOS
+    if (platform === 'darwin' && ctrlKey) return
 
     const screenPosition = this.screenPositionForMouseEvent(event)
 
@@ -1658,15 +1670,7 @@ class TextEditorComponent {
       return
     }
 
-    // Handle middle mouse button only on Linux (paste clipboard)
-    if (this.getPlatform() === 'linux' && button === 1) {
-      const selection = clipboard.readText('selection')
-      model.setCursorScreenPosition(screenPosition, {autoscroll: false})
-      model.insertText(selection)
-      return
-    }
-
-    const addOrRemoveSelection = metaKey || (ctrlKey && this.getPlatform() !== 'darwin')
+    const addOrRemoveSelection = metaKey || (ctrlKey && platform !== 'darwin')
 
     switch (detail) {
       case 1: