Check exclusions prior to resolving pyproject.toml files (#3588)

astral-sh · Mar 18, 2023 · fa04861 · fa04861
1 parent 404504a
commit fa04861
Showing 1 changed file with 32 additions and 32 deletions.
diff --git a/crates/ruff/src/resolver.rs b/crates/ruff/src/resolver.rs
@@ -260,38 +260,6 @@ pub fn python_files_in_path(
         std::sync::Mutex::new(vec![]);
     walker.run(|| {
         Box::new(|result| {
-            // Search for the `pyproject.toml` file in this directory, before we visit any
-            // of its contents.
-            if pyproject_strategy.is_hierarchical() {
-                if let Ok(entry) = &result {
-                    if entry
-                        .file_type()
-                        .map_or(false, |file_type| file_type.is_dir())
-                    {
-                        match settings_toml(entry.path()) {
-                            Ok(Some(pyproject)) => match resolve_scoped_settings(
-                                &pyproject,
-                                &Relativity::Parent,
-                                processor,
-                            ) {
-                                Ok((root, settings)) => {
-                                    resolver.write().unwrap().add(root, settings);
-                                }
-                                Err(err) => {
-                                    *error.lock().unwrap() = Err(err);
-                                    return WalkState::Quit;
-                                }
-                            },
-                            Ok(None) => {}
-                            Err(err) => {
-                                *error.lock().unwrap() = Err(err);
-                                return WalkState::Quit;
-                            }
-                        }
-                    }
-                }
-            }
-
             // Respect our own exclusion behavior.
             if let Ok(entry) = &result {
                 if entry.depth() > 0 {
@@ -324,6 +292,38 @@ pub fn python_files_in_path(
                 }
             }
 
+            // Search for the `pyproject.toml` file in this directory, before we visit any
+            // of its contents.
+            if pyproject_strategy.is_hierarchical() {
+                if let Ok(entry) = &result {
+                    if entry
+                        .file_type()
+                        .map_or(false, |file_type| file_type.is_dir())
+                    {
+                        match settings_toml(entry.path()) {
+                            Ok(Some(pyproject)) => match resolve_scoped_settings(
+                                &pyproject,
+                                &Relativity::Parent,
+                                processor,
+                            ) {
+                                Ok((root, settings)) => {
+                                    resolver.write().unwrap().add(root, settings);
+                                }
+                                Err(err) => {
+                                    *error.lock().unwrap() = Err(err);
+                                    return WalkState::Quit;
+                                }
+                            },
+                            Ok(None) => {}
+                            Err(err) => {
+                                *error.lock().unwrap() = Err(err);
+                                return WalkState::Quit;
+                            }
+                        }
+                    }
+                }
+            }
+
             if result.as_ref().map_or(true, |entry| {
                 // Accept all files that are passed-in directly.
                 (entry.depth() == 0 && entry.file_type().map_or(false, |ft| ft.is_file()))