From 0932cb46069d88f11577b9b8e09b969ee966c189 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Wed, 25 Mar 2015 20:14:34 +0300
Subject: [PATCH] J2K: auto-replacing of if's with safe access

---
 .../intentions/IfThenToSafeAccessIntention.kt         |  8 ++++++--
 .../org/jetbrains/kotlin/idea/j2k/J2kPostProcessor.kt | 11 ++++++++++-
 .../codeSimplifications/IfToSafeCall.java             |  9 +++++++++
 .../fileOrElement/codeSimplifications/IfToSafeCall.kt |  7 +++++++
 .../JavaToKotlinConverterForWebDemoTestGenerated.java |  6 ++++++
 .../JavaToKotlinConverterSingleFileTestGenerated.java |  6 ++++++
 6 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 j2k/testData/fileOrElement/codeSimplifications/IfToSafeCall.java
 create mode 100644 j2k/testData/fileOrElement/codeSimplifications/IfToSafeCall.kt

diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToSafeAccessIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToSafeAccessIntention.kt
index 81a86117931..32a32a357eb 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToSafeAccessIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToSafeAccessIntention.kt
@@ -58,6 +58,11 @@ public class IfThenToSafeAccessIntention : JetSelfTargetingIntention<JetIfExpres
     }
 
     override fun applyTo(element: JetIfExpression, editor: Editor) {
+        val safeAccessExpr = applyTo(element)
+        safeAccessExpr.inlineReceiverIfApplicableWithPrompt(editor)
+    }
+
+    public fun applyTo(element: JetIfExpression): JetSafeQualifiedExpression {
         val condition = element.getCondition() as JetBinaryExpression
         val receiverExpression = checkNotNull(condition.getNonNullExpression(), "The receiver expression cannot be null")
 
@@ -79,8 +84,7 @@ public class IfThenToSafeAccessIntention : JetSelfTargetingIntention<JetIfExpres
                 }
 
         val resultingExprString = "${receiverExpression.getText()}?.${selectorExpression?.getText()}"
-        val safeAccessExpr = element.replace(resultingExprString) as JetSafeQualifiedExpression
-        safeAccessExpr.inlineReceiverIfApplicableWithPrompt(editor)
+        return element.replace(resultingExprString) as JetSafeQualifiedExpression
     }
 
     fun clauseContainsAppropriateDotQualifiedExpression(clause: JetExpression, receiverExpression: JetExpression): Boolean =
diff --git a/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessor.kt
index 314a6f5856e..e395178be5e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessor.kt
@@ -22,11 +22,11 @@ import org.jetbrains.kotlin.diagnostics.Errors
 import org.jetbrains.kotlin.idea.caches.resolve.analyzeFullyAndGetResult
 import org.jetbrains.kotlin.idea.intentions.RemoveExplicitTypeArguments
 import org.jetbrains.kotlin.idea.intentions.SimplifyNegatedBinaryExpressionIntention
+import org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.IfThenToSafeAccessIntention
 import org.jetbrains.kotlin.idea.quickfix.RemoveRightPartOfBinaryExpressionFix
 import org.jetbrains.kotlin.j2k.PostProcessor
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.BindingContext
-import org.jetbrains.kotlin.utils.printAndReturn
 import java.util.ArrayList
 
 public class J2kPostProcessor(override val contextToAnalyzeIn: PsiElement) : PostProcessor {
@@ -65,6 +65,15 @@ public class J2kPostProcessor(override val contextToAnalyzeIn: PsiElement) : Pos
                     intention.applyTo(expression)
                 }
             }
+
+            override fun visitIfExpression(expression: JetIfExpression) {
+                super.visitIfExpression(expression)
+
+                val intention = IfThenToSafeAccessIntention()
+                if (intention.isApplicableTo(expression)) {
+                    intention.applyTo(expression)
+                }
+            }
         })
 
         for (typeArgs in redundantTypeArgs) {
diff --git a/j2k/testData/fileOrElement/codeSimplifications/IfToSafeCall.java b/j2k/testData/fileOrElement/codeSimplifications/IfToSafeCall.java
new file mode 100644
index 00000000000..a859c6388e3
--- /dev/null
+++ b/j2k/testData/fileOrElement/codeSimplifications/IfToSafeCall.java
@@ -0,0 +1,9 @@
+import java.io.File;
+
+class C {
+    void foo(File file) {
+        if (file != null) {
+            file.delete();
+        }
+    }
+}
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/codeSimplifications/IfToSafeCall.kt b/j2k/testData/fileOrElement/codeSimplifications/IfToSafeCall.kt
new file mode 100644
index 00000000000..a1ce0a99c3e
--- /dev/null
+++ b/j2k/testData/fileOrElement/codeSimplifications/IfToSafeCall.kt
@@ -0,0 +1,7 @@
+import java.io.File
+
+class C {
+    fun foo(file: File?) {
+        file?.delete()
+    }
+}
diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java
index 020603ef607..bfaf0335095 100644
--- a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java
+++ b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java
@@ -982,6 +982,12 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/codeSimplifications"), Pattern.compile("^(.+)\\.java$"), true);
         }
 
+        @TestMetadata("IfToSafeCall.java")
+        public void testIfToSafeCall() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/IfToSafeCall.java");
+            doTest(fileName);
+        }
+
         @TestMetadata("NotIs.java")
         public void testNotIs() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/NotIs.java");
diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java
index 08f56952dbb..2933f178107 100644
--- a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java
+++ b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java
@@ -982,6 +982,12 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/codeSimplifications"), Pattern.compile("^(.+)\\.java$"), true);
         }
 
+        @TestMetadata("IfToSafeCall.java")
+        public void testIfToSafeCall() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/IfToSafeCall.java");
+            doTest(fileName);
+        }
+
         @TestMetadata("NotIs.java")
         public void testNotIs() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/NotIs.java");