Fix context for class variables, fixes #127

Author: davidhalter

crates/zuban_python/src/file/inference.rs

@@ -885,15 +885,33 @@ impl<'db, 'file> Inference<'db, 'file, '_> {
                     if cls.is_calculating_class_infos() {
                         return None;
                     }
-                    cls.instance()
-                        .lookup(
-                            self.i_s,
-                            name_def.as_code(),
-                            InstanceLookupOptions::new(&|_| ())
-                                .with_skip_first_of_mro(self.i_s.db, cls),
-                        )
-                        .lookup
-                        .into_maybe_inferred()
+                    cls.lookup(
+                        self.i_s,
+                        name_def.as_code(),
+                        ClassLookupOptions::new(&|_| ()).with_ignore_self(),
+                    )
+                    .lookup
+                    .into_maybe_inferred()
+                    .and_then(|x| {
+                        if let Some(ComplexPoint::TypeInstance(Type::Class(c))) =
+                            x.maybe_complex_point(self.i_s.db)
+                            && c.link == self.i_s.db.python_state.property_link()
+                        {
+                            // Properties can beo overwritten with the property value type as a
+                            // normal variable. Here we make sure that the context is correct.
+                            return cls
+                                .instance()
+                                .lookup(
+                                    self.i_s,
+                                    name_def.as_code(),
+                                    InstanceLookupOptions::new(&|_| ())
+                                        .with_skip_first_of_mro(self.i_s.db, cls),
+                                )
+                                .lookup
+                                .into_maybe_inferred();
+                        }
+                        Some(x)
+                    })
                 })
                 .or_else(|| {
                     Some(

crates/zuban_python/src/python_state.rs

@@ -1091,6 +1091,7 @@ impl PythonState {
     attribute_link!(builtins, pub frozenset_link, builtins_frozenset_index);
     attribute_link!(builtins, pub notimplementederror_link, builtins_notimplementederror);
     attribute_link!(builtins, pub slice_link, builtins_slice_index);
+    attribute_link!(builtins, pub property_link, builtins_property_index);
     attribute_link!(abc, pub abc_meta_link, abc_abc_meta_index);
     attribute_link!(abc, pub abstractmethod_link, abc_abstractmethod_index);
     attribute_link!(abc, pub abstractproperty_link, abc_abstractproperty_index);

crates/zuban_python/tests/mypylike/tests/classes.test

@@ -2096,3 +2096,19 @@ reveal_type(y)  # N: Revealed type is "Any"
 Test().y = ''  # E: "Test" has no attribute "y"
 Test().with_annotation1  # E: "Test" has no attribute "with_annotation1"
 Test().with_annotation2  # E: "Test" has no attribute "with_annotation2"
+
+[case context_for_class_vars_should_not_be_instance_method]
+import m
+
+def wrap[T](obj: T) -> T: ...
+
+class A(m.Base):
+    y = wrap(m.Base.f)
+    f = wrap(m.Base.f)
+
+A().y()
+A().f()
+
+[file m.pyi]
+class Base:
+    def f(self) -> None: ...