Function scope check

Author: Mikhail Arkhipov

src/Analysis/Engine/Impl/ModuleAnalysis.cs

@@ -239,8 +239,8 @@ public VariablesResult GetVariables(Expression expr, SourceLocation location, st
                     foreach (var s in scope.EnumerateTowardsGlobal) {
                         var scopeVariables = GetVariablesInScope(name, s).Distinct();
                         variables = variables.Union(scopeVariables);
-                        var args = scopeVariables.Where(v => IsFunctionArgument(v.Variable));
-                        if(args.Any()) {
+                        var args = scopeVariables.Where(v => IsFunctionArgument(s, v));
+                        if (args.Any()) {
                             break;
                         }
                     }
@@ -255,7 +255,7 @@ public VariablesResult GetVariables(Expression expr, SourceLocation location, st
                     if (definitions.Length > 0) {
                         var defsToRefs = definitions.Skip(1).Select(v => new AnalysisVariable(v.Variable, VariableType.Reference, v.Location));
                         variables = definitions.Take(1).Concat(others.Concat(defsToRefs));
-                     }
+                    }
                 }
                 return new VariablesResult(variables, unit.Tree);
             }
@@ -270,8 +270,17 @@ public VariablesResult GetVariables(Expression expr, SourceLocation location, st
             return new VariablesResult(variables, unit.Tree);
         }
 
-        private bool IsFunctionArgument(IVariableDefinition v)
-            => v?.Types?.MaybeEnumerate().FirstOrDefault() is ParameterInfo;
+        private bool IsFunctionArgument(IScope scope, IAnalysisVariable v) {
+            if (v.Variable?.Types?.MaybeEnumerate().FirstOrDefault() is ParameterInfo) {
+                return true;
+            }
+            if (scope is FunctionScope funcScope) {
+                var def = funcScope.Function.FunctionDefinition;
+                // TODO: Use indexes rather than lines to check location
+                return v.Location.StartLine == def.GetStart(def.GlobalParent).Line;
+            }
+            return false;
+        }
 
         private IEnumerable<IAnalysisVariable> GetVariablesInScope(NameExpression name, IScope scope) {
             var result = new List<IAnalysisVariable>();

src/Analysis/Engine/Test/AnalysisTest.cs

@@ -3923,6 +3923,7 @@ def f(x = x):
             using (var server = await CreateServerAsync()) {
                 var uri = TestData.GetDefaultModuleUri();
                 await server.OpenDefaultDocumentAndGetAnalysisAsync(code);
+
                 var referencesx1 = await server.SendFindReferences(uri, 2, 6);
                 var referencesx2 = await server.SendFindReferences(uri, 2, 10);
                 var referencesx3 = await server.SendFindReferences(uri, 3, 4);
@@ -4980,6 +4981,7 @@ public async Task CrossModule(int[] permutation) {
 
                 await server.SendDidOpenTextDocument(uris[permutation[0]], contents[permutation[0]]);
                 await server.SendDidOpenTextDocument(uris[permutation[1]], contents[permutation[1]]);
+                await server.WaitForCompleteAnalysisAsync(CancellationToken.None);
 
                 var analysis = await server.GetAnalysisAsync(uris[0]);
                 analysis.Should().HaveVariable("module2").WithValue<IModuleInfo>()
@@ -5586,6 +5588,7 @@ def mydec(self, x):
                 await server.SendDidOpenTextDocument(uris[permutation[0]], contents[permutation[0]]);
                 await server.SendDidOpenTextDocument(uris[permutation[1]], contents[permutation[1]]);
 
+                await server.WaitForCompleteAnalysisAsync(CancellationToken.None);
                 var analysis1 = await server.GetAnalysisAsync(uris[0]);
                 var analysis2 = await server.GetAnalysisAsync(uris[1]);