@zzzen/pyright-internal 1.2.0-dev.20240121 → 1.2.0-dev.20240128

package/dist/analyzer/checker.js

@@ -494,7 +494,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
     visitFor(node) {
         this._evaluator.evaluateTypesForStatement(node);
         if (node.typeComment) {
-            this._evaluator.addDiagnosticForTextRange(this._fileInfo, this._fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.annotationNotSupported(), node.typeComment);
+            this._evaluator.addDiagnosticForTextRange(this._fileInfo, this._fileInfo.diagnosticRuleSet.reportInvalidTypeForm, diagnosticRules_1.DiagnosticRule.reportInvalidTypeForm, localize_1.LocMessage.annotationNotSupported(), node.typeComment);
         }
         return true;
     }
@@ -534,7 +534,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
             this._evaluator.evaluateTypesForStatement(item);
         });
         if (node.typeComment) {
-            this._evaluator.addDiagnosticForTextRange(this._fileInfo, this._fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.annotationNotSupported(), node.typeComment);
+            this._evaluator.addDiagnosticForTextRange(this._fileInfo, this._fileInfo.diagnosticRuleSet.reportInvalidTypeForm, diagnosticRules_1.DiagnosticRule.reportInvalidTypeForm, localize_1.LocMessage.annotationNotSupported(), node.typeComment);
         }
         return true;
     }
@@ -611,7 +611,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                         if (returnTypeResult.expectedTypeDiagAddendum) {
                             diagAddendum = returnTypeResult.expectedTypeDiagAddendum;
                         }
-                        this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.returnTypeMismatch().format({
+                        this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportReturnType, localize_1.LocMessage.returnTypeMismatch().format({
                             exprType: this._evaluator.printType(returnType),
                             returnType: this._evaluator.printType(declaredReturnType),
                         }) + diagAddendum.getString(), (_b = node.returnExpression) !== null && _b !== void 0 ? _b : node, (_c = returnTypeResult.expectedTypeDiagAddendum) === null || _c === void 0 ? void 0 : _c.getEffectiveTextRange());
@@ -1513,7 +1513,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
             const errorMessage = node.isAsync
                 ? localize_1.LocMessage.generatorAsyncReturnType()
                 : localize_1.LocMessage.generatorSyncReturnType();
-            this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, errorMessage.format({ yieldType: this._evaluator.printType(types_1.AnyType.create()) }) +
+            this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportInvalidTypeForm, errorMessage.format({ yieldType: this._evaluator.printType(types_1.AnyType.create()) }) +
                 diagAddendum.getString(), (_a = node.returnTypeAnnotation) !== null && _a !== void 0 ? _a : node.name);
         }
     }
@@ -1729,12 +1729,12 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
             }
         });
         if (staticMethodCount > 0 && staticMethodCount < functionType.overloads.length) {
-            this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.overloadStaticMethodInconsistent().format({
+            this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportInconsistentOverload, localize_1.LocMessage.overloadStaticMethodInconsistent().format({
                 name: node.name.value,
             }), (_c = (_b = (_a = functionType.overloads[0]) === null || _a === void 0 ? void 0 : _a.details.declaration) === null || _b === void 0 ? void 0 : _b.node.name) !== null && _c !== void 0 ? _c : node.name);
         }
         if (classMethodCount > 0 && classMethodCount < functionType.overloads.length) {
-            this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.overloadClassMethodInconsistent().format({
+            this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportInconsistentOverload, localize_1.LocMessage.overloadClassMethodInconsistent().format({
                 name: node.name.value,
             }), (_f = (_e = (_d = functionType.overloads[0]) === null || _d === void 0 ? void 0 : _d.details.declaration) === null || _e === void 0 ? void 0 : _e.node.name) !== null && _f !== void 0 ? _f : node.name);
         }
@@ -2047,7 +2047,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                         : [];
                 if (overloadedFunctions.length === 1) {
                     // There should never be a single overload.
-                    this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.singleOverload().format({ name }), primaryDecl.node.name);
+                    this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportInconsistentOverload, localize_1.LocMessage.singleOverload().format({ name }), primaryDecl.node.name);
                 }
                 // If the file is not a stub and this is the first overload,
                 // verify that there is an implementation.
