From c8d1326ed3096382fb324597ba46eef4a9925029 Mon Sep 17 00:00:00 2001
From: Eric Traut <eric@traut.com>
Date: Fri, 24 Jan 2025 10:31:35 -0800
Subject: [PATCH] Fixed bug that results in a false negative when two import
 statements shadow the same symbol and an attribute is accessed between the
 two import statements. This addresses #9752.

---
 .../pyright-internal/src/analyzer/binder.ts   | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/packages/pyright-internal/src/analyzer/binder.ts b/packages/pyright-internal/src/analyzer/binder.ts
index 6c2a81c029a5..a3432cb9acb7 100644
--- a/packages/pyright-internal/src/analyzer/binder.ts
+++ b/packages/pyright-internal/src/analyzer/binder.ts
@@ -2569,6 +2569,13 @@ export class Binder extends ParseTreeWalker {
 
         AnalyzerNodeInfo.setFlowNode(node, this._currentFlowNode!);
 
+        let uriOfLastSubmodule: Uri;
+        if (importInfo && importInfo.isImportFound && !importInfo.isNativeLib && importInfo.resolvedUris.length > 0) {
+            uriOfLastSubmodule = importInfo.resolvedUris[importInfo.resolvedUris.length - 1];
+        } else {
+            uriOfLastSubmodule = UnresolvedModuleMarker;
+        }
+
         // See if there's already a matching alias declaration for this import.
         // if so, we'll update it rather than creating a new one. This is required
         // to handle cases where multiple import statements target the same
@@ -2578,14 +2585,13 @@ export class Binder extends ParseTreeWalker {
         // python module loader.
         const existingDecl = symbol
             .getDeclarations()
-            .find((decl) => decl.type === DeclarationType.Alias && decl.firstNamePart === firstNamePartValue);
+            .find(
+                (decl) =>
+                    decl.type === DeclarationType.Alias &&
+                    decl.firstNamePart === firstNamePartValue &&
+                    uriOfLastSubmodule.equals(decl.uri)
+            );
         let newDecl: AliasDeclaration;
-        let uriOfLastSubmodule: Uri;
-        if (importInfo && importInfo.isImportFound && !importInfo.isNativeLib && importInfo.resolvedUris.length > 0) {
-            uriOfLastSubmodule = importInfo.resolvedUris[importInfo.resolvedUris.length - 1];
-        } else {
-            uriOfLastSubmodule = UnresolvedModuleMarker;
-        }
 
         const isResolved =
             importInfo && importInfo.isImportFound && !importInfo.isNativeLib && importInfo.resolvedUris.length > 0;