More accurate deparenthesize (keeping annotations) in some IDE actions

So #KT-19004 Fixed

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

@@ -68,14 +68,24 @@ public class KtPsiUtil {
 
     @NotNull
     public static KtExpression safeDeparenthesize(@NotNull KtExpression expression) {
-        KtExpression deparenthesized = deparenthesize(expression);
+        return safeDeparenthesize(expression, false);
+    }
+
+    @NotNull
+    public static KtExpression safeDeparenthesize(@NotNull KtExpression expression, boolean keepAnnotations) {
+        KtExpression deparenthesized = deparenthesize(expression, keepAnnotations);
         return deparenthesized != null ? deparenthesized : expression;
     }
 
     @Nullable
-    public static KtExpression deparenthesize(@Nullable KtExpression expression ) {
+    public static KtExpression deparenthesize(@Nullable KtExpression expression) {
+        return deparenthesize(expression, false);
+    }
+
+    @Nullable
+    public static KtExpression deparenthesize(@Nullable KtExpression expression, boolean keepAnnotations) {
         while (true) {
-            KtExpression baseExpression = deparenthesizeOnce(expression);
+            KtExpression baseExpression = deparenthesizeOnce(expression, keepAnnotations);
 
             if (baseExpression == expression) return baseExpression;
             expression = baseExpression;
@@ -86,7 +96,14 @@ public class KtPsiUtil {
     public static KtExpression deparenthesizeOnce(
             @Nullable KtExpression expression
     ) {
-        if (expression instanceof KtAnnotatedExpression) {
+        return deparenthesizeOnce(expression, false);
+    }
+
+    @Nullable
+    public static KtExpression deparenthesizeOnce(
+            @Nullable KtExpression expression, boolean keepAnnotations
+    ) {
+        if (expression instanceof KtAnnotatedExpression && !keepAnnotations) {
             return ((KtAnnotatedExpression) expression).getBaseExpression();
         }
         else if (expression instanceof KtLabeledExpression) {

idea/src/org/jetbrains/kotlin/idea/intentions/SimplifyBooleanWithConstantsIntention.kt

@@ -58,7 +58,7 @@ class SimplifyBooleanWithConstantsIntention : SelfTargetingOffsetIndependentInte
     override fun applyTo(element: KtBinaryExpression, editor: Editor?) {
         val topBinary = PsiTreeUtil.getTopmostParentOfType(element, KtBinaryExpression::class.java) ?: element
         val simplified = toSimplifiedExpression(topBinary)
-        topBinary.replace(KtPsiUtil.safeDeparenthesize(simplified))
+        topBinary.replace(KtPsiUtil.safeDeparenthesize(simplified, true))
     }
 
     private fun toSimplifiedExpression(expression: KtExpression): KtExpression {

idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/IfThenUtils.kt

@@ -58,10 +58,10 @@ fun KtBinaryExpression.expressionComparedToNull(): KtExpression? {
 }
 
 fun KtExpression.unwrapBlockOrParenthesis(): KtExpression {
-    val innerExpression = KtPsiUtil.safeDeparenthesize(this)
+    val innerExpression = KtPsiUtil.safeDeparenthesize(this, true)
     if (innerExpression is KtBlockExpression) {
         val statement = innerExpression.statements.singleOrNull() ?: return this
-        return KtPsiUtil.safeDeparenthesize(statement)
+        return KtPsiUtil.safeDeparenthesize(statement, true)
     }
     return innerExpression
 }

idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/DoubleBangToIfThenIntention.kt

@@ -50,7 +50,7 @@ class DoubleBangToIfThenIntention : SelfTargetingRangeIntention<KtPostfixExpress
     override fun applyTo(element: KtPostfixExpression, editor: Editor?) {
         if (editor == null) throw IllegalArgumentException("This intention requires an editor")
 
-        val base = KtPsiUtil.safeDeparenthesize(element.baseExpression!!)
+        val base = KtPsiUtil.safeDeparenthesize(element.baseExpression!!, true)
         val expressionText = formatForUseInExceptionArgument(base.text!!)
 
         val defaultException = KtPsiFactory(element).createExpression("throw NullPointerException()")

idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfToWhenIntention.kt

@@ -165,7 +165,7 @@ class IfToWhenIntention : SelfTargetingRangeIntention<KtIfExpression>(KtIfExpres
             }
         }
 
-        add(KtPsiUtil.safeDeparenthesize(expression))
+        add(KtPsiUtil.safeDeparenthesize(expression, true))
         return this
     }
 }

idea/testData/inspectionsLocal/cascadeIf/withAnnotation.kt

@@ -0,0 +1,13 @@
+// WITH_RUNTIME
+fun foo(a: Any) {
+    <caret>if (a == "") {
+        println(a)
+    }
+    else if (a is String) {
+        println(a)
+    }
+    else if (a is List<*>) {
+        @Suppress("UNCHECKED_CAST")
+        println(a as List<String>)
+    }
+}

idea/testData/inspectionsLocal/cascadeIf/withAnnotation.kt.after

@@ -0,0 +1,9 @@
+// WITH_RUNTIME
+fun foo(a: Any) {
+    when (a) {
+        "" -> println(a)
+        is String -> println(a)
+        is List<*> -> @Suppress("UNCHECKED_CAST")
+        println(a as List<String>)
+    }
+}

idea/testData/intentions/branched/doubleBangToIfThen/withAnnotation.kt

@@ -0,0 +1,6 @@
+@Target(AnnotationTarget.EXPRESSION)
+annotation class Ann
+
+fun foo(arg: String?) {
+    (@Ann arg)<caret>!!
+}

idea/testData/intentions/branched/doubleBangToIfThen/withAnnotation.kt.after

@@ -0,0 +1,6 @@
+@Target(AnnotationTarget.EXPRESSION)
+annotation class Ann
+
+fun foo(arg: String?) {
+    if (@Ann arg == null) throw NullPointerException("Expression '@Ann arg' must not be null")
+}

idea/testData/intentions/branched/ifWhen/ifToWhen/withAnnotation.kt

@@ -0,0 +1,15 @@
+var b = true
+
+@Target(AnnotationTarget.EXPRESSION)
+annotation class Ann
+
+fun println(s: String) {}
+
+fun foo() {
+    <caret>if (@Ann b) {
+        println("!")
+    }
+    else {
+        println("")
+    }
+}

idea/testData/intentions/branched/ifWhen/ifToWhen/withAnnotation.kt.after

@@ -0,0 +1,13 @@
+var b = true
+
+@Target(AnnotationTarget.EXPRESSION)
+annotation class Ann
+
+fun println(s: String) {}
+
+fun foo() {
+    when {
+        @Ann b -> println("!")
+        else -> println("")
+    }
+}

idea/testData/intentions/simplifyBooleanWithConstants/withAnnotation.kt

@@ -0,0 +1,10 @@
+var b = true
+
+@Target(AnnotationTarget.EXPRESSION)
+annotation class Ann
+
+fun foo() {
+    if (@Ann <caret>b == true) {
+
+    }
+}

idea/testData/intentions/simplifyBooleanWithConstants/withAnnotation.kt.after

@@ -0,0 +1,10 @@
+var b = true
+
+@Target(AnnotationTarget.EXPRESSION)
+annotation class Ann
+
+fun foo() {
+    if (@Ann <caret>b) {
+
+    }
+}

idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java

@@ -113,6 +113,12 @@ public class LocalInspectionTestGenerated extends AbstractLocalInspectionTest {
             doTest(fileName);
         }
 
+        @TestMetadata("withAnnotation.kt")
+        public void testWithAnnotation() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/cascadeIf/withAnnotation.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("withBreak.kt")
         public void testWithBreak() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/cascadeIf/withBreak.kt");

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

@@ -945,6 +945,12 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
                 String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/doubleBangToIfThen/usedInAssignment.kt");
                 doTest(fileName);
             }
+
+            @TestMetadata("withAnnotation.kt")
+            public void testWithAnnotation() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/doubleBangToIfThen/withAnnotation.kt");
+                doTest(fileName);
+            }
         }
 
         @TestMetadata("idea/testData/intentions/branched/elvisToIfThen")
@@ -1982,6 +1988,12 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
                     String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/ifToWhen/whenWithMultipleConditionTypes.kt");
                     doTest(fileName);
                 }
+
+                @TestMetadata("withAnnotation.kt")
+                public void testWithAnnotation() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/ifToWhen/withAnnotation.kt");
+                    doTest(fileName);
+                }
             }
 
             @TestMetadata("idea/testData/intentions/branched/ifWhen/whenToIf")
@@ -14545,6 +14557,12 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/simpleWithParentheses2.kt");
             doTest(fileName);
         }
+
+        @TestMetadata("withAnnotation.kt")
+        public void testWithAnnotation() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/withAnnotation.kt");
+            doTest(fileName);
+        }
     }
 
     @TestMetadata("idea/testData/intentions/simplifyNegatedBinaryExpression")