diff --git a/assets/settings/default.json b/assets/settings/default.json index b47f0dc2e7e17decf3ff76de32eccd3d713daa4c..bf2acc708e9fe49653f02ab607059ea1b8a48725 100644 --- a/assets/settings/default.json +++ b/assets/settings/default.json @@ -268,7 +268,9 @@ // Whether to show warnings or not by default. "include_warnings": true }, - // TODO kb docs + // Add files or globs of files that will be excluded by Zed entirely: + // they will be skipped during FS scan(s), file tree and file search + // will lack the corresponding file entries. "file_scan_exclusions": [ "**/.git", "**/.svn", diff --git a/crates/collab/src/tests/integration_tests.rs b/crates/collab/src/tests/integration_tests.rs index 61bbabccddfd2cb96596c854682c3f8d5e918154..fa7c4fe67df4fed4645e8c6552e242b3d7662276 100644 --- a/crates/collab/src/tests/integration_tests.rs +++ b/crates/collab/src/tests/integration_tests.rs @@ -1381,8 +1381,6 @@ async fn test_share_project( Path::new("a.txt"), Path::new("b.txt"), Path::new("ignored-dir"), - Path::new("ignored-dir/c.txt"), - Path::new("ignored-dir/d.txt"), ] ); }); diff --git a/crates/project/src/project_settings.rs b/crates/project/src/project_settings.rs index cda37be601c8e67b96eda2b708074b638e240f30..a7acc7bba8d8e98cbecc832d042e545133dc5058 100644 --- a/crates/project/src/project_settings.rs +++ b/crates/project/src/project_settings.rs @@ -10,7 +10,6 @@ pub struct ProjectSettings { pub lsp: HashMap, LspSettings>, #[serde(default)] pub git: GitSettings, - // TODO kb docs and project_search test #[serde(default)] pub file_scan_exclusions: Option>, } diff --git a/crates/project/src/worktree.rs b/crates/project/src/worktree.rs index 1dd0771cfe3deb1fb43bacd1c05f8f0e171335bb..aa6341f330f726a42b15644a04f24a5ede187531 100644 --- a/crates/project/src/worktree.rs +++ b/crates/project/src/worktree.rs @@ -3502,6 +3502,7 @@ impl BackgroundScanner { let state = self.state.lock(); let snapshot = &state.snapshot; root_abs_path = snapshot.abs_path().clone(); + // TODO kb we need `DOT_GIT` and `GITIGNORE` entries always processed. if snapshot.is_abs_path_excluded(&job.abs_path) { log::error!("skipping excluded directory {:?}", job.path); return Ok(()); diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs index 8f19e7480259e67e7affdfd7b476d750de8545e4..5f3a6db6d49cd089ef9b3bc1855888b462a674fd 100644 --- a/crates/search/src/project_search.rs +++ b/crates/search/src/project_search.rs @@ -1767,14 +1767,16 @@ impl View for ProjectSearchBar { render_option_button_icon("icons/word_search.svg", SearchOptions::WHOLE_WORD, cx) }); - let include_ignored = is_semantic_disabled.then(|| { + let mut include_ignored = is_semantic_disabled.then(|| { render_option_button_icon( - // TODO kb icon + // TODO proper icon "icons/case_insensitive.svg", SearchOptions::INCLUDE_IGNORED, cx, ) }); + // TODO not implemented yet + let _ = include_ignored.take(); let search_button_for_mode = |mode, side, cx: &mut ViewContext| { let is_active = if let Some(search) = self.active_project_search.as_ref() {