From 3713f508004ceca1df899cf6e8469948217f0893 Mon Sep 17 00:00:00 2001
From: Tal Man <tman@andrew.cmu.edu>
Date: Sun, 20 Apr 2014 12:45:31 -0400
Subject: [PATCH] Intention to convert assert into an if with throw - bug fix
 for when the call is dot qualified

---
 .../intentions/ConvertAssertToIfWithThrowIntention.kt     | 8 +++++++-
 .../intentions/convertAssertToIf/dotQualifiedCall.kt      | 4 ++++
 .../convertAssertToIf/dotQualifiedCall.kt.after           | 6 ++++++
 .../intentions/CodeTransformationTestGenerated.java       | 5 +++++
 4 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 idea/testData/intentions/convertAssertToIf/dotQualifiedCall.kt
 create mode 100644 idea/testData/intentions/convertAssertToIf/dotQualifiedCall.kt.after

diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertAssertToIfWithThrowIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertAssertToIfWithThrowIntention.kt
index 5dd8458611d..9397250a2e8 100644
--- a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertAssertToIfWithThrowIntention.kt
+++ b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertAssertToIfWithThrowIntention.kt
@@ -28,6 +28,7 @@ import org.jetbrains.jet.lang.resolve.DescriptorUtils
 import kotlin.properties.Delegates
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns
 import org.jetbrains.jet.lang.psi.JetIfExpression
+import org.jetbrains.jet.lang.psi.JetDotQualifiedExpression
 
 public class ConvertAssertToIfWithThrowIntention : JetSelfTargetingIntention<JetCallExpression>(
         "convert.assert.to.if.with.throw", javaClass()) {
@@ -98,6 +99,11 @@ public class ConvertAssertToIfWithThrowIntention : JetSelfTargetingIntention<Jet
             simplifier.applyTo(ifCondition, editor)
         }
 
-        element.replace(ifExpression)
+        val parent = element.getParent()
+        if (parent is JetDotQualifiedExpression) {
+            parent.replace(ifExpression)
+        } else {
+            element.replace(ifExpression)
+        }
     }
 }
diff --git a/idea/testData/intentions/convertAssertToIf/dotQualifiedCall.kt b/idea/testData/intentions/convertAssertToIf/dotQualifiedCall.kt
new file mode 100644
index 00000000000..1dbc43f76d1
--- /dev/null
+++ b/idea/testData/intentions/convertAssertToIf/dotQualifiedCall.kt
@@ -0,0 +1,4 @@
+// WITH_RUNTIME
+fun foo() {
+    kotlin.<caret>assert(true, "text")
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/convertAssertToIf/dotQualifiedCall.kt.after b/idea/testData/intentions/convertAssertToIf/dotQualifiedCall.kt.after
new file mode 100644
index 00000000000..e91f674a0b9
--- /dev/null
+++ b/idea/testData/intentions/convertAssertToIf/dotQualifiedCall.kt.after
@@ -0,0 +1,6 @@
+// WITH_RUNTIME
+fun foo() {
+    if (!true) {
+        throw AssertionError("text")
+    }
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/jet/plugin/intentions/CodeTransformationTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/intentions/CodeTransformationTestGenerated.java
index 00a32f62866..18aab3564f7 100644
--- a/idea/tests/org/jetbrains/jet/plugin/intentions/CodeTransformationTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/intentions/CodeTransformationTestGenerated.java
@@ -3541,6 +3541,11 @@ public class CodeTransformationTestGenerated extends AbstractCodeTransformationT
             doTestConvertAssertToIfWithThrowIntention("idea/testData/intentions/convertAssertToIf/booleanConditionWithVariables.kt");
         }
         
+        @TestMetadata("dotQualifiedCall.kt")
+        public void testDotQualifiedCall() throws Exception {
+            doTestConvertAssertToIfWithThrowIntention("idea/testData/intentions/convertAssertToIf/dotQualifiedCall.kt");
+        }
+        
         @TestMetadata("functionCallCondition.kt")
         public void testFunctionCallCondition() throws Exception {
             doTestConvertAssertToIfWithThrowIntention("idea/testData/intentions/convertAssertToIf/functionCallCondition.kt");