pyrefly 0.38.0__tar.gz → 0.38.1__tar.gz

{pyrefly-0.38.0 → pyrefly-0.38.1}/Cargo.lock

@@ -2079,7 +2079,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly"
-version = "0.38.0"
+version = "0.38.1"
 dependencies = [
  "anstream",
  "anyhow",
@@ -2130,7 +2130,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_build"
-version = "0.38.0"
+version = "0.38.1"
 dependencies = [
  "anyhow",
  "dupe",
@@ -2148,7 +2148,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_bundled"
-version = "0.38.0"
+version = "0.38.1"
 dependencies = [
  "anyhow",
  "starlark_map",
@@ -2158,7 +2158,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_config"
-version = "0.38.0"
+version = "0.38.1"
 dependencies = [
  "anyhow",
  "clap",
@@ -2193,7 +2193,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_derive"
-version = "0.38.0"
+version = "0.38.1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2202,7 +2202,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_python"
-version = "0.38.0"
+version = "0.38.1"
 dependencies = [
  "anyhow",
  "dupe",
@@ -2226,7 +2226,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_types"
-version = "0.38.0"
+version = "0.38.1"
 dependencies = [
  "compact_str 0.8.0",
  "dupe",
@@ -2246,7 +2246,7 @@ dependencies = [
 
 [[package]]
 name = "pyrefly_util"
-version = "0.38.0"
+version = "0.38.1"
 dependencies = [
  "anstream",
  "anyhow",
@@ -3309,7 +3309,7 @@ dependencies = [
 
 [[package]]
 name = "tsp_types"
-version = "0.38.0"
+version = "0.38.1"
 dependencies = [
  "lsp-server",
  "lsp-types",

{pyrefly-0.38.0 → pyrefly-0.38.1}/PKG-INFO

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

{pyrefly-0.38.0 → pyrefly-0.38.1}/crates/pyrefly_build/Cargo.toml

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

{pyrefly-0.38.0 → pyrefly-0.38.1}/crates/pyrefly_build/src/source_db/query_source_db.rs

@@ -85,19 +85,29 @@ impl QuerySourceDatabase {
             return false;
         }
         drop(read);
-        let mut write = self.inner.write();
-        write.path_lookup = SmallMap::new();
+        let mut path_lookup: SmallMap<PathBuf, Target> = SmallMap::new();
         for (target, manifest) in new_db.iter() {
             for source in manifest.srcs.values().flatten() {
-                if let Some(old_target) = write.path_lookup.get_mut(&**source) {
+                if let Some(old_target) = path_lookup.get_mut(&**source) {
                     let new_target = (&*old_target).min(target);
                     *old_target = new_target.dupe();
                 } else {
-                    write.path_lookup.insert(source.clone(), target.dupe());
+                    path_lookup.insert(source.clone(), target.dupe());
                 }
             }
         }
+        let read = self.inner.read();
+        // Check one more time to make sure nobody else did this already.
+        // Realistically this shouldn't happen, since in LSP mode we only have one
+        // sourcedb reload task at a time.
+        if new_db == read.db {
+            debug!("No source DB changes from Buck query");
+            return false;
+        }
+        drop(read);
+        let mut write = self.inner.write();
         write.db = new_db;
+        write.path_lookup = path_lookup;
         debug!("Finished updating source DB with Buck response");
         true
     }

{pyrefly-0.38.0 → pyrefly-0.38.1}/crates/pyrefly_bundled/Cargo.toml

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

{pyrefly-0.38.0 → pyrefly-0.38.1}/crates/pyrefly_config/Cargo.toml

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

{pyrefly-0.38.0 → pyrefly-0.38.1}/crates/pyrefly_config/src/environment/environment.rs

@@ -91,7 +91,7 @@ impl PythonEnvironment {
             self.python_version = Some(PythonVersion::default());
         }
         if self.site_package_path.is_none() {
-            self.site_package_path = Some(Vec::new());
+            self.site_package_path = Some(vec![PathBuf::from("./typings")]);
         }
     }
 

{pyrefly-0.38.0 → pyrefly-0.38.1}/crates/pyrefly_config/src/error_kind.rs

@@ -126,6 +126,9 @@ pub enum ErrorKind {
     /// A TypedDict definition has some typing-related error.
     /// e.g. using invalid keywords in the base class list.
     BadTypedDict,
+    /// An error related to TypedDict keys.
+    /// e.g. attempting to access a TypedDict with a key that does not exist.
+    BadTypedDictKey,
     /// An error caused by unpacking.
     /// e.g. attempting to unpack an iterable into the wrong number of variables.
     BadUnpacking,
@@ -216,9 +219,6 @@ pub enum ErrorKind {
     RedundantCondition,
     /// Raised by a call to reveal_type().
     RevealType,
-    /// An error related to TypedDict keys.
-    /// e.g. attempting to access a TypedDict with a key that does not exist.
-    TypedDictKeyError,
     /// Attempting to use a name that may be unbound or uninitialized
     UnboundName,
     /// An error caused by a keyword argument used in the wrong place.

{pyrefly-0.38.0 → pyrefly-0.38.1}/crates/pyrefly_config/src/migration/config_option_migrater.rs

@@ -10,7 +10,7 @@ use configparser::ini::Ini;
 use crate::config::ConfigFile;
 use crate::migration::pyright::PyrightConfig;
 
-/// A trait for configuration options that can be migrated from mypy to pyrefly
+/// A trait for configuration options that can be migrated from mypy or pyright to pyrefly
 pub trait ConfigOptionMigrater {
     /// Migrate a configuration option from mypy.ini to pyrefly config
     ///

{pyrefly-0.38.0 → pyrefly-0.38.1}/crates/pyrefly_config/src/migration/mod.rs

@@ -17,6 +17,7 @@ pub(crate) mod python_platform;
 pub(crate) mod python_version;
 pub mod run;
 pub(crate) mod search_path;
+pub(crate) mod site_package_path;
 pub(crate) mod sub_configs;
 pub(crate) mod untyped_def_behavior;
 

{pyrefly-0.38.0 → pyrefly-0.38.1}/crates/pyrefly_config/src/migration/pyright.rs

@@ -54,6 +54,8 @@ pub struct PyrightConfig {
     pub project_excludes: Option<Globs>,
     #[serde(rename = "extraPaths")]
     pub search_path: Option<Vec<PathBuf>>,
+    #[serde(rename = "stubPath")]
+    pub stub_path: Option<PathBuf>,
     #[serde(rename = "pythonPlatform")]
     pub python_platform: Option<String>,
     #[serde(rename = "pythonVersion")]
@@ -73,6 +75,7 @@ use crate::migration::python_interpreter::PythonInterpreter;
 use crate::migration::python_platform::PythonPlatformConfig;
 use crate::migration::python_version::PythonVersionConfig;
 use crate::migration::search_path::SearchPath;
+use crate::migration::site_package_path::SitePackagePath;
 use crate::migration::sub_configs::SubConfigs;
 
 impl PyrightConfig {
@@ -91,6 +94,7 @@ impl PyrightConfig {
             Box::new(PythonVersionConfig),
             Box::new(PythonPlatformConfig),
             Box::new(SearchPath),
+            Box::new(SitePackagePath),
             Box::new(IgnoreMissingImports),
             Box::new(ErrorCodes),
             Box::new(SubConfigs),

pyrefly-0.38.1/crates/pyrefly_config/src/migration/site_package_path.rs

@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+use configparser::ini::Ini;
+
+use crate::config::ConfigFile;
+use crate::migration::config_option_migrater::ConfigOptionMigrater;
+use crate::migration::pyright::PyrightConfig;
+
+/// Configuration option for site package path
+pub struct SitePackagePath;
+
+impl ConfigOptionMigrater for SitePackagePath {
+    fn migrate_from_mypy(
+        &self,
+        _mypy_cfg: &Ini,
+        _pyrefly_cfg: &mut ConfigFile,
+    ) -> anyhow::Result<()> {
+        Err(anyhow::anyhow!("No site package path found in mypy config"))
+    }
+
+    fn migrate_from_pyright(
+        &self,
+        pyright_cfg: &PyrightConfig,
+        pyrefly_cfg: &mut ConfigFile,
+    ) -> anyhow::Result<()> {
+        // In pyright, stub path is specified in the "stubPath" field
+        let stub_path = match &pyright_cfg.stub_path {
+            Some(path) => path,
+            None => return Err(anyhow::anyhow!("No stub path found in pyright config")),
+        };
+
+        pyrefly_cfg.python_environment.site_package_path = Some(vec![stub_path.clone()]);
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::path::PathBuf;
+
+    use super::*;
+    use crate::migration::test_util::default_pyright_config;
+
+    const STUB_PATH: &str = "src/stubs";
+
+    #[test]
+    fn test_migrate_from_pyright_with_stub_path() {
+        let mut pyright_cfg = default_pyright_config();
+        pyright_cfg.stub_path = Some(PathBuf::from(STUB_PATH));
+
+        let mut pyrefly_cfg = ConfigFile::default();
+
+        let site_package_path = SitePackagePath;
+        let result = site_package_path.migrate_from_pyright(&pyright_cfg, &mut pyrefly_cfg);
+
+        assert!(result.is_ok());
+        assert_eq!(
+            pyrefly_cfg.python_environment.site_package_path,
+            Some(vec![PathBuf::from(STUB_PATH)])
+        );
+    }
+
+    #[test]
+    fn test_migrate_from_pyright_without_stub_path() {
+        let pyright_cfg = default_pyright_config();
+
+        let mut pyrefly_cfg = ConfigFile::default();
+        let default_site_package_path = pyrefly_cfg.python_environment.site_package_path.clone();
+
+        let site_package_path = SitePackagePath;
+        let result = site_package_path.migrate_from_pyright(&pyright_cfg, &mut pyrefly_cfg);
+
+        assert!(result.is_err());
+        assert_eq!(
+            pyrefly_cfg.python_environment.site_package_path,
+            default_site_package_path
+        );
+    }
+}

{pyrefly-0.38.0 → pyrefly-0.38.1}/crates/pyrefly_config/src/migration/test_util.rs

@@ -14,6 +14,7 @@ pub fn default_pyright_config() -> PyrightConfig {
         project_includes: None,
         project_excludes: None,
         search_path: None,
+        stub_path: None,
         python_platform: None,
         python_version: None,
         errors: RuleOverrides {

{pyrefly-0.38.0 → pyrefly-0.38.1}/crates/pyrefly_derive/Cargo.toml

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

{pyrefly-0.38.0 → pyrefly-0.38.1}/crates/pyrefly_python/Cargo.toml

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

{pyrefly-0.38.0 → pyrefly-0.38.1}/crates/pyrefly_python/src/ignore.rs

@@ -290,6 +290,7 @@ impl Ignore {
             "index-error" => "bad-index",
             "match-error" => "bad-match",
             "type-alias-error" => "invalid-type-alias",
+            "typed-dict-key-error" => "bad-typed-dict-key",
             _ => old,
         }
     }

{pyrefly-0.38.0 → pyrefly-0.38.1}/crates/pyrefly_types/Cargo.toml

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

{pyrefly-0.38.0 → pyrefly-0.38.1}/crates/pyrefly_util/Cargo.toml

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

{pyrefly-0.38.0 → pyrefly-0.38.1}/crates/tsp_types/Cargo.toml

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

{pyrefly-0.38.0 → pyrefly-0.38.1}/pyrefly/Cargo.toml

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

{pyrefly-0.38.0 → pyrefly-0.38.1}/pyrefly/lib/alt/class/class_field.rs

@@ -1208,7 +1208,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                     self.error(
                         errors,
                         range,
-                        ErrorInfo::Kind(ErrorKind::TypedDictKeyError),
+                        ErrorInfo::Kind(ErrorKind::BadTypedDictKey),
                         format!(
                             "Cannot extend closed TypedDict `{}` with extra item `{}`",
                             base.name(),
@@ -1224,7 +1224,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                         // The field type needs to be assignable to the extra_items type.
                         if !self.is_subset_eq(field_ty, &ty) {
                             self.error(
-                                errors, range, ErrorInfo::Kind(ErrorKind::TypedDictKeyError),
+                                errors, range, ErrorInfo::Kind(ErrorKind::BadTypedDictKey),
                             format!(
                                 "`{}` is not assignable to `extra_items` type `{}` of TypedDict `{}`",
                                 self.for_display(field_ty.clone()), self.for_display(ty), base.name()));
@@ -1237,14 +1237,14 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                             self.error(
                                 errors,
                                 range,
-                                ErrorInfo::Kind(ErrorKind::TypedDictKeyError),
+                                ErrorInfo::Kind(ErrorKind::BadTypedDictKey),
                                 format!("TypedDict `{}` with non-read-only `extra_items` cannot be extended with required extra item `{}`", base.name(), name),
                             );
                         } else if !self.is_equal(field_ty, &ty) {
                             self.error(
                                 errors,
                                 range,
-                                ErrorInfo::Kind(ErrorKind::TypedDictKeyError),
+                                ErrorInfo::Kind(ErrorKind::BadTypedDictKey),
                                 format!(
                                     "`{}` is not consistent with `extra_items` type `{}` of TypedDict `{}`",
                                     self.for_display(field_ty.clone()), self.for_display(ty), base.name()),

{pyrefly-0.38.0 → pyrefly-0.38.1}/pyrefly/lib/alt/class/typed_dict.rs

@@ -87,7 +87,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                             self.error(
                                 check_errors,
                                 key.range(),
-                                ErrorInfo::Kind(ErrorKind::TypedDictKeyError),
+                                ErrorInfo::Kind(ErrorKind::BadTypedDictKey),
                                 format!("Cannot update read-only field `{key_name}`"),
                             );
                         }
@@ -115,7 +115,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                             self.error(
                                 check_errors,
                                 key.range(),
-                                ErrorInfo::Kind(ErrorKind::TypedDictKeyError),
+                                ErrorInfo::Kind(ErrorKind::BadTypedDictKey),
                                 format!(
                                     "Key `{}` is not defined in TypedDict `{}`",
                                     key_name,
@@ -129,7 +129,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                     self.error(
                         check_errors,
                         key.range(),
-                        ErrorInfo::Kind(ErrorKind::TypedDictKeyError),
+                        ErrorInfo::Kind(ErrorKind::BadTypedDictKey),
                         format!(
                             "Expected string literal key, got `{}`",
                             self.for_display(key_type)
@@ -155,7 +155,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                     self.error(
                         check_errors,
                         range,
-                        ErrorInfo::Kind(ErrorKind::TypedDictKeyError),
+                        ErrorInfo::Kind(ErrorKind::BadTypedDictKey),
                         format!(
                             "Missing required key `{}` for TypedDict `{}`",
                             key,

{pyrefly-0.38.0 → pyrefly-0.38.1}/pyrefly/lib/alt/expr.rs

@@ -10,6 +10,8 @@ use std::fmt;
 use std::fmt::Display;
 
 use dupe::Dupe;
+use itertools::Either;
+use itertools::Itertools;
 use num_traits::ToPrimitive;
 use pyrefly_python::ast::Ast;
 use pyrefly_python::dunder;
@@ -40,6 +42,8 @@ use ruff_python_ast::name::Name;
 use ruff_text_size::Ranged;
 use ruff_text_size::TextRange;
 use starlark_map::Hashed;
+use vec1::Vec1;
+use vec1::vec1;
 
 use crate::alt::answers::LookupAnswer;
 use crate::alt::answers_solver::AnswersSolver;
@@ -611,14 +615,47 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
     }
 
     fn tuple_infer(&self, x: &ExprTuple, hint: Option<HintRef>, errors: &ErrorCollector) -> Type {
-        let (hint_ts, default_hint) = if let Some(hint) = &hint
-            && let Type::Tuple(tup) = hint.ty()
-        {
-            let (hint_ts, default_hint) = self.tuple_to_element_hints(tup);
-            let type_to_hint = |t| HintRef::new(t, hint.errors());
+        let owner = Owner::new();
+        let (hint_ts, default_hint) = if let Some(hint) = &hint {
+            let (tuples, nontuples) = self.split_tuple_hint(hint.ty());
+            // Combine hints from multiple tuples.
+            let mut element_hints: Vec<Vec1<&Type>> = Vec::new();
+            let mut default_hint = Vec::new();
+            for tuple in tuples {
+                let (cur_element_hints, cur_default_hint) = self.tuple_to_element_hints(tuple);
+                if let Some(cur_default_hint) = cur_default_hint {
+                    // Use the default hint for any elements that this tuple doesn't provide per-element hints for.
+                    for ts in element_hints.iter_mut().skip(cur_element_hints.len()) {
+                        ts.push(cur_default_hint);
+                    }
+                    default_hint.push(cur_default_hint);
+                }
+                for (i, element_hint) in cur_element_hints.into_iter().enumerate() {
+                    if i < element_hints.len() {
+                        element_hints[i].push(element_hint);
+                    } else {
+                        element_hints.push(vec1![element_hint]);
+                    }
+                }
+            }
+            if !nontuples.is_empty() {
+                // The non-tuple options may contain a type like Sequence[T] that provides an additional default hint.
+                let nontuple_hint = self.unions(nontuples.into_iter().cloned().collect());
+                let nontuple_element_hint =
+                    self.decompose_tuple(HintRef::new(&nontuple_hint, hint.errors()));
+                if let Some(nontuple_element_hint) = nontuple_element_hint {
+                    let nontuple_element_hint = owner.push(nontuple_element_hint.to_type());
+                    for ts in element_hints.iter_mut() {
+                        ts.push(nontuple_element_hint);
+                    }
+                    default_hint.push(nontuple_element_hint);
+                }
+            }
             (
-                hint_ts.into_map(type_to_hint),
-                default_hint.map(type_to_hint),
+                element_hints.into_map(|ts| self.types_to_hint(ts, hint.errors(), &owner)),
+                Vec1::try_from_vec(default_hint)
+                    .ok()
+                    .map(|ts| self.types_to_hint(ts, hint.errors(), &owner)),
             )
         } else {
             (Vec::new(), None)
@@ -719,6 +756,17 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
         }
     }
 
+    fn split_tuple_hint<'b>(&self, hint: &'b Type) -> (Vec<&'b Tuple>, Vec<&'b Type>) {
+        match hint {
+            Type::Tuple(tuple) => (vec![tuple], Vec::new()),
+            Type::Union(ts) => ts.iter().partition_map(|t| match t {
+                Type::Tuple(tuple) => Either::Left(tuple),
+                _ => Either::Right(t),
+            }),
+            _ => (Vec::new(), vec![hint]),
+        }
+    }
+
     fn tuple_to_element_hints<'b>(&self, tup: &'b Tuple) -> (Vec<&'b Type>, Option<&'b Type>) {
         match tup {
             Tuple::Concrete(elts) => (elts.iter().collect(), None),
@@ -730,6 +778,23 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
         }
     }
 
+    fn types_to_hint<'b>(
+        &self,
+        ts: Vec1<&'b Type>,
+        errors: Option<&'b ErrorCollector>,
+        owner: &'b Owner<Type>,
+    ) -> HintRef<'b, 'b> {
+        if ts.len() == 1 {
+            let (t, _) = ts.split_off_first();
+            HintRef::new(t, errors)
+        } else {
+            HintRef::new(
+                owner.push(self.unions(ts.into_iter().cloned().collect())),
+                errors,
+            )
+        }
+    }
+
     fn dict_infer(
         &self,
         items: &[DictItem],
@@ -1863,7 +1928,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                                 self.error(
                                     errors,
                                     slice.range(),
-                                    ErrorInfo::Kind(ErrorKind::TypedDictKeyError),
+                                    ErrorInfo::Kind(ErrorKind::BadTypedDictKey),
                                     format!(
                                         "TypedDict `{}` does not have key `{}`",
                                         typed_dict.name(),
@@ -1884,7 +1949,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                         _ => self.error(
                             errors,
                             slice.range(),
-                            ErrorInfo::Kind(ErrorKind::TypedDictKeyError),
+                            ErrorInfo::Kind(ErrorKind::BadTypedDictKey),
                             format!(
                                 "Invalid key for TypedDict `{}`, got `{}`",
                                 typed_dict.name(),

{pyrefly-0.38.0 → pyrefly-0.38.1}/pyrefly/lib/alt/solve.rs

@@ -1517,7 +1517,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                 self.error(
                     errors,
                     range,
-                    ErrorInfo::Kind(ErrorKind::TypedDictKeyError),
+                    ErrorInfo::Kind(ErrorKind::BadTypedDictKey),
                     format!(
                         "TypedDict `{}` does not have key `{}`",
                         typed_dict.name(),
@@ -2231,7 +2231,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                 return self.error(
                     errors,
                     key_range,
-                    ErrorInfo::Kind(ErrorKind::TypedDictKeyError),
+                    ErrorInfo::Kind(ErrorKind::BadTypedDictKey),
                     format!(
                         "TypedDict `{}` does not have key `{}`",
                         typed_dict.name(),

{pyrefly-0.38.0 → pyrefly-0.38.1}/pyrefly/lib/alt/unwrap.rs

@@ -251,6 +251,16 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
         }
     }
 
+    pub fn decompose_tuple<'b>(&self, hint: HintRef<'b, '_>) -> Option<Hint<'b>> {
+        let elem = self.fresh_var();
+        let tuple_type = self.stdlib.tuple(elem.to_type()).to_type();
+        if self.is_subset_eq(&tuple_type, hint.ty()) {
+            hint.map_ty_opt(|ty| self.resolve_var_opt(ty, elem))
+        } else {
+            None
+        }
+    }
+
     pub fn decompose_lambda<'b>(
         &self,
         hint: HintRef<'b, '_>,

{pyrefly-0.38.0 → pyrefly-0.38.1}/pyrefly/lib/binding/function.rs

@@ -685,6 +685,22 @@ fn function_last_expressions<'a>(
                     return None;
                 }
             }
+            Stmt::For(x) => {
+                let mut has_break = false;
+                fn f(stmt: &Stmt, res: &mut bool) {
+                    match stmt {
+                        Stmt::Break(_) => {
+                            *res = true;
+                        }
+                        Stmt::While(_) | Stmt::For(_) => {}
+                        _ => stmt.recurse(&mut |stmt| f(stmt, res)),
+                    }
+                }
+                x.body.visit(&mut |stmt| f(stmt, &mut has_break));
+                if has_break {
+                    return None;
+                }
+            }
             Stmt::If(x) => {
                 let mut last_test = None;
                 for (test, body) in sys_info.pruned_if_branches(x) {