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

context_server: Only look for context server project settings in visible worktrees (#27633)

Browse source 
This PR fixes an issue where we were looking for context server project
settings in _all_ worktrees, not just visible ones.

This meant that if you had a single file worktree open (e.g.,
`settings.json`) this could impact whether context servers defined in
project settings would load.

Release Notes:

- Fixed an issue where context servers defined in project settings would
not be respected in some scenarios.

Co-authored-by: Wilhelm Klopp <wil.klopp@gmail.com>
This commit is contained in:
Marshall Bowers 2025-03-27 18:58:29 -04:00 • committed by GitHub
parent edc7d73643
commit f1ce83b533
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/context_server/src/manager.rs
View file

@ -247,12 +247,15 @@ impl ContextServerManager {
let mut desired_servers = HashMap::default(); let mut desired_servers = HashMap::default();
let (registry, project) = this.update(cx, |this, cx| { let (registry, project) = this.update(cx, |this, cx| {
let location = this.project.read(cx).worktrees(cx).next().map(|worktree| { let location = this
settings::SettingsLocation { .project
.read(cx)
.visible_worktrees(cx)
.next()
.map(|worktree| settings::SettingsLocation {
worktree_id: worktree.read(cx).id(), worktree_id: worktree.read(cx).id(),
path: Path::new(""), path: Path::new(""),
} });
});
let settings = ContextServerSettings::get(location, cx); let settings = ContextServerSettings::get(location, cx);
desired_servers = settings.context_servers.clone(); desired_servers = settings.context_servers.clone();