5dc26c261d
Previously we were using a single globset::Glob in PathMatcher; higher
up the stack, we were then resorting to using a list of PathMatchers.
globset crate exposes a GlobSet type that's better suited for this use
case. In my benchmarks, using a single PathMatcher with GlobSet instead
of a Vec of PathMatchers with Globs is about 3 times faster with the
default 'file_scan_exclusions' values. This slightly improves our
project load time for projects with large # of files, as showcased in
the following videos of loading a project with 100k source files. This
project is *not* a git repository, so it should measure raw overhead on
our side.
Current nightly: 51404d4ea0
https://github.com/zed-industries/zed/assets/24362066/e0aa9f8c-aae6-4348-8d42-d20bd41fcd76
versus this PR:
https://github.com/zed-industries/zed/assets/24362066/408dcab1-cee2-4c9e-a541-a31d14772dd7
Release Notes:
- Improved performance in large worktrees
73 lines
2.2 KiB
Rust
73 lines
2.2 KiB
Rust
use std::path::Path;
|
|
|
|
use anyhow::Context;
|
|
use gpui::AppContext;
|
|
use schemars::JsonSchema;
|
|
use serde::{Deserialize, Serialize};
|
|
use settings::{Settings, SettingsSources};
|
|
use util::paths::PathMatcher;
|
|
|
|
#[derive(Clone, PartialEq, Eq)]
|
|
pub struct WorktreeSettings {
|
|
pub file_scan_exclusions: PathMatcher,
|
|
pub private_files: PathMatcher,
|
|
}
|
|
|
|
impl WorktreeSettings {
|
|
pub fn is_path_private(&self, path: &Path) -> bool {
|
|
path.ancestors()
|
|
.any(|ancestor| self.private_files.is_match(&ancestor))
|
|
}
|
|
|
|
pub fn is_path_excluded(&self, path: &Path) -> bool {
|
|
path.ancestors()
|
|
.any(|ancestor| self.file_scan_exclusions.is_match(&ancestor))
|
|
}
|
|
}
|
|
|
|
#[derive(Clone, Default, Serialize, Deserialize, JsonSchema)]
|
|
pub struct WorktreeSettingsContent {
|
|
/// Completely ignore files matching globs from `file_scan_exclusions`
|
|
///
|
|
/// Default: [
|
|
/// "**/.git",
|
|
/// "**/.svn",
|
|
/// "**/.hg",
|
|
/// "**/CVS",
|
|
/// "**/.DS_Store",
|
|
/// "**/Thumbs.db",
|
|
/// "**/.classpath",
|
|
/// "**/.settings"
|
|
/// ]
|
|
#[serde(default)]
|
|
pub file_scan_exclusions: Option<Vec<String>>,
|
|
|
|
/// Treat the files matching these globs as `.env` files.
|
|
/// Default: [ "**/.env*" ]
|
|
pub private_files: Option<Vec<String>>,
|
|
}
|
|
|
|
impl Settings for WorktreeSettings {
|
|
const KEY: Option<&'static str> = None;
|
|
|
|
type FileContent = WorktreeSettingsContent;
|
|
|
|
fn load(
|
|
sources: SettingsSources<Self::FileContent>,
|
|
_: &mut AppContext,
|
|
) -> anyhow::Result<Self> {
|
|
let result: WorktreeSettingsContent = sources.json_merge()?;
|
|
let mut file_scan_exclusions = result.file_scan_exclusions.unwrap_or_default();
|
|
let mut private_files = result.private_files.unwrap_or_default();
|
|
file_scan_exclusions.sort();
|
|
private_files.sort();
|
|
Ok(Self {
|
|
file_scan_exclusions: path_matchers(&file_scan_exclusions, "file_scan_exclusions")?,
|
|
private_files: path_matchers(&private_files, "private_files")?,
|
|
})
|
|
}
|
|
}
|
|
|
|
fn path_matchers(values: &[String], context: &'static str) -> anyhow::Result<PathMatcher> {
|
|
PathMatcher::new(values).with_context(|| format!("Failed to parse globs from {}", context))
|
|
}
|