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

Run Project::diagnose when registering a new language on Worktree

Browse source
This commit is contained in:
Antonio Scandurra 2022-01-03 16:58:36 +01:00
parent 2b31a48ef9
commit 496066db59
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -475,7 +475,10 @@ impl Project {
fn add_worktree(&mut self, worktree: ModelHandle<Worktree>, cx: &mut ModelContext<Self>) { fn add_worktree(&mut self, worktree: ModelHandle<Worktree>, cx: &mut ModelContext<Self>) {
cx.observe(&worktree, |_, _, cx| cx.notify()).detach(); cx.observe(&worktree, |_, _, cx| cx.notify()).detach();
cx.subscribe(&worktree, |_, worktree, event, cx| match event { cx.subscribe(&worktree, |this, worktree, event, cx| match event {
worktree::Event::LanguageRegistered => {
this.diagnose(cx);
}
worktree::Event::DiagnosticsUpdated(path) => { worktree::Event::DiagnosticsUpdated(path) => {
cx.emit(Event::DiagnosticsUpdated(ProjectPath { cx.emit(Event::DiagnosticsUpdated(ProjectPath {
worktree_id: worktree.id(), worktree_id: worktree.id(),

2
crates/project/src/worktree.rs
View file

@ -68,6 +68,7 @@ pub enum Worktree {
#[derive(Debug)] #[derive(Debug)]
pub enum Event { pub enum Event {
LanguageRegistered,
DiagnosticsUpdated(Arc<Path>), DiagnosticsUpdated(Arc<Path>),
} }
@ -1060,6 +1061,7 @@ impl LocalWorktree {
) -> Option<Arc<LanguageServer>> { ) -> Option<Arc<LanguageServer>> {
if !self.languages.iter().any(|l| Arc::ptr_eq(l, language)) { if !self.languages.iter().any(|l| Arc::ptr_eq(l, language)) {
self.languages.push(language.clone()); self.languages.push(language.clone());
cx.emit(Event::LanguageRegistered);
} }
if let Some(server) = self.language_servers.get(language.name()) { if let Some(server) = self.language_servers.get(language.name()) {