From 70d4a7997e52bacc6d4aafa0d7f474af3ff2de9e Mon Sep 17 00:00:00 2001
From: Denis Zharkov <denis.zharkov@jetbrains.com>
Date: Fri, 7 Aug 2015 12:07:14 +0300
Subject: [PATCH] Minor. Extract getDataFlowValueExcludingReceiver

---
 .../calls/smartcasts/SmartCastManager.java    | 26 ++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/SmartCastManager.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/SmartCastManager.java
index 7192a2027f1..ffce32c10e7 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/SmartCastManager.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/SmartCastManager.java
@@ -117,19 +117,33 @@ public class SmartCastManager {
             @NotNull DeclarationDescriptor containingDeclarationOrModule,
             @NotNull DataFlowInfo dataFlowInfo,
             @NotNull ReceiverValue receiverToCast
+    ) {
+        DataFlowValue dataFlowValue = getDataFlowValueExcludingReceiver(bindingContext, containingDeclarationOrModule, receiverToCast);
+
+        if (dataFlowValue != null) {
+            return dataFlowInfo.getPossibleTypes(dataFlowValue);
+        }
+
+        return Collections.emptyList();
+    }
+
+    @Nullable
+    public static DataFlowValue getDataFlowValueExcludingReceiver(
+            @NotNull BindingContext bindingContext,
+            @NotNull DeclarationDescriptor containingDeclarationOrModule,
+            @NotNull ReceiverValue receiverToCast
     ) {
         if (receiverToCast instanceof ThisReceiver) {
             ThisReceiver receiver = (ThisReceiver) receiverToCast;
             assert receiver.exists();
-            DataFlowValue dataFlowValue = DataFlowValueFactory.createDataFlowValue(receiver);
-            return dataFlowInfo.getPossibleTypes(dataFlowValue);
+            return DataFlowValueFactory.createDataFlowValue(receiver);
         }
         else if (receiverToCast instanceof ExpressionReceiver) {
-            DataFlowValue dataFlowValue = DataFlowValueFactory.createDataFlowValue(
-                    receiverToCast, bindingContext, containingDeclarationOrModule);
-            return dataFlowInfo.getPossibleTypes(dataFlowValue);
+            return DataFlowValueFactory.createDataFlowValue(
+                    receiverToCast, bindingContext, containingDeclarationOrModule
+            );
         }
-        return Collections.emptyList();
+        return null;
     }
 
     public boolean isSubTypeBySmartCastIgnoringNullability(