From ec46dc8a3716367855edb57bf33a9dfb5bd968c6 Mon Sep 17 00:00:00 2001
From: Dmitry Batrak <Dmitry.Batrak@jetbrains.com>
Date: Thu, 20 Dec 2018 11:59:34 +0300
Subject: [PATCH] use correct modifiers in EditorMouseFixture

(fix EditorMultiCaretTest.testMiddleButtonDragStartingFromVirtualSpace)
---
 .../fixtures/EditorMouseFixture.java          | 23 ++++---------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/EditorMouseFixture.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/EditorMouseFixture.java
index c80f1c13e14e..b96787b882f5 100644
--- a/platform/testFramework/src/com/intellij/testFramework/fixtures/EditorMouseFixture.java
+++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/EditorMouseFixture.java
@@ -50,7 +50,7 @@ public class EditorMouseFixture {
     component.dispatchEvent(new MouseEvent(myLastComponent = component,
                                            myLastId = MouseEvent.MOUSE_PRESSED,
                                            System.currentTimeMillis(),
-                                           getModifiers(),
+                                           myModifiers,
                                            myX = p.x,
                                            myY = p.y,
                                            clickCount,
@@ -68,7 +68,7 @@ public class EditorMouseFixture {
     myLastComponent.dispatchEvent(new MouseEvent(myLastComponent,
                                                  myLastId = MouseEvent.MOUSE_RELEASED,
                                                  System.currentTimeMillis(),
-                                                 getModifiers(),
+                                                 myModifiers,
                                                  myX,
                                                  myY,
                                                  clickCount,
@@ -78,7 +78,7 @@ public class EditorMouseFixture {
       myLastComponent.dispatchEvent(new MouseEvent(myLastComponent,
                                                    myLastId = MouseEvent.MOUSE_CLICKED,
                                                    System.currentTimeMillis(),
-                                                   getModifiers(),
+                                                   myModifiers,
                                                    myX,
                                                    myY,
                                                    clickCount,
@@ -121,7 +121,7 @@ public class EditorMouseFixture {
     component.dispatchEvent(new MouseEvent(component,
                                            myLastId = MouseEvent.MOUSE_MOVED,
                                            System.currentTimeMillis(),
-                                           getModifiers(),
+                                           myModifiers,
                                            myX = x,
                                            myY = y,
                                            0,
@@ -141,7 +141,7 @@ public class EditorMouseFixture {
     component.dispatchEvent(new MouseEvent(component,
                                            myLastId = MouseEvent.MOUSE_DRAGGED,
                                            System.currentTimeMillis(),
-                                           getModifiers(),
+                                           myModifiers,
                                            myX = x,
                                            myY = y,
                                            1,
@@ -183,17 +183,4 @@ public class EditorMouseFixture {
   private Point getPoint(int visualLine, int visualColumn) {
     return myEditor.visualPositionToXY(new VisualPosition(visualLine, visualColumn));
   }
-
-  @MagicConstant(flagsFromClass = InputEvent.class)
-  private int getModifiers() {
-    if (myButton == MouseEvent.BUTTON3) {
-      return myModifiers | InputEvent.META_MASK;
-    }
-    else if (myButton == MouseEvent.BUTTON2) {
-      return myModifiers | InputEvent.ALT_MASK;
-    }
-    else {
-      return myModifiers;
-    }
-  }
 }