Refactor

Author: sterliakov

mypy/checker.py

@@ -2448,10 +2448,22 @@ def check_method_override_for_base_with_name(
             )
         return False
 
-    def get_property_instance(self, method: Decorator | OverloadedFuncDef) -> Instance | None:
+    def get_property_instance(
+        self, method: Var | Decorator | OverloadedFuncDef
+    ) -> Instance | None:
         if method.type is None:
             return None
-        deco = method if isinstance(method, Decorator) else method.items[0]
+
+        func: SymbolNode | None = method
+        if isinstance(method, Var):
+            mt = get_proper_type(method.type)
+            if isinstance(mt, Overloaded):
+                func = mt.items[0].definition
+            elif isinstance(mt, CallableType):
+                func = mt.definition
+        if not isinstance(func, (Decorator, OverloadedFuncDef)):
+            return None
+        deco = func if isinstance(func, Decorator) else func.items[0]
         if not isinstance(deco, Decorator):
             return None
         property_deco_name = next(

mypy/checker_shared.py

@@ -275,7 +275,9 @@ def get_precise_awaitable_type(self, typ: Type, local_errors: ErrorWatcher) -> T
         raise NotImplementedError
 
     @abstractmethod
-    def get_property_instance(self, method: Decorator | OverloadedFuncDef) -> Instance | None:
+    def get_property_instance(
+        self, method: Var | Decorator | OverloadedFuncDef
+    ) -> Instance | None:
         raise NotImplementedError
 
     @abstractmethod

mypy/checkexpr.py

@@ -388,9 +388,13 @@ def analyze_ref_expr(self, e: RefExpr, lvalue: bool = False) -> Type:
 
         if isinstance(node, Var):
             # Variable reference.
-            result = self.analyze_var_ref(node, e)
-            if isinstance(result, PartialType):
-                result = self.chk.handle_partial_var_type(result, lvalue, node, e)
+            property_type = self.chk.get_property_instance(node)
+            if property_type is not None:
+                result = property_type
+            else:
+                result = self.analyze_var_ref(node, e)
+                if isinstance(result, PartialType):
+                    result = self.chk.handle_partial_var_type(result, lvalue, node, e)
         elif isinstance(node, Decorator):
             property_type = self.chk.get_property_instance(node)
             if property_type is not None:

mypy/checkmember.py

@@ -1262,17 +1262,8 @@ def analyze_class_attribute_access(
                     erase_vars.add(itype.type.self_type)
                 t = erase_typevars(t, {tv.id for tv in erase_vars})
 
-        if isinstance(node.node, Var):
-            if isinstance(node.node.type, Overloaded):
-                prop_candidate = node.node.type.items[0].definition
-            elif isinstance(node.node.type, CallableType):
-                prop_candidate = node.node.type.definition
-            else:
-                prop_candidate = node.node
-        else:
-            prop_candidate = node.node
-        if isinstance(prop_candidate, (Decorator, OverloadedFuncDef)):
-            property_type = mx.chk.get_property_instance(prop_candidate)
+        if isinstance(node.node, (Var, Decorator, OverloadedFuncDef)):
+            property_type = mx.chk.get_property_instance(node.node)
             if property_type is not None:
                 return property_type