diagnostics

Author: juleswritescode

crates/pg_lsp/src/b_server.rs

@@ -9,6 +9,7 @@ use crate::client::client_flags::ClientFlags;
 use crate::server::options::ClientConfigurationOptions;
 use crate::utils::file_path;
 use crate::utils::normalize_uri;
+use crate::utils::to_proto;
 use crate::workspace_handler::WorkspaceHandler;
 
 struct Server {
@@ -87,28 +88,33 @@ impl Server {
         }
     }
 
-    async fn publish_diagnostics(&self, mut uri: Url) -> anyhow::Result<()> {
+    async fn publish_diagnostics(&self, mut uri: Url) {
         normalize_uri(&mut uri);
 
         let diagnostics = self
             .workspace_handler
             .get_diagnostics(file_path(&uri))
             .await;
 
+        let diagnostics: Vec<Diagnostic> = diagnostics
+            .into_iter()
+            .map(|(d, r)| to_proto::diagnostic(d, r))
+            .collect();
+
         self.client
             .send_notification::<ShowMessage>(ShowMessageParams {
                 typ: MessageType::INFO,
                 message: format!("diagnostics {}", diagnostics.len()),
-            })
-            .await;
+            });
 
         let params = PublishDiagnosticsParams {
             uri,
             diagnostics,
             version: None,
         };
 
-        Ok(())
+        self.client
+            .send_notification::<notification::PublishDiagnostics>(params);
     }
 }
 

crates/pg_lsp/src/utils/line_index_ext.rs

@@ -1,6 +1,6 @@
 use line_index::{LineCol, LineColUtf16, LineIndex};
-use lsp_types::{Position, Range};
 use text_size::{TextRange, TextSize};
+use tower_lsp::lsp_types::{Position, Range};
 
 pub trait LineIndexExt {
     fn offset_lsp(&self, line_col: Position) -> Option<TextSize>;

crates/pg_lsp/src/utils/to_proto.rs

@@ -1,9 +1,7 @@
-use pg_base_db::Document;
 use pg_diagnostics::Diagnostic;
+use tower_lsp::lsp_types;
 
-use super::line_index_ext::LineIndexExt;
-
-pub fn diagnostic(document: &Document, diagnostic: &Diagnostic) -> lsp_types::Diagnostic {
+pub fn diagnostic(diagnostic: Diagnostic, range: lsp_types::Range) -> lsp_types::Diagnostic {
     let severity = match diagnostic.severity {
         pg_diagnostics::Severity::Error => lsp_types::DiagnosticSeverity::ERROR,
         pg_diagnostics::Severity::Warning => lsp_types::DiagnosticSeverity::WARNING,
@@ -12,14 +10,9 @@ pub fn diagnostic(document: &Document, diagnostic: &Diagnostic) -> lsp_types::Di
         pg_diagnostics::Severity::Fatal => lsp_types::DiagnosticSeverity::ERROR,
     };
 
-    let range = document
-        .line_index
-        .line_col_lsp_range(diagnostic.range)
-        .unwrap();
-
     lsp_types::Diagnostic {
         severity: Some(severity),
-        source: Some(diagnostic.source.clone()),
-        ..lsp_types::Diagnostic::new_simple(range, diagnostic.message.clone())
+        source: Some(diagnostic.source),
+        ..lsp_types::Diagnostic::new_simple(range, diagnostic.message)
     }
 }

crates/pg_lsp/src/workspace_handler.rs

@@ -1,11 +1,10 @@
 use std::sync::Arc;
 
-use lsp_types::Range;
 use pg_base_db::PgLspPath;
 use pg_diagnostics::Diagnostic;
 use pg_workspace::Workspace;
-use text_size::TextRange;
 use tokio::sync::RwLock;
+use tower_lsp::lsp_types::Range;
 
 use crate::{db_connection::DbConnection, utils::line_index_ext::LineIndexExt};
 
@@ -82,7 +81,12 @@ impl WorkspaceHandler {
             .diagnostics(&path)
             .into_iter()
             .map(|d| {
-                let range = doc.as_ref().unwrap().line_index.line_col_lsp_range(d.range).unwrap();
+                let range = doc
+                    .as_ref()
+                    .unwrap()
+                    .line_index
+                    .line_col_lsp_range(d.range)
+                    .unwrap();
                 (d, range)
             })
             .collect()