@zzzen/pyright-internal 1.2.0-dev.20240428 → 1.2.0-dev.20240505

package/dist/analyzer/checker.js

@@ -767,31 +767,37 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         if (baseType) {
             (0, typeUtils_1.doForEachSubtype)(baseType, (subtype) => {
                 const tupleType = (0, typeUtils_1.getSpecializedTupleType)(subtype);
-                if ((0, types_1.isClassInstance)(subtype) &&
-                    (tupleType === null || tupleType === void 0 ? void 0 : tupleType.tupleTypeArguments) &&
-                    !(0, typeUtils_1.isUnboundedTupleClass)(tupleType) &&
-                    !this._evaluator.isTypeSubsumedByOtherType(tupleType, baseType, /* allowAnyToSubsume */ false)) {
-                    const tupleLength = tupleType.tupleTypeArguments.length;
-                    if (node.items.length === 1 &&
-                        !node.trailingComma &&
-                        node.items[0].argumentCategory === 0 /* ArgumentCategory.Simple */ &&
-                        !node.items[0].name) {
-                        const subscriptType = this._evaluator.getType(node.items[0].valueExpression);
-                        if (subscriptType &&
-                            (0, types_1.isClassInstance)(subscriptType) &&
-                            types_1.ClassType.isBuiltIn(subscriptType, 'int') &&
-                            (0, typeUtils_1.isLiteralType)(subscriptType) &&
-                            typeof subscriptType.literalValue === 'number') {
-                            if ((subscriptType.literalValue >= 0 && subscriptType.literalValue >= tupleLength) ||
-                                (subscriptType.literalValue < 0 && subscriptType.literalValue + tupleLength < 0)) {
-                                this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.tupleIndexOutOfRange().format({
-                                    index: subscriptType.literalValue,
-                                    type: this._evaluator.printType(subtype),
-                                }), node);
-                            }
-                        }
-                    }
+                if (!(0, types_1.isClassInstance)(subtype) || !(tupleType === null || tupleType === void 0 ? void 0 : tupleType.tupleTypeArguments) || (0, typeUtils_1.isUnboundedTupleClass)(tupleType)) {
+                    return;
+                }
+                const tupleLength = tupleType.tupleTypeArguments.length;
+                if (node.items.length !== 1 ||
+                    node.trailingComma ||
+                    node.items[0].argumentCategory !== 0 /* ArgumentCategory.Simple */ ||
+                    node.items[0].name) {
+                    return;
                 }
+                const subscriptType = this._evaluator.getType(node.items[0].valueExpression);
+                if (!subscriptType ||
+                    !(0, types_1.isClassInstance)(subscriptType) ||
+                    !types_1.ClassType.isBuiltIn(subscriptType, 'int') ||
+                    !(0, typeUtils_1.isLiteralType)(subscriptType) ||
+                    typeof subscriptType.literalValue !== 'number') {
+                    return;
+                }
+                if ((subscriptType.literalValue < 0 || subscriptType.literalValue < tupleLength) &&
+                    (subscriptType.literalValue >= 0 || subscriptType.literalValue + tupleLength >= 0)) {
+                    return;
+                }
+                // This can be an expensive check, so we save it for the end once we
+                // are about to emit a diagnostic.
+                if (this._evaluator.isTypeSubsumedByOtherType(tupleType, baseType, /* allowAnyToSubsume */ false)) {
+                    return;
+                }
+                this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.tupleIndexOutOfRange().format({
+                    index: subscriptType.literalValue,
+                    type: this._evaluator.printType(subtype),
+                }), node);
             });
         }
         return true;
@@ -2153,11 +2159,18 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
             if (decl.type === 1 /* DeclarationType.Variable */) {
                 if (decl.inferredTypeSource) {
                     if (sawAssignment) {
-                        // We check for assignment of Final instance and class variables
-                        // the type evaluator because we need to take into account whether
-                        // the assignment is within an `__init__` method, so ignore class
-                        // scopes here.
-                        if (scopeType !== 3 /* ScopeType.Class */) {
+                        let exemptAssignment = false;
+                        if (scopeType === 3 /* ScopeType.Class */) {
+                            // We check for assignment of Final instance and class variables
+                            // in the type evaluator because we need to take into account whether
+                            // the assignment is within an `__init__` method, so ignore class
+                            // scopes here.
+                            const classOrFunc = ParseTreeUtils.getEnclosingClassOrFunction(decl.node);
+                            if ((classOrFunc === null || classOrFunc === void 0 ? void 0 : classOrFunc.nodeType) === 28 /* ParseNodeType.Function */) {
+                                exemptAssignment = true;
+                            }
+                        }
+                        if (!exemptAssignment) {
                             reportRedeclaration = true;
                         }
                     }