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

package/dist/analyzer/checker.js

@@ -387,7 +387,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
             }
             // Verify common dunder signatures.
             this._validateDunderSignatures(node, functionTypeResult.functionType, containingClassNode !== undefined);
-            // Verify TypeGuard or StrictTypeGuard functions.
+            // Verify TypeGuard functions.
             this._validateTypeGuardFunction(node, functionTypeResult.functionType, containingClassNode !== undefined);
             this._validateFunctionTypeVarUsage(node, functionTypeResult);
         }
@@ -2973,7 +2973,6 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         });
     }
     _validateTypeGuardFunction(node, functionType, isMethod) {
-        var _a;
         const returnType = functionType.details.declaredReturnType;
         if (!returnType) {
             return;
@@ -2981,9 +2980,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         if (!(0, types_1.isClassInstance)(returnType) || !returnType.typeArguments || returnType.typeArguments.length < 1) {
             return;
         }
-        const isNormalTypeGuard = types_1.ClassType.isBuiltIn(returnType, 'TypeGuard');
-        const isStrictTypeGuard = types_1.ClassType.isBuiltIn(returnType, 'StrictTypeGuard');
-        if (!isNormalTypeGuard && !isStrictTypeGuard) {
+        if (!types_1.ClassType.isBuiltIn(returnType, 'TypeGuard')) {
             return;
         }
         // Make sure there's at least one input parameter provided.
@@ -2998,25 +2995,6 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         if (paramCount < 1) {
             this._evaluator.addDiagnostic(this._fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.typeGuardParamCount(), node.name);
         }
-        if (isStrictTypeGuard) {
-            const typeGuardType = returnType.typeArguments[0];
-            // Determine the type of the first parameter.
-            const paramIndex = isMethod && !types_1.FunctionType.isStaticMethod(functionType) ? 1 : 0;
-            if (paramIndex >= functionType.details.parameters.length) {
-                return;
-            }
-            const paramType = types_1.FunctionType.getEffectiveParameterType(functionType, paramIndex);
-            // Verify that the typeGuardType is a narrower type than the paramType.
-            if (!this._evaluator.assignType(paramType, typeGuardType)) {
-                const returnAnnotation = node.returnTypeAnnotation || ((_a = node.functionAnnotationComment) === null || _a === void 0 ? void 0 : _a.returnTypeAnnotation);
-                if (returnAnnotation) {
-                    this._evaluator.addDiagnostic(this._fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.strictTypeGuardReturnType().format({
-                        type: this._evaluator.printType(paramType),
-                        returnType: this._evaluator.printType(typeGuardType),
-                    }), returnAnnotation);
-                }
-            }
-        }
     }
     _validateDunderSignatures(node, functionType, isMethod) {
         var _a;
@@ -3053,21 +3031,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 +3073,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