Merge branch 'master' of https://github.com/Microsoft/python-language-server into overloads

Author: MikhailArkhipov

src/Analysis/Engine/Impl/Analyzer/FunctionAnalysisUnit.cs

@@ -101,7 +101,8 @@ private bool ProcessAbstractDecorators(IAnalysisSet decorator) {
 
             // Only handle these if they are specialized
             foreach (var d in decorator.OfType<SpecializedCallable>()) {
-                if (d.DeclaringModule?.ModuleName != "abc") {
+                if (d.DeclaringModule != null
+                    && d.DeclaringModule.ModuleName != "abc") {
                     continue;
                 }
 

src/Analysis/Engine/Impl/Infrastructure/Extensions/StringBuilderExtensions.cs

@@ -24,5 +24,21 @@ public static StringBuilder TrimEnd(this StringBuilder sb) {
             }
             return sb;
         }
+
+        public static StringBuilder EnsureEndsWithSpace(this StringBuilder sb, int count = 1, bool allowLeading = false) {
+            if (sb.Length == 0 && !allowLeading) {
+                return sb;
+            }
+
+            for (var i = sb.Length - 1; i >= 0 && char.IsWhiteSpace(sb[i]); i--) {
+                count--;
+            }
+
+            if (count > 0) {
+                sb.Append(new string(' ', count));
+            }
+
+            return sb;
+        }
     }
 }

src/Analysis/Engine/Impl/Values/SpecializedNamespace.cs

@@ -217,6 +217,8 @@ public override IEnumerable<ILocationInfo> Locations {
             }
         }
 
+        public override string Name => _original == null ? base.Name : this._original.Name;
+
         public override IEnumerable<OverloadResult> Overloads {
             get {
                 if (_original == null) {

src/Analysis/Engine/Test/InheritanceTests.cs

@@ -3,12 +3,13 @@
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.Python.LanguageServer.Implementation;
+using Microsoft.PythonTools.Analysis;
 using Microsoft.PythonTools.Analysis.FluentAssertions;
 using Microsoft.PythonTools.Interpreter;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using TestUtilities;
 
-namespace Microsoft.PythonTools.Analysis {
+namespace AnalysisTests {
     [TestClass]
     public class InheritanceTests {
         public TestContext TestContext { get; set; }
@@ -38,5 +39,30 @@ def virt():
                 analysis.Should().HaveVariable("b").OfType(BuiltinTypeId.Int);
             }
         }
+
+        [TestMethod]
+        public async Task AbstractPropertyReturnTypeIgnored() {
+            var code = @"
+import abc
+
+class A:
+    @abc.abstractproperty
+    def virt():
+        pass
+
+class B(A):
+    @property
+    def virt():
+        return 42
+
+a = A()
+b = a.virt";
+
+            using (var server = await new Server().InitializeAsync(PythonVersions.Required_Python36X)) {
+                var analysis = await server.OpenDefaultDocumentAndGetAnalysisAsync(code);
+
+                analysis.Should().HaveVariable("b").OfType(BuiltinTypeId.Int);
+            }
+        }
     }
 }

src/Analysis/Engine/Test/LanguageServerTests.cs

@@ -992,6 +992,42 @@ public async Task ParseAndAnalysisDiagnostics() {
             );
         }
 
+        [TestMethod, Priority(0)]
+        public async Task OnTypeFormatting() {
+            using (var s = await CreateServer()) {
+                var uri = await AddModule(s, "def foo  ( ) :\n    x = a + b\n    x+= 1");
+
+                // Extended tests for line formatting are in LineFormatterTests.
+                // These just verify that the language server formats and returns something correct.
+                var edits = await s.SendDocumentOnTypeFormatting(uri, new SourceLocation(2, 1), "\n");
+                edits.Should().OnlyContain(new TextEdit {
+                    newText = "def foo():",
+                    range = new Range {
+                        start = new SourceLocation(1, 1),
+                        end = new SourceLocation(1, 15)
+                    }
+                });
+
+                edits = await s.SendDocumentOnTypeFormatting(uri, new SourceLocation(3, 1), "\n");
+                edits.Should().OnlyContain(new TextEdit {
+                    newText = "x = a + b",
+                    range = new Range {
+                        start = new SourceLocation(2, 5),
+                        end = new SourceLocation(2, 14)
+                    }
+                });
+
+                edits = await s.SendDocumentOnTypeFormatting(uri, new SourceLocation(4, 1), "\n");
+                edits.Should().OnlyContain(new TextEdit {
+                    newText = "x += 1",
+                    range = new Range {
+                        start = new SourceLocation(3, 5),
+                        end = new SourceLocation(3, 10)
+                    }
+                });
+            }
+        }
+
         class GetAllExtensionProvider : ILanguageServerExtensionProvider {
             public Task<ILanguageServerExtension> CreateAsync(IPythonLanguageServer server, IReadOnlyDictionary<string, object> properties, CancellationToken cancellationToken) {
                 return Task.FromResult<ILanguageServerExtension>(new GetAllExtension((Server)server, properties));