@zzzen/pyright-internal 1.2.0-dev.20231203 → 1.2.0-dev.20231210

package/dist/analyzer/checker.js

@@ -42,9 +42,9 @@ const collectionUtils_1 = require("../common/collectionUtils");
 const debug_1 = require("../common/debug");
 const diagnostic_1 = require("../common/diagnostic");
 const diagnosticRules_1 = require("../common/diagnosticRules");
-const pathUtils_1 = require("../common/pathUtils");
 const pythonVersion_1 = require("../common/pythonVersion");
 const textRange_1 = require("../common/textRange");
+const uri_1 = require("../common/uri/uri");
 const definitionProvider_1 = require("../languageService/definitionProvider");
 const localize_1 = require("../localization/localize");
 const parseNodes_1 = require("../parser/parseNodes");
@@ -98,7 +98,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         // Report code complexity issues for the module.
         const codeComplexity = AnalyzerNodeInfo.getCodeFlowComplexity(this._moduleNode);
         if (isPrintCodeComplexityEnabled) {
-            console.log(`Code complexity of module ${this._fileInfo.filePath} is ${codeComplexity.toString()}`);
+            console.log(`Code complexity of module ${this._fileInfo.fileUri.toUserVisibleString()} is ${codeComplexity.toString()}`);
         }
         if (codeComplexity > typeEvaluator_1.maxCodeComplexity) {
             this._evaluator.addDiagnosticForTextRange(this._fileInfo, this._fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.codeTooComplexToAnalyze(), { start: 0, length: 0 });
@@ -994,10 +994,11 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                 continue;
             }
             const resolvedAlias = this._evaluator.resolveAliasDeclaration(decl, /* resolveLocalNames */ true);
-            if (!(resolvedAlias === null || resolvedAlias === void 0 ? void 0 : resolvedAlias.path) || !(0, sourceMapper_1.isStubFile)(resolvedAlias.path)) {
+            const resolvedAliasUri = resolvedAlias === null || resolvedAlias === void 0 ? void 0 : resolvedAlias.uri;
+            if (!resolvedAliasUri || !(0, sourceMapper_1.isStubFile)(resolvedAliasUri)) {
                 continue;
             }
-            const importResult = this._getImportResult(node, resolvedAlias.path);
+            const importResult = this._getImportResult(node, resolvedAliasUri);
             if (!importResult) {
                 continue;
             }
@@ -1074,17 +1075,17 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         // Don't explore further.
         return false;
     }
-    _getImportResult(node, filePath) {
-        const execEnv = this._importResolver.getConfigOptions().findExecEnvironment(filePath);
+    _getImportResult(node, uri) {
+        const execEnv = this._importResolver.getConfigOptions().findExecEnvironment(uri);
         const moduleNameNode = node.parent.module;
         // Handle both absolute and relative imports.
         const moduleName = moduleNameNode.leadingDots === 0
-            ? this._importResolver.getModuleNameForImport(filePath, execEnv).moduleName
-            : (0, importStatementUtils_1.getRelativeModuleName)(this._importResolver.fileSystem, this._fileInfo.filePath, filePath);
+            ? this._importResolver.getModuleNameForImport(uri, execEnv).moduleName
+            : (0, importStatementUtils_1.getRelativeModuleName)(this._importResolver.fileSystem, this._fileInfo.fileUri, uri);
         if (!moduleName) {
             return undefined;
         }
-        return this._importResolver.resolveImport(this._fileInfo.filePath, execEnv, (0, importResolver_1.createImportedModuleDescriptor)(moduleName));
+        return this._importResolver.resolveImport(this._fileInfo.fileUri, execEnv, (0, importResolver_1.createImportedModuleDescriptor)(moduleName));
     }
     _addMissingModuleSourceDiagnosticIfNeeded(importResult, node) {
         if (importResult.isNativeLib ||
@@ -2078,7 +2079,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                                         index: index + 1,
                                     }) + diag.getString(), implementationFunction.details.declaration.node.name);
                                     if (diagnostic && overload.details.declaration) {
-                                        diagnostic.addRelatedInfo(localize_1.Localizer.DiagnosticAddendum.overloadSignature(), (_b = (_a = overload.details.declaration) === null || _a === void 0 ? void 0 : _a.path) !== null && _b !== void 0 ? _b : primaryDecl.path, (_d = (_c = overload.details.declaration) === null || _c === void 0 ? void 0 : _c.range) !== null && _d !== void 0 ? _d : primaryDecl.range);
+                                        diagnostic.addRelatedInfo(localize_1.Localizer.DiagnosticAddendum.overloadSignature(), (_b = (_a = overload.details.declaration) === null || _a === void 0 ? void 0 : _a.uri) !== null && _b !== void 0 ? _b : primaryDecl.uri, (_d = (_c = overload.details.declaration) === null || _c === void 0 ? void 0 : _c.range) !== null && _d !== void 0 ? _d : primaryDecl.range);
                                     }
                                 }
                             }
