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

package/dist/analyzer/checker.js

@@ -803,7 +803,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         else if (node.d.operator === 39 /* OperatorType.Is */ || node.d.operator === 40 /* OperatorType.IsNot */) {
             // Don't apply this rule if it's within an assert.
             if (!ParseTreeUtils.isWithinAssertExpression(node)) {
-                this._validateComparisonTypesForIsOperator(node);
+                this._validateComparisonTypes(node);
             }
         }
         else if (node.d.operator === 41 /* OperatorType.In */ || node.d.operator === 42 /* OperatorType.NotIn */) {
@@ -1326,36 +1326,6 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
             }), node);
         }
     }
-    // Determines whether the types of the two operands for an "is" or "is not"
-    // operation have overlapping types.
-    _validateComparisonTypesForIsOperator(node) {
-        const rightType = this._evaluator.getType(node.d.rightExpr);
-        if (!rightType || !(0, typeUtils_1.isNoneInstance)(rightType)) {
-            return;
-        }
-        const leftType = this._evaluator.getType(node.d.leftExpr);
-        if (!leftType) {
-            return;
-        }
-        let foundMatchForNone = false;
-        (0, typeUtils_1.doForEachSubtype)(leftType, (subtype) => {
-            subtype = this._evaluator.makeTopLevelTypeVarsConcrete(subtype);
-            if (this._evaluator.assignType(subtype, this._evaluator.getNoneType())) {
-                foundMatchForNone = true;
-            }
-        });
-        const getMessage = () => {
-            return node.d.operator === 39 /* OperatorType.Is */
-                ? localize_1.LocMessage.comparisonAlwaysFalse()
-                : localize_1.LocMessage.comparisonAlwaysTrue();
-        };
-        if (!foundMatchForNone) {
-            this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportUnnecessaryComparison, getMessage().format({
-                leftType: this._evaluator.printType(leftType, { expandTypeAlias: true }),
-                rightType: this._evaluator.printType(rightType),
-            }), node);
-        }
-    }
     // Determines whether the types of the two operands for an == or != operation
     // have overlapping types.
     _validateComparisonTypes(node) {
@@ -1376,7 +1346,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
             return;
         }
         const getMessage = () => {
-            return node.d.operator === 12 /* OperatorType.Equals */
+            return node.d.operator === 12 /* OperatorType.Equals */ || node.d.operator === 39 /* OperatorType.Is */
                 ? localize_1.LocMessage.comparisonAlwaysFalse()
                 : localize_1.LocMessage.comparisonAlwaysTrue();
         };
