
There's still a bit more work to do on this, but this PR is compiling (with warnings) after eliminating the key types. When the tasks below are complete, this will be the new narrative for GPUI: - `Entity<T>` - This replaces `View<T>`/`Model<T>`. It represents a unit of state, and if `T` implements `Render`, then `Entity<T>` implements `Element`. - `&mut App` This replaces `AppContext` and represents the app. - `&mut Context<T>` This replaces `ModelContext` and derefs to `App`. It is provided by the framework when updating an entity. - `&mut Window` Broken out of `&mut WindowContext` which no longer exists. Every method that once took `&mut WindowContext` now takes `&mut Window, &mut App` and every method that took `&mut ViewContext<T>` now takes `&mut Window, &mut Context<T>` Not pictured here are the two other failed attempts. It's been quite a month! Tasks: - [x] Remove `View`, `ViewContext`, `WindowContext` and thread through `Window` - [x] [@cole-miller @mikayla-maki] Redraw window when entities change - [x] [@cole-miller @mikayla-maki] Get examples and Zed running - [x] [@cole-miller @mikayla-maki] Fix Zed rendering - [x] [@mikayla-maki] Fix todo! macros and comments - [x] Fix a bug where the editor would not be redrawn because of view caching - [x] remove publicness window.notify() and replace with `AppContext::notify` - [x] remove `observe_new_window_models`, replace with `observe_new_models` with an optional window - [x] Fix a bug where the project panel would not be redrawn because of the wrong refresh() call being used - [x] Fix the tests - [x] Fix warnings by eliminating `Window` params or using `_` - [x] Fix conflicts - [x] Simplify generic code where possible - [x] Rename types - [ ] Update docs ### issues post merge - [x] Issues switching between normal and insert mode - [x] Assistant re-rendering failure - [x] Vim test failures - [x] Mac build issue Release Notes: - N/A --------- Co-authored-by: Antonio Scandurra <me@as-cii.com> Co-authored-by: Cole Miller <cole@zed.dev> Co-authored-by: Mikayla <mikayla@zed.dev> Co-authored-by: Joseph <joseph@zed.dev> Co-authored-by: max <max@zed.dev> Co-authored-by: Michael Sloan <michael@zed.dev> Co-authored-by: Mikayla Maki <mikaylamaki@Mikaylas-MacBook-Pro.local> Co-authored-by: Mikayla <mikayla.c.maki@gmail.com> Co-authored-by: joão <joao@zed.dev>
103 lines
3.3 KiB
Rust
103 lines
3.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};
|
|
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)]
|
|
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| p != "")
|
|
.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 path_matchers(values: &[String], context: &'static str) -> anyhow::Result<PathMatcher> {
|
|
PathMatcher::new(values).with_context(|| format!("Failed to parse globs from {}", context))
|
|
}
|