Control whether a variable is captured in a closure

Author: mglukhikh

compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowValueFactory.java

@@ -22,8 +22,10 @@
 import org.jetbrains.kotlin.JetNodeTypes;
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
 import org.jetbrains.kotlin.descriptors.*;
+import org.jetbrains.kotlin.descriptors.impl.LocalVariableDescriptor;
 import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.kotlin.resolve.BindingContext;
+import org.jetbrains.kotlin.resolve.BindingContextUtils;
 import org.jetbrains.kotlin.resolve.DescriptorUtils;
 import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage;
 import org.jetbrains.kotlin.resolve.calls.context.ResolutionContext;
@@ -122,12 +124,13 @@ else if (receiverValue == ReceiverValue.NO_RECEIVER) {
     @NotNull
     public static DataFlowValue createDataFlowValue(
             @NotNull VariableDescriptor variableDescriptor,
+            @NotNull BindingContext bindingContext,
             @Nullable ModuleDescriptor usageContainingModule
     ) {
         JetType type = variableDescriptor.getType();
         return new DataFlowValue(variableDescriptor, type,
                                  isStableVariable(variableDescriptor, usageContainingModule),
-                                 isLocalVariable(variableDescriptor),
+                                 isLocalVariable(variableDescriptor, bindingContext),
                                  getImmanentNullability(type));
     }
 
@@ -237,7 +240,7 @@ private static IdentifierInfo getIdForSimpleNameExpression(
             VariableDescriptor variableDescriptor = (VariableDescriptor) declarationDescriptor;
             return combineInfo(receiverInfo, createInfo(variableDescriptor,
                                                         isStableVariable(variableDescriptor, usageModuleDescriptor),
-                                                        isLocalVariable(variableDescriptor)));
+                                                        isLocalVariable(variableDescriptor, bindingContext)));
         }
         if (declarationDescriptor instanceof PackageViewDescriptor) {
             return createPackageInfo(declarationDescriptor);
@@ -272,12 +275,10 @@ private static IdentifierInfo getIdForThisReceiver(@Nullable DeclarationDescript
         return NO_IDENTIFIER_INFO;
     }
 
-    public static boolean isLocalVariable(@NotNull VariableDescriptor variableDescriptor) {
-        if (variableDescriptor instanceof PropertyDescriptor) {
-            return false;
-        }
-        DeclarationDescriptor declaration = variableDescriptor.getContainingDeclaration();
-        if (declaration instanceof FunctionDescriptor) {
+    public static boolean isLocalVariable(@NotNull VariableDescriptor variableDescriptor, @NotNull BindingContext bindingContext) {
+        if (variableDescriptor instanceof LocalVariableDescriptor) {
+            if (BindingContextUtils.isVarCapturedInClosure(bindingContext, variableDescriptor))
+                return false;
             return true;
         }
         return false;

compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorForStatements.java

@@ -146,7 +146,8 @@ public JetTypeInfo visitProperty(@NotNull JetProperty property, ExpressionTyping
             // In this case s will be not-nullable until it is changed
             if (property.getTypeReference() == null && type != null) {
                 DataFlowValue variableDataFlowValue = DataFlowValueFactory.createDataFlowValue(
-                        propertyDescriptor, DescriptorUtils.getContainingModuleOrNull(scope.getContainingDeclaration()));
+                        propertyDescriptor, context.trace.getBindingContext(),
+                        DescriptorUtils.getContainingModuleOrNull(scope.getContainingDeclaration()));
                 DataFlowValue initializerDataFlowValue = DataFlowValueFactory.createDataFlowValue(initializer, type, context);
                 dataFlowInfo = dataFlowInfo.assign(variableDataFlowValue, initializerDataFlowValue);
             }