@zzzen/pyright-internal 1.2.0-dev.20231008 → 1.2.0-dev.20231015

package/dist/analyzer/typeEvaluator.js

@@ -1284,7 +1284,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     128 /* SkipAttributeAccessOverride */, types_1.ClassType.cloneAsInstantiable(objectType));
             }
         }
-        if (memberInfo) {
+        if (memberInfo && !memberInfo.isSetTypeError) {
             return {
                 type: memberInfo.type,
                 classType: memberInfo.classType,
@@ -1337,7 +1337,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 /* isAccessedThroughObject */ true, memberName, usage, metaclassDiag, memberAccessFlags, classType);
             }
         }
-        if (memberInfo) {
+        if (memberInfo && !memberInfo.isSetTypeError) {
             return {
                 type: memberInfo.type,
                 isIncomplete: !!memberInfo.isTypeIncomplete,
@@ -3902,6 +3902,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 return undefined;
             }
             type = descriptorResult.type;
+            let isSetTypeError = false;
             if (usage.method === 'set' && usage.setType) {
                 // Verify that the assigned type is compatible.
                 if (!assignType(type, usage.setType.type, diag === null || diag === void 0 ? void 0 : diag.createAddendum())) {
@@ -3912,7 +3913,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                             classType: printObjectTypeForClass(classType),
                         }));
                     }
-                    return undefined;
+                    isSetTypeError = true;
                 }
                 if ((0, types_1.isInstantiableClass)(memberInfo.classType) &&
                     types_1.ClassType.isFrozenDataClass(memberInfo.classType) &&
@@ -3920,13 +3921,14 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.dataClassFrozen().format({
                         name: printType(types_1.ClassType.cloneAsInstance(memberInfo.classType)),
                     }));
-                    return undefined;
+                    isSetTypeError = true;
                 }
             }
             return {
                 symbol: memberInfo.symbol,
                 type,
                 isTypeIncomplete,
+                isSetTypeError,
                 isClassMember: !memberInfo.isInstanceMember,
                 isClassVar: memberInfo.isClassVar,
                 classType: memberInfo.classType,
@@ -3945,6 +3947,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     symbol: undefined,
                     type: generalAttrType.type,
                     isTypeIncomplete: false,
+                    isSetTypeError: false,
                     isClassMember: false,
                     isClassVar: false,
                     isAsymmetricAccessor: generalAttrType.isAsymmetricAccessor,
@@ -6197,17 +6200,6 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 // intended behavior according to PEP 484.
                 const matchResults = matchFunctionArgumentsToParameters(errorNode, argList, { type: overload, isIncomplete: typeResult.isIncomplete }, overloadIndex);
                 if (!matchResults.argumentErrors) {
-                    // If there is an expected return type, see if it's potentially compatible
-                    // with this overload's return type. If not, we'll de-emphasize this overload.
-                    if (inferenceContext === null || inferenceContext === void 0 ? void 0 : inferenceContext.expectedType) {
-                        const returnType = getFunctionEffectiveReturnType(matchResults.overload);
-                        if (!assignType((0, typeUtils_1.replaceTypeVarsWithAny)(inferenceContext.expectedType), (0, typeUtils_1.replaceTypeVarsWithAny)(returnType), 
-                        /* diag */ undefined, 
-                        /* destTypeVarContext */ undefined, 
-                        /* srcTypeVarContext */ undefined, 8 /* SkipSolveTypeVars */)) {
-                            matchResults.relevance += -0.5;
-                        }
-                    }
                     filteredMatchResults.push(matchResults);
                 }
                 overloadIndex++;
@@ -9286,9 +9278,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 }
                 else if (mappingType && (0, types_1.isInstantiableClass)(mappingType)) {
                     const mappingTypeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(mappingType));
-                    // Self-specialize the class.
-                    mappingType = types_1.ClassType.cloneForSpecialization(mappingType, mappingType.details.typeParameters, 
-                    /* isTypeArgumentExplicit */ true);
+                    mappingType = (0, typeUtils_1.selfSpecializeClass)(mappingType);
                     if (assignType(types_1.ClassType.cloneAsInstance(mappingType), unexpandedType, 
                     /* diag */ undefined, mappingTypeVarContext, 
                     /* srcTypeVarContext */ undefined, 128 /* RetainLiteralsForTypeVar */)) {
@@ -10823,7 +10813,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         const nameNode = node.leftExpression;
         const assignedName = nameNode.value;
         if (assignedName === 'Any') {
-            return types_1.AnyType.create();
+            return types_1.AnyType.createSpecialForm();
         }
         const specialTypes = new Map([
             ['overload', { alias: '', module: 'builtins' }],
@@ -11191,6 +11181,11 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     if ((0, types_1.isUnion)(argType)) {
                         argType = (0, types_1.removeUnbound)(argType);
                     }
+                    // Any is allowed as a base class. Remove its "special form" flag to avoid
+                    // false positive errors.
+                    if ((0, types_1.isAny)(argType) && types_1.TypeBase.isSpecialForm(argType)) {
+                        argType = types_1.AnyType.create();
+                    }
                     if (!(0, types_1.isAnyOrUnknown)(argType) && !(0, types_1.isUnbound)(argType)) {
                         if ((0, typeUtils_1.isMetaclassInstance)(argType)) {
                             (0, debug_1.assert)((0, types_1.isClassInstance)(argType));
@@ -15495,6 +15490,12 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 };
             }
         }
+        else if ((0, types_1.isAnyOrUnknown)(member.classType)) {
+            return {
+                type: member.classType,
+                isIncomplete: false,
+            };
+        }
         return undefined;
     }
     function assignClass(destType, srcType, diag, destTypeVarContext, srcTypeVarContext, flags, recursionCount, reportErrorsUsingObjType) {
@@ -16167,7 +16168,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         if ((0, types_1.isAnyOrUnknown)(destType)) {
             return true;
         }
-        if ((0, types_1.isAnyOrUnknown)(srcType)) {
+        if ((0, types_1.isAnyOrUnknown)(srcType) && !types_1.TypeBase.isSpecialForm(srcType)) {
             const targetTypeVarContext = (flags & 2 /* ReverseTypeVarMatching */) === 0 ? destTypeVarContext : srcTypeVarContext;
             if (targetTypeVarContext) {
                 // If it's an ellipsis type, convert it to a regular "Any"
@@ -16393,7 +16394,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     }
                 }
             }
-            else if ((0, types_1.isAnyOrUnknown)(concreteSrcType)) {
+            else if ((0, types_1.isAnyOrUnknown)(concreteSrcType) && !types_1.TypeBase.isSpecialForm(concreteSrcType)) {
                 return (flags & 16 /* OverloadOverlapCheck */) === 0;
             }
             else if ((0, types_1.isUnion)(concreteSrcType)) {
@@ -17379,7 +17380,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                             category: p.category,
                             name: p.name,
                             isNameSynthesized: p.isNameSynthesized,
-                            hasDefault: !!p.hasDefault,
+                            hasDefault: p.hasDefault,
+                            hasDeclaredType: p.hasDeclaredType,
                             defaultValueExpression: p.defaultValueExpression,
                             type: types_1.FunctionType.getEffectiveParameterType(effectiveSrcType, index),
                         });