Build settings index in parallel for the native server

Author: dhruvmanila

Cargo.lock

@@ -28,6 +28,7 @@ ruff_workspace = { workspace = true }
 
 anyhow = { workspace = true }
 crossbeam = { workspace = true }
+ignore = { workspace = true }
 jod-thread = { workspace = true }
 lsp-server = { workspace = true }
 lsp-types = { workspace = true }
@@ -38,7 +39,6 @@ serde_json = { workspace = true }
 shellexpand = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
-walkdir = { workspace = true }
 
 [dev-dependencies]
 insta = { workspace = true }

crates/ruff_server/Cargo.toml

@@ -1,3 +1,9 @@
+use std::collections::BTreeMap;
+use std::path::{Path, PathBuf};
+use std::sync::Arc;
+
+use ignore::{WalkBuilder, WalkState};
+
 use ruff_linter::{
     display_settings, fs::normalize_path_to, settings::types::FilePattern,
     settings::types::PreviewMode,
@@ -8,12 +14,6 @@ use ruff_workspace::{
     pyproject::{find_user_settings_toml, settings_toml},
     resolver::{ConfigurationTransformer, Relativity},
 };
-use std::{
-    collections::BTreeMap,
-    path::{Path, PathBuf},
-    sync::Arc,
-};
-use walkdir::WalkDir;
 
 use crate::session::settings::{ConfigurationPreference, ResolvedEditorSettings};
 
@@ -30,7 +30,7 @@ pub struct RuffSettings {
 }
 
 pub(super) struct RuffSettingsIndex {
-    /// Index from folder to the resoled ruff settings.
+    /// Index from folder to the resolved ruff settings.
     index: BTreeMap<PathBuf, Arc<RuffSettings>>,
     fallback: Arc<RuffSettings>,
 }
@@ -126,70 +126,88 @@ impl RuffSettingsIndex {
         }
 
         // 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();
+        let mut builder = WalkBuilder::new(root);
+        builder.standard_filters(true);
+        builder.hidden(false);
+        builder.threads(
+            std::thread::available_parallelism()
+                .map_or(1, std::num::NonZeroUsize::get)
+                .min(12),
+        );
+        let walker = builder.build_parallel();
+
+        let index = std::sync::RwLock::new(index);
+        walker.run(|| {
+            Box::new(|result| {
+                let Ok(entry) = result else {
+                    return WalkState::Continue;
+                };
 
-            // 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))
+                // Skip non-directories.
+                if !entry
+                    .file_type()
+                    .is_some_and(|file_type| file_type.is_dir())
                 {
-                    if match_exclusion(&directory, file_name, &settings.file_resolver.exclude) {
-                        tracing::debug!("Ignored path via `exclude`: {}", directory.display());
-
-                        walker.skip_current_dir();
-                        continue;
-                    } else if match_exclusion(
-                        &directory,
-                        file_name,
-                        &settings.file_resolver.extend_exclude,
-                    ) {
-                        tracing::debug!(
-                            "Ignored path via `extend-exclude`: {}",
-                            directory.display()
-                        );
-
-                        walker.skip_current_dir();
-                        continue;
+                    return WalkState::Continue;
+                }
+
+                let directory = entry.into_path();
+                tracing::debug!("Visiting: {}", directory.display());
+
+                // If the directory is excluded from the workspace, skip it.
+                if let Some(file_name) = directory.file_name() {
+                    if let Some((_, settings)) = index
+                        .read()
+                        .unwrap()
+                        .range(..directory.clone())
+                        .rfind(|(path, _)| directory.starts_with(path))
+                    {
+                        if match_exclusion(&directory, file_name, &settings.file_resolver.exclude) {
+                            tracing::debug!("Ignored path via `exclude`: {}", directory.display());
+                            return WalkState::Continue;
+                        } else if match_exclusion(
+                            &directory,
+                            file_name,
+                            &settings.file_resolver.extend_exclude,
+                        ) {
+                            tracing::debug!(
+                                "Ignored path via `extend-exclude`: {}",
+                                directory.display()
+                            );
+                            return WalkState::Continue;
+                        }
                     }
                 }
-            }
 
-            if let Some(pyproject) = settings_toml(&directory).ok().flatten() {
-                let Ok(settings) = ruff_workspace::resolver::resolve_root_settings(
-                    &pyproject,
-                    Relativity::Parent,
-                    &EditorConfigurationTransformer(editor_settings, root),
-                ) else {
-                    continue;
-                };
-                index.insert(
-                    directory,
-                    Arc::new(RuffSettings {
-                        path: Some(pyproject),
-                        file_resolver: settings.file_resolver,
-                        linter: settings.linter,
-                        formatter: settings.formatter,
-                    }),
-                );
-            }
-        }
+                if let Some(pyproject) = settings_toml(&directory).ok().flatten() {
+                    let Ok(settings) = ruff_workspace::resolver::resolve_root_settings(
+                        &pyproject,
+                        Relativity::Parent,
+                        &EditorConfigurationTransformer(editor_settings, root),
+                    ) else {
+                        return WalkState::Continue;
+                    };
+                    index.write().unwrap().insert(
+                        directory,
+                        Arc::new(RuffSettings {
+                            path: Some(pyproject),
+                            file_resolver: settings.file_resolver,
+                            linter: settings.linter,
+                            formatter: settings.formatter,
+                        }),
+                    );
+                }
+
+                WalkState::Continue
+            })
+        });
 
         let fallback = Arc::new(RuffSettings::fallback(editor_settings, root));
 
-        Self { index, fallback }
+        Self {
+            index: index.into_inner().unwrap(),
+            fallback,
+        }
     }
 
     pub(super) fn get(&self, document_path: &Path) -> Arc<RuffSettings> {