From afa9a80b3a4bfc9ed16d0028bc0d31be68321701 Mon Sep 17 00:00:00 2001
From: Dmitry Gridin <dmitry.gridin@jetbrains.com>
Date: Thu, 6 Jun 2019 12:09:28 +0700
Subject: [PATCH] Fix multi module tests for AddOperatorModifierInspection

---
 .../inspections/AddOperatorModifierInspection.kt     |  8 ++------
 .../common/common.kt}                                |  0
 .../common/common.kt.after}                          |  0
 .../js/js.kt                                         |  1 +
 .../js/js.kt.after                                   |  1 +
 .../jvm/jvm.kt                                       |  0
 .../jvm/jvm.kt.after                                 |  0
 .../common/common.kt}                                |  1 +
 .../common/common.kt.after}                          |  1 +
 .../js/js.kt                                         |  0
 .../js/js.kt.after                                   |  0
 .../jvm/jvm.kt                                       |  0
 .../jvm/jvm.kt.after                                 |  0
 .../quickfix/QuickFixMultiModuleTestGenerated.java   | 12 ++++++------
 14 files changed, 12 insertions(+), 12 deletions(-)
 rename idea/testData/multiModuleQuickFix/{addOperatorByImpl/header/header.kt => addOperatorByActual/common/common.kt} (100%)
 rename idea/testData/multiModuleQuickFix/{addOperatorByImpl/header/header.kt.after => addOperatorByActual/common/common.kt.after} (100%)
 rename idea/testData/multiModuleQuickFix/{addOperatorByImpl => addOperatorByActual}/js/js.kt (56%)
 rename idea/testData/multiModuleQuickFix/{addOperatorByImpl => addOperatorByActual}/js/js.kt.after (57%)
 rename idea/testData/multiModuleQuickFix/{addOperatorByHeader => addOperatorByActual}/jvm/jvm.kt (100%)
 rename idea/testData/multiModuleQuickFix/{addOperatorByHeader => addOperatorByActual}/jvm/jvm.kt.after (100%)
 rename idea/testData/multiModuleQuickFix/{addOperatorByHeader/header/header.kt => addOperatorByExpect/common/common.kt} (52%)
 rename idea/testData/multiModuleQuickFix/{addOperatorByHeader/header/header.kt.after => addOperatorByExpect/common/common.kt.after} (53%)
 rename idea/testData/multiModuleQuickFix/{addOperatorByHeader => addOperatorByExpect}/js/js.kt (100%)
 rename idea/testData/multiModuleQuickFix/{addOperatorByHeader => addOperatorByExpect}/js/js.kt.after (100%)
 rename idea/testData/multiModuleQuickFix/{addOperatorByImpl => addOperatorByExpect}/jvm/jvm.kt (100%)
 rename idea/testData/multiModuleQuickFix/{addOperatorByImpl => addOperatorByExpect}/jvm/jvm.kt.after (100%)

diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/AddOperatorModifierInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/AddOperatorModifierInspection.kt
index ec234f2e4d5..aff02466109 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/AddOperatorModifierInspection.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/AddOperatorModifierInspection.kt
@@ -10,7 +10,6 @@ import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny
 import org.jetbrains.kotlin.idea.refactoring.withExpectedActuals
-import org.jetbrains.kotlin.idea.util.application.executeWriteCommand
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.KtNamedFunction
 import org.jetbrains.kotlin.psi.psiUtil.startOffset
@@ -23,8 +22,6 @@ class AddOperatorModifierInspection : AbstractApplicabilityBasedInspection<KtNam
 
     override val defaultFixText = "Add 'operator' modifier"
 
-    override val startFixInWriteAction: Boolean = false
-
     override fun isApplicable(element: KtNamedFunction): Boolean {
         if (element.nameIdentifier == null || element.hasModifier(KtTokens.OPERATOR_KEYWORD)) return false
         val functionDescriptor = element.resolveToDescriptorIfAny() ?: return false
@@ -32,9 +29,8 @@ class AddOperatorModifierInspection : AbstractApplicabilityBasedInspection<KtNam
     }
 
     override fun applyTo(element: PsiElement, project: Project, editor: Editor?) {
-        val declarations = (element as KtNamedFunction).withExpectedActuals()
-        project.executeWriteCommand(defaultFixText) {
-            for (declaration in declarations) declaration.addModifier(KtTokens.OPERATOR_KEYWORD)
+        for (declaration in (element as KtNamedFunction).withExpectedActuals()) {
+            declaration.addModifier(KtTokens.OPERATOR_KEYWORD)
         }
     }
 }
