pyrefly 0.28.0__tar.gz → 0.29.0__tar.gz

{pyrefly-0.28.0 → pyrefly-0.29.0}/Cargo.lock

@@ -2058,7 +2058,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly"
-version = "0.28.0"
+version = "0.29.0"
 dependencies = [
  "anstream",
  "anyhow",
@@ -2106,7 +2106,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_bundled"
-version = "0.28.0"
+version = "0.29.0"
 dependencies = [
  "anyhow",
  "starlark_map",
@@ -2116,7 +2116,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_config"
-version = "0.28.0"
+version = "0.29.0"
 dependencies = [
  "anyhow",
  "clap",
@@ -2149,7 +2149,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_derive"
-version = "0.28.0"
+version = "0.29.0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2158,7 +2158,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_python"
-version = "0.28.0"
+version = "0.29.0"
 dependencies = [
  "anyhow",
  "dupe",
@@ -2180,7 +2180,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_types"
-version = "0.28.0"
+version = "0.29.0"
 dependencies = [
  "compact_str 0.8.0",
  "dupe",
@@ -2200,7 +2200,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_util"
-version = "0.28.0"
+version = "0.29.0"
 dependencies = [
  "anstream",
  "anyhow",

{pyrefly-0.28.0 → pyrefly-0.29.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyrefly
-Version: 0.28.0
+Version: 0.29.0
 Classifier: Development Status :: 3 - Alpha
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3

{pyrefly-0.28.0 → pyrefly-0.29.0}/crates/pyrefly_bundled/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "pyrefly_bundled"
-version = "0.28.0"
+version = "0.29.0"
 authors = ["Meta"]
 edition = "2024"
 repository = "https://github.com/facebook/pyrefly"

{pyrefly-0.28.0 → pyrefly-0.29.0}/crates/pyrefly_config/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "pyrefly_config"
-version = "0.28.0"
+version = "0.29.0"
 authors = ["Meta"]
 edition = "2024"
 repository = "https://github.com/facebook/pyrefly"
@@ -22,7 +22,7 @@ pyrefly_util = { path = "../pyrefly_util" }
 regex = "1.11.1"
 regex-syntax = "0.7.5"
 serde = { version = "1.0.219", features = ["derive", "rc"] }
-serde_json = { version = "1.0.140", features = ["alloc", "float_roundtrip", "unbounded_depth"] }
+serde_json = { version = "1.0.140", features = ["alloc", "float_roundtrip", "raw_value", "unbounded_depth"] }
 serde_jsonrc = "0.1"
 serde_with = { version = "3", features = ["hex", "json"] }
 starlark_map = "0.13.0"

{pyrefly-0.28.0 → pyrefly-0.29.0}/crates/pyrefly_config/src/error_kind.rs

@@ -146,6 +146,9 @@ pub enum ErrorKind {
     InvalidAnnotation,
     /// Passing an argument that is invalid for reasons besides type.
     InvalidArgument,
+    /// Error caused by incorrect usage of a decorator.
+    /// e.g. using @final on a top-level function
+    InvalidDecorator,
     /// An error caused by incorrect inheritance in a class or type definition.
     /// e.g. a metaclass that is not a subclass of `type`.
     InvalidInheritance,

{pyrefly-0.28.0 → pyrefly-0.29.0}/crates/pyrefly_config/src/migration/error_codes.rs

@@ -51,6 +51,8 @@ impl ConfigOptionMigrater for ErrorCodes {
 
 #[cfg(test)]
 mod tests {
+    use configparser::ini::IniDefault;
+
     use super::*;
     use crate::error_kind::ErrorKind;
     use crate::error_kind::Severity;
@@ -113,8 +115,15 @@ mod tests {
 
     #[test]
     fn test_migrate_from_mypy_with_disable_codes() {
-        let mut mypy_cfg = Ini::new();
-        mypy_cfg.set("mypy", "disable_error_code", Some("arg-type".to_owned()));
+        let mut default = IniDefault::default();
+        default.multiline = true;
+        let mut mypy_cfg = Ini::new_from_defaults(default);
+
+        mypy_cfg.set(
+            "mypy",
+            "disable_error_code",
+            Some("arg-type, call-overload".to_owned()),
+        );
 
         let mut pyrefly_cfg = ConfigFile::default();
 
@@ -127,6 +136,10 @@ mod tests {
             errors.severity(ErrorKind::BadArgumentType),
             Severity::Ignore
         );
+        assert_eq!(
+            errors.severity(ErrorKind::NoMatchingOverload),
+            Severity::Ignore
+        );
     }
 
     #[test]

{pyrefly-0.28.0 → pyrefly-0.29.0}/crates/pyrefly_config/src/migration/mypy/util.rs

@@ -124,6 +124,26 @@ fn code_to_kind(mut errors: HashMap<String, Severity>) -> Option<ErrorDisplayCon
         map.insert(ErrorKind::BadArgumentType, value);
     }
 
+    if let Some(value) = [errors.remove("assignment")].into_iter().flatten().max() {
+        map.insert(ErrorKind::BadAssignment, value);
+    }
+
+    if let Some(value) = [errors.remove("call-arg")].into_iter().flatten().max() {
+        map.insert(ErrorKind::BadArgumentCount, value);
+    }
+
+    if let Some(value) = [errors.remove("call-overload")].into_iter().flatten().max() {
+        map.insert(ErrorKind::NoMatchingOverload, value);
+    }
+
+    if let Some(value) = [errors.remove("index"), errors.remove("operator")]
+        .into_iter()
+        .flatten()
+        .max()
+    {
+        map.insert(ErrorKind::UnsupportedOperation, value);
+    }
+
     if map.is_empty() {
         None
     } else {

{pyrefly-0.28.0 → pyrefly-0.29.0}/crates/pyrefly_derive/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "pyrefly_derive"
-version = "0.28.0"
+version = "0.29.0"
 authors = ["Meta"]
 edition = "2024"
 repository = "https://github.com/facebook/pyrefly"

{pyrefly-0.28.0 → pyrefly-0.29.0}/crates/pyrefly_python/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "pyrefly_python"
-version = "0.28.0"
+version = "0.29.0"
 authors = ["Meta"]
 edition = "2024"
 repository = "https://github.com/facebook/pyrefly"

{pyrefly-0.28.0 → pyrefly-0.29.0}/crates/pyrefly_python/src/ast.rs

@@ -130,8 +130,8 @@ impl Ast {
             s = &buffer;
             add += TextSize::new(1); // 3 for the quotes, minus 1 for the bracket, minus 1 for the raw quote
         }
-        // Make sure the range is precise, so that we get the right UTF8 indicies.
-        // We might have a problem with \ escapes moving indicies, but if necessary we can ban those.
+        // Make sure the range is precise, so that we get the right UTF8 indices.
+        // We might have a problem with \ escapes moving indices, but if necessary we can ban those.
         Ast::parse_expr(s, x.range.start() + add)
     }
 

{pyrefly-0.28.0 → pyrefly-0.29.0}/crates/pyrefly_python/src/docstring.rs

@@ -51,11 +51,7 @@ impl Docstring {
                 break; // Stop after first match to avoid over-trimming
             }
         }
-        let result = result
-            .replace("\r", "")
-            .replace("\t", "    ")
-            .replace("[", r"\[")
-            .replace("]", r"\]");
+        let result = result.replace("\r", "").replace("\t", "    ");
 
         // Remove the shortest amount of whitespace from the beginning of each line
         let min_indent = result
@@ -103,7 +99,6 @@ mod tests {
             "test docstring"
         );
     }
-
     #[test]
     fn test_clean_removes_multiline_single_quotes() {
         assert_eq!(
@@ -174,9 +169,4 @@ mod tests {
             "hello\nworld\ntest"
         );
     }
-
-    #[test]
-    fn test_brackets() {
-        assert_eq!(Docstring::clean("tuple[test]").as_str(), r"tuple\[test\]");
-    }
 }

{pyrefly-0.28.0 → pyrefly-0.29.0}/crates/pyrefly_python/src/ignore.rs

@@ -17,7 +17,7 @@
 //! Note that Pyright will only honor such codes after `# pyright: ignore[code]`.
 //!
 //! You can also use `# mypy: ignore-errors`, `# pyrefly: ignore-errors`
-//! or `# type: ignore` at the beginning of a file to surpress all errors.
+//! or `# type: ignore` at the beginning of a file to suppress all errors.
 //!
 //! For Pyre compatibility we also allow `# pyre-ignore` and `# pyre-fixme`
 //! as equivalents to `pyre: ignore`, and `# pyre-ignore-all-errors` as

{pyrefly-0.28.0 → pyrefly-0.29.0}/crates/pyrefly_python/src/lib.rs

@@ -34,3 +34,6 @@ pub mod sys_info;
 
 /// Suffixes of python files that we can be processed.
 pub const PYTHON_EXTENSIONS: &[&str] = &["py", "pyi"];
+
+/// Suffixes of compiled python modules
+pub const COMPILED_FILE_SUFFIXES: &[&str] = &["pyc", "pyx", "pyd"];

{pyrefly-0.28.0 → pyrefly-0.29.0}/crates/pyrefly_python/src/module_name.rs

@@ -142,6 +142,10 @@ impl ModuleName {
         Self::from_str("_typeshed._type_checker_internals")
     }
 
+    pub fn pydantic() -> Self {
+        Self::from_str("pydantic.main")
+    }
+
     /// The "unknown" module name, which corresponds to `__unknown__`.
     /// Used for files directly opened or passed on the command line which aren't on the search path.
     pub fn unknown() -> Self {

{pyrefly-0.28.0 → pyrefly-0.29.0}/crates/pyrefly_python/src/symbol_kind.rs

@@ -24,6 +24,7 @@ pub enum SymbolKind {
     TypeParameter,
     TypeAlias,
     Function,
+    Method,
     Class,
 }
 
@@ -38,6 +39,7 @@ impl SymbolKind {
             SymbolKind::TypeParameter => lsp_types::SymbolKind::TYPE_PARAMETER,
             SymbolKind::TypeAlias => lsp_types::SymbolKind::INTERFACE,
             SymbolKind::Function => lsp_types::SymbolKind::FUNCTION,
+            SymbolKind::Method => lsp_types::SymbolKind::METHOD,
             SymbolKind::Class => lsp_types::SymbolKind::CLASS,
         }
     }
@@ -52,6 +54,7 @@ impl SymbolKind {
             SymbolKind::TypeParameter => CompletionItemKind::TYPE_PARAMETER,
             SymbolKind::TypeAlias => CompletionItemKind::INTERFACE,
             SymbolKind::Function => CompletionItemKind::FUNCTION,
+            SymbolKind::Method => CompletionItemKind::METHOD,
             SymbolKind::Class => CompletionItemKind::CLASS,
         }
     }
@@ -66,6 +69,7 @@ impl SymbolKind {
             SymbolKind::TypeParameter => "(type parameter)".to_owned(),
             SymbolKind::TypeAlias => "(type alias)".to_owned(),
             SymbolKind::Function => "(function)".to_owned(),
+            SymbolKind::Method => "(method)".to_owned(),
             SymbolKind::Class => "(class)".to_owned(),
         }
     }
@@ -86,6 +90,7 @@ impl SymbolKind {
             SymbolKind::TypeAlias => (SemanticTokenType::INTERFACE, vec![]),
             // todo(samzhou19815): modifier for async
             SymbolKind::Function => (SemanticTokenType::FUNCTION, vec![]),
+            SymbolKind::Method => (SemanticTokenType::METHOD, vec![]),
             SymbolKind::Class => (SemanticTokenType::CLASS, vec![]),
         }
     }

{pyrefly-0.28.0 → pyrefly-0.29.0}/crates/pyrefly_types/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "pyrefly_types"
-version = "0.28.0"
+version = "0.29.0"
 authors = ["Meta"]
 edition = "2024"
 repository = "https://github.com/facebook/pyrefly"

{pyrefly-0.28.0 → pyrefly-0.29.0}/crates/pyrefly_types/src/class.rs

@@ -140,28 +140,31 @@ impl Debug for ClassInner {
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 #[derive(Visit, VisitMut, TypeEq)]
 pub enum ClassKind {
-    StaticMethod,
-    ClassMethod,
-    Property,
+    StaticMethod(Name),
+    ClassMethod(Name),
+    Property(Name),
     Class,
     EnumMember,
+    EnumNonmember,
     DataclassField,
 }
 
 impl ClassKind {
     fn from_qname(qname: &QName) -> Self {
-        match (qname.module_name().as_str(), qname.id().as_str()) {
-            ("builtins", "staticmethod") => Self::StaticMethod,
-            ("abc", "abstractstaticmethod") => Self::StaticMethod,
-            ("builtins", "classmethod") => Self::ClassMethod,
-            ("abc", "abstractclassmethod") => Self::ClassMethod,
-            ("builtins", "property") => Self::Property,
-            ("abc", "abstractproperty") => Self::Property,
-            ("functools", "cached_property") => Self::Property,
-            ("cached_property", "cached_property") => Self::Property,
-            ("cinder", "cached_property") => Self::Property,
-            ("cinder", "async_cached_property") => Self::Property,
+        let name = qname.id();
+        match (qname.module_name().as_str(), name.as_str()) {
+            ("builtins", "staticmethod") => Self::StaticMethod(name.clone()),
+            ("abc", "abstractstaticmethod") => Self::StaticMethod(name.clone()),
+            ("builtins", "classmethod") => Self::ClassMethod(name.clone()),
+            ("abc", "abstractclassmethod") => Self::ClassMethod(name.clone()),
+            ("builtins", "property") => Self::Property(name.clone()),
+            ("abc", "abstractproperty") => Self::Property(name.clone()),
+            ("functools", "cached_property") => Self::Property(name.clone()),
+            ("cached_property", "cached_property") => Self::Property(name.clone()),
+            ("cinder", "cached_property") => Self::Property(name.clone()),
+            ("cinder", "async_cached_property") => Self::Property(name.clone()),
             ("enum", "member") => Self::EnumMember,
+            ("enum", "nonmember") => Self::EnumNonmember,
             ("dataclasses", "Field") => Self::DataclassField,
             _ => Self::Class,
         }

{pyrefly-0.28.0 → pyrefly-0.29.0}/crates/pyrefly_types/src/display.rs

@@ -332,7 +332,7 @@ impl<'a> TypeDisplayContext<'a> {
             Type::Tuple(t) => t.fmt_with_type(f, |t| self.display_internal(t)),
             Type::Forall(box Forall {
                 tparams,
-                body: body @ Forallable::Function(_),
+                body: body @ (Forallable::Function(_) | Forallable::Callable(_)),
             }) => {
                 write!(
                     f,

{pyrefly-0.28.0 → pyrefly-0.29.0}/crates/pyrefly_types/src/read_only.rs

@@ -46,7 +46,7 @@ impl ReadOnlyReason {
                 "A field accessed through `super()` is considered read-only".to_owned()
             }
             ReadOnlyReason::PydanticFrozen => {
-                "This field belongs to a frozen Pydantic model,".to_owned()
+                "This field belongs to a frozen Pydantic model".to_owned()
             }
         }
     }

{pyrefly-0.28.0 → pyrefly-0.29.0}/crates/pyrefly_types/src/simplify.rs

@@ -268,7 +268,7 @@ mod tests {
     use crate::types::Type;
 
     #[test]
-    fn test_flatten_nevers() {
+    fn test_flatten_never() {
         let xs = vec![
             Type::Never(NeverStyle::Never),
             Type::Never(NeverStyle::NoReturn),

{pyrefly-0.28.0 → pyrefly-0.29.0}/crates/pyrefly_types/src/typed_dict.rs

@@ -76,3 +76,25 @@ impl TypedDict {
         Type::TypedDict(self)
     }
 }
+
+/// How does the TypedDict handle extra items? See https://peps.python.org/pep-0728.
+#[derive(Clone, Debug, TypeEq, PartialEq, Eq, Hash)]
+pub enum ExtraItems {
+    /// Default behavior when neither the `closed` nor `extra_items` keyword is specified.
+    Default,
+    /// Closed TypedDict that does not allow extra items. This is equivalent to Extra(Never) but
+    /// is its own variant because of how common it is.
+    Closed,
+    /// The TypedDict allows extra items of the specified type. Note that Extra(Never) (a closed
+    /// TypedDict) is represented with a separate Closed variant.
+    Extra(Type),
+}
+
+impl ExtraItems {
+    pub fn extra(ty: &Type) -> Self {
+        match ty {
+            Type::Never(_) => Self::Closed,
+            _ => Self::Extra(ty.clone()),
+        }
+    }
+}

{pyrefly-0.28.0 → pyrefly-0.29.0}/crates/pyrefly_types/src/types.rs

@@ -77,6 +77,23 @@ impl Var {
     }
 }
 
+#[derive(PartialEq, Eq)]
+pub enum TParamsSource {
+    Class,
+    TypeAlias,
+    Function,
+}
+
+impl Display for TParamsSource {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Self::Class => write!(f, "class"),
+            Self::TypeAlias => write!(f, "type alias"),
+            Self::Function => write!(f, "function"),
+        }
+    }
+}
+
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 #[derive(Visit, VisitMut, TypeEq)]
 pub struct TParam {
@@ -381,6 +398,17 @@ impl BoundMethod {
     pub fn as_function(self) -> Type {
         self.func.as_type()
     }
+
+    pub fn with_bound_object(&self, obj: Type) -> Self {
+        Self {
+            obj,
+            func: self.func.clone(),
+        }
+    }
+
+    pub fn as_type(self) -> Type {
+        Type::BoundMethod(Box::new(self))
+    }
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
@@ -526,6 +554,7 @@ impl Forall<Forallable> {
 pub enum Forallable {
     TypeAlias(TypeAlias),
     Function(Function),
+    Callable(Callable),
 }
 
 impl Forallable {
@@ -543,6 +572,7 @@ impl Forallable {
     pub fn name(&self) -> Name {
         match self {
             Self::Function(func) => func.metadata.kind.as_func_id().func,
+            Self::Callable(_) => Name::new_static("<callable>"),
             Self::TypeAlias(ta) => (*ta.name).clone(),
         }
     }
@@ -550,6 +580,7 @@ impl Forallable {
     pub fn as_type(self) -> Type {
         match self {
             Self::Function(func) => Type::Function(Box::new(func)),
+            Self::Callable(callable) => Type::Callable(Box::new(callable)),
             Self::TypeAlias(ta) => Type::TypeAlias(ta),
         }
     }
@@ -557,6 +588,7 @@ impl Forallable {
     fn is_typeguard(&self) -> bool {
         match self {
             Self::Function(func) => func.signature.is_typeguard(),
+            Self::Callable(callable) => callable.is_typeguard(),
             Self::TypeAlias(_) => false,
         }
     }
@@ -564,6 +596,7 @@ impl Forallable {
     fn is_typeis(&self) -> bool {
         match self {
             Self::Function(func) => func.signature.is_typeis(),
+            Self::Callable(callable) => callable.is_typeis(),
             Self::TypeAlias(_) => false,
         }
     }
@@ -1095,6 +1128,10 @@ impl Type {
     pub fn visit_toplevel_callable<'a>(&'a self, mut f: impl FnMut(&'a Callable)) {
         match self {
             Type::Callable(callable) => f(callable),
+            Type::Forall(box Forall {
+                body: Forallable::Callable(callable),
+                ..
+            }) => f(callable),
             Type::Function(box func)
             | Type::Forall(box Forall {
                 body: Forallable::Function(func),
@@ -1129,6 +1166,10 @@ impl Type {
     fn transform_toplevel_callable(&mut self, mut f: impl FnMut(&mut Callable)) {
         match self {
             Type::Callable(callable) => f(callable),
+            Type::Forall(box Forall {
+                body: Forallable::Callable(callable),
+                ..
+            }) => f(callable),
             Type::Function(box func)
             | Type::Forall(box Forall {
                 body: Forallable::Function(func),

{pyrefly-0.28.0 → pyrefly-0.29.0}/crates/pyrefly_util/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "pyrefly_util"
-version = "0.28.0"
+version = "0.29.0"
 authors = ["Meta"]
 edition = "2024"
 repository = "https://github.com/facebook/pyrefly"
@@ -33,7 +33,7 @@ ruff_python_ast = { git = "https://github.com/astral-sh/ruff/", rev = "9bee8376a
 ruff_source_file = { git = "https://github.com/astral-sh/ruff/", rev = "9bee8376a17401f9736b45fdefffb62edc2f1668" }
 ruff_text_size = { git = "https://github.com/astral-sh/ruff/", rev = "9bee8376a17401f9736b45fdefffb62edc2f1668" }
 serde = { version = "1.0.219", features = ["derive", "rc"] }
-serde_json = { version = "1.0.140", features = ["alloc", "float_roundtrip", "unbounded_depth"] }
+serde_json = { version = "1.0.140", features = ["alloc", "float_roundtrip", "raw_value", "unbounded_depth"] }
 starlark_map = "0.13.0"
 tracing = { version = "0.1.41", features = ["attributes", "valuable"] }
 tracing-subscriber = { version = "0.3.19", features = ["chrono", "env-filter", "json", "local-time", "parking_lot", "registry"] }

{pyrefly-0.28.0 → pyrefly-0.29.0}/crates/pyrefly_util/src/globs.rs

@@ -470,7 +470,7 @@ impl Globs {
 /// A struct which allows filtering by matching a high-priority [`Globs`] of excludes
 /// and several ignore files. The first positive (ignore) or negative (allowlist)
 /// match that's found from the following order is what's used.
-/// 1. `excludes`: user-provied paths, either from a config or CLI.
+/// 1. `excludes`: user-provided paths, either from a config or CLI.
 /// 2. `.gitignore`: if one exists from an upward search from `root`, the first
 ///    positive or negative match (`!`) is used
 /// 3. `.ignore`: if it exists, behaves similar to `.gitignore`

{pyrefly-0.28.0 → pyrefly-0.29.0}/pyrefly/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "pyrefly"
-version = "0.28.0"
+version = "0.29.0"
 authors = ["Meta"]
 edition = "2024"
 repository = "https://github.com/facebook/pyrefly"
@@ -46,7 +46,7 @@ ruff_python_parser = { git = "https://github.com/astral-sh/ruff/", rev = "9bee83
 ruff_source_file = { git = "https://github.com/astral-sh/ruff/", rev = "9bee8376a17401f9736b45fdefffb62edc2f1668" }
 ruff_text_size = { git = "https://github.com/astral-sh/ruff/", rev = "9bee8376a17401f9736b45fdefffb62edc2f1668" }
 serde = { version = "1.0.219", features = ["derive", "rc"] }
-serde_json = { version = "1.0.140", features = ["alloc", "float_roundtrip", "unbounded_depth"] }
+serde_json = { version = "1.0.140", features = ["alloc", "float_roundtrip", "raw_value", "unbounded_depth"] }
 serde_repr = "0.1.14"
 starlark_map = "0.13.0"
 static_assertions = "1.1.0"

{pyrefly-0.28.0 → pyrefly-0.29.0}/pyrefly/lib/alt/answers.rs

@@ -12,7 +12,6 @@ use std::path::PathBuf;
 use std::sync::Arc;
 
 use dupe::Dupe;
-use dupe::OptionDupedExt;
 use pyrefly_python::module::TextRangeWithModule;
 use pyrefly_python::module_name::ModuleName;
 use pyrefly_python::module_path::ModulePath;
@@ -88,6 +87,8 @@ pub struct Traces {
     types: SmallMap<TextRange, Arc<Type>>,
     /// A map from (range of callee, overload information)
     overloaded_callees: SmallMap<TextRange, OverloadedCallee>,
+    /// A map of text ranges that correspond to 'b' portion in expressions a.b where b is a property access -> getter type
+    invoked_properties: SmallMap<TextRange, Arc<Type>>,
 }
 
 /// Invariants:
@@ -553,16 +554,23 @@ impl Answers {
         &self.solver
     }
 
-    pub fn get_type_trace(&self, range: TextRange) -> Option<Arc<Type>> {
+    pub fn get_type_trace(&self, range: TextRange) -> Option<Type> {
         let lock = self.trace.as_ref()?.lock();
-        lock.types.get(&range).duped()
+        Some(self.for_display(lock.types.get(&range)?.as_ref().clone()))
     }
 
-    pub fn get_chosen_overload_trace(&self, range: TextRange) -> Option<Callable> {
+    pub fn try_get_getter_for_range(&self, range: TextRange) -> Option<Type> {
+        let lock = self.trace.as_ref()?.lock();
+        Some(self.for_display(lock.invoked_properties.get(&range)?.as_ref().clone()))
+    }
+
+    pub fn get_chosen_overload_trace(&self, range: TextRange) -> Option<Type> {
         let lock = self.trace.as_ref()?.lock();
         let overloaded_callee = lock.overloaded_callees.get(&range)?;
         if overloaded_callee.is_closest_overload_chosen {
-            Some(overloaded_callee.closest_overload.clone())
+            Some(self.for_display(Type::Callable(Box::new(
+                overloaded_callee.closest_overload.clone(),
+            ))))
         } else {
             None
         }
@@ -695,6 +703,15 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
         }
     }
 
+    pub fn record_property_getter(&self, loc: TextRange, getter_ty: &Type) {
+        if let Some(trace) = &self.current().trace {
+            trace
+                .lock()
+                .invoked_properties
+                .insert(loc, Arc::new(getter_ty.clone()));
+        }
+    }
+
     pub fn record_type_trace(&self, loc: TextRange, ty: &Type) {
         if let Some(trace) = &self.current().trace {
             trace.lock().types.insert(loc, Arc::new(ty.clone()));