From 698d839eee6af6aed987d8aa3f2ebddae9ff5e3b Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Wed, 25 Mar 2015 18:59:35 +0300
Subject: [PATCH] Added a test

---
 .../resolve/partialBodyResolve/IfNullElseReturn.dump     | 6 ++++++
 .../resolve/partialBodyResolve/IfNullElseReturn.kt       | 9 +++++++++
 .../idea/resolve/PartialBodyResolveTestGenerated.java    | 6 ++++++
 3 files changed, 21 insertions(+)
 create mode 100644 idea/testData/resolve/partialBodyResolve/IfNullElseReturn.dump
 create mode 100644 idea/testData/resolve/partialBodyResolve/IfNullElseReturn.kt

diff --git a/idea/testData/resolve/partialBodyResolve/IfNullElseReturn.dump b/idea/testData/resolve/partialBodyResolve/IfNullElseReturn.dump
new file mode 100644
index 00000000000..de8e3f0907b
--- /dev/null
+++ b/idea/testData/resolve/partialBodyResolve/IfNullElseReturn.dump
@@ -0,0 +1,6 @@
+Resolve target: value-parameter val p: kotlin.Any?
+----------------------------------------------
+fun foo(p: Any?) {
+    /* STATEMENT DELETED: if (p == null) { print("null") } else { return } */
+    <caret>p?.hashCode()
+}
diff --git a/idea/testData/resolve/partialBodyResolve/IfNullElseReturn.kt b/idea/testData/resolve/partialBodyResolve/IfNullElseReturn.kt
new file mode 100644
index 00000000000..b64ed9f187f
--- /dev/null
+++ b/idea/testData/resolve/partialBodyResolve/IfNullElseReturn.kt
@@ -0,0 +1,9 @@
+fun foo(p: Any?) {
+    if (p == null) {
+        print("null")
+    }
+    else {
+        return
+    }
+    <caret>p?.hashCode()
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/PartialBodyResolveTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/resolve/PartialBodyResolveTestGenerated.java
index 6d3adc8021f..dddb8ab94e2 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/resolve/PartialBodyResolveTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/PartialBodyResolveTestGenerated.java
@@ -240,6 +240,12 @@ public class PartialBodyResolveTestGenerated extends AbstractPartialBodyResolveT
         doTest(fileName);
     }
 
+    @TestMetadata("IfNullElseReturn.kt")
+    public void testIfNullElseReturn() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNullElseReturn.kt");
+        doTest(fileName);
+    }
+
     @TestMetadata("IfNullElvisReturn.kt")
     public void testIfNullElvisReturn() throws Exception {
         String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNullElvisReturn.kt");