diff --git a/idea/testData/multiModuleQuickFix/addOperatorByImpl/header/header.kt b/idea/testData/multiModuleQuickFix/addOperatorByActual/common/common.kt
similarity index 100%
rename from idea/testData/multiModuleQuickFix/addOperatorByImpl/header/header.kt
rename to idea/testData/multiModuleQuickFix/addOperatorByActual/common/common.kt
diff --git a/idea/testData/multiModuleQuickFix/addOperatorByImpl/header/header.kt.after b/idea/testData/multiModuleQuickFix/addOperatorByActual/common/common.kt.after
similarity index 100%
rename from idea/testData/multiModuleQuickFix/addOperatorByImpl/header/header.kt.after
rename to idea/testData/multiModuleQuickFix/addOperatorByActual/common/common.kt.after
diff --git a/idea/testData/multiModuleQuickFix/addOperatorByImpl/js/js.kt b/idea/testData/multiModuleQuickFix/addOperatorByActual/js/js.kt
similarity index 56%
rename from idea/testData/multiModuleQuickFix/addOperatorByImpl/js/js.kt
rename to idea/testData/multiModuleQuickFix/addOperatorByActual/js/js.kt
index f43d0179430..c1f85094573 100644
--- a/idea/testData/multiModuleQuickFix/addOperatorByImpl/js/js.kt
+++ b/idea/testData/multiModuleQuickFix/addOperatorByActual/js/js.kt
@@ -1,4 +1,5 @@
 // "Add 'operator' modifier" "true"
