Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Keep .vscode folder included during initialization even if it's in .gitignore (#28631)

Browse source 
This fixes an issue where tasks in `.vscode/tasks.json` weren't being
loaded at startup of a project

Closes #28494

Release Notes:

- Tasks are now loaded from local `.vscode/tasks.json` files even if
they are `.gitignore`d
This commit is contained in:
hrou0003 2025-04-12 22:54:47 +10:00 • committed by GitHub
parent d1ffda9bfe
commit e4844b281d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
crates/paths/src/paths.rs
View file

@ -375,6 +375,11 @@ pub fn local_settings_folder_relative_path() -> &'static Path {
Path::new(".zed") Path::new(".zed")
} }
/// Returns the relative path to a `.vscode` folder within a project.
pub fn local_vscode_folder_relative_path() -> &'static Path {
Path::new(".vscode")
}
/// Returns the relative path to a `settings.json` file within a project. /// Returns the relative path to a `settings.json` file within a project.
pub fn local_settings_file_relative_path() -> &'static Path { pub fn local_settings_file_relative_path() -> &'static Path {
Path::new(".zed/settings.json") Path::new(".zed/settings.json")

3
crates/worktree/src/worktree.rs
View file

@ -29,7 +29,7 @@ use ignore::IgnoreStack;
use language::DiskState; use language::DiskState;
use parking_lot::Mutex; use parking_lot::Mutex;
use paths::local_settings_folder_relative_path; use paths::{local_settings_folder_relative_path, local_vscode_folder_relative_path};
use postage::{ use postage::{
barrier, barrier,
prelude::{Sink as _, Stream as _}, prelude::{Sink as _, Stream as _},
@ -2865,6 +2865,7 @@ impl BackgroundScannerState {
(!entry.is_external && (!entry.is_ignored || entry.is_always_included)) (!entry.is_external && (!entry.is_ignored || entry.is_always_included))
|| entry.path.file_name() == Some(*DOT_GIT) || entry.path.file_name() == Some(*DOT_GIT)
|| entry.path.file_name() == Some(local_settings_folder_relative_path().as_os_str()) || entry.path.file_name() == Some(local_settings_folder_relative_path().as_os_str())
|| entry.path.file_name() == Some(local_vscode_folder_relative_path().as_os_str())
|| self.scanned_dirs.contains(&entry.id) // If we've ever scanned it, keep scanning || self.scanned_dirs.contains(&entry.id) // If we've ever scanned it, keep scanning
|| self || self
.paths_to_scan .paths_to_scan