@@ -2248,7 +2249,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                     }
                 }
                 if (primaryDeclNode) {
-                    diag.addRelatedInfo(primaryDeclInfo, primaryDecl.path, primaryDecl.range);
+                    diag.addRelatedInfo(primaryDeclInfo, primaryDecl.uri, primaryDecl.range);
                 }
             }
         };
@@ -2881,6 +2882,15 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                 // the call expression and determine whether any of them
                 // are deprecated.
                 getDeprecatedMessageForOverloadedCall(this._evaluator, subtype);
+                // If there the implementation itself is deprecated, assume it
+                // is deprecated even if it's outside of a call expression.
+                const overloadImpl = types_1.OverloadedFunctionType.getImplementation(subtype);
+                if ((overloadImpl === null || overloadImpl === void 0 ? void 0 : overloadImpl.details.deprecatedMessage) !== undefined) {
+                    if (!overloadImpl.details.name || node.value === overloadImpl.details.name) {
+                        deprecatedMessage = overloadImpl.details.deprecatedMessage;
+                        errorMessage = getDeprecatedMessageForFunction(overloadImpl);
+                    }
+                }
             }
         });
         if (errorMessage) {
@@ -2953,18 +2963,18 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         const stdlibPath = this._importResolver.getTypeshedStdLibPath(this._fileInfo.executionEnvironment);
         if (stdlibPath &&
             this._importResolver.isStdlibModule(desc, this._fileInfo.executionEnvironment) &&
-            this._sourceMapper.isUserCode(this._fileInfo.filePath)) {
+            this._sourceMapper.isUserCode(this._fileInfo.fileUri)) {
             // This means the user has a module that is overwriting the stdlib module.
             const diag = this._evaluator.addDiagnosticForTextRange(this._fileInfo, this._fileInfo.diagnosticRuleSet.reportShadowedImports, diagnosticRules_1.DiagnosticRule.reportShadowedImports, localize_1.Localizer.Diagnostic.stdlibModuleOverridden().format({
                 name: moduleName,
-                path: this._fileInfo.filePath,
+                path: this._fileInfo.fileUri.toUserVisibleString(),
             }), this._moduleNode);
             // Add a quick action that renames the file.
             if (diag) {
                 const renameAction = {
                     action: "renameShadowedFile" /* ActionKind.RenameShadowedFileAction */,
-                    oldFile: this._fileInfo.filePath,
-                    newFile: this._sourceMapper.getNextFileName(this._fileInfo.filePath),
+                    oldUri: this._fileInfo.fileUri,
+                    newUri: this._sourceMapper.getNextFileName(this._fileInfo.fileUri),
                 };
                 diag.addAction(renameAction);
             }
@@ -3002,20 +3012,20 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         if (stdlibPath && this._importResolver.isStdlibModule(module, this._fileInfo.executionEnvironment)) {
             // If the definition for this name is in 'user' module, it is overwriting the stdlib module.
             const definitions = definitionProvider_1.DefinitionProvider.getDefinitionsForNode(this._sourceMapper, this._evaluator, namePartNodes[namePartNodes.length - 1], namePartNodes[namePartNodes.length - 1].start, vscode_languageserver_1.CancellationToken.None);
-            const paths = definitions ? definitions.map((d) => d.path) : [];
+            const paths = definitions ? definitions.map((d) => d.uri) : [];
             paths.forEach((p) => {
                 if (!p.startsWith(stdlibPath) && !(0, sourceMapper_1.isStubFile)(p) && this._sourceMapper.isUserCode(p)) {
                     // This means the user has a module that is overwriting the stdlib module.
                     const diag = this._evaluator.addDiagnostic(this._fileInfo.diagnosticRuleSet.reportShadowedImports, diagnosticRules_1.DiagnosticRule.reportShadowedImports, localize_1.Localizer.Diagnostic.stdlibModuleOverridden().format({
                         name: nameParts.join('.'),
-                        path: p,
+                        path: p.toUserVisibleString(),
                     }), node);
                     // Add a quick action that renames the file.
                     if (diag) {
                         const renameAction = {
                             action: "renameShadowedFile" /* ActionKind.RenameShadowedFileAction */,
-                            oldFile: p,
-                            newFile: this._sourceMapper.getNextFileName(p),
+                            oldUri: p,
+                            newUri: this._sourceMapper.getNextFileName(p),
                         };
                         diag.addAction(renameAction);
                     }
@@ -3371,7 +3381,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                 }
                 else if (decls[0].type === 5 /* DeclarationType.Function */) {
                     if (decls.every((decl) => decl.type !== 5 /* DeclarationType.Function */ || ParseTreeUtils.isSuiteEmpty(decl.node.suite))) {
-                        if ((0, pathUtils_1.getFileExtension)(decls[0].path).toLowerCase() !== '.pyi') {
+                        if (!decls[0].uri.hasExtension('.pyi')) {
                             if (!isSymbolImplemented(name)) {
                                 diagAddendum.addMessage(localize_1.Localizer.DiagnosticAddendum.missingProtocolMember().format({
                                     name,
@@ -3451,7 +3461,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                     if (diagnostic) {
                         const fieldDecls = symbol.getTypedDeclarations();
                         if (fieldDecls.length > 0) {
-                            diagnostic.addRelatedInfo(localize_1.Localizer.DiagnosticAddendum.dataClassFieldLocation(), fieldDecls[0].path, fieldDecls[0].range);
+                            diagnostic.addRelatedInfo(localize_1.Localizer.DiagnosticAddendum.dataClassFieldLocation(), fieldDecls[0].uri, fieldDecls[0].range);
                         }
                     }
                 }
@@ -3613,7 +3623,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         const updatedTypeParams = classType.details.typeParameters.map((typeParam) => types_1.TypeVarType.cloneAsInvariant(typeParam));
         const updatedClassType = types_1.ClassType.cloneWithNewTypeParameters(classType, updatedTypeParams);
         const objectObject = types_1.ClassType.cloneAsInstance(objectType);
-        const dummyTypeObject = types_1.ClassType.createInstantiable('__varianceDummy', '', '', '', 0, 0, undefined, undefined);
+        const dummyTypeObject = types_1.ClassType.createInstantiable('__varianceDummy', '', '', uri_1.Uri.empty(), 0, 0, undefined, undefined);
         updatedTypeParams.forEach((param, paramIndex) => {
             // Skip variadics and ParamSpecs.
             if (param.details.isVariadic || param.details.isParamSpec) {
@@ -3801,7 +3811,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                         ? localize_1.Localizer.DiagnosticAddendum.newMethodLocation()
                         : localize_1.Localizer.DiagnosticAddendum.initMethodLocation()).format({
                         type: this._evaluator.printType(types_1.ClassType.cloneAsInstance(displayOnInit ? newMethodResult.classType : initMethodResult.classType)),
-                    }), secondaryDecl.path, secondaryDecl.range);
+                    }), secondaryDecl.uri, secondaryDecl.range);
                 }
             }
         }
@@ -4061,11 +4071,11 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
             diag.addRelatedInfo(localize_1.Localizer.DiagnosticAddendum.baseClassOverriddenType().format({
                 baseClass: this._evaluator.printType((0, typeUtils_1.convertToInstance)(overriddenClassAndSymbol.classType)),
                 type: this._evaluator.printType(overriddenType),
-            }), overriddenDecl.path, overriddenDecl.range);
+            }), overriddenDecl.uri, overriddenDecl.range);
             diag.addRelatedInfo(localize_1.Localizer.DiagnosticAddendum.baseClassOverridesType().format({
                 baseClass: this._evaluator.printType((0, typeUtils_1.convertToInstance)(overrideClassAndSymbol.classType)),
                 type: this._evaluator.printType(overrideType),
-            }), overrideDecl.path, overrideDecl.range);
+            }), overrideDecl.uri, overrideDecl.range);
         }
     }
     // Validates that any overridden methods or variables contain the same
