mirror of
https://github.com/zed-industries/zed.git
synced 2025-02-10 12:19:28 +00:00
Load worktree settings when loading options for language servers (#7615)
Previously we only looked at the global settings, this changes that to start looking in local settings first and then fall back to global ones. Fixes #4279. Release Notes: - Fixed language server configurations not being picked up from local, worktree-specific settings. ([#4279](https://github.com/zed-industries/zed/issues/4279)). Co-authored-by: Antonio <antonio@zed.dev> Co-authored-by: Bennet <bennetbo@gmx.de>
This commit is contained in:
parent
f3bfa11148
commit
ad97e447f5
1 changed files with 2 additions and 1 deletions
|
@ -2787,7 +2787,8 @@ impl Project {
|
|||
None => return,
|
||||
};
|
||||
|
||||
let project_settings = ProjectSettings::get_global(cx);
|
||||
let project_settings =
|
||||
ProjectSettings::get(Some((worktree_id.to_proto() as usize, Path::new(""))), cx);
|
||||
let lsp = project_settings.lsp.get(&adapter.name.0);
|
||||
let override_options = lsp.map(|s| s.initialization_options.clone()).flatten();
|
||||
|
||||
|
|
Loading…
Reference in a new issue