## Objective `file_scan_exclusions` replaces the defaults instead of adding to them, so excluding one extra directory means restating all eleven default globs and never picking up defaults added in later Zed releases. ## Solution `file_scan_exclusions` now accepts the `"..."` entry, which expands to the value it overrides, so `["**/node_modules", "..."]` adds to the inherited globs instead of replacing them. Entries listed by name keep their position, and leaving `"..."` out still replaces the list outright, so existing settings behave exactly as they do today. ## Testing - Four unit tests in `crates/settings_content/src/project.rs` cover splicing versus replacing, accumulation across successive layers, and edge cases: a repeated `"..."`, an empty list clearing the value, and a bare `["..."]` leaving it unchanged. - To check by hand: set `"file_scan_exclusions": ["**/node_modules", "..."]` in user settings and confirm `node_modules` disappears from the project panel and file finder while `.git` and `.DS_Store` stay excluded. Remove `"..."` and confirm only `node_modules` is excluded. Repeat in a project's `.zed/settings.json` to confirm it splices the resolved user settings rather than the defaults. - Tested on macOS. This is platform-independent settings-merge logic with no OS-specific code paths, so I did not test Linux or Windows. ## Self-Review Checklist: - [x] I’ve reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [x] The content adheres to Zed’s UI standards ([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) and [icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md) guidelines) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable --- Release Notes: - Added support for the `"..."` entry in `file_scan_exclusions`. Custom exclusions can now extend the defaults instead of replacing them.
112 lines
4.1 KiB
Rust
112 lines
4.1 KiB
Rust
use std::path::Path;
|
|
|
|
use anyhow::Context as _;
|
|
use settings::{RegisterSetting, ScanSymlinksSetting, Settings};
|
|
use util::{
|
|
ResultExt,
|
|
paths::{PathMatcher, PathStyle},
|
|
rel_path::RelPath,
|
|
};
|
|
|
|
#[derive(Clone, PartialEq, Eq, RegisterSetting)]
|
|
pub struct WorktreeSettings {
|
|
/// Whether to prevent this project from being shared in public channels.
|
|
pub prevent_sharing_in_public_channels: bool,
|
|
pub file_scan_exclusions: PathMatcher,
|
|
pub file_scan_inclusions: PathMatcher,
|
|
/// This field contains all ancestors of the `file_scan_inclusions`. It's used to
|
|
/// determine whether to terminate worktree scanning for a given dir.
|
|
pub parent_dir_scan_inclusions: PathMatcher,
|
|
pub scan_symlinks: ScanSymlinksSetting,
|
|
pub file_scan_depth: Option<u32>,
|
|
pub private_files: PathMatcher,
|
|
pub hidden_files: PathMatcher,
|
|
pub read_only_files: PathMatcher,
|
|
}
|
|
|
|
impl WorktreeSettings {
|
|
pub fn is_path_private(&self, path: &RelPath) -> bool {
|
|
path.ancestors()
|
|
.any(|ancestor| self.private_files.is_match(ancestor))
|
|
}
|
|
|
|
pub fn is_path_excluded(&self, path: &RelPath) -> bool {
|
|
path.ancestors()
|
|
.any(|ancestor| self.file_scan_exclusions.is_match(ancestor))
|
|
}
|
|
|
|
pub fn is_path_always_included(&self, path: &RelPath, is_dir: bool) -> bool {
|
|
if is_dir {
|
|
self.parent_dir_scan_inclusions.is_match(path)
|
|
} else {
|
|
self.file_scan_inclusions.is_match(path)
|
|
}
|
|
}
|
|
|
|
pub fn is_path_hidden(&self, path: &RelPath) -> bool {
|
|
path.ancestors()
|
|
.any(|ancestor| self.hidden_files.is_match(ancestor))
|
|
}
|
|
|
|
pub fn is_path_read_only(&self, path: &RelPath) -> bool {
|
|
self.read_only_files.is_match(path)
|
|
}
|
|
|
|
pub fn is_std_path_read_only(&self, path: &Path) -> bool {
|
|
self.read_only_files.is_match_std_path(path)
|
|
}
|
|
}
|
|
|
|
impl Settings for WorktreeSettings {
|
|
fn from_settings(content: &settings::SettingsContent) -> Self {
|
|
let worktree = content.project.worktree.clone();
|
|
let file_scan_exclusions = worktree.file_scan_exclusions.unwrap().0;
|
|
let file_scan_inclusions = worktree.file_scan_inclusions.unwrap();
|
|
let private_files = worktree.private_files.unwrap().0;
|
|
let hidden_files = worktree.hidden_files.unwrap();
|
|
let read_only_files = worktree.read_only_files.unwrap_or_default();
|
|
let scan_symlinks = worktree.scan_symlinks.unwrap();
|
|
let parsed_file_scan_inclusions: Vec<String> = file_scan_inclusions
|
|
.iter()
|
|
.flat_map(|glob| {
|
|
Path::new(glob)
|
|
.ancestors()
|
|
.skip(1)
|
|
.map(|a| a.to_string_lossy().into())
|
|
})
|
|
.filter(|p: &String| !p.is_empty())
|
|
.collect();
|
|
|
|
Self {
|
|
prevent_sharing_in_public_channels: worktree.prevent_sharing_in_public_channels,
|
|
file_scan_exclusions: path_matchers(file_scan_exclusions, "file_scan_exclusions")
|
|
.log_err()
|
|
.unwrap_or_default(),
|
|
parent_dir_scan_inclusions: path_matchers(
|
|
parsed_file_scan_inclusions,
|
|
"file_scan_inclusions",
|
|
)
|
|
.unwrap(),
|
|
file_scan_inclusions: path_matchers(file_scan_inclusions, "file_scan_inclusions")
|
|
.unwrap(),
|
|
private_files: path_matchers(private_files, "private_files")
|
|
.log_err()
|
|
.unwrap_or_default(),
|
|
hidden_files: path_matchers(hidden_files, "hidden_files")
|
|
.log_err()
|
|
.unwrap_or_default(),
|
|
read_only_files: path_matchers(read_only_files, "read_only_files")
|
|
.log_err()
|
|
.unwrap_or_default(),
|
|
scan_symlinks,
|
|
file_scan_depth: worktree.file_scan_depth.filter(|depth| *depth > 0),
|
|
}
|
|
}
|
|
}
|
|
|
|
fn path_matchers(mut values: Vec<String>, context: &'static str) -> anyhow::Result<PathMatcher> {
|
|
values.sort();
|
|
PathMatcher::new(values, PathStyle::local())
|
|
.with_context(|| format!("Failed to parse globs from {}", context))
|
|
}
|