Closes #ISSUE Initially, the `SettingsUi` trait was tied to `Settings`, however, given that the `Settings::FileContent` type (which may be the same as the type that implements `Settings`) will be the type that more directly maps to the JSON structure (and therefore have the documentation, correct field names (or `serde` rename attributes), etc) it makes more sense to have the deriving of `SettingsUi` occur on the `FileContent` type rather than the `Settings` type. In order for this to work a relatively important change had to be made to the derive macro, that being that it now "unwraps" options into their inner type, so a field with type `Option<Foo>` where `Foo: SettingsUi` will treat the field as if it were just `Foo`, expecting there to be a default set in `default.json`. This imposes some restrictions on what `Settings::FileContent` can be as seen in 1e19398 where `FileContent` itself can't be optional without manually implementing `SettingsUi`, as well as introducing some risk that if the `FileContent` type has `serde(default)`, the default value will override the default value from `default.json` in the UI even though it may differ (but it should!). A future PR should probably replace the other settings with `FileContent = Option<T>` (all of which currently have `T == bool`) with wrapper structs and have `KEY = None` so the further niceties `derive(SettingsUi)` will provide such as path renaming, custom UI, auto naming and doc comment extraction can be used. Release Notes: - N/A *or* Added/Fixed/Improved ...
129 lines
4.3 KiB
Rust
129 lines
4.3 KiB
Rust
use std::path::Path;
|
|
|
|
use anyhow::Context as _;
|
|
use gpui::App;
|
|
use schemars::JsonSchema;
|
|
use serde::{Deserialize, Serialize};
|
|
use settings::{Settings, SettingsSources, SettingsUi};
|
|
use util::paths::PathMatcher;
|
|
|
|
#[derive(Clone, PartialEq, Eq)]
|
|
pub struct WorktreeSettings {
|
|
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))
|
|
}
|
|
}
|
|
|
|
#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, SettingsUi)]
|
|
pub struct WorktreeSettingsContent {
|
|
/// Completely ignore files matching globs from `file_scan_exclusions`. Overrides
|
|
/// `file_scan_inclusions`.
|
|
///
|
|
/// Default: [
|
|
/// "**/.git",
|
|
/// "**/.svn",
|
|
/// "**/.hg",
|
|
/// "**/.jj",
|
|
/// "**/CVS",
|
|
/// "**/.DS_Store",
|
|
/// "**/Thumbs.db",
|
|
/// "**/.classpath",
|
|
/// "**/.settings"
|
|
/// ]
|
|
#[serde(default)]
|
|
pub file_scan_exclusions: Option<Vec<String>>,
|
|
|
|
/// Always include files that match these globs when scanning for files, even if they're
|
|
/// ignored by git. This setting is overridden by `file_scan_exclusions`.
|
|
/// Default: [
|
|
/// ".env*",
|
|
/// "docker-compose.*.yml",
|
|
/// ]
|
|
#[serde(default)]
|
|
pub file_scan_inclusions: 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 App) -> 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();
|
|
let mut parsed_file_scan_inclusions: Vec<String> = result
|
|
.file_scan_inclusions
|
|
.unwrap_or_default()
|
|
.iter()
|
|
.flat_map(|glob| {
|
|
Path::new(glob)
|
|
.ancestors()
|
|
.map(|a| a.to_string_lossy().into())
|
|
})
|
|
.filter(|p: &String| !p.is_empty())
|
|
.collect();
|
|
file_scan_exclusions.sort();
|
|
private_files.sort();
|
|
parsed_file_scan_inclusions.sort();
|
|
Ok(Self {
|
|
file_scan_exclusions: path_matchers(&file_scan_exclusions, "file_scan_exclusions")?,
|
|
private_files: path_matchers(&private_files, "private_files")?,
|
|
file_scan_inclusions: path_matchers(
|
|
&parsed_file_scan_inclusions,
|
|
"file_scan_inclusions",
|
|
)?,
|
|
})
|
|
}
|
|
|
|
fn import_from_vscode(vscode: &settings::VsCodeSettings, current: &mut Self::FileContent) {
|
|
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.file_scan_inclusions.as_mut() {
|
|
old.extend(inclusions)
|
|
} else {
|
|
current.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.file_scan_exclusions.as_mut() {
|
|
old.extend(exclusions)
|
|
} else {
|
|
current.file_scan_exclusions = Some(exclusions)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
fn path_matchers(values: &[String], context: &'static str) -> anyhow::Result<PathMatcher> {
|
|
PathMatcher::new(values).with_context(|| format!("Failed to parse globs from {}", context))
|
|
}
|