@@ -4230,7 +4240,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                             }) + diagAddendum.getString(), decl.type === 5 /* DeclarationType.Function */ ? decl.node.name : decl.node);
                             const origDecl = (0, symbolUtils_1.getLastTypedDeclaredForSymbol)(baseClassAndSymbol.symbol);
                             if (diag && origDecl) {
-                                diag.addRelatedInfo(localize_1.Localizer.DiagnosticAddendum.overriddenMethod(), origDecl.path, origDecl.range);
+                                diag.addRelatedInfo(localize_1.Localizer.DiagnosticAddendum.overriddenMethod(), origDecl.uri, origDecl.range);
                             }
                         }
                     }
@@ -4246,7 +4256,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                             }), decl.node.name);
                             const origDecl = (0, symbolUtils_1.getLastTypedDeclaredForSymbol)(baseClassAndSymbol.symbol);
                             if (diag && origDecl) {
-                                diag.addRelatedInfo(localize_1.Localizer.DiagnosticAddendum.finalMethod(), origDecl.path, origDecl.range);
+                                diag.addRelatedInfo(localize_1.Localizer.DiagnosticAddendum.finalMethod(), origDecl.uri, origDecl.range);
                             }
                         }
                     }
@@ -4267,7 +4277,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                         }), lastDecl.node);
                         const origDecl = (0, symbolUtils_1.getLastTypedDeclaredForSymbol)(baseClassAndSymbol.symbol);
                         if (diag && origDecl) {
-                            diag.addRelatedInfo(localize_1.Localizer.DiagnosticAddendum.overriddenMethod(), origDecl.path, origDecl.range);
+                            diag.addRelatedInfo(localize_1.Localizer.DiagnosticAddendum.overriddenMethod(), origDecl.uri, origDecl.range);
                         }
                     }
                 }
