From be6c748007ef4f3b1318e06f62bfe49848207772 Mon Sep 17 00:00:00 2001 From: Eric Traut Date: Fri, 19 Nov 2021 17:28:02 -0800 Subject: [PATCH] Fixed recent regression in import resolver that caused a local import to no longer be preferred over an installed module by the same name. --- packages/pyright-internal/src/analyzer/importResolver.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/pyright-internal/src/analyzer/importResolver.ts b/packages/pyright-internal/src/analyzer/importResolver.ts index 8d10b32e1..9c961ec2f 100644 --- a/packages/pyright-internal/src/analyzer/importResolver.ts +++ b/packages/pyright-internal/src/analyzer/importResolver.ts @@ -1371,6 +1371,11 @@ export class ImportResolver { return newImport; } + // Prefer local packages. + if (bestImportSoFar.importType === ImportType.Local && !bestImportSoFar.isNamespacePackage) { + return bestImportSoFar; + } + // If both are namespace imports, select the one that resolves the symbols. if ( bestImportSoFar.isNamespacePackage &&