JET-124 Sometimes local variables are not resolved in the callee position

idea/src/org/jetbrains/jet/lang/resolve/WritableScopeImpl.java

@@ -36,7 +36,6 @@ public class WritableScopeImpl extends WritableScopeWithImports {
     @Nullable
     private JetType thisType;
 
-    private boolean variablesAsFunctionsAdded;
     private List<VariableDescriptor> variableDescriptors;
 
     public WritableScopeImpl(@NotNull JetScope scope, @NotNull DeclarationDescriptor owner, @NotNull ErrorHandler errorHandler) {
@@ -243,9 +242,9 @@ public class WritableScopeImpl extends WritableScopeWithImports {
     }
 
     private void addVariablesAsFunctions() {
-        if (variablesAsFunctionsAdded) return;
-        variablesAsFunctionsAdded = true;
-        for (VariableDescriptor variableDescriptor : getVariableDescriptors()) {
+        List<VariableDescriptor> variableDescriptors = getVariableDescriptors();
+        this.variableDescriptors = null;
+        for (VariableDescriptor variableDescriptor : variableDescriptors) {
             JetType outType = variableDescriptor.getOutType();
             if (outType != null && JetStandardClasses.isFunctionType(outType)) {
                 addFunctionDescriptor(VariableAsFunctionDescriptor.create(variableDescriptor));

idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java

@@ -2482,7 +2482,6 @@ public class JetTypeInferrer {
 
         @Override
         public void visitProperty(JetProperty property) {
-
             JetTypeReference receiverTypeRef = property.getReceiverTypeRef();
             if (receiverTypeRef != null) {
                 context.trace.getErrorHandler().genericError(receiverTypeRef.getNode(), "Local receiver-properties are not allowed");

idea/testData/checker/regression/Jet124.jet

@@ -0,0 +1,8 @@
+fun foo1() : {(Int) : Int}
+
+fun foo() {
+  val h : {(Int) : Int} = foo1();
+  h(1)
+  val m : {(Int) : Int} = {(a : Int) => 1}//foo1()
+  m(1)
+}