React on message-less LSP requests properly

Kirill Bulatov and Julia Risley created 2 years ago

Co-Authored-By: Julia Risley <[e-mail]>

Change summary

crates/editor/src/editor.rs   |  3 +--
crates/editor/src/element.rs  |  1 -
crates/lsp/src/lsp.rs         |  1 +
crates/project/src/project.rs | 12 +++---------
4 files changed, 5 insertions(+), 12 deletions(-)

Detailed changes

crates/editor/src/editor.rs

@@ -1339,8 +1339,7 @@ impl Editor {
                 }));
                 project_subscriptions.push(cx.subscribe(project, |editor, _, event, cx| {
                     match event {
-                        project::Event::LanguageServerReady(_) => {
-                            dbg!("@@@@@@@@@@@@@ ReceiveD event");
+                        project::Event::ReloadInlayHints => {
                             editor.update_inlay_hints(cx);
                         }
                         _ => {}

crates/editor/src/element.rs

@@ -1821,7 +1821,6 @@ impl LineWithInvisibles {
 
         // TODO kb bad: syscalls + cloning happen very frequently, check the timestamp first
         let new_hints = editor.inlay_hints.read();
-        dbg!(new_hints.last());
 
         self.draw_invisibles(
             &selection_ranges,

crates/lsp/src/lsp.rs

@@ -615,6 +615,7 @@ impl LanguageServer {
                                 })
                                 .detach();
                         }
+
                         Err(error) => {
                             log::error!(
                                 "error deserializing {} request: {:?}, message: {:?}",

crates/project/src/project.rs

@@ -254,7 +254,6 @@ pub enum Event {
     LanguageServerAdded(LanguageServerId),
     LanguageServerRemoved(LanguageServerId),
     LanguageServerLog(LanguageServerId, String),
-    LanguageServerReady(LanguageServerId),
     Notification(String),
     ActiveEntryChanged(Option<ProjectEntryId>),
     WorktreeAdded,
@@ -278,6 +277,7 @@ pub enum Event {
         new_peer_id: proto::PeerId,
     },
     CollaboratorLeft(proto::PeerId),
+    ReloadInlayHints,
 }
 
 pub enum LanguageServerState {
@@ -2813,19 +2813,13 @@ impl Project {
 
             language_server
                 .on_request::<lsp::request::InlayHintRefreshRequest, _, _>({
-                    dbg!("!!!!!!!!!!!!!!");
                     let this = this.downgrade();
-                    move |params, mut cx| async move {
-                        // TODO kb does not get called now, why?
-                        dbg!("#########################");
-
+                    move |(), mut cx| async move {
                         let this = this
                             .upgrade(&cx)
                             .ok_or_else(|| anyhow!("project dropped"))?;
-                        dbg!(params);
                         this.update(&mut cx, |_, cx| {
-                            dbg!("@@@@@@@@@@@@@ SENT event");
-                            cx.emit(Event::LanguageServerReady(server_id));
+                            cx.emit(Event::ReloadInlayHints);
                         });
                         Ok(())
                     }