Jake Bailey (jakebailey) · Nov 13, 2019 · Sep 30, 2019 · Oct 1, 2019 · Oct 4, 2019 · Oct 4, 2019
diff --git a/src/LanguageServer/Impl/Sources/ReferenceSource.cs b/src/LanguageServer/Impl/Sources/ReferenceSource.cs
@@ -44,24 +44,35 @@ public ReferenceSource(IServiceContainer services) {
         }
 
         public async Task<Reference[]> FindAllReferencesAsync(Uri uri, SourceLocation location, ReferenceSearchOptions options, CancellationToken cancellationToken = default) {
-            if (uri != null) {
-                var analysis = await Document.GetAnalysisAsync(uri, _services, FindReferencesAnalysisTimeout, cancellationToken);
+            if (uri == null) {
+                return Array.Empty<Reference>();
+            }
+            var analysis = await Document.GetAnalysisAsync(uri, _services, FindReferencesAnalysisTimeout, cancellationToken);
 
-                var definitionSource = new DefinitionSource(_services);
-                var definition = definitionSource.FindDefinition(analysis, location, out var definingMember);
-                if (definition == null) {
-                    return Array.Empty<Reference>();
-                }
+            var definitionSource = new DefinitionSource(_services);
+            var definition = definitionSource.FindDefinition(analysis, location, out var definingMember);
+            if (definition == null) {
+                return Array.Empty<Reference>();
+            }
 
-                var rootDefinition = definingMember.GetRootDefinition();
-                var name = definingMember.GetName();
+            var rootDefinition = definingMember.GetRootDefinition();
+            if (rootDefinition == null) {
+                return Array.Empty<Reference>();
+            }
+
+            var name = definingMember.GetName();
+            var moduleUri = rootDefinition.Definition?.DocumentUri;
+            if (moduleUri == null) {
+                return Array.Empty<Reference>();
+            }
+
+            var rdt = _services.GetService<IRunningDocumentTable>();
+            var declaringModule = rdt.GetDocument(moduleUri);
 
-                // If it is an implicitly declared variable, such as function or a class
-                // then the location is invalid and the module is null. Use current module.
-                var declaringModule = rootDefinition?.DeclaringModule ?? analysis.Document;
-                if (!string.IsNullOrEmpty(name) && (declaringModule.ModuleType == ModuleType.User || options == ReferenceSearchOptions.All)) {
-                    return await FindAllReferencesAsync(name, declaringModule, rootDefinition, location, definitionSource, cancellationToken);
-                }
+            // If it is an implicitly declared variable, such as function or a class
+            // then the location is invalid and the module is null. Use current module.
+            if (!string.IsNullOrEmpty(name) && (declaringModule.ModuleType == ModuleType.User || options == ReferenceSearchOptions.All)) {
+                return await FindAllReferencesAsync(name, declaringModule, rootDefinition, location, definitionSource, cancellationToken);
             }
             return Array.Empty<Reference>();
         }

diff --git a/src/LanguageServer/Test/RenameTests.cs b/src/LanguageServer/Test/RenameTests.cs
@@ -220,7 +220,7 @@ public async Task NoRenameInCompiled() {
         }
 
         [TestMethod, Priority(0)]
-        public async Task NoRenameInLibrary() {
+        public async Task NoRenameInSystemLibrary() {
             const string code = @"from logging import BASIC_FORMAT";
             var analysis = await GetAnalysisAsync(code, PythonVersions.LatestAvailable3X);
             var rs = new RenameSource(Services);
@@ -231,5 +231,18 @@ public async Task NoRenameInLibrary() {
             wse = await rs.RenameAsync(analysis.Document.Uri, new SourceLocation(1, 23), "z");
             wse.Should().BeNull();
         }
+
+        [TestMethod, Priority(0)]
+        public async Task NoRenameInUserLibrary() {
+            const string code = @"
+import Library1
+Library1.make_foo()
+";
+            var analysis = await GetAnalysisAsync(code, PythonVersions.LatestAvailable3X);
+            var rs = new RenameSource(Services);
+
+            var wse = await rs.RenameAsync(analysis.Document.Uri, new SourceLocation(3, 16), "z");
+            wse.Should().BeNull();
+        }
     }
 }
diff --git a/src/UnitTests/TestData/AstAnalysis/Library1.py b/src/UnitTests/TestData/AstAnalysis/Library1.py
@@ -0,0 +1,14 @@
+class Foo():
+	"""This is Foo and the docs should be here"""
+    def __init__(self):
+        self.x = 1234
+        self.y = "str"
+
+
+def make_foo():
+	"""This is make_foo and the docs should be here"""
+    return Foo()
+
+def print_foo(f):
+	"""This is print_foo and the docs should be here"""
+    print(f"{f.x}, {f.y}")