Did a cleanup pass on applyAttributeAccessOverride.

microsoft · Nov 3, 2023 · 841a79e · 841a79e
1 parent 2285641
commit 841a79e
Showing 1 changed file with 46 additions and 43 deletions.
diff --git a/packages/pyright-internal/src/analyzer/typeEvaluator.ts b/packages/pyright-internal/src/analyzer/typeEvaluator.ts
@@ -6177,8 +6177,6 @@ export function createTypeEvaluator(importLookup: ImportLookup, evaluatorOptions
         selfType?: ClassType | TypeVarType
     ): MemberAccessTypeResult | undefined {
         const getAttributeAccessMember = (name: string) => {
-            // See if the class has a "__getattribute__" or "__getattr__" method.
-            // If so, arbitrary members are supported.
             return getTypeOfObjectMember(
                 errorNode,
                 classType,
@@ -6202,54 +6200,59 @@ export function createTypeEvaluator(importLookup: ImportLookup, evaluatorOptions
             accessMemberType = getAttributeAccessMember('__delattr__');
         }
 
-        if (accessMemberType) {
-            let nameLiteralType: Type = AnyType.create();
-            if (strClassType && isInstantiableClass(strClassType)) {
-                nameLiteralType = ClassType.cloneWithLiteral(ClassType.cloneAsInstance(strClassType), memberName);
-            }
+        if (!accessMemberType) {
+            return undefined;
+        }
 
-            const argList: FunctionArgument[] = [
-                {
-                    // Provide "name" argument.
-                    argumentCategory: ArgumentCategory.Simple,
-                    typeResult: { type: nameLiteralType },
-                },
-            ];
+        let nameLiteralType: Type = AnyType.create();
+        if (strClassType && isInstantiableClass(strClassType)) {
+            nameLiteralType = ClassType.cloneWithLiteral(ClassType.cloneAsInstance(strClassType), memberName);
+        }
 
-            if (usage.method === 'set') {
-                argList.push({
-                    // Provide "value" argument.
-                    argumentCategory: ArgumentCategory.Simple,
-                    typeResult: {
-                        type: usage.setType?.type ?? UnknownType.create(),
-                        isIncomplete: !!usage.setType?.isIncomplete,
-                    },
-                });
-            }
+        const argList: FunctionArgument[] = [
+            {
+                // Provide "name" argument.
+                argumentCategory: ArgumentCategory.Simple,
+                typeResult: { type: nameLiteralType },
+            },
+        ];
 
-            if (isFunction(accessMemberType) || isOverloadedFunction(accessMemberType)) {
-                const typeVarContext = new TypeVarContext(getTypeVarScopeId(accessMemberType));
-                const callResult = validateCallArguments(
-                    errorNode,
-                    argList,
-                    { type: accessMemberType },
-                    typeVarContext,
-                    /* skipUnknownArgCheck */ true
-                );
+        if (usage.method === 'set') {
+            argList.push({
+                // Provide "value" argument.
+                argumentCategory: ArgumentCategory.Simple,
+                typeResult: {
+                    type: usage.setType?.type ?? UnknownType.create(),
+                    isIncomplete: !!usage.setType?.isIncomplete,
+                },
+            });
+        }
 
-                let isAsymmetricAccessor = false;
-                if (usage.method === 'set') {
-                    isAsymmetricAccessor = isClassWithAsymmetricAttributeAccessor(classType);
-                }
+        if (!isFunction(accessMemberType) && !isOverloadedFunction(accessMemberType)) {
+            // TODO - need to handle and report this error.
+            return undefined;
+        }
 
-                return {
-                    type: callResult.returnType ?? UnknownType.create(),
-                    isAsymmetricAccessor,
-                };
-            }
+        const typeVarContext = new TypeVarContext(getTypeVarScopeId(accessMemberType));
+        const callResult = validateCallArguments(
+            errorNode,
+            argList,
+            { type: accessMemberType },
+            typeVarContext,
+            /* skipUnknownArgCheck */ true
+        );
+
+        // TODO - need to handle and report errors when validating call to
+        // attribute access method.
+        let isAsymmetricAccessor = false;
+        if (usage.method === 'set') {
+            isAsymmetricAccessor = isClassWithAsymmetricAttributeAccessor(classType);
         }
 
-        return undefined;
+        return {
+            type: callResult.returnType ?? UnknownType.create(),
+            isAsymmetricAccessor,
+        };
     }
 
     function getTypeOfIndex(node: IndexNode, flags = EvaluatorFlags.None): TypeResult {