From e16ab3efa7676e7bcaaa78cedf2465f531f9c82b Mon Sep 17 00:00:00 2001
From: Aria Desires <aria.desires@gmail.com>
Date: Fri, 12 Dec 2025 08:09:51 -0500
Subject: [PATCH] full freedom

---
 crates/ty/tests/cli/python_environment.rs           |  6 +++---
 .../src/module_resolver/resolver.rs                 | 13 +++++++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/crates/ty/tests/cli/python_environment.rs b/crates/ty/tests/cli/python_environment.rs
index 1f3479d2fd..bd15d1076a 100644
--- a/crates/ty/tests/cli/python_environment.rs
+++ b/crates/ty/tests/cli/python_environment.rs
@@ -2390,14 +2390,14 @@ fn default_root_flat_layout() -> anyhow::Result<()> {
 fn default_root_tests_folder() -> anyhow::Result<()> {
     let case = CliTest::with_files([
         ("src/foo.py", "foo = 10"),
-        ("tests/bar.py", "bar = 20"),
+        ("tests/bar.py", "baz = 20"),
         (
             "tests/test_bar.py",
             r#"
             from foo import foo
-            from bar import bar
+            from bar import baz
 
-            print(f"{foo} {bar}")
+            print(f"{foo} {baz}")
             "#,
         ),
     ])?;
diff --git a/crates/ty_python_semantic/src/module_resolver/resolver.rs b/crates/ty_python_semantic/src/module_resolver/resolver.rs
index 901b4f44f1..a1503f5a3b 100644
--- a/crates/ty_python_semantic/src/module_resolver/resolver.rs
+++ b/crates/ty_python_semantic/src/module_resolver/resolver.rs
@@ -432,12 +432,17 @@ fn desperate_search_paths(db: &dyn Db, importing_file: File) -> Option<Vec<Searc
     let mut search_paths = Vec::new();
     for rel_dir in rel_path.ancestors() {
         let candidate_path = base_path.join(rel_dir);
-        // Any dir named `tests` might be a pytest root, but not if it's a package
-        let is_pytest_dir = rel_dir.file_name() == Some("tests")
-            && !system.is_file(&candidate_path.join("__init__.py"))
+        if !system.is_directory(&candidate_path) {
+            continue;
+        }
+        // Any dir that isn't a proper package is plausibly some test/script dir that could be
+        // added as a search-path at runtime. Notably this reflects pytest's default mode where
+        // it adds every dir with a .py to the search-paths (making all test files root modules),
+        // unless they see an `__init__.py`, in which case they assume you don't want that.
+        let isnt_regular_package = !system.is_file(&candidate_path.join("__init__.py"))
             && !system.is_file(&candidate_path.join("__init__.pyi"));
         // Any dir with a pyproject.toml or ty.toml might be a project root
-        if is_pytest_dir
+        if isnt_regular_package
             || system.is_file(&candidate_path.join("pyproject.toml"))
             || system.is_file(&candidate_path.join("ty.toml"))
         {