Respect excludes in ruff server configuration discovery

crates/ruff_server/Cargo.toml

@@ -28,6 +28,7 @@ ruff_workspace = { workspace = true }
 
 anyhow = { workspace = true }
 crossbeam = { workspace = true }
+globset = { workspace = true }
 jod-thread = { workspace = true }
 lsp-server = { workspace = true }
 lsp-types = { workspace = true }

crates/ruff_server/src/session/index/ruff_settings.rs

@@ -1,7 +1,9 @@
+use globset::Candidate;
 use ruff_linter::{
     display_settings, fs::normalize_path_to, settings::types::FilePattern,
     settings::types::PreviewMode,
 };
+use ruff_workspace::resolver::match_candidate_exclusion;
 use ruff_workspace::{
     configuration::{Configuration, FormatConfiguration, LintConfiguration, RuleSelection},
     pyproject::{find_user_settings_toml, settings_toml},
@@ -12,12 +14,13 @@ use std::{
     path::{Path, PathBuf},
     sync::Arc,
 };
-use walkdir::{DirEntry, WalkDir};
+use walkdir::WalkDir;
 
 use crate::session::settings::{ConfigurationPreference, ResolvedEditorSettings};
 
-#[derive(Default)]
 pub(crate) struct RuffSettings {
+    /// Settings used to manage file inclusion and exclusion.
+    file_resolver: ruff_workspace::FileResolverSettings,
     /// Settings to pass into the Ruff linter.
     linter: ruff_linter::settings::LinterSettings,
     /// Settings to pass into the Ruff formatter.
@@ -54,7 +57,7 @@ impl RuffSettings {
                 .ok()
             })
             .unwrap_or_else(|| {
-                let default_configuration = ruff_workspace::configuration::Configuration::default();
+                let default_configuration = Configuration::default();
                 EditorConfigurationTransformer(editor_settings, root)
                     .transform(default_configuration)
                     .into_settings(root)
@@ -64,6 +67,7 @@ impl RuffSettings {
             });
 
         RuffSettings {
+            file_resolver: fallback.file_resolver,
             formatter: fallback.formatter,
             linter: fallback.linter,
         }
@@ -85,20 +89,18 @@ impl RuffSettingsIndex {
         // Add any settings from above the workspace root.
         for directory in root.ancestors() {
             if let Some(pyproject) = settings_toml(directory).ok().flatten() {
-                if index.contains_key(&pyproject) {
-                    continue;
-                }
-
                 let Ok(settings) = ruff_workspace::resolver::resolve_root_settings(
                     &pyproject,
                     Relativity::Parent,
                     &EditorConfigurationTransformer(editor_settings, root),
                 ) else {
                     continue;
                 };
+
                 index.insert(
                     directory.to_path_buf(),
                     Arc::new(RuffSettings {
+                        file_resolver: settings.file_resolver,
                         linter: settings.linter,
                         formatter: settings.formatter,
                     }),
@@ -107,18 +109,55 @@ impl RuffSettingsIndex {
             }
         }
 
-        // Add any settings within the workspace itself.
-        for directory in WalkDir::new(root)
-            .into_iter()
-            .filter_map(Result::ok)
-            .filter(|entry| entry.file_type().is_dir())
-            .map(DirEntry::into_path)
-        {
-            if let Some(pyproject) = settings_toml(&directory).ok().flatten() {
-                if index.contains_key(&pyproject) {
-                    continue;
+        // Add any settings within the workspace itself
+        let mut walker = WalkDir::new(root).into_iter();
+
+        while let Some(entry) = walker.next() {
+            let Ok(entry) = entry else {
+                continue;
+            };
+
+            // Skip non-directories.
+            if !entry.file_type().is_dir() {
+                continue;
+            }
+
+            let directory = entry.into_path();
+
+            // If the directory is excluded from the workspace, skip it.
+            if let Some(file_name) = directory.file_name() {
+                if let Some((_, settings)) = index
+                    .range(..directory.clone())
+                    .rfind(|(path, _)| directory.starts_with(path))
+                {
+                    let candidate = Candidate::new(&directory);
+                    let basename = Candidate::new(file_name);
+                    if match_candidate_exclusion(
+                        &candidate,
+                        &basename,
+                        &settings.file_resolver.exclude,
+                    ) {
+                        tracing::debug!("Ignored path via `exclude`: {}", directory.display());
+
+                        walker.skip_current_dir();
+                        continue;
+                    } else if match_candidate_exclusion(
+                        &candidate,
+                        &basename,
+                        &settings.file_resolver.extend_exclude,
+                    ) {
+                        tracing::debug!(
+                            "Ignored path via `extend-exclude`: {}",
+                            directory.display()
+                        );
+
+                        walker.skip_current_dir();
+                        continue;
+                    }
                 }
+            }
 
+            if let Some(pyproject) = settings_toml(&directory).ok().flatten() {
                 let Ok(settings) = ruff_workspace::resolver::resolve_root_settings(
                     &pyproject,
                     Relativity::Parent,
@@ -129,6 +168,7 @@ impl RuffSettingsIndex {
                 index.insert(
                     directory,
                     Arc::new(RuffSettings {
+                        file_resolver: settings.file_resolver,
                         linter: settings.linter,
                         formatter: settings.formatter,
                     }),
@@ -145,8 +185,7 @@ impl RuffSettingsIndex {
         if let Some((_, settings)) = self
             .index
             .range(..document_path.to_path_buf())
-            .rev()
-            .find(|(path, _)| document_path.starts_with(path))
+            .rfind(|(path, _)| document_path.starts_with(path))
         {
             return settings.clone();
         }