From 966da0b03f096c84836c342c2fea590e0c1a34d5 Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Wed, 16 Jul 2014 21:12:53 +0400
Subject: [PATCH] Fix ConvertAssertToIfWithThrowIntention

to not invoke ShortenReferences on file created by JetPsiFactory

 #KT-5476 Fixed
---
 .../ConvertAssertToIfWithThrowIntention.kt    | 42 ++++++++++++-------
 .../assertErrorOverloaded.kt                  |  7 +++-
 .../assertErrorOverloaded.kt.after            |  9 +++-
 3 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertAssertToIfWithThrowIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertAssertToIfWithThrowIntention.kt
index 6bcf056bd69..6fea99b3253 100644
--- a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertAssertToIfWithThrowIntention.kt
+++ b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertAssertToIfWithThrowIntention.kt
@@ -29,6 +29,8 @@ import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns
 import org.jetbrains.jet.lang.psi.JetIfExpression
 import org.jetbrains.jet.lang.psi.JetDotQualifiedExpression
 import org.jetbrains.jet.lang.resolve.bindingContextUtil.getResolvedCall
+import org.jetbrains.jet.lang.psi.JetBlockExpression
+import org.jetbrains.jet.lang.psi.JetThrowExpression
 
 public class ConvertAssertToIfWithThrowIntention : JetSelfTargetingIntention<JetCallExpression>(
         "convert.assert.to.if.with.throw", javaClass()) {
@@ -57,6 +59,13 @@ public class ConvertAssertToIfWithThrowIntention : JetSelfTargetingIntention<Jet
     }
 
     override fun applyTo(element: JetCallExpression, editor: Editor) {
+        val replacementIfExpression = createReplacementExpression(element) ?: return
+        val replaced = replaceExpression(element, replacementIfExpression)
+        ShortenReferences.process(replaced.getThen()!!)
+        simplifyConditionIfPossible(editor, replaced)
+    }
+
+    private fun createReplacementExpression(element: JetCallExpression): JetIfExpression? {
         val args = element.getValueArguments()
         val condition = args[0]?.getArgumentExpression()
         val lambdas = element.getFunctionLiteralArguments()
@@ -73,7 +82,7 @@ public class ConvertAssertToIfWithThrowIntention : JetSelfTargetingIntention<Jet
                     psiFactory.createExpression("\"Assertion failed\"")
                 }
 
-        if (condition == null || messageExpr == null) return
+        if (condition == null || messageExpr == null) return null
 
         val message =
                 if (messageIsAFunction && messageExpr is JetCallableReferenceExpression) {
@@ -86,25 +95,30 @@ public class ConvertAssertToIfWithThrowIntention : JetSelfTargetingIntention<Jet
                     "${messageExpr.getText()}"
                 }
 
-        val assertTypeRef = psiFactory.createType("java.lang.AssertionError")
-        ShortenReferences.process(assertTypeRef)
-
-        val text = "if (!true) { throw ${assertTypeRef.getText()}(${message}) }"
+        val text = "if (!true) { throw java.lang.AssertionError(${message}) }"
         val ifExpression = psiFactory.createExpression(text) as JetIfExpression
 
         val ifCondition = ifExpression.getCondition() as JetPrefixExpression
         ifCondition.getBaseExpression()?.replace(condition)
+        return ifExpression
+    }
 
+    private fun simplifyConditionIfPossible(editor: Editor, replaced: JetIfExpression) {
+        val condition = replaced.getCondition() as JetPrefixExpression
         val simplifier = SimplifyNegatedBinaryExpressionIntention()
-        if (simplifier.isApplicableTo(ifCondition)) {
-            simplifier.applyTo(ifCondition, editor)
-        }
-
-        val parent = element.getParent()
-        if (parent is JetDotQualifiedExpression) {
-            parent.replace(ifExpression)
-        } else {
-            element.replace(ifExpression)
+        if (simplifier.isApplicableTo(condition)) {
+            simplifier.applyTo(condition, editor)
         }
     }
+
+    private fun replaceExpression(original: JetCallExpression, replacement: JetIfExpression): JetIfExpression {
+        val parent = original.getParent()
+        val result = if (parent is JetDotQualifiedExpression) {
+            parent.replace(replacement)
+        }
+        else {
+            original.replace(replacement)
+        }
+        return result as JetIfExpression
+    }
 }
diff --git a/idea/testData/intentions/convertAssertToIf/assertErrorOverloaded.kt b/idea/testData/intentions/convertAssertToIf/assertErrorOverloaded.kt
index 905257c92a8..017f4c65b5c 100644
--- a/idea/testData/intentions/convertAssertToIf/assertErrorOverloaded.kt
+++ b/idea/testData/intentions/convertAssertToIf/assertErrorOverloaded.kt
@@ -1,6 +1,9 @@
-// WITH_RUNTIME
+package a
+
 fun foo() {
     <caret>assert(true, "text")
 }
 
-class AssertionError
\ No newline at end of file
+class AssertionError
+
+// WITH_RUNTIME
diff --git a/idea/testData/intentions/convertAssertToIf/assertErrorOverloaded.kt.after b/idea/testData/intentions/convertAssertToIf/assertErrorOverloaded.kt.after
index 816f615395a..8de87c70cd4 100644
--- a/idea/testData/intentions/convertAssertToIf/assertErrorOverloaded.kt.after
+++ b/idea/testData/intentions/convertAssertToIf/assertErrorOverloaded.kt.after
@@ -1,8 +1,13 @@
-// WITH_RUNTIME
+package a
+
+import java.lang
+
 fun foo() {
     if (!true) {
         throw lang.AssertionError("text")
     }
 }
 
-class AssertionError
\ No newline at end of file
+class AssertionError
+
+// WITH_RUNTIME