"Replace 'invoke' with direct call" intention: do not add unnecessary parenthesis

#KT-37967 Fixed

compiler/psi/src/org/jetbrains/kotlin/psi/KtPsiUtil.java

@@ -455,15 +455,21 @@ public class KtPsiUtil {
 
         if (parentElement instanceof KtCallExpression && currentInner == ((KtCallExpression) parentElement).getCalleeExpression()) {
             KtCallExpression parentCall = (KtCallExpression) parentElement;
-            if (innerExpression instanceof KtSimpleNameExpression) return false;
+            KtExpression targetInnerExpression = innerExpression;
+            if (targetInnerExpression instanceof KtDotQualifiedExpression) {
+                KtExpression selector = ((KtDotQualifiedExpression) targetInnerExpression).getSelectorExpression();
+                if (selector != null) {
+                    targetInnerExpression = selector;
+                }
+            }
+            if (targetInnerExpression instanceof KtSimpleNameExpression) return false;
             if (KtPsiUtilKt.getQualifiedExpressionForSelector(parentElement) != null) return true;
-            if (innerExpression instanceof KtCallExpression
+            if (targetInnerExpression instanceof KtCallExpression && parentCall.getValueArgumentList() == null) return true;
-                && parentCall.getValueArgumentList() == null) return true;
+            return !(targetInnerExpression instanceof KtThisExpression
-            return !(innerExpression instanceof KtThisExpression
+                     || targetInnerExpression instanceof KtArrayAccessExpression
-                     || innerExpression instanceof KtArrayAccessExpression
+                     || targetInnerExpression instanceof KtConstantExpression
-                     || innerExpression instanceof KtConstantExpression
+                     || targetInnerExpression instanceof KtStringTemplateExpression
-                     || innerExpression instanceof KtStringTemplateExpression
+                     || targetInnerExpression instanceof KtCallExpression);
-                     || innerExpression instanceof KtCallExpression);
         }
 
         if (parentElement instanceof KtValueArgument) {

idea/testData/intentions/conventionNameCalls/replaceInvoke/dotQualifiedReceiver.kt

@@ -0,0 +1,11 @@
+class A {
+    val b = B()
+}
+
+class B {
+    operator fun invoke() {}
+}
+
+fun test(a: A) {
+    a.b.<caret>invoke()
+}

idea/testData/intentions/conventionNameCalls/replaceInvoke/dotQualifiedReceiver.kt.after

@@ -0,0 +1,11 @@
+class A {
+    val b = B()
+}
+
+class B {
+    operator fun invoke() {}
+}
+
+fun test(a: A) {
+    a.b()
+}

idea/testData/intentions/conventionNameCalls/replaceInvoke/dotQualifiedReceiver2.kt

@@ -0,0 +1,11 @@
+class A {
+    fun b() = B()
+}
+
+class B {
+    operator fun invoke() {}
+}
+
+fun test(a: A) {
+    a.b().<caret>invoke()
+}

idea/testData/intentions/conventionNameCalls/replaceInvoke/dotQualifiedReceiver2.kt.after

@@ -0,0 +1,11 @@
+class A {
+    fun b() = B()
+}
+
+class B {
+    operator fun invoke() {}
+}
+
+fun test(a: A) {
+    a.b()()
+}

idea/testData/intentions/conventionNameCalls/replaceInvoke/dotQualifiedReceiver3.kt

@@ -0,0 +1,12 @@
+class A {
+    fun b() = B()
+}
+
+class B {
+    operator fun invoke(f: () -> Unit) {}
+}
+
+fun test(a: A) {
+    a.b().<caret>invoke {
+    }
+}

idea/testData/intentions/conventionNameCalls/replaceInvoke/dotQualifiedReceiver3.kt.after

@@ -0,0 +1,12 @@
+class A {
+    fun b() = B()
+}
+
+class B {
+    operator fun invoke(f: () -> Unit) {}
+}
+
+fun test(a: A) {
+    (a.b()) {
+    }
+}

idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java

@@ -3910,6 +3910,21 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
                 KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("idea/testData/intentions/conventionNameCalls/replaceInvoke"), Pattern.compile("^([\\w\\-_]+)\\.(kt|kts)$"), null, true);
             }
 
+            @TestMetadata("dotQualifiedReceiver.kt")
+            public void testDotQualifiedReceiver() throws Exception {
+                runTest("idea/testData/intentions/conventionNameCalls/replaceInvoke/dotQualifiedReceiver.kt");
+            }
+
+            @TestMetadata("dotQualifiedReceiver2.kt")
+            public void testDotQualifiedReceiver2() throws Exception {
+                runTest("idea/testData/intentions/conventionNameCalls/replaceInvoke/dotQualifiedReceiver2.kt");
+            }
+
+            @TestMetadata("dotQualifiedReceiver3.kt")
+            public void testDotQualifiedReceiver3() throws Exception {
+                runTest("idea/testData/intentions/conventionNameCalls/replaceInvoke/dotQualifiedReceiver3.kt");
+            }
+
             @TestMetadata("expressionReceiver.kt")
             public void testExpressionReceiver() throws Exception {
                 runTest("idea/testData/intentions/conventionNameCalls/replaceInvoke/expressionReceiver.kt");