@zzzen/pyright-internal 1.2.0-dev.20230716 → 1.2.0-dev.20230723

package/dist/analyzer/checker.d.ts

@@ -112,6 +112,7 @@ export declare class Checker extends ParseTreeWalker {
     private _validateTypeGuardFunction;
     private _validateDunderSignatures;
     private _validateFunctionReturn;
+    private _reportUnknownReturnResult;
     private _validateFinalMemberOverrides;
     private _reportDuplicateEnumMembers;
     private _validateProtocolCompatibility;

package/dist/analyzer/checker.js

@@ -3053,21 +3053,10 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
             const implicitlyReturnsNone = this._evaluator.isAfterNodeReachable(node.suite);
             let declaredReturnType = functionType.details.declaredReturnType;
             if (declaredReturnType) {
-                if ((0, types_1.isUnknown)(declaredReturnType)) {
-                    this._evaluator.addDiagnostic(this._fileInfo.diagnosticRuleSet.reportUnknownVariableType, diagnosticRules_1.DiagnosticRule.reportUnknownVariableType, localize_1.Localizer.Diagnostic.declaredReturnTypeUnknown(), returnAnnotation);
-                }
-                else if ((0, typeUtils_1.isPartlyUnknown)(declaredReturnType)) {
-                    this._evaluator.addDiagnostic(this._fileInfo.diagnosticRuleSet.reportUnknownVariableType, diagnosticRules_1.DiagnosticRule.reportUnknownVariableType, localize_1.Localizer.Diagnostic.declaredReturnTypePartiallyUnknown().format({
-                        returnType: this._evaluator.printType(declaredReturnType, { expandTypeAlias: true }),
-                    }), returnAnnotation);
-                }
-                const diag = new diagnostic_1.DiagnosticAddendum();
+                this._reportUnknownReturnResult(node, declaredReturnType);
                 if ((0, types_1.isTypeVar)(declaredReturnType) &&
                     declaredReturnType.details.declaredVariance === 4 /* Contravariant */) {
-                    diag.addMessage(localize_1.Localizer.DiagnosticAddendum.typeVarIsContravariant().format({
-                        name: types_1.TypeVarType.getReadableName(declaredReturnType),
-                    }));
-                    this._evaluator.addDiagnostic(this._fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.returnTypeContravariant() + diag.getString(), returnAnnotation);
+                    this._evaluator.addDiagnostic(this._fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.returnTypeContravariant(), returnAnnotation);
                 }
             }
             // Wrap the declared type in a generator type if the function is a generator.
@@ -3106,14 +3095,17 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         }
         else {
             const inferredReturnType = this._evaluator.getFunctionInferredReturnType(functionType);
-            if ((0, types_1.isUnknown)(inferredReturnType)) {
-                this._evaluator.addDiagnostic(this._fileInfo.diagnosticRuleSet.reportUnknownParameterType, diagnosticRules_1.DiagnosticRule.reportUnknownParameterType, localize_1.Localizer.Diagnostic.returnTypeUnknown(), node.name);
-            }
-            else if ((0, typeUtils_1.isPartlyUnknown)(inferredReturnType)) {
-                this._evaluator.addDiagnostic(this._fileInfo.diagnosticRuleSet.reportUnknownParameterType, diagnosticRules_1.DiagnosticRule.reportUnknownParameterType, localize_1.Localizer.Diagnostic.returnTypePartiallyUnknown().format({
-                    returnType: this._evaluator.printType(inferredReturnType, { expandTypeAlias: true }),
-                }), node.name);
-            }
+            this._reportUnknownReturnResult(node, inferredReturnType);
+        }
+    }
+    _reportUnknownReturnResult(node, returnType) {
+        if ((0, types_1.isUnknown)(returnType)) {
+            this._evaluator.addDiagnostic(this._fileInfo.diagnosticRuleSet.reportUnknownParameterType, diagnosticRules_1.DiagnosticRule.reportUnknownParameterType, localize_1.Localizer.Diagnostic.returnTypeUnknown(), node.name);
+        }
+        else if ((0, typeUtils_1.isPartlyUnknown)(returnType)) {
+            this._evaluator.addDiagnostic(this._fileInfo.diagnosticRuleSet.reportUnknownParameterType, diagnosticRules_1.DiagnosticRule.reportUnknownParameterType, localize_1.Localizer.Diagnostic.returnTypePartiallyUnknown().format({
+                returnType: this._evaluator.printType(returnType, { expandTypeAlias: true }),
+            }), node.name);
         }
     }
     // Validates that any overridden member variables are not marked