From 22974391eb371b063309f8a9fb9c9b4e72bd76dc Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Tue, 21 Aug 2012 19:26:04 +0400
Subject: [PATCH] Extract method

---
 .../ControlStructureTypingVisitor.java        | 64 +++++++++++--------
 1 file changed, 36 insertions(+), 28 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingVisitor.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingVisitor.java
index af90a4df8a4..59096f3be23 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingVisitor.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingVisitor.java
@@ -250,7 +250,6 @@ public class ControlStructureTypingVisitor extends ExpressionTypingVisitor {
         if (!isStatement) return DataFlowUtils.illegalStatementType(expression, contextWithExpectedType, facade);
 
         ExpressionTypingContext context = contextWithExpectedType.replaceExpectedType(TypeUtils.NO_EXPECTED_TYPE);
-        JetParameter loopParameter = expression.getLoopParameter();
         JetExpression loopRange = expression.getLoopRange();
         JetType expectedParameterType = null;
         if (loopRange != null) {
@@ -262,34 +261,9 @@ public class ControlStructureTypingVisitor extends ExpressionTypingVisitor {
 
         WritableScope loopScope = newWritableScopeImpl(context, "Scope with for-loop index");
 
+        JetParameter loopParameter = expression.getLoopParameter();
         if (loopParameter != null) {
-            JetTypeReference typeReference = loopParameter.getTypeReference();
-            VariableDescriptor variableDescriptor;
-            if (typeReference != null) {
-                variableDescriptor = context.expressionTypingServices.getDescriptorResolver().resolveLocalVariableDescriptor(context.scope.getContainingDeclaration(), context.scope, loopParameter, context.trace);
-                JetType actualParameterType = variableDescriptor.getType();
-                if (expectedParameterType != null &&
-                        actualParameterType != null &&
-                        !JetTypeChecker.INSTANCE.isSubtypeOf(expectedParameterType, actualParameterType)) {
-                    context.trace.report(TYPE_MISMATCH_IN_FOR_LOOP.on(typeReference, expectedParameterType, actualParameterType));
-                }
-            }
-            else {
-                if (expectedParameterType == null) {
-                    expectedParameterType = ErrorUtils.createErrorType("Error");
-                }
-                variableDescriptor = context.expressionTypingServices.getDescriptorResolver().resolveLocalVariableDescriptor(context.scope.getContainingDeclaration(), loopParameter, expectedParameterType, context.trace);
-            }
-
-            {
-                // http://youtrack.jetbrains.net/issue/KT-527
-
-                VariableDescriptor olderVariable = context.scope.getLocalVariable(variableDescriptor.getName());
-                if (olderVariable != null && DescriptorUtils.isLocal(context.scope.getContainingDeclaration(), olderVariable)) {
-                    PsiElement declaration = BindingContextUtils.descriptorToDeclaration(context.trace.getBindingContext(), variableDescriptor);
-                    context.trace.report(Errors.NAME_SHADOWING.on(declaration, variableDescriptor.getName().getName()));
-                }
-            }
+            VariableDescriptor variableDescriptor = createLoopParameterDescriptor(loopParameter, expectedParameterType, context);
 
             loopScope.addVariableDescriptor(variableDescriptor);
         }
@@ -302,6 +276,40 @@ public class ControlStructureTypingVisitor extends ExpressionTypingVisitor {
         return DataFlowUtils.checkType(JetStandardClasses.getUnitType(), expression, contextWithExpectedType, context.dataFlowInfo);
     }
 
+    private static VariableDescriptor createLoopParameterDescriptor(
+            JetParameter loopParameter,
+            JetType expectedParameterType,
+            ExpressionTypingContext context
+    ) {
+        JetTypeReference typeReference = loopParameter.getTypeReference();
+        VariableDescriptor variableDescriptor;
+        if (typeReference != null) {
+            variableDescriptor = context.expressionTypingServices.getDescriptorResolver().resolveLocalVariableDescriptor(context.scope.getContainingDeclaration(), context.scope, loopParameter, context.trace);
+            JetType actualParameterType = variableDescriptor.getType();
+            if (expectedParameterType != null &&
+                    !JetTypeChecker.INSTANCE.isSubtypeOf(expectedParameterType, actualParameterType)) {
+                context.trace.report(TYPE_MISMATCH_IN_FOR_LOOP.on(typeReference, expectedParameterType, actualParameterType));
+            }
+        }
+        else {
+            if (expectedParameterType == null) {
+                expectedParameterType = ErrorUtils.createErrorType("Error");
+            }
+            variableDescriptor = context.expressionTypingServices.getDescriptorResolver().resolveLocalVariableDescriptor(context.scope.getContainingDeclaration(), loopParameter, expectedParameterType, context.trace);
+        }
+
+        {
+            // http://youtrack.jetbrains.net/issue/KT-527
+
+            VariableDescriptor olderVariable = context.scope.getLocalVariable(variableDescriptor.getName());
+            if (olderVariable != null && DescriptorUtils.isLocal(context.scope.getContainingDeclaration(), olderVariable)) {
+                PsiElement declaration = BindingContextUtils.descriptorToDeclaration(context.trace.getBindingContext(), variableDescriptor);
+                context.trace.report(Errors.NAME_SHADOWING.on(declaration, variableDescriptor.getName().getName()));
+            }
+        }
+        return variableDescriptor;
+    }
+
     @Nullable
     /*package*/ static JetType checkIterableConvention(@NotNull ExpressionReceiver loopRange, ExpressionTypingContext context) {
         JetExpression loopRangeExpression = loopRange.getExpression();