Mikhail Arkhipov (MikhailArkhipov) · May 11, 2019 · Mar 1, 2019 · Mar 1, 2019 · Mar 5, 2019 · Mar 5, 2019
diff --git a/src/Analysis/Ast/Impl/Extensions/EvaluatorExtensions.cs b/src/Analysis/Ast/Impl/Extensions/EvaluatorExtensions.cs
@@ -13,6 +13,7 @@
 // See the Apache Version 2.0 License for specific language governing
 // permissions and limitations under the License.
 
+using System;
 using Microsoft.Python.Analysis.Analyzer;
 using Microsoft.Python.Analysis.Types;
 using Microsoft.Python.Analysis.Values;
@@ -23,5 +24,10 @@ public static IMember LookupNameInScopes(this IExpressionEvaluator eval, string
             => eval.LookupNameInScopes(name, out scope, out _, options);
         public static IMember LookupNameInScopes(this IExpressionEvaluator eval, string name, LookupOptions options = LookupOptions.Normal)
             => eval.LookupNameInScopes(name, out _, out _, options);
+
+        public static IDisposable OpenScope(this IExpressionEvaluator eval, IPythonClassType cls)
+            => eval.OpenScope(cls.DeclaringModule, cls.ClassDefinition);
+        public static IDisposable OpenScope(this IExpressionEvaluator eval, IPythonFunctionType ft)
+            => eval.OpenScope(ft.DeclaringModule, ft.FunctionDefinition);
     }
 }
diff --git a/src/Analysis/Ast/Impl/Extensions/PythonClassExtensions.cs b/src/Analysis/Ast/Impl/Extensions/PythonClassExtensions.cs
@@ -28,7 +28,7 @@ public static void AddMemberReference(this IPythonType type, string name, IExpre
             if (m is LocatedMember lm) {
                 lm.AddReference(location);
             } else if(type is IPythonClassType cls) {
-                using (eval.OpenScope(cls.DeclaringModule, cls.ClassDefinition)) {
+                using (eval.OpenScope(cls)) {
                     eval.LookupNameInScopes(name, out _, out var v, LookupOptions.Local);
                     v?.AddReference(location);
                 }

diff --git a/src/LanguageServer/Impl/Sources/DefinitionSource.cs b/src/LanguageServer/Impl/Sources/DefinitionSource.cs
@@ -206,7 +206,7 @@ private Reference FromMemberExpression(MemberExpression mex, IDocumentAnalysis a
                 case IPythonClassType cls:
                     // Data members may be instances that are not tracking locations.
                     // In this case we'll try look up the respective variable instead.
-                    using (eval.OpenScope(analysis.Document, cls.ClassDefinition)) {
+                    using (eval.OpenScope(cls)) {
                         eval.LookupNameInScopes(mex.Name, out _, out var v2, LookupOptions.Local);
                         if (v2 != null) {
                             definingMember = v2;

diff --git a/src/LanguageServer/Test/GoToDefinitionTests.cs b/src/LanguageServer/Test/GoToDefinitionTests.cs
@@ -13,6 +13,9 @@
 // See the Apache Version 2.0 License for specific language governing
 // permissions and limitations under the License.
 
+using System;
+using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 using FluentAssertions;
 using Microsoft.Python.Analysis.Analyzer;
@@ -304,5 +307,38 @@ import helper
             reference.range.Should().Be(0, 0, 0, 7);
             reference.uri.AbsolutePath.Should().Contain("__init__.py");
         }
+
+        [TestMethod, Priority(0)]
+        public async Task ImportedClassMember() {
+            await TestData.CreateTestSpecificFileAsync($"module{Path.DirectorySeparatorChar}bar.py", @"
+class Bar:
+    def get_name(self): ...
+");
+
+            const string code = @"
+from .module.bar import Bar
+
+class MainClass:
+    def __init__(self):
+        self.bar = Bar()
+
+    def foo(self):
+        return self.bar.get_name()
+";
+            var root = TestData.GetTestSpecificRootUri().AbsolutePath;
+            await CreateServicesAsync(root, PythonVersions.LatestAvailable3X);
+            var rdt = Services.GetService<IRunningDocumentTable>();
+
+            var mainPath = TestData.GetTestSpecificUri("main.py");
+            var doc = rdt.OpenDocument(mainPath, code);
+
+            var analysis = await doc.GetAnalysisAsync(Timeout.Infinite);
+            var ds = new DefinitionSource(Services);
+
+            var reference = ds.FindDefinition(analysis, new SourceLocation(9, 27), out _);
+            reference.Should().NotBeNull();
+            reference.range.Should().Be(2, 8, 2, 16);
+            reference.uri.AbsolutePath.Should().Contain("bar.py");
+        }
     }
 }