@zzzen/pyright-internal 1.2.0-dev.20240929 → 1.2.0-dev.20241006

package/dist/analyzer/checker.js

@@ -553,7 +553,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         let returnType;
         const enclosingFunctionNode = ParseTreeUtils.getEnclosingFunction(node);
         let declaredReturnType = enclosingFunctionNode
-            ? this._evaluator.getFunctionDeclaredReturnType(enclosingFunctionNode)
+            ? this._evaluator.getDeclaredReturnType(enclosingFunctionNode)
             : undefined;
         if (node.d.expr) {
             returnTypeResult = (_a = this._evaluator.getTypeResult(node.d.expr)) !== null && _a !== void 0 ? _a : { type: types_1.UnknownType.create() };
@@ -1864,8 +1864,8 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         // First check the parameters to see if they are assignable.
         let isConsistent = this._evaluator.assignType(overloadBound, implBound, diag, constraints, 64 /* AssignTypeFlags.SkipReturnTypeCheck */ | 2 /* AssignTypeFlags.Contravariant */ | 512 /* AssignTypeFlags.SkipSelfClsTypeCheck */);
         // Now check the return types.
-        const overloadReturnType = this._evaluator.solveAndApplyConstraints((_d = types_1.FunctionType.getEffectiveReturnType(overloadBound)) !== null && _d !== void 0 ? _d : this._evaluator.getFunctionInferredReturnType(overloadBound), constraints);
-        const implReturnType = this._evaluator.solveAndApplyConstraints((_e = types_1.FunctionType.getEffectiveReturnType(implBound)) !== null && _e !== void 0 ? _e : this._evaluator.getFunctionInferredReturnType(implBound), constraints);
+        const overloadReturnType = this._evaluator.solveAndApplyConstraints((_d = types_1.FunctionType.getEffectiveReturnType(overloadBound)) !== null && _d !== void 0 ? _d : this._evaluator.getInferredReturnType(overloadBound), constraints);
+        const implReturnType = this._evaluator.solveAndApplyConstraints((_e = types_1.FunctionType.getEffectiveReturnType(implBound)) !== null && _e !== void 0 ? _e : this._evaluator.getInferredReturnType(implBound), constraints);
         const returnDiag = new diagnostic_1.DiagnosticAddendum();
         if (!(0, types_1.isNever)(overloadReturnType) &&
             !this._evaluator.assignType(implReturnType, overloadReturnType, returnDiag.createAddendum(), constraints, 0 /* AssignTypeFlags.Default */)) {
@@ -2390,7 +2390,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                 let duplicateIsOk = false;
                 // If the return type has not yet been inferred, do so now.
                 if (primaryType && (0, types_1.isFunction)(primaryType)) {
-                    this._evaluator.getFunctionInferredReturnType(primaryType);
+                    this._evaluator.getInferredReturnType(primaryType);
                 }
                 const otherType = (_b = this._evaluator.getTypeForDeclaration(otherDecl)) === null || _b === void 0 ? void 0 : _b.type;
                 const suite1 = ParseTreeUtils.getEnclosingSuite(primaryDecl.node);
@@ -2401,7 +2401,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                 const isInSameStatementList = suite1 === suite2;
                 // If the return type has not yet been inferred, do so now.
                 if (otherType && (0, types_1.isFunction)(otherType)) {
-                    this._evaluator.getFunctionInferredReturnType(otherType);
+                    this._evaluator.getInferredReturnType(otherType);
                 }
                 // If both declarations are functions, it's OK if they
                 // both have the same signatures.
@@ -3321,7 +3321,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                 }
             }
             else {
-                const inferredReturnType = this._evaluator.getFunctionInferredReturnType(functionType);
+                const inferredReturnType = this._evaluator.getInferredReturnType(functionType);
                 if (!(0, types_1.isNever)(inferredReturnType) &&
                     !(0, typeUtils_1.isNoneInstance)(inferredReturnType) &&
                     !(0, types_1.isAnyOrUnknown)(inferredReturnType)) {
@@ -3386,7 +3386,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
             }
         }
         else {
-            const inferredReturnType = this._evaluator.getFunctionInferredReturnType(functionType);
+            const inferredReturnType = this._evaluator.getInferredReturnType(functionType);
             this._reportUnknownReturnResult(node, inferredReturnType);
             this._validateReturnTypeIsNotContravariant(inferredReturnType, node.d.name);
         }