Ref fixes

Author: Mikhail Arkhipov

src/Analysis/Engine/Impl/ModuleAnalysis.cs

@@ -236,14 +236,13 @@ public VariablesResult GetVariables(Expression expr, SourceLocation location, st
                 if (!scope.EnumerateTowardsGlobal.Any()) {
                     variables = _unit.State.BuiltinModule.GetDefinitions(name.Name).SelectMany(ToVariables);
                 } else {
-                    foreach (var s in scope.EnumerateTowardsGlobal.Where(s => s.VisibleToChildren)) {
+                    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()) {
-                            variables = variables.Union(args);
                             break;
                         }
-                        variables = variables.Union(scopeVariables);
                     }
 
                     // Now take outermost definition and treat inner ones (such as reassignments) as references

src/LanguageServer/Impl/Implementation/Server.OnTypeFormatting.cs

@@ -21,7 +21,7 @@
 
 namespace Microsoft.Python.LanguageServer.Implementation {
     public sealed partial class Server {
-        public override async Task<TextEdit[]> DocumentOnTypeFormatting(DocumentOnTypeFormattingParams @params, CancellationToken cancellationToken) {
+        public override Task<TextEdit[]> DocumentOnTypeFormatting(DocumentOnTypeFormattingParams @params, CancellationToken cancellationToken) {
             int targetLine; // One-indexed line number
 
             switch (@params.ch) {
@@ -38,13 +38,13 @@ public override async Task<TextEdit[]> DocumentOnTypeFormatting(DocumentOnTypeFo
             var uri = @params.textDocument.uri;
 
             if (!(ProjectFiles.GetEntry(uri) is IDocument doc)) {
-                return Array.Empty<TextEdit>();
+                return Task.FromResult(Array.Empty<TextEdit>());
             }
             var part = ProjectFiles.GetPart(uri);
 
             using (var reader = doc.ReadDocument(part, out _)) {
                 var lineFormatter = new LineFormatter(reader, Analyzer.LanguageVersion);
-                return lineFormatter.FormatLine(targetLine);
+                return Task.FromResult(lineFormatter.FormatLine(targetLine));
             }
         }
     }