+// TOOL: org.jetbrains.kotlin.idea.inspections.AddOperatorModifierInspection
 
 actual class Foo {
     actual fun <caret>unaryMinus() {
diff --git a/idea/testData/multiModuleQuickFix/addOperatorByImpl/js/js.kt.after b/idea/testData/multiModuleQuickFix/addOperatorByActual/js/js.kt.after
similarity index 57%
rename from idea/testData/multiModuleQuickFix/addOperatorByImpl/js/js.kt.after
rename to idea/testData/multiModuleQuickFix/addOperatorByActual/js/js.kt.after
index 041d0b89123..8d4999aa83c 100644
--- a/idea/testData/multiModuleQuickFix/addOperatorByImpl/js/js.kt.after
+++ b/idea/testData/multiModuleQuickFix/addOperatorByActual/js/js.kt.after
@@ -1,4 +1,5 @@
 // "Add 'operator' modifier" "true"
+// TOOL: org.jetbrains.kotlin.idea.inspections.AddOperatorModifierInspection
 
 actual class Foo {
     actual operator fun unaryMinus() {
diff --git a/idea/testData/multiModuleQuickFix/addOperatorByHeader/jvm/jvm.kt b/idea/testData/multiModuleQuickFix/addOperatorByActual/jvm/jvm.kt
similarity index 100%
rename from idea/testData/multiModuleQuickFix/addOperatorByHeader/jvm/jvm.kt
rename to idea/testData/multiModuleQuickFix/addOperatorByActual/jvm/jvm.kt
diff --git a/idea/testData/multiModuleQuickFix/addOperatorByHeader/jvm/jvm.kt.after b/idea/testData/multiModuleQuickFix/addOperatorByActual/jvm/jvm.kt.after
similarity index 100%
rename from idea/testData/multiModuleQuickFix/addOperatorByHeader/jvm/jvm.kt.after
rename to idea/testData/multiModuleQuickFix/addOperatorByActual/jvm/jvm.kt.after
diff --git a/idea/testData/multiModuleQuickFix/addOperatorByHeader/header/header.kt b/idea/testData/multiModuleQuickFix/addOperatorByExpect/common/common.kt
similarity index 52%
rename from idea/testData/multiModuleQuickFix/addOperatorByHeader/header/header.kt
rename to idea/testData/multiModuleQuickFix/addOperatorByExpect/common/common.kt
index e723c2ae6b1..4f0b86eb66f 100644
--- a/idea/testData/multiModuleQuickFix/addOperatorByHeader/header/header.kt
+++ b/idea/testData/multiModuleQuickFix/addOperatorByExpect/common/common.kt
@@ -1,4 +1,5 @@
 // "Add 'operator' modifier" "true"
+// TOOL: org.jetbrains.kotlin.idea.inspections.AddOperatorModifierInspection
 
 expect class Foo {
     fun <caret>unaryMinus()
diff --git a/idea/testData/multiModuleQuickFix/addOperatorByHeader/header/header.kt.after b/idea/testData/multiModuleQuickFix/addOperatorByExpect/common/common.kt.after
similarity index 53%
rename from idea/testData/multiModuleQuickFix/addOperatorByHeader/header/header.kt.after
rename to idea/testData/multiModuleQuickFix/addOperatorByExpect/common/common.kt.after
index c24f90759b1..93132b621e2 100644
--- a/idea/testData/multiModuleQuickFix/addOperatorByHeader/header/header.kt.after
+++ b/idea/testData/multiModuleQuickFix/addOperatorByExpect/common/common.kt.after
@@ -1,4 +1,5 @@
 // "Add 'operator' modifier" "true"
+// TOOL: org.jetbrains.kotlin.idea.inspections.AddOperatorModifierInspection
 
 expect class Foo {
     operator fun unaryMinus()
diff --git a/idea/testData/multiModuleQuickFix/addOperatorByHeader/js/js.kt b/idea/testData/multiModuleQuickFix/addOperatorByExpect/js/js.kt
similarity index 100%
rename from idea/testData/multiModuleQuickFix/addOperatorByHeader/js/js.kt
rename to idea/testData/multiModuleQuickFix/addOperatorByExpect/js/js.kt
diff --git a/idea/testData/multiModuleQuickFix/addOperatorByHeader/js/js.kt.after b/idea/testData/multiModuleQuickFix/addOperatorByExpect/js/js.kt.after
similarity index 100%
rename from idea/testData/multiModuleQuickFix/addOperatorByHeader/js/js.kt.after
rename to idea/testData/multiModuleQuickFix/addOperatorByExpect/js/js.kt.after
diff --git a/idea/testData/multiModuleQuickFix/addOperatorByImpl/jvm/jvm.kt b/idea/testData/multiModuleQuickFix/addOperatorByExpect/jvm/jvm.kt
similarity index 100%
rename from idea/testData/multiModuleQuickFix/addOperatorByImpl/jvm/jvm.kt
rename to idea/testData/multiModuleQuickFix/addOperatorByExpect/jvm/jvm.kt
diff --git a/idea/testData/multiModuleQuickFix/addOperatorByImpl/jvm/jvm.kt.after b/idea/testData/multiModuleQuickFix/addOperatorByExpect/jvm/jvm.kt.after
similarity index 100%
rename from idea/testData/multiModuleQuickFix/addOperatorByImpl/jvm/jvm.kt.after
rename to idea/testData/multiModuleQuickFix/addOperatorByExpect/jvm/jvm.kt.after
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiModuleTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiModuleTestGenerated.java
index 18f2fc0580d..21635a9b004 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiModuleTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiModuleTestGenerated.java
@@ -70,14 +70,14 @@ public class QuickFixMultiModuleTestGenerated extends AbstractQuickFixMultiModul
         runTest("idea/testData/multiModuleQuickFix/addFunctionToCommonClassFromJavaUsage/");
     }
 
-    @TestMetadata("addOperatorByHeader")
-    public void testAddOperatorByHeader() throws Exception {
-        runTest("idea/testData/multiModuleQuickFix/addOperatorByHeader/");
+    @TestMetadata("addOperatorByActual")
+    public void testAddOperatorByActual() throws Exception {
+        runTest("idea/testData/multiModuleQuickFix/addOperatorByActual/");
     }
 
-    @TestMetadata("addOperatorByImpl")
-    public void testAddOperatorByImpl() throws Exception {
-        runTest("idea/testData/multiModuleQuickFix/addOperatorByImpl/");
+    @TestMetadata("addOperatorByExpect")
+    public void testAddOperatorByExpect() throws Exception {
+        runTest("idea/testData/multiModuleQuickFix/addOperatorByExpect/");
     }
 
     public void testAllFilesPresentInMultiModuleQuickFix() throws Exception {