@zzzen/pyright-internal 1.2.0-dev.20231217 → 1.2.0-dev.20231224

package/dist/analyzer/typeEvaluator.js

@@ -568,7 +568,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 break;
             }
             case 55 /* ParseNodeType.UnaryOperation */: {
-                typeResult = (0, operations_1.getTypeOfUnaryOperation)(evaluatorInterface, node, inferenceContext);
+                typeResult = (0, operations_1.getTypeOfUnaryOperation)(evaluatorInterface, node, flags, inferenceContext);
                 break;
             }
             case 7 /* ParseNodeType.BinaryOperation */: {
@@ -1333,7 +1333,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             !types_1.ClassType.isBuiltIn(metaclass, 'type') &&
             !types_1.ClassType.isSameGenericClass(metaclass, objectType)) {
             const descMemberInfo = getTypeOfClassMemberName(errorNode, metaclass, memberName, usage, 
-            /* diag */ undefined, flags | 512 /* MemberAccessFlags.SkipAttributeAccessOverride */, objectType);
+            /* diag */ undefined, flags | 512 /* MemberAccessFlags.SkipAttributeAccessOverride */, objectType, recursionCount);
             if (descMemberInfo) {
                 const isProperty = (0, types_1.isClassInstance)(descMemberInfo.type) && types_1.ClassType.isPropertyClass(descMemberInfo.type);
                 if ((0, typeUtils_1.isDescriptorInstance)(descMemberInfo.type, /* requireSetter */ true) || isProperty) {
@@ -1353,7 +1353,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             }
             subDiag = diag ? new diagnostic_1.DiagnosticAddendum() : undefined;
             // See if the member is present in the object itself.
-            memberInfo = getTypeOfClassMemberName(errorNode, objectType, memberName, usage, subDiag, effectiveFlags, selfType);
+            memberInfo = getTypeOfClassMemberName(errorNode, objectType, memberName, usage, subDiag, effectiveFlags, selfType, recursionCount);
         }
         // If it wasn't found on the object, see if it's part of the metaclass.
         if (!memberInfo && metaclass && (0, types_1.isInstantiableClass)(metaclass)) {
@@ -2350,7 +2350,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             // Is this subtype a tuple?
             const tupleType = (0, typeUtils_1.getSpecializedTupleType)(subtype);
             if (tupleType && tupleType.tupleTypeArguments) {
-                const sourceEntryTypes = tupleType.tupleTypeArguments.map((t) => (0, typeUtils_1.addConditionToType)(t.type, (0, typeUtils_1.getTypeCondition)(subtype)));
+                const sourceEntryTypes = tupleType.tupleTypeArguments.map((t) => (0, typeUtils_1.addConditionToType)(t.type, (0, typeUtils_1.getTypeCondition)(subtype), /* skipSelfCondition */ true));
                 const unboundedIndex = tupleType.tupleTypeArguments.findIndex((t) => t.isUnbounded);
                 if (unboundedIndex >= 0) {
                     if (sourceEntryTypes.length < targetTypes.length) {
@@ -2503,7 +2503,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 }
                 return subtype;
             }
-            if ((0, types_1.isTypeVar)(subtype) && !subtype.details.recursiveTypeAliasName) {
+            if ((0, types_1.isTypeVar)(subtype)) {
                 // If this is a recursive type alias placeholder
                 // that hasn't yet been resolved, return it as is.
                 if (subtype.details.recursiveTypeAliasName) {
@@ -2516,7 +2516,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     subtype.details.constraints.forEach((constraintType, constraintIndex) => {
                         if (conditionFilter) {
                             const typeVarName = types_1.TypeVarType.getNameWithScope(subtype);
-                            const applicableConstraint = conditionFilter.find((filter) => filter.typeVarName === typeVarName);
+                            const applicableConstraint = conditionFilter.find((filter) => filter.typeVar.nameWithScope === typeVarName);
                             // If this type variable is being constrained to a single index,
                             // don't include the other indices.
                             if (applicableConstraint && applicableConstraint.constraintIndex !== constraintIndex) {
@@ -2526,13 +2526,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                         if (types_1.TypeBase.isInstantiable(subtype)) {
                             constraintType = (0, typeUtils_1.convertToInstantiable)(constraintType);
                         }
-                        typesToCombine.push((0, typeUtils_1.addConditionToType)(constraintType, [
-                            {
-                                typeVarName: types_1.TypeVarType.getNameWithScope(subtype),
-                                constraintIndex,
-                                isConstrainedTypeVar: true,
-                            },
-                        ]));
+                        typesToCombine.push((0, typeUtils_1.addConditionToType)(constraintType, [{ typeVar: subtype, constraintIndex }]));
                     });
                     return (0, types_1.combineTypes)(typesToCombine);
                 }
@@ -2542,17 +2536,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 // Fall back to a bound of "object" if no bound is provided.
                 let boundType = (_b = (_a = subtype.details.boundType) !== null && _a !== void 0 ? _a : objectType) !== null && _b !== void 0 ? _b : types_1.UnknownType.create();
                 boundType = types_1.TypeBase.isInstantiable(subtype) ? (0, typeUtils_1.convertToInstantiable)(boundType) : boundType;
-                // Handle Self and type[Self] specially.
-                if (subtype.details.isSynthesizedSelf && (0, types_1.isClass)(boundType)) {
-                    return types_1.ClassType.cloneIncludeSubclasses(boundType);
-                }
-                return (0, typeUtils_1.addConditionToType)(boundType, [
-                    {
-                        typeVarName: types_1.TypeVarType.getNameWithScope(subtype),
-                        constraintIndex: 0,
-                        isConstrainedTypeVar: false,
-                    },
-                ]);
+                return (0, typeUtils_1.addConditionToType)(boundType, [{ typeVar: subtype, constraintIndex: 0 }]);
             }
             return subtype;
         });
@@ -2584,7 +2568,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 }
                 if (transformedType) {
                     // Apply the type condition if it's associated with a constrained TypeVar.
-                    const typeCondition = (_a = (0, typeUtils_1.getTypeCondition)(subtype)) === null || _a === void 0 ? void 0 : _a.filter((condition) => condition.isConstrainedTypeVar);
+                    const typeCondition = (_a = (0, typeUtils_1.getTypeCondition)(subtype)) === null || _a === void 0 ? void 0 : _a.filter((condition) => condition.typeVar.details.constraints.length > 0);
                     if (typeCondition && typeCondition.length > 0) {
                         transformedType = (0, typeUtils_1.addConditionToType)(transformedType, typeCondition);
                     }
@@ -3582,7 +3566,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 const typeResult = (_a = (0, enums_1.getTypeOfEnumMember)(evaluatorInterface, node, baseType, memberName, isIncomplete)) !== null && _a !== void 0 ? _a : getTypeOfBoundMember(node.memberName, baseType, memberName, usage, diag, 
                 /* memberAccessFlags */ undefined, baseTypeResult.bindToSelfType);
                 if (typeResult) {
-                    type = (0, typeUtils_1.addConditionToType)(typeResult.type, (0, typeUtils_1.getTypeCondition)(baseType));
+                    type = (0, typeUtils_1.addConditionToType)(typeResult.type, (0, typeUtils_1.getTypeCondition)(baseType), 
+                    /* skipSelfCondition */ true);
                 }
                 if (typeResult === null || typeResult === void 0 ? void 0 : typeResult.isIncomplete) {
                     isIncomplete = true;
@@ -7979,11 +7964,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                         !arg0Type.details.isParamSpec &&
                         arg0Type.details.constraints.length === 0) {
                         typeGuardType = (0, typeUtils_1.addConditionToType)(typeGuardType, [
-                            {
-                                typeVarName: types_1.TypeVarType.getNameWithScope(arg0Type),
-                                constraintIndex: 0,
-                                isConstrainedTypeVar: false,
-                            },
+                            { typeVar: arg0Type, constraintIndex: 0 },
                         ]);
                     }
                 }
@@ -15009,30 +14990,32 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
     }
     // Returns the type of the symbol. If the type is explicitly declared, that type
     // is returned. If not, the type is inferred from assignments to the symbol. All
-    // assigned types are evaluated and combined into a union. If a "usageNode"
-    // node is specified, only declarations that are outside of the current execution
-    // scope or that are reachable (as determined by code flow analysis) are considered.
-    // This helps in cases where there are cyclical dependencies between symbols.
+    // assigned types are evaluated and combined into a union.
     function getEffectiveTypeOfSymbol(symbol) {
         return getEffectiveTypeOfSymbolForUsage(symbol).type;
     }
+    // If a "usageNode" node is specified, only declarations that are outside
+    // of the current execution scope or that are reachable (as determined by
+    // code flow analysis) are considered. This helps in cases where there
+    // are cyclical dependencies between symbols.
     function getEffectiveTypeOfSymbolForUsage(symbol, usageNode, useLastDecl = false) {
         let declaredTypeInfo;
         // If there's a declared type, it takes precedence over inferred types.
         if (symbol.hasTypedDeclarations()) {
             declaredTypeInfo = getDeclaredTypeOfSymbol(symbol, usageNode);
             const declaredType = declaredTypeInfo === null || declaredTypeInfo === void 0 ? void 0 : declaredTypeInfo.type;
-            const hasMetadata = !!declaredTypeInfo.isTypeAlias;
-            if (declaredType || !hasMetadata) {
-                let isIncomplete = false;
-                if (declaredType) {
-                    if ((0, types_1.isFunction)(declaredType) && types_1.FunctionType.isPartiallyEvaluated(declaredType)) {
-                        isIncomplete = true;
-                    }
-                    else if ((0, types_1.isClass)(declaredType) && types_1.ClassType.isPartiallyEvaluated(declaredType)) {
-                        isIncomplete = true;
-                    }
+            let isIncomplete = false;
+            if (declaredType) {
+                if ((0, types_1.isFunction)(declaredType) && types_1.FunctionType.isPartiallyEvaluated(declaredType)) {
+                    isIncomplete = true;
                 }
+                else if ((0, types_1.isClass)(declaredType) && types_1.ClassType.isPartiallyEvaluated(declaredType)) {
+                    isIncomplete = true;
+                }
+            }
+            // If the "declared" type uses a "TypeAlias" type annotation, then
+            // we need to use the inferred type path to evaluate its type.
+            if (declaredType || !declaredTypeInfo.isTypeAlias) {
                 const typedDecls = symbol.getTypedDeclarations();
                 const result = {
                     type: declaredType !== null && declaredType !== void 0 ? declaredType : types_1.UnknownType.create(),
@@ -15045,6 +15028,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 return result;
             }
         }
+        return inferTypeOfSymbolForUsage(symbol, usageNode, useLastDecl);
+    }
+    function inferTypeOfSymbolForUsage(symbol, usageNode, useLastDecl = false) {
         // Look in the inferred type cache to see if we've computed this already.
         let cacheEntries = effectiveTypeCache.get(symbol.id);
         const usageNodeId = usageNode ? usageNode.id : undefined;
@@ -15092,9 +15078,25 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         }
         // Determine which declarations to use for inference.
         const declsToConsider = [];
+        let includesVariableDecl = false;
+        let includesIllegalTypeAliasDecl = false;
         let sawExplicitTypeAlias = false;
         decls.forEach((decl, index) => {
             var _a, _b, _c;
+            const resolvedDecl = (_a = resolveAliasDeclaration(decl, /* resolveLocalNames */ true, {
+                allowExternallyHiddenAccess: AnalyzerNodeInfo.getFileInfo(decl.node).isStubFile,
+            })) !== null && _a !== void 0 ? _a : decl;
+            if (!isPossibleTypeAliasDeclaration(resolvedDecl)) {
+                includesIllegalTypeAliasDecl = true;
+            }
+            if (resolvedDecl.type === 1 /* DeclarationType.Variable */) {
+                // Exempt typing.pyi, which uses variables to define some
+                // special forms like Any.
+                const fileInfo = AnalyzerNodeInfo.getFileInfo(resolvedDecl.node);
+                if (!fileInfo.isTypingStubFile) {
+                    includesVariableDecl = true;
+                }
+            }
             if (declIndexToConsider !== undefined && declIndexToConsider !== index) {
                 return;
             }
@@ -15114,18 +15116,15 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             if (usageNode !== undefined) {
                 if (decl.type !== 8 /* DeclarationType.Alias */) {
                     // Is the declaration in the same execution scope as the "usageNode" node?
+                    // If so, we can skip it because code flow analysis will allow us
+                    // to determine the type in this context.
                     const usageScope = ParseTreeUtils.getExecutionScopeNode(usageNode);
                     const declScope = ParseTreeUtils.getExecutionScopeNode(decl.node);
                     if (usageScope === declScope) {
-                        if (!isFlowPathBetweenNodes(decl.node, usageNode)) {
-                            return;
-                        }
+                        return;
                     }
                 }
             }
-            const resolvedDecl = (_a = resolveAliasDeclaration(decl, /* resolveLocalNames */ true, {
-                allowExternallyHiddenAccess: AnalyzerNodeInfo.getFileInfo(decl.node).isStubFile,
-            })) !== null && _a !== void 0 ? _a : decl;
             const isExplicitTypeAlias = isExplicitTypeAliasDeclaration(resolvedDecl);
             const isTypeAlias = isExplicitTypeAlias || isPossibleTypeAliasOrTypedDict(resolvedDecl);
             if (isExplicitTypeAlias) {
@@ -15141,6 +15140,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             declsToConsider.push(resolvedDecl);
         });
         const result = getTypeOfSymbolForDecls(symbol, declsToConsider, effectiveTypeCacheKey);
+        result.includesVariableDecl = includesVariableDecl;
+        result.includesIllegalTypeAliasDecl = includesIllegalTypeAliasDecl;
         // Add the result to the effective type cache if it doesn't include speculative results.
         if (!result.includesSpeculativeResult) {
             addToEffectiveTypeCache(result);
@@ -15161,7 +15162,6 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         const typesToCombine = [];
         let isIncomplete = false;
         let sawPendingEvaluation = false;
-        let includesVariableDecl = false;
         let includesSpeculativeResult = false;
         decls.forEach((decl) => {
             if (pushSymbolResolution(symbol, decl)) {
@@ -15172,12 +15172,6 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     }
                     if (type) {
                         if (decl.type === 1 /* DeclarationType.Variable */) {
-                            // Exempt typing.pyi, which uses variables to define some
-                            // special forms like Any.
-                            const fileInfo = AnalyzerNodeInfo.getFileInfo(decl.node);
-                            if (!fileInfo.isTypingStubFile) {
-                                includesVariableDecl = true;
-                            }
                             let isConstant = false;
                             if (decl.type === 1 /* DeclarationType.Variable */) {
                                 if (decl.isConstant || isFinalVariableDeclaration(decl)) {
@@ -15239,15 +15233,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         else {
             type = types_1.UnboundType.create();
         }
-        return {
-            type,
-            isIncomplete,
-            includesVariableDecl,
-            includesIllegalTypeAliasDecl: !decls.every((decl) => isPossibleTypeAliasDeclaration(decl)),
-            includesSpeculativeResult,
-            isRecursiveDefinition: false,
-            evaluationAttempts,
-        };
+        return { type, isIncomplete, includesSpeculativeResult, evaluationAttempts };
     }
     // If a declaration has an explicit type (e.g. a variable with an annotation),
     // this function evaluates the type and returns it. If the symbol has no
@@ -16228,7 +16214,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             if (types_1.TypeBase.isInstantiable(destType) === types_1.TypeBase.isInstantiable(srcType) &&
                 srcType.condition &&
                 srcType.condition.some((cond) => {
-                    return !cond.isConstrainedTypeVar && cond.typeVarName === destTypeVar.nameWithScope;
+                    return (cond.typeVar.details.constraints.length === 0 &&
+                        cond.typeVar.nameWithScope === destTypeVar.nameWithScope);
                 })) {
                 return true;
             }
@@ -17019,13 +17006,13 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             const destTypeVarName = types_1.TypeVarType.getNameWithScope(destType);
             // Determine which conditions on this type apply to this type variable.
             // There might be more than one of them.
-            const applicableConditions = ((_a = (0, typeUtils_1.getTypeCondition)(srcSubtype)) !== null && _a !== void 0 ? _a : []).filter((constraint) => constraint.typeVarName === destTypeVarName);
+            const applicableConditions = ((_a = (0, typeUtils_1.getTypeCondition)(srcSubtype)) !== null && _a !== void 0 ? _a : []).filter((constraint) => constraint.typeVar.nameWithScope === destTypeVarName);
             // If there are no applicable conditions, it's not assignable.
             if (applicableConditions.length === 0) {
                 return true;
             }
             return !applicableConditions.some((condition) => {
-                if (condition.typeVarName === types_1.TypeVarType.getNameWithScope(destType)) {
+                if (condition.typeVar.nameWithScope === types_1.TypeVarType.getNameWithScope(destType)) {
                     if (destType.details.boundType) {
                         (0, debug_1.assert)(condition.constraintIndex === 0, 'Expected constraint for bound TypeVar to have index of 0');
                         return assignType(destType.details.boundType, srcSubtype,