Co-Authored-By: Ben K <ben@zed.dev> Co-Authored-By: Anthony <anthony@zed.dev> Co-Authored-By: Mikayla <mikayla@zed.dev> Release Notes: - settings: Major internal changes to settings. The primary user-facing effect is that some settings which did not make sense in project settings files are no-longer read from there. (For example the inline blame settings) --------- Co-authored-by: Ben Kunkle <ben@zed.dev> Co-authored-by: Mikayla Maki <mikayla.c.maki@gmail.com> Co-authored-by: Anthony <anthony@zed.dev>
133 lines
4.8 KiB
Rust
133 lines
4.8 KiB
Rust
use std::path::Path;
|
|
|
|
use anyhow::Context as _;
|
|
use gpui::App;
|
|
use settings::{Settings, SettingsContent};
|
|
use util::{ResultExt, paths::PathMatcher};
|
|
|
|
#[derive(Clone, PartialEq, Eq)]
|
|
pub struct WorktreeSettings {
|
|
pub project_name: Option<String>,
|
|
pub file_scan_inclusions: PathMatcher,
|
|
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))
|
|
}
|
|
|
|
pub fn is_path_always_included(&self, path: &Path) -> bool {
|
|
path.ancestors()
|
|
.any(|ancestor| self.file_scan_inclusions.is_match(&ancestor))
|
|
}
|
|
}
|
|
|
|
impl Settings for WorktreeSettings {
|
|
fn from_defaults(content: &settings::SettingsContent, _cx: &mut App) -> Self {
|
|
let worktree = content.project.worktree.clone();
|
|
let file_scan_exclusions = worktree.file_scan_exclusions.unwrap();
|
|
let file_scan_inclusions = worktree.file_scan_inclusions.unwrap();
|
|
let private_files = worktree.private_files.unwrap();
|
|
let parsed_file_scan_inclusions: Vec<String> = file_scan_inclusions
|
|
.iter()
|
|
.flat_map(|glob| {
|
|
Path::new(glob)
|
|
.ancestors()
|
|
.map(|a| a.to_string_lossy().into())
|
|
})
|
|
.filter(|p: &String| !p.is_empty())
|
|
.collect();
|
|
|
|
Self {
|
|
project_name: None,
|
|
file_scan_exclusions: path_matchers(file_scan_exclusions, "file_scan_exclusions")
|
|
.unwrap(),
|
|
file_scan_inclusions: path_matchers(
|
|
parsed_file_scan_inclusions,
|
|
"file_scan_inclusions",
|
|
)
|
|
.unwrap(),
|
|
private_files: path_matchers(private_files, "private_files").unwrap(),
|
|
}
|
|
}
|
|
|
|
fn refine(&mut self, content: &SettingsContent, _cx: &mut App) {
|
|
let worktree = &content.project.worktree;
|
|
|
|
if let Some(project_name) = worktree.project_name.clone() {
|
|
self.project_name = Some(project_name);
|
|
}
|
|
|
|
if let Some(mut private_files) = worktree.private_files.clone() {
|
|
let sources = self.private_files.sources();
|
|
private_files.extend_from_slice(sources);
|
|
if let Some(matchers) = path_matchers(private_files, "private_files").log_err() {
|
|
self.private_files = matchers;
|
|
}
|
|
}
|
|
|
|
if let Some(file_scan_exclusions) = worktree.file_scan_exclusions.clone() {
|
|
if let Some(matchers) =
|
|
path_matchers(file_scan_exclusions, "file_scan_exclusions").log_err()
|
|
{
|
|
self.file_scan_exclusions = matchers
|
|
}
|
|
}
|
|
|
|
if let Some(file_scan_inclusions) = worktree.file_scan_inclusions.clone() {
|
|
let parsed_file_scan_inclusions: Vec<String> = file_scan_inclusions
|
|
.iter()
|
|
.flat_map(|glob| {
|
|
Path::new(glob)
|
|
.ancestors()
|
|
.map(|a| a.to_string_lossy().into())
|
|
})
|
|
.filter(|p: &String| !p.is_empty())
|
|
.collect();
|
|
if let Some(matchers) =
|
|
path_matchers(parsed_file_scan_inclusions, "file_scan_inclusions").log_err()
|
|
{
|
|
self.file_scan_inclusions = matchers
|
|
}
|
|
}
|
|
}
|
|
|
|
fn import_from_vscode(vscode: &settings::VsCodeSettings, current: &mut SettingsContent) {
|
|
if let Some(inclusions) = vscode
|
|
.read_value("files.watcherInclude")
|
|
.and_then(|v| v.as_array())
|
|
.and_then(|v| v.iter().map(|n| n.as_str().map(str::to_owned)).collect())
|
|
{
|
|
if let Some(old) = current.project.worktree.file_scan_inclusions.as_mut() {
|
|
old.extend(inclusions)
|
|
} else {
|
|
current.project.worktree.file_scan_inclusions = Some(inclusions)
|
|
}
|
|
}
|
|
if let Some(exclusions) = vscode
|
|
.read_value("files.watcherExclude")
|
|
.and_then(|v| v.as_array())
|
|
.and_then(|v| v.iter().map(|n| n.as_str().map(str::to_owned)).collect())
|
|
{
|
|
if let Some(old) = current.project.worktree.file_scan_exclusions.as_mut() {
|
|
old.extend(exclusions)
|
|
} else {
|
|
current.project.worktree.file_scan_exclusions = Some(exclusions)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
fn path_matchers(mut values: Vec<String>, context: &'static str) -> anyhow::Result<PathMatcher> {
|
|
values.sort();
|
|
PathMatcher::new(values).with_context(|| format!("Failed to parse globs from {}", context))
|
|
}
|