Fix parent parent directory used in workspace config configurer

Summary: We've been passing the grandparent directory of the file we're loading instead of the parent directory for a while. Luckily, this doesn't change too much (just the workspace we might find), but we shouldn't be doing this

Reviewed By: kinto0

Differential Revision: D85456687

fbshipit-source-id: 4fc44354f5aaba47ea89c0d67c6e0ff6b582763b

Author: connernilsen

pyrefly/lib/commands/config_finder.rs

@@ -181,7 +181,7 @@ pub fn standard_config_finder(configure: Arc<dyn ConfigConfigurer>) -> ConfigFin
             // We couldn't walk up and find a possible root of the project, so let's try to create a search
             // path that is still useful for this import by including all of its parents.
             None => {
-                let path = match path.details() {
+                let parent = match path.details() {
                     ModulePathDetails::FileSystem(x) | ModulePathDetails::Memory(x) => {
                         if let Some(path) = x.parent() {
                             path
@@ -199,24 +199,21 @@ pub fn standard_config_finder(configure: Arc<dyn ConfigConfigurer>) -> ConfigFin
                 };
                 cache_parents
                     .lock()
-                    .entry(path.to_owned())
+                    .entry(parent.to_owned())
                     .or_insert_with(|| {
                         let mut config = ConfigFile {
                             project_includes: ConfigFile::default_project_includes(),
                             // We use `fallback_search_path` because otherwise a user with `/sys` on their
                             // computer (all of them) will override `sys.version` in preference to typeshed.
-                            fallback_search_path: path
+                            fallback_search_path: parent
                                 .ancestors()
                                 .map(|x| x.to_owned())
                                 .collect::<Vec<_>>(),
                             root: ConfigBase::default_for_ide_without_config(),
                             ..Default::default()
                         };
-                        let parent = path.parent();
-                        if let Some(parent) = parent {
-                            config.rewrite_with_path_to_config(parent);
-                        }
-                        let (config, errors) = configure2.configure(parent, config, vec![]);
+                        config.rewrite_with_path_to_config(parent);
+                        let (config, errors) = configure2.configure(Some(parent), config, vec![]);
                         // Since this is a config we generated, these are likely internal errors.
                         debug_log(errors);
                         config
@@ -388,7 +385,7 @@ mod tests {
 
         // check namespace
         let config_file = finder(
-            Some(&root.join("no_config")),
+            Some(&root.join("no_config/foo")),
             ModuleName::unknown(),
             ModulePath::namespace(root.join("no_config/foo")),
         );
@@ -404,7 +401,7 @@ mod tests {
 
         // check filesystem/memory
         let config_file = finder(
-            Some(&root.join("no_config")),
+            Some(&root.join("no_config/foo")),
             ModuleName::unknown(),
             ModulePath::filesystem(root.join("no_config/foo/bar.py")),
         );