@@ -4313,7 +4323,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                                     }) + diagAddendum.getString(), decls[decls.length - 1].node);
                                     const origDecl = baseClassMethodType.details.declaration;
                                     if (diag && origDecl) {
-                                        diag.addRelatedInfo(localize_1.Localizer.DiagnosticAddendum.overriddenMethod(), origDecl.path, origDecl.range);
+                                        diag.addRelatedInfo(localize_1.Localizer.DiagnosticAddendum.overriddenMethod(), origDecl.uri, origDecl.range);
                                     }
                                 }
                             }
@@ -4332,7 +4342,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                                             }) + diagAddendum.getString(), decl.node.name);
                                             const origDecl = baseClassMethodType.details.declaration;
                                             if (diag && origDecl) {
-                                                diag.addRelatedInfo(localize_1.Localizer.DiagnosticAddendum.overriddenMethod(), origDecl.path, origDecl.range);
+                                                diag.addRelatedInfo(localize_1.Localizer.DiagnosticAddendum.overriddenMethod(), origDecl.uri, origDecl.range);
                                             }
                                         }
                                     }
@@ -4391,7 +4401,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                         }) + diagAddendum.getString(), (_a = (0, declarationUtils_1.getNameNodeForDeclaration)(lastDecl)) !== null && _a !== void 0 ? _a : lastDecl.node);
                         const origDecl = (0, symbolUtils_1.getLastTypedDeclaredForSymbol)(baseClassAndSymbol.symbol);
                         if (diag && origDecl) {
-                            diag.addRelatedInfo(localize_1.Localizer.DiagnosticAddendum.overriddenSymbol(), origDecl.path, origDecl.range);
+                            diag.addRelatedInfo(localize_1.Localizer.DiagnosticAddendum.overriddenSymbol(), origDecl.uri, origDecl.range);
                         }
                     }
                     else if (overriddenTDEntry && overrideTDEntry) {
@@ -4428,7 +4438,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                             className: baseClass.details.name,
                         }), lastDecl.node);
                         if (diag) {
-                            diag.addRelatedInfo(localize_1.Localizer.DiagnosticAddendum.overriddenSymbol(), overrideFinalVarDecl.path, overrideFinalVarDecl.range);
+                            diag.addRelatedInfo(localize_1.Localizer.DiagnosticAddendum.overriddenSymbol(), overrideFinalVarDecl.uri, overrideFinalVarDecl.range);
                         }
                     }
                     // Verify that a class variable isn't overriding an instance
@@ -4458,7 +4468,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                         }), (_b = (0, declarationUtils_1.getNameNodeForDeclaration)(lastDecl)) !== null && _b !== void 0 ? _b : lastDecl.node);
                         const origDecl = (0, symbolUtils_1.getLastTypedDeclaredForSymbol)(baseClassAndSymbol.symbol);
                         if (diag && origDecl) {
-                            diag.addRelatedInfo(localize_1.Localizer.DiagnosticAddendum.overriddenSymbol(), origDecl.path, origDecl.range);
+                            diag.addRelatedInfo(localize_1.Localizer.DiagnosticAddendum.overriddenSymbol(), origDecl.uri, origDecl.range);
                         }
                     }
                 }