@zzzen/pyright-internal 1.2.0-dev.20240901 → 1.2.0-dev.20240908

package/dist/analyzer/checker.js

@@ -412,7 +412,9 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
             }
         }
         this._scopedNodes.push(node);
-        if (functionTypeResult && (0, types_1.isOverloaded)(functionTypeResult.decoratedType)) {
+        if (functionTypeResult &&
+            (0, types_1.isOverloaded)(functionTypeResult.decoratedType) &&
+            functionTypeResult.functionType.priv.overloaded) {
             // If this is the implementation for the overloaded function, skip
             // overload consistency checks.
             if (types_1.OverloadedType.getImplementation(functionTypeResult.decoratedType) !== functionTypeResult.functionType) {
@@ -672,34 +674,11 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         return true;
     }
     visitRaise(node) {
-        this._evaluator.verifyRaiseExceptionType(node);
-        if (node.d.valueExpression) {
-            const baseExceptionType = this._evaluator.getBuiltInType(node, 'BaseException');
-            const exceptionType = this._evaluator.getType(node.d.valueExpression);
-            // Validate that the argument of "raise" is an exception object or None.
-            if (exceptionType && baseExceptionType && (0, types_1.isInstantiableClass)(baseExceptionType)) {
-                const diagAddendum = new diagnostic_1.DiagnosticAddendum();
-                (0, typeUtils_1.doForEachSubtype)(exceptionType, (subtype) => {
-                    subtype = this._evaluator.makeTopLevelTypeVarsConcrete(subtype);
-                    if (!(0, types_1.isAnyOrUnknown)(subtype) && !(0, typeUtils_1.isNoneInstance)(subtype)) {
-                        if ((0, types_1.isClass)(subtype)) {
-                            if (!(0, typeUtils_1.derivesFromClassRecursive)(subtype, baseExceptionType, /* ignoreUnknown */ false)) {
-                                diagAddendum.addMessage(localize_1.LocMessage.exceptionTypeIncorrect().format({
-                                    type: this._evaluator.printType(subtype),
-                                }));
-                            }
-                        }
-                        else {
-                            diagAddendum.addMessage(localize_1.LocMessage.exceptionTypeIncorrect().format({
-                                type: this._evaluator.printType(subtype),
-                            }));
-                        }
-                    }
-                });
-                if (!diagAddendum.isEmpty()) {
-                    this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.expectedExceptionObj() + diagAddendum.getString(), node.d.valueExpression);
-                }
-            }
+        if (node.d.expr) {
+            this._evaluator.verifyRaiseExceptionType(node.d.expr);
+        }
+        if (node.d.fromExpr) {
+            this._evaluator.verifyRaiseExceptionType(node.d.fromExpr);
         }
         return true;
     }
@@ -1009,11 +988,11 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         return true;
     }
     visitImportFromAs(node) {
-        var _a, _b;
+        var _a, _b, _c;
         if (this._fileInfo.isStubFile) {
             return false;
         }
-        const decls = this._evaluator.getDeclarationsForNameNode(node.d.name);
+        const decls = (_a = this._evaluator.getDeclInfoForNameNode(node.d.name)) === null || _a === void 0 ? void 0 : _a.decls;
         if (!decls) {
             return false;
         }
@@ -1035,14 +1014,14 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
             break;
         }
         let isImportFromTyping = false;
-        if (((_a = node.parent) === null || _a === void 0 ? void 0 : _a.nodeType) === 25 /* ParseNodeType.ImportFrom */) {
+        if (((_b = node.parent) === null || _b === void 0 ? void 0 : _b.nodeType) === 25 /* ParseNodeType.ImportFrom */) {
             if (node.parent.d.module.d.leadingDots === 0 && node.parent.d.module.d.nameParts.length === 1) {
                 if (node.parent.d.module.d.nameParts[0].d.value === 'typing') {
                     isImportFromTyping = true;
                 }
             }
         }
-        const type = this._evaluator.getType((_b = node.d.alias) !== null && _b !== void 0 ? _b : node.d.name);
+        const type = this._evaluator.getType((_c = node.d.alias) !== null && _c !== void 0 ? _c : node.d.name);
         this._reportDeprecatedUseForType(node.d.name, type, isImportFromTyping);
         return false;
     }
@@ -1851,7 +1830,8 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
     // earlier overload. Typeshed stubs contain type: ignore comments on these
     // lines, so it is important for us to report them in the same manner.
     _findNodeForOverload(functionNode, overloadType) {
-        const decls = this._evaluator.getDeclarationsForNameNode(functionNode.d.name);
+        var _a;
+        const decls = (_a = this._evaluator.getDeclInfoForNameNode(functionNode.d.name)) === null || _a === void 0 ? void 0 : _a.decls;
         if (!decls) {
             return undefined;
         }
@@ -3306,7 +3286,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         }
     }
     _conditionallyReportPrivateUsage(node) {
-        var _a, _b;
+        var _a, _b, _c;
         if (this._fileInfo.diagnosticRuleSet.reportPrivateUsage === 'none') {
             return;
         }
@@ -3329,8 +3309,8 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         // Get the declarations for this name node, but filter out
         // any variable declarations that are bound using nonlocal
         // or global explicit bindings.
-        const declarations = (_b = this._evaluator
-            .getDeclarationsForNameNode(node)) === null || _b === void 0 ? void 0 : _b.filter((decl) => decl.type !== 1 /* DeclarationType.Variable */ || !decl.isExplicitBinding);
+        const declarations = (_c = (_b = this._evaluator
+            .getDeclInfoForNameNode(node)) === null || _b === void 0 ? void 0 : _b.decls) === null || _c === void 0 ? void 0 : _c.filter((decl) => decl.type !== 1 /* DeclarationType.Variable */ || !decl.isExplicitBinding);
         let primaryDeclaration = declarations && declarations.length > 0 ? declarations[declarations.length - 1] : undefined;
         if (!primaryDeclaration || primaryDeclaration.node === node) {
             return;
@@ -3465,7 +3445,9 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         }
         if (isTypeIs) {
             const scopeIds = (0, typeUtils_1.getTypeVarScopeIds)(functionType);
-            const typeGuardType = (0, typeUtils_1.makeTypeVarsBound)(returnType.priv.typeArgs[0], scopeIds);
+            const narrowedType = returnType.priv.typeArgs[0];
+            let typeGuardType = (0, typeUtils_1.makeTypeVarsBound)(narrowedType, scopeIds);
+            typeGuardType = types_1.TypeBase.cloneWithTypeForm(typeGuardType, typeGuardType);
             // Determine the type of the first parameter.
             const paramIndex = isMethod && !types_1.FunctionType.isStaticMethod(functionType) ? 1 : 0;
             if (paramIndex >= functionType.shared.parameters.length) {
@@ -3478,7 +3460,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                 if (returnAnnotation) {
                     this._evaluator.addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.typeIsReturnType().format({
                         type: this._evaluator.printType(paramType),
-                        returnType: this._evaluator.printType(typeGuardType),
+                        returnType: this._evaluator.printType(narrowedType),
                     }), returnAnnotation);
                 }
             }
@@ -3604,7 +3586,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                         className: parentSymbol.classType.shared.name,
                     }), decl.node);
                 }
-                else if (types_1.ClassType.isReadOnlyInstanceVariables(parentSymbol.classType) &&
+                else if (types_1.ClassType.hasNamedTupleEntry(parentSymbol.classType, name) &&
                     !SymbolNameUtils.isDunderName(name)) {
                     // If the parent class is a named tuple, all instance variables
                     // (other than dundered ones) are implicitly final.
@@ -3893,7 +3875,7 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
                     // If this is part of a dataclass, a class handled by a dataclass_transform,
                     // or a NamedTuple, exempt it because the class variable will be transformed
                     // into an instance variable in this case.
-                    if (types_1.ClassType.isDataClass(classType) || types_1.ClassType.isReadOnlyInstanceVariables(classType)) {
+                    if (types_1.ClassType.isDataClass(classType) || types_1.ClassType.hasNamedTupleEntry(classType, name)) {
                         return true;
                     }
                     // If this is part of a TypedDict, exempt it because the class variables