@zzzen/pyright-internal 1.2.0-dev.20240225 → 1.2.0-dev.20240310

package/dist/analyzer/checker.js

@@ -1094,7 +1094,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         // Handle both absolute and relative imports.
         const moduleName = moduleNameNode.leadingDots === 0
             ? this._importResolver.getModuleNameForImport(uri, execEnv).moduleName
-            : (0, importStatementUtils_1.getRelativeModuleName)(this._importResolver.fileSystem, this._fileInfo.fileUri, uri);
+            : (0, importStatementUtils_1.getRelativeModuleName)(this._importResolver.fileSystem, this._fileInfo.fileUri, uri, this._importResolver.getConfigOptions());
         if (!moduleName) {
             return undefined;
         }
@@ -2122,23 +2122,33 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         let sawFinal = false;
         let sawAssignment = false;
         decls.forEach((decl) => {
+            var _a;
             if (this._evaluator.isFinalVariableDeclaration(decl)) {
                 if (sawFinal) {
                     this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.finalRedeclaration().format({ name }), decl.node);
                 }
                 sawFinal = true;
             }
-            if (decl.type === 1 /* DeclarationType.Variable */ && decl.inferredTypeSource) {
-                if (sawAssignment) {
-                    // We check for assignment of Final instance and class variables
-                    // the type evaluator because we need to take into account whether
-                    // the assignment is within an `__init__` method, so ignore class
-                    // scopes here.
-                    if (scopeType !== 2 /* ScopeType.Class */) {
-                        this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.finalReassigned().format({ name }), decl.node);
+            let reportRedeclaration = false;
+            if (decl.type === 1 /* DeclarationType.Variable */) {
+                if (decl.inferredTypeSource) {
+                    if (sawAssignment) {
+                        // We check for assignment of Final instance and class variables
+                        // the type evaluator because we need to take into account whether
+                        // the assignment is within an `__init__` method, so ignore class
+                        // scopes here.
+                        if (scopeType !== 2 /* ScopeType.Class */) {
+                            reportRedeclaration = true;
+                        }
                     }
+                    sawAssignment = true;
                 }
-                sawAssignment = true;
+            }
+            else {
+                reportRedeclaration = true;
+            }
+            if (reportRedeclaration) {
+                this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.finalReassigned().format({ name }), (_a = (0, declarationUtils_1.getNameNodeForDeclaration)(decl)) !== null && _a !== void 0 ? _a : decl.node);
             }
         });
         // If it's not a stub file, an assignment must be provided.