@@ -2079,7 +2079,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                         // If this is a method within a protocol class, don't require that
                         // there is an implementation.
                         if (!exemptMissingImplementation) {
-                            this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.overloadWithoutImplementation().format({
+                            this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportNoOverloadImplementation, localize_1.LocMessage.overloadWithoutImplementation().format({
                                 name: primaryDecl.node.name.value,
                             }), primaryDecl.node.name);
                         }
@@ -2091,7 +2091,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                             const diag = new diagnostic_1.DiagnosticAddendum();
                             if (!this._isLegalOverloadImplementation(overload, implementationFunction, diag)) {
                                 if (implementationFunction.details.declaration) {
-                                    const diagnostic = this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.overloadImplementationMismatch().format({
+                                    const diagnostic = this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportInconsistentOverload, localize_1.LocMessage.overloadImplementationMismatch().format({
                                         name,
                                         index: index + 1,
                                     }) + diag.getString(), implementationFunction.details.declaration.node.name);
@@ -2171,7 +2171,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         if (typeAliasDecl && decls.length > 1) {
             decls.forEach((decl) => {
                 if (decl !== typeAliasDecl) {
-                    this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.typeAliasRedeclared().format({ name }), decl.node);
+                    this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportRedeclaration, localize_1.LocMessage.typeAliasRedeclared().format({ name }), decl.node);
                 }
             });
         }
@@ -2279,7 +2279,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                     duplicateIsOk = true;
                 }
                 if (!duplicateIsOk) {
-                    const diag = this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.obscuredClassDeclaration().format({ name }), otherDecl.node.name);
+                    const diag = this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportRedeclaration, localize_1.LocMessage.obscuredClassDeclaration().format({ name }), otherDecl.node.name);
                     addPrimaryDeclInfo(diag);
                 }
             }
@@ -2312,7 +2312,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                     duplicateIsOk = true;
                 }
                 if (!duplicateIsOk) {
-                    const diag = this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, otherDecl.isMethod
+                    const diag = this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportRedeclaration, otherDecl.isMethod
                         ? localize_1.LocMessage.obscuredMethodDeclaration().format({ name })
                         : localize_1.LocMessage.obscuredFunctionDeclaration().format({ name }), otherDecl.node.name);
                     addPrimaryDeclInfo(diag);
@@ -2328,7 +2328,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                     }
                     if (!duplicateIsOk) {
                         const message = localize_1.LocMessage.obscuredParameterDeclaration();
-                        const diag = this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, message.format({ name }), otherDecl.node.name);
+                        const diag = this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportRedeclaration, message.format({ name }), otherDecl.node.name);
                         addPrimaryDeclInfo(diag);
                     }
                 }
@@ -2349,14 +2349,14 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                             duplicateIsOk = true;
                         }
                         if (!duplicateIsOk) {
-                            const diag = this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.obscuredVariableDeclaration().format({ name }), otherDecl.node);
+                            const diag = this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportRedeclaration, localize_1.LocMessage.obscuredVariableDeclaration().format({ name }), otherDecl.node);
                             addPrimaryDeclInfo(diag);
                         }
                     }
                 }
             }
             else if (otherDecl.type === 4 /* DeclarationType.TypeAlias */) {
-                const diag = this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.obscuredTypeAliasDeclaration().format({ name }), otherDecl.node.name);
+                const diag = this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportRedeclaration, localize_1.LocMessage.obscuredTypeAliasDeclaration().format({ name }), otherDecl.node.name);
                 addPrimaryDeclInfo(diag);
             }
         }
@@ -2547,7 +2547,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
             }
         });
         if (!isValidType) {
-            this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, isInstanceCheck
+            this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportArgumentType, isInstanceCheck
                 ? localize_1.LocMessage.isInstanceInvalidType().format({
                     type: this._evaluator.printType(arg1Type),
                 }) + diag.getString()
@@ -3030,7 +3030,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                     this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportUnboundVariable, localize_1.LocMessage.symbolIsUnbound().format({ name: node.value }), node);
                 }
                 else if ((0, types_1.isPossiblyUnbound)(type)) {
-                    this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportUnboundVariable, localize_1.LocMessage.symbolIsPossiblyUnbound().format({ name: node.value }), node);
+                    this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportPossiblyUnboundVariable, localize_1.LocMessage.symbolIsPossiblyUnbound().format({ name: node.value }), node);
                 }
             }
         }
