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

Author: MikhailArkhipov

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

@@ -454,13 +454,13 @@ private bool TryImportModule(string modName, bool forceAbsolute, out ModuleRefer
             return false;
         }
 
-        internal List<AnalysisValue> LookupBaseMethods(string name, IEnumerable<IAnalysisSet> bases, Node node, AnalysisUnit unit) {
+        internal List<AnalysisValue> LookupBaseMethods(string name, IEnumerable<IAnalysisSet> mro, Node node, AnalysisUnit unit) {
             var result = new List<AnalysisValue>();
-            foreach (var b in bases) {
-                foreach (var curType in b) {
-                    var klass = curType as BuiltinClassInfo;
-                    if (klass != null) {
-                        var value = klass.GetMember(node, unit, name);
+            foreach (var @class in mro.Skip(1)) {
+                foreach (var curType in @class) {
+                    bool isClass = curType is ClassInfo || curType is BuiltinClassInfo;
+                    if (isClass) {
+                        var value = curType.GetMember(node, unit, name);
                         if (value != null) {
                             result.AddRange(value);
                         }
@@ -470,7 +470,6 @@ internal List<AnalysisValue> LookupBaseMethods(string name, IEnumerable<IAnalysi
             return result;
         }
 
-
         public override bool Walk(FunctionDefinition node) {
             InterpreterScope funcScope;
             if (_unit.InterpreterScope.TryGetNodeScope(node, out funcScope)) {
@@ -572,9 +571,28 @@ public override bool Walk(ImportStatement node) {
 
         public override bool Walk(ReturnStatement node) {
             var fnScope = CurrentFunction;
-            if (node.Expression != null && fnScope != null) {
-                var lookupRes = _eval.Evaluate(node.Expression);
-                fnScope.AddReturnTypes(node, _unit, lookupRes);
+            if (fnScope == null || node.Expression == null) {
+                return true;
+            }
+
+            var lookupRes = _eval.Evaluate(node.Expression);
+            fnScope.AddReturnTypes(node, _unit, lookupRes);
+
+            var function = fnScope.Function;
+            var analysisUnit = (FunctionAnalysisUnit)function.AnalysisUnit;
+
+            if (Scope.OuterScope is ClassScope curClass) {
+                var bases = LookupBaseMethods(
+                    analysisUnit.Ast.Name,
+                    curClass.Class.Mro,
+                    analysisUnit.Ast,
+                    analysisUnit
+                );
+
+                foreach (FunctionInfo baseFunction in bases.OfType<FunctionInfo>()) {
+                    var baseAnalysisUnit = (FunctionAnalysisUnit)baseFunction.AnalysisUnit;
+                    baseAnalysisUnit.ReturnValue.AddTypes(_unit, lookupRes);
+                }
             }
             return true;
         }

src/Analysis/Engine/Impl/Microsoft.Python.Analysis.Engine.csproj

@@ -5,13 +5,13 @@
     <AssemblyName>Microsoft.Python.Analysis.Engine</AssemblyName>
   </PropertyGroup>
   <PropertyGroup>
-    <!-- 
+    <!--
       1701, 1702 - "You may need to supply assembly policy"
       1998 - "This async method lacks 'await'"
     -->
     <NoWarn>1701;1702;1998;$(NoWarn)</NoWarn>
   </PropertyGroup>
-  <Import Project="..\..\..\..\Build\NetStandard.settings" />
+  <Import Project="..\..\..\..\build\NetStandard.settings" />
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
   <ItemGroup>
     <PackageReference Include="MicroBuild.Core" Version="0.3.0">
@@ -47,5 +47,5 @@
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-  <Import Project="..\..\..\..\Build\NetStandard.targets" />
-</Project>
+  <Import Project="..\..\..\..\build\NetStandard.targets" />
+</Project>