@@ -1404,20 +1374,20 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         }
         else {
             let isComparable = false;
-            (0, typeUtils_1.doForEachSubtype)(leftType, (leftSubtype) => {
+            this._evaluator.mapSubtypesExpandTypeVars(leftType, {}, (leftSubtype) => {
                 if (isComparable) {
                     return;
                 }
-                leftSubtype = this._evaluator.makeTopLevelTypeVarsConcrete(leftSubtype);
-                (0, typeUtils_1.doForEachSubtype)(rightType, (rightSubtype) => {
+                this._evaluator.mapSubtypesExpandTypeVars(rightType, {}, (rightSubtype) => {
                     if (isComparable) {
                         return;
                     }
-                    rightSubtype = this._evaluator.makeTopLevelTypeVarsConcrete(rightSubtype);
                     if (this._isTypeComparable(leftSubtype, rightSubtype)) {
                         isComparable = true;
                     }
+                    return rightSubtype;
                 });
+                return leftSubtype;
             });
             if (!isComparable) {
                 const leftTypeText = this._evaluator.printType(leftType, { expandTypeAlias: true });
@@ -1440,10 +1410,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
             return false;
         }
         if ((0, types_1.isModule)(leftType) || (0, types_1.isModule)(rightType)) {
-            return (0, types_1.isTypeSame)(leftType, rightType);
-        }
-        if ((0, typeUtils_1.isNoneInstance)(leftType) || (0, typeUtils_1.isNoneInstance)(rightType)) {
-            return (0, types_1.isTypeSame)(leftType, rightType);
+            return (0, types_1.isTypeSame)(leftType, rightType, { ignoreConditions: true });
         }
         const isLeftCallable = (0, types_1.isFunction)(leftType) || (0, types_1.isOverloaded)(leftType);
         const isRightCallable = (0, types_1.isFunction)(rightType) || (0, types_1.isOverloaded)(rightType);
@@ -1470,7 +1437,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
             return false;
         }
         if ((0, types_1.isClassInstance)(leftType)) {
-            if ((0, types_1.isClassInstance)(rightType)) {
+            if ((0, types_1.isClass)(rightType)) {
                 const genericLeftType = types_1.ClassType.specialize(leftType, /* typeArgs */ undefined);
                 const genericRightType = types_1.ClassType.specialize(rightType, /* typeArgs */ undefined);
                 if (this._evaluator.assignType(genericLeftType, genericRightType) ||
@@ -1479,7 +1446,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                 }
                 // Assume that if the types are disjoint and built-in classes that they
                 // will never be comparable.
-                if (types_1.ClassType.isBuiltIn(leftType) && types_1.ClassType.isBuiltIn(rightType)) {
+                if (types_1.ClassType.isBuiltIn(leftType) && types_1.ClassType.isBuiltIn(rightType) && types_1.TypeBase.isInstance(rightType)) {
                     return false;
                 }
             }
@@ -1586,7 +1553,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                         // the TypeVar multiple times.
                         const baseType = this._evaluator.getType(baseExpression);
                         const aliasInfo = (_a = baseType === null || baseType === void 0 ? void 0 : baseType.props) === null || _a === void 0 ? void 0 : _a.typeAliasInfo;
-                        if ((aliasInfo === null || aliasInfo === void 0 ? void 0 : aliasInfo.typeParams) && subscriptIndex < aliasInfo.typeParams.length) {
+                        if ((aliasInfo === null || aliasInfo === void 0 ? void 0 : aliasInfo.shared.typeParams) && subscriptIndex < aliasInfo.shared.typeParams.length) {
                             isExempt = true;
                         }
                     }
@@ -3033,7 +3000,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
             const deprecatedForm = (_a = deprecatedSymbols_1.deprecatedAliases.get(node.d.value)) !== null && _a !== void 0 ? _a : deprecatedSymbols_1.deprecatedSpecialForms.get(node.d.value);
             if (deprecatedForm) {
                 if (((0, types_1.isInstantiableClass)(type) && type.shared.fullName === deprecatedForm.fullName) ||
-                    ((_c = (_b = type.props) === null || _b === void 0 ? void 0 : _b.typeAliasInfo) === null || _c === void 0 ? void 0 : _c.fullName) === deprecatedForm.fullName) {
+                    ((_c = (_b = type.props) === null || _b === void 0 ? void 0 : _b.typeAliasInfo) === null || _c === void 0 ? void 0 : _c.shared.fullName) === deprecatedForm.fullName) {
                     if (pythonVersion_1.PythonVersion.isGreaterOrEqualTo(this._fileInfo.executionEnvironment.pythonVersion, deprecatedForm.version)) {
                         if (!deprecatedForm.typingImportOnly || isImportFromTyping) {
                             this._reportDeprecatedDiagnostic(node, localize_1.LocMessage.deprecatedType().format({
@@ -4877,7 +4844,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
             ['fdel', (c) => { var _a; return (_a = c.priv.fdelInfo) === null || _a === void 0 ? void 0 : _a.methodType; }],
         ];
         propMethodInfo.forEach((info) => {
-            var _a;
+            var _a, _b;
             const diagAddendum = new diagnostic_1.DiagnosticAddendum();
             const [methodName, methodAccessor] = info;
             const baseClassPropMethod = methodAccessor(baseType);
@@ -4885,46 +4852,65 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
             // Is the method present on the base class but missing in the subclass?
             if (baseClassPropMethod) {
                 const baseClassMethodType = (0, typeUtils_1.partiallySpecializeType)(baseClassPropMethod, baseClassType, this._evaluator.getTypeClassType());
-                if ((0, types_1.isFunction)(baseClassMethodType)) {
-                    if (!subclassPropMethod) {
-                        // The method is missing.
-                        diagAddendum.addMessage(localize_1.LocAddendum.propertyMethodMissing().format({
-                            name: methodName,
-                        }));
-                        const decls = overrideSymbol.getDeclarations();
-                        if (decls.length > 0) {
-                            const lastDecl = decls[decls.length - 1];
-                            const diag = this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportIncompatibleMethodOverride, localize_1.LocMessage.propertyOverridden().format({
-                                name: memberName,
-                                className: baseClassType.shared.name,
-                            }) + diagAddendum.getString(), (_a = (0, declarationUtils_1.getNameNodeForDeclaration)(lastDecl)) !== null && _a !== void 0 ? _a : lastDecl.node);
-                            const origDecl = baseClassMethodType.shared.declaration;
-                            if (diag && origDecl) {
-                                diag.addRelatedInfo(localize_1.LocAddendum.overriddenMethod(), origDecl.uri, origDecl.range);
-                            }
+                if (!(0, types_1.isFunction)(baseClassMethodType)) {
+                    return;
+                }
+                if (!subclassPropMethod) {
+                    // The method is missing.
+                    diagAddendum.addMessage(localize_1.LocAddendum.propertyMethodMissing().format({
+                        name: methodName,
+                    }));
+                    const decls = overrideSymbol.getDeclarations();
+                    if (decls.length > 0) {
+                        const lastDecl = decls[decls.length - 1];
+                        const diag = this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportIncompatibleMethodOverride, localize_1.LocMessage.propertyOverridden().format({
+                            name: memberName,
+                            className: baseClassType.shared.name,
+                        }) + diagAddendum.getString(), (_a = (0, declarationUtils_1.getNameNodeForDeclaration)(lastDecl)) !== null && _a !== void 0 ? _a : lastDecl.node);
+                        const origDecl = baseClassMethodType.shared.declaration;
+                        if (diag && origDecl) {
+                            diag.addRelatedInfo(localize_1.LocAddendum.overriddenMethod(), origDecl.uri, origDecl.range);
                         }
                     }
-                    else {
-                        const subclassMethodType = (0, typeUtils_1.partiallySpecializeType)(subclassPropMethod, childClassType, this._evaluator.getTypeClassType());
-                        if ((0, types_1.isFunction)(subclassMethodType)) {
-                            if (!this._evaluator.validateOverrideMethod(baseClassMethodType, subclassMethodType, childClassType, diagAddendum.createAddendum())) {
-                                diagAddendum.addMessage(localize_1.LocAddendum.propertyMethodIncompatible().format({
-                                    name: methodName,
-                                }));
-                                const decl = subclassMethodType.shared.declaration;
-                                if (decl && decl.type === 5 /* DeclarationType.Function */) {
-                                    const diag = this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportIncompatibleMethodOverride, localize_1.LocMessage.propertyOverridden().format({
-                                        name: memberName,
-                                        className: baseClassType.shared.name,
-                                    }) + diagAddendum.getString(), decl.node.d.name);
-                                    const origDecl = baseClassMethodType.shared.declaration;
-                                    if (diag && origDecl) {
-                                        diag.addRelatedInfo(localize_1.LocAddendum.overriddenMethod(), origDecl.uri, origDecl.range);
-                                    }
-                                }
-                            }
-                        }
+                    return;
+                }
+                const subclassMethodType = (0, typeUtils_1.partiallySpecializeType)(subclassPropMethod, childClassType, this._evaluator.getTypeClassType());
+                if (!(0, types_1.isFunction)(subclassMethodType)) {
+                    return;
+                }
+                if (this._evaluator.validateOverrideMethod(baseClassMethodType, subclassMethodType, childClassType, diagAddendum.createAddendum())) {
+                    return;
+                }
+                diagAddendum.addMessage(localize_1.LocAddendum.propertyMethodIncompatible().format({
+                    name: methodName,
+                }));
+                const decl = subclassMethodType.shared.declaration;
+                if (!decl || decl.type !== 5 /* DeclarationType.Function */) {
+                    return;
+                }
+                let diagLocation = decl.node.d.name;
+                // Make sure the method decl is contained within the
+                // class suite. If not, it probably comes from a decorator
+                // in another class. We don't want to report the error
+                // in the wrong location.
+                const childClassDecl = childClassType.shared.declaration;
+                if (!childClassDecl ||
+                    childClassDecl.node.nodeType !== 10 /* ParseNodeType.Class */ ||
+                    !ParseTreeUtils.isNodeContainedWithin(decl.node, childClassDecl.node.d.suite)) {
+                    const symbolDecls = overrideSymbol.getDeclarations();
+                    if (symbolDecls.length === 0) {
+                        return;
                     }
+                    const lastSymbolDecl = symbolDecls[symbolDecls.length - 1];
+                    diagLocation = (_b = (0, declarationUtils_1.getNameNodeForDeclaration)(lastSymbolDecl)) !== null && _b !== void 0 ? _b : lastSymbolDecl.node;
+                }
+                const diag = this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportIncompatibleMethodOverride, localize_1.LocMessage.propertyOverridden().format({
+                    name: memberName,
+                    className: baseClassType.shared.name,
+                }) + diagAddendum.getString(), diagLocation);
+                const origDecl = baseClassMethodType.shared.declaration;
+                if (diag && origDecl) {
+                    diag.addRelatedInfo(localize_1.LocAddendum.overriddenMethod(), origDecl.uri, origDecl.range);
                 }
             }
         });