Merge pull request #1024 from micahscopes/additional-lsp-diagnostics

additional LSP diagnostics + fixups

Author: sbillig

crates/language-server/src/functionality/diagnostics.rs

@@ -12,8 +12,9 @@ use hir::{
     analysis_pass::AnalysisPassManager, diagnostics::DiagnosticVoucher, lower::map_file_to_mod,
     ParsingPass,
 };
-use hir_analysis::name_resolution::{
-    DefConflictAnalysisPass, ImportAnalysisPass, PathAnalysisPass,
+use hir_analysis::{
+    name_resolution::{DefConflictAnalysisPass, ImportAnalysisPass, PathAnalysisPass},
+    ty::{BodyAnalysisPass, FuncAnalysisPass, ImplTraitAnalysisPass, TraitAnalysisPass},
 };
 use url::Url;
 
@@ -130,8 +131,10 @@ fn initialize_analysis_pass(db: &LanguageServerDatabase) -> AnalysisPassManager<
     pass_manager.add_module_pass(Box::new(DefConflictAnalysisPass::new(db)));
     pass_manager.add_module_pass(Box::new(ImportAnalysisPass::new(db)));
     pass_manager.add_module_pass(Box::new(PathAnalysisPass::new(db)));
-    // pass_manager.add_module_pass(Box::new(FuncAnalysisPass::new(db)));
-    // pass_manager.add_module_pass(Box::new(TraitAnalysisPass::new(db)));
+    pass_manager.add_module_pass(Box::new(TraitAnalysisPass::new(db)));
+    pass_manager.add_module_pass(Box::new(ImplTraitAnalysisPass::new(db)));
+    pass_manager.add_module_pass(Box::new(FuncAnalysisPass::new(db)));
+    pass_manager.add_module_pass(Box::new(BodyAnalysisPass::new(db)));
 
     pass_manager
 }

crates/language-server/src/server.rs

@@ -13,25 +13,18 @@ use async_lsp::ClientSocket;
 use async_std::stream::StreamExt;
 use futures_batch::ChunksTimeoutStreamExt;
 // use serde_json::Value;
-use tracing::info;
 use tracing::instrument::WithSubscriber;
+use tracing::{info, warn};
 
 use crate::backend::Backend;
 use crate::functionality::{goto, handlers};
+use async_lsp::lsp_types::request::Initialize;
 use async_lsp::router::Router;
-use async_lsp::{
-    lsp_types::request::Initialize,
-    // steer::{FirstComeFirstServe, LspSteer},
-    // util::BoxLspService,
-    // ResponseError,
-};
 
 pub(crate) fn setup(
     client: ClientSocket,
     name: String,
-    // ) -> LspActorService<Backend> {
 ) -> WithFallbackService<LspActorService<Backend>, Router<()>> {
-    // BoxLspService<Value, ResponseError> {
     info!("Setting up server");
     let client_for_actor = client.clone();
     let client_for_logging = client.clone();
@@ -60,12 +53,12 @@ pub(crate) fn setup(
 
     let mut streaming_router = Router::new(());
     setup_streams(client.clone(), &mut streaming_router);
+    setup_unhandled(&mut streaming_router);
 
-    // lsp_actor_service
     WithFallbackService::new(lsp_actor_service, streaming_router)
 }
 
-pub fn setup_streams(client: ClientSocket, router: &mut Router<()>) {
+fn setup_streams(client: ClientSocket, router: &mut Router<()>) {
     info!("setting up streams");
 
     let mut diagnostics_stream = router
@@ -83,3 +76,15 @@ pub fn setup_streams(client: ClientSocket, router: &mut Router<()>) {
         .with_current_subscriber(),
     );
 }
+
+fn setup_unhandled(router: &mut Router<()>) {
+    router
+        .unhandled_notification(|_, params| {
+            warn!("Unhandled notification: {:?}", params);
+            std::ops::ControlFlow::Continue(())
+        })
+        .unhandled_event(|_, params| {
+            warn!("Unhandled event: {:?}", params);
+            std::ops::ControlFlow::Continue(())
+        });
+}

crates/language-server/src/util.rs

@@ -5,7 +5,7 @@ use common::{
 };
 use fxhash::FxHashMap;
 use hir::{hir_def::scope_graph::ScopeId, span::LazySpan, SpannedHirDb};
-use tracing::error;
+use tracing::{error, warn};
 use url::Url;
 
 pub fn calculate_line_offsets(text: &str) -> Vec<usize> {
@@ -83,14 +83,26 @@ pub fn diag_to_lsp(
 ) -> FxHashMap<async_lsp::lsp_types::Url, Vec<async_lsp::lsp_types::Diagnostic>> {
     let mut result =
         FxHashMap::<async_lsp::lsp_types::Url, Vec<async_lsp::lsp_types::Diagnostic>>::default();
-    diag.sub_diagnostics.into_iter().for_each(|sub| {
-        let uri = sub.span.as_ref().unwrap().file.abs_path(db);
-        let lsp_range = to_lsp_range_from_span(sub.span.unwrap(), db);
 
-        // todo: generalize this to handle other kinds of URLs besides file URLs
-        let uri = Url::from_file_path(uri).unwrap();
+    diag.sub_diagnostics.into_iter().for_each(|sub| {
+        let span = match sub.span {
+            Some(span) => span,
+            None => {
+                warn!("Diagnostic span is missing");
+                return;
+            }
+        };
+
+        let uri = span.file.abs_path(db);
+        let uri = match Url::from_file_path(uri) {
+            Ok(uri) => uri,
+            Err(()) => {
+                error!("Failed to convert path to URL");
+                return;
+            }
+        };
 
-        match lsp_range {
+        match to_lsp_range_from_span(span, db) {
             Ok(range) => {
                 let diags = result.entry(uri).or_insert_with(Vec::new);
                 diags.push(async_lsp::lsp_types::Diagnostic {
@@ -102,14 +114,15 @@ pub fn diag_to_lsp(
                     related_information: None,
                     tags: None,
                     code_description: None,
-                    data: None, // for code actions
+                    data: None,
                 });
             }
-            Err(_) => {
-                error!("Failed to convert span to range");
+            Err(e) => {
+                error!("Error getting diagnostic: {} (ignoring diagnostic)", e);
             }
         }
     });
+
     result
 }