@@ -3324,7 +3324,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                     if (!ParseTreeUtils.isSuiteEmpty(node.suite) &&
                         !types_1.FunctionType.isOverloaded(functionType) &&
                         !types_1.FunctionType.isAsync(functionType)) {
-                        this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.noReturnReturnsNone(), returnAnnotation);
+                        this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportReturnType, localize_1.LocMessage.noReturnReturnsNone(), returnAnnotation);
                     }
                 }
                 else if (!types_1.FunctionType.isAbstractMethod(functionType)) {
@@ -3337,7 +3337,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                         // an abstract method or a protocol method and don't require that
                         // the return type matches. This check can also be skipped for an overload.
                         if (!ParseTreeUtils.isSuiteEmpty(node.suite) && !types_1.FunctionType.isOverloaded(functionType)) {
-                            this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.returnMissing().format({
+                            this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportReturnType, localize_1.LocMessage.returnMissing().format({
                                 returnType: this._evaluator.printType(declaredReturnType),
                             }) + diagAddendum.getString(), returnAnnotation);
                         }
@@ -3456,7 +3456,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                 if (!(0, types_1.isClassInstance)(assignedValueType) ||
                     !types_1.ClassType.isSameGenericClass(assignedValueType, classType)) {
                     if (!this._evaluator.assignType(declaredValueType, assignedValueType, diag)) {
-                        this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.typeAssignmentMismatch().format(this._evaluator.printSrcDestTypes(assignedValueType, declaredValueType)) + diag.getString(), errorNode);
+                        this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportAssignmentType, localize_1.LocMessage.typeAssignmentMismatch().format(this._evaluator.printSrcDestTypes(assignedValueType, declaredValueType)) + diag.getString(), errorNode);
                     }
                 }
             }
@@ -4160,7 +4160,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                     overloads.forEach((overload) => {
                         var _a, _b;
                         if (types_1.FunctionType.isFinal(overload) && ((_a = overload.details.declaration) === null || _a === void 0 ? void 0 : _a.node)) {
-                            this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.overloadFinalInconsistencyImpl().format({
+                            this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportInconsistentOverload, localize_1.LocMessage.overloadFinalInconsistencyImpl().format({
                                 name: overload.details.name,
                             }), (_b = (0, declarationUtils_1.getNameNodeForDeclaration)(overload.details.declaration)) !== null && _b !== void 0 ? _b : overload.details.declaration.node);
                         }
@@ -4172,7 +4172,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                 overloads.slice(1).forEach((overload, index) => {
                     var _a, _b;
                     if (types_1.FunctionType.isFinal(overload) && ((_a = overload.details.declaration) === null || _a === void 0 ? void 0 : _a.node)) {
-                        this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.overloadFinalInconsistencyNoImpl().format({
+                        this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportInconsistentOverload, localize_1.LocMessage.overloadFinalInconsistencyNoImpl().format({
                             name: overload.details.name,
                             index: index + 2,
                         }), (_b = (0, declarationUtils_1.getNameNodeForDeclaration)(overload.details.declaration)) !== null && _b !== void 0 ? _b : overload.details.declaration.node);
@@ -4851,7 +4851,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
             const errorMessage = enclosingFunctionNode.isAsync
                 ? localize_1.LocMessage.generatorAsyncReturnType()
                 : localize_1.LocMessage.generatorSyncReturnType();
-            this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, errorMessage.format({ yieldType: this._evaluator.printType(yieldType) }) +
+            this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportReturnType, errorMessage.format({ yieldType: this._evaluator.printType(yieldType) }) +
                 ((_a = expectedDiagAddendum === null || expectedDiagAddendum === void 0 ? void 0 : expectedDiagAddendum.getString()) !== null && _a !== void 0 ? _a : diagAddendum.getString()), (_b = node.expression) !== null && _b !== void 0 ? _b : node, (_d = (_c = expectedDiagAddendum === null || expectedDiagAddendum === void 0 ? void 0 : expectedDiagAddendum.getEffectiveTextRange()) !== null && _c !== void 0 ? _c : node.expression) !== null && _d !== void 0 ? _d : node);
         }
     }
@@ -4918,7 +4918,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                 });
                 // Were all of the exception types overridden?
                 if (typesOfThisExcept.length > 0 && typesOfThisExcept.length === overriddenExceptionCount) {
-                    this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.unreachableExcept() + diagAddendum.getString(), except.typeExpression);
+                    this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportUnusedExcept, localize_1.LocMessage.unreachableExcept() + diagAddendum.getString(), except.typeExpression);
                     this._evaluator.addUnreachableCode(except, except.exceptSuite);
                 }
             }