@zzzen/pyright-internal 1.2.0-dev.20240324 → 1.2.0-dev.20240407

package/dist/analyzer/typeUtils.js

@@ -878,12 +878,23 @@ function isLiteralType(type) {
     return types_1.TypeBase.isInstance(type) && type.literalValue !== undefined;
 }
 exports.isLiteralType = isLiteralType;
-function isLiteralTypeOrUnion(type) {
+function isLiteralTypeOrUnion(type, allowNone = false) {
     if ((0, types_1.isClassInstance)(type)) {
+        if (allowNone && isNoneInstance(type)) {
+            return true;
+        }
         return type.literalValue !== undefined;
     }
     if ((0, types_1.isUnion)(type)) {
-        return !(0, types_1.findSubtype)(type, (subtype) => !(0, types_1.isClassInstance)(subtype) || subtype.literalValue === undefined);
+        return !(0, types_1.findSubtype)(type, (subtype) => {
+            if (!(0, types_1.isClassInstance)(subtype)) {
+                return true;
+            }
+            if (isNoneInstance(subtype)) {
+                return !allowNone;
+            }
+            return subtype.literalValue === undefined;
+        });
     }
     return false;
 }
@@ -989,10 +1000,10 @@ function isMaybeDescriptorInstance(type, requireSetter = false) {
     if (!(0, types_1.isClassInstance)(type)) {
         return false;
     }
-    if (!type.details.fields.has('__get__')) {
+    if (!types_1.ClassType.getSymbolTable(type).has('__get__')) {
         return false;
     }
-    if (requireSetter && !type.details.fields.has('__set__')) {
+    if (requireSetter && !types_1.ClassType.getSymbolTable(type).has('__set__')) {
         return false;
     }
     return true;
@@ -1216,14 +1227,14 @@ function getProtocolSymbolsRecursive(classType, symbolMap, classFlags = 16384 /*
             getProtocolSymbolsRecursive(baseClass, symbolMap, classFlags, recursionCount + 1);
         }
     });
-    classType.details.fields.forEach((symbol, name) => {
+    types_1.ClassType.getSymbolTable(classType).forEach((symbol, name) => {
         if (!symbol.isIgnoredForProtocolMatch()) {
             symbolMap.set(name, {
                 symbol,
                 classType,
                 isInstanceMember: symbol.isInstanceMember(),
                 isClassMember: symbol.isClassMember(),
-                isClassVar: symbol.isClassVar(),
+                isClassVar: (0, symbolUtils_1.isEffectivelyClassVar)(symbol, /* isDataclass */ false),
                 isTypeDeclared: symbol.hasTypedDeclarations(),
                 skippedUndeclaredType: false,
             });
@@ -1282,7 +1293,9 @@ function lookUpClassMember(classType, memberName, flags = 0 /* MemberAccessFlags
     if (metaclass && (0, types_1.isClass)(metaclass) && !types_1.ClassType.isBuiltIn(metaclass, 'type')) {
         const metaMemberItr = getClassMemberIterator(metaclass, memberName, 32 /* MemberAccessFlags.SkipClassMembers */);
         const metaMember = (_a = metaMemberItr.next()) === null || _a === void 0 ? void 0 : _a.value;
-        if (metaMember) {
+        // If the metaclass defines the member and we didn't hit an Unknown
+        // class in the metaclass MRO, use the metaclass member.
+        if (metaMember && !(0, types_1.isAnyOrUnknown)(metaMember.classType)) {
             // Set the isClassMember to true because it's a class member from the
             // perspective of the classType.
             metaMember.isClassMember = true;
@@ -1344,7 +1357,7 @@ function* getClassMemberIterator(classType, memberName, flags = 0 /* MemberAcces
             if (!(0, types_1.isInstantiableClass)(specializedMroClass)) {
                 continue;
             }
-            const memberFields = specializedMroClass.details.fields;
+            const memberFields = types_1.ClassType.getSymbolTable(specializedMroClass);
             // Look at instance members first if requested.
             if ((flags & 16 /* MemberAccessFlags.SkipInstanceMembers */) === 0) {
                 const symbol = memberFields.get(memberName);
@@ -1355,7 +1368,7 @@ function* getClassMemberIterator(classType, memberName, flags = 0 /* MemberAcces
                             symbol,
                             isInstanceMember: true,
                             isClassMember: symbol.isClassMember(),
-                            isClassVar: symbol.isClassVar(),
+                            isClassVar: (0, symbolUtils_1.isEffectivelyClassVar)(symbol, types_1.ClassType.isDataClass(specializedMroClass)),
                             classType: specializedMroClass,
                             isTypeDeclared: hasDeclaredType,
                             skippedUndeclaredType,
@@ -1393,7 +1406,7 @@ function* getClassMemberIterator(classType, memberName, flags = 0 /* MemberAcces
                             symbol,
                             isInstanceMember,
                             isClassMember,
-                            isClassVar: symbol.isClassVar(),
+                            isClassVar: (0, symbolUtils_1.isEffectivelyClassVar)(symbol, isDataclass),
                             classType: specializedMroClass,
                             isTypeDeclared: hasDeclaredType,
                             skippedUndeclaredType,
@@ -1475,14 +1488,14 @@ function getClassFieldsRecursive(classType) {
     types_1.ClassType.getReverseMro(classType).forEach((mroClass) => {
         const specializedMroClass = partiallySpecializeType(mroClass, classType);
         if ((0, types_1.isClass)(specializedMroClass)) {
-            specializedMroClass.details.fields.forEach((symbol, name) => {
+            types_1.ClassType.getSymbolTable(specializedMroClass).forEach((symbol, name) => {
                 if (!symbol.isIgnoredForProtocolMatch() && symbol.hasTypedDeclarations()) {
                     memberMap.set(name, {
                         classType: specializedMroClass,
                         symbol,
                         isInstanceMember: symbol.isInstanceMember(),
                         isClassMember: symbol.isClassMember(),
-                        isClassVar: symbol.isClassVar(),
+                        isClassVar: (0, symbolUtils_1.isEffectivelyClassVar)(symbol, types_1.ClassType.isDataClass(specializedMroClass)),
                         isTypeDeclared: true,
                         skippedUndeclaredType: false,
                     });
@@ -1500,8 +1513,11 @@ function getClassFieldsRecursive(classType) {
 exports.getClassFieldsRecursive = getClassFieldsRecursive;
 // Combines two lists of type var types, maintaining the combined order
 // but removing any duplicates.
-function addTypeVarsToListIfUnique(list1, list2) {
+function addTypeVarsToListIfUnique(list1, list2, typeVarScopeId) {
     for (const type2 of list2) {
+        if (typeVarScopeId && type2.scopeId !== typeVarScopeId) {
+            continue;
+        }
         if (!list1.find((type1) => (0, types_1.isTypeSame)(convertToInstance(type1), convertToInstance(type2)))) {
             list1.push(type2);
         }
@@ -2006,7 +2022,7 @@ function getMembersForClass(classType, symbolTable, includeInstanceVars) {
         if ((0, types_1.isInstantiableClass)(mroClass)) {
             // Add any new member variables from this class.
             const isClassTypedDict = types_1.ClassType.isTypedDictClass(mroClass);
-            mroClass.details.fields.forEach((symbol, name) => {
+            types_1.ClassType.getSymbolTable(mroClass).forEach((symbol, name) => {
                 if (symbol.isClassMember() || (includeInstanceVars && symbol.isInstanceMember())) {
                     if (!isClassTypedDict || !(0, symbolUtils_1.isTypedDictMemberAccessedThroughIndex)(symbol)) {
                         if (!symbol.isInitVar()) {
@@ -2031,7 +2047,7 @@ function getMembersForClass(classType, symbolTable, includeInstanceVars) {
         if (metaclass && (0, types_1.isInstantiableClass)(metaclass)) {
             for (const mroClass of metaclass.details.mro) {
                 if ((0, types_1.isInstantiableClass)(mroClass)) {
-                    mroClass.details.fields.forEach((symbol, name) => {
+                    types_1.ClassType.getSymbolTable(mroClass).forEach((symbol, name) => {
                         const existingSymbol = symbolTable.get(name);
                         if (!existingSymbol) {
                             symbolTable.set(name, symbol);
@@ -3362,11 +3378,8 @@ class ApplySolvedTypeVarsTransformer extends TypeVarTransformer {
                         });
                     }
                 }
-                if ((0, types_1.isTypeVar)(replacement) &&
-                    typeVar.isVariadicInUnion &&
-                    replacement.details.isVariadic &&
-                    !replacement.isVariadicInUnion) {
-                    return types_1.TypeVarType.cloneForUnpacked(replacement, /* isInUnion */ true);
+                if ((0, types_1.isTypeVar)(replacement) && typeVar.isVariadicUnpacked && replacement.details.isVariadic) {
+                    return types_1.TypeVarType.cloneForUnpacked(replacement, typeVar.isVariadicInUnion);
                 }
                 return replacement;
             }