Merge pull request #118 from MikhailArkhipov/master

Fix References_Parameters_NestedFunction

Author: Mikhail Arkhipov

src/Analysis/Engine/Impl/ModuleAnalysis.cs

@@ -229,14 +229,14 @@ public VariablesResult GetVariables(Expression expr, SourceLocation location, st
             }
 
             if (expr is NameExpression name) {
-                var defScope = scope.EnumerateTowardsGlobal.FirstOrDefault(s =>
-                    s.ContainsVariable(name.Name) && (s == scope || s.VisibleToChildren || IsFirstLineOfFunction(scope, s, location)));
-
-                if (defScope == null) {
-                    variables = _unit.State.BuiltinModule.GetDefinitions(name.Name)
-                        .SelectMany(ToVariables);
+                if (!scope.EnumerateTowardsGlobal.Any()) {
+                    variables = _unit.State.BuiltinModule.GetDefinitions(name.Name).SelectMany(ToVariables);
                 } else {
-                    variables = GetVariablesInScope(name, defScope).Distinct();
+                    foreach (var defScope in scope.EnumerateTowardsGlobal
+                        .Where(s => s.ContainsVariable(name.Name) && (s == scope || s.VisibleToChildren || IsFirstLineOfFunction(scope, s, location)))) {
+                        var scopeVariables = GetVariablesInScope(name, defScope).Distinct();
+                        variables = variables.Union(scopeVariables);
+                    }
                 }
             } else if (expr is MemberExpression member && !string.IsNullOrEmpty(member.Name)) {
                 var objects = eval.Evaluate(member.Target);

src/Analysis/Engine/Test/AnalysisTest.cs

@@ -3120,7 +3120,6 @@ not abc
         }
 
         [TestMethod, Priority(0)]
-        [Ignore("https://github.com/Microsoft/python-language-server/issues/39")]
         public async Task References_Parameters_NestedFunction() {
             var uri = TestData.GetDefaultModuleUri();
             using (var server = await CreateServerAsync(PythonVersions.LatestAvailable2X)) {