Refactor lsp module into smaller modules for readability (#1207)

* Refactor lsp module into smaller modules for readability

* Fix clippy issues

Author: martskins

src/config/mod.rs

@@ -3,7 +3,7 @@ mod server_command;
 use crate::{
     types::{
         CodeLensDisplay, DiagnosticsDisplay, DiagnosticsList, DocumentHighlightDisplay,
-        HoverPreviewOption, RootMarkers, SelectionUI, UseVirtualText,
+        HoverPreviewOption, RootMarkers, SelectionUi, UseVirtualText,
     },
     vim::Vim,
 };
@@ -55,7 +55,7 @@ impl SemanticTokenMapping {
 pub struct Config {
     pub auto_start: bool,
     pub server_commands: HashMap<String, ServerCommand>,
-    pub selection_ui: SelectionUI,
+    pub selection_ui: SelectionUi,
     pub trace: TraceOption,
     pub settings_path: Vec<String>,
     pub load_settings: bool,
@@ -105,7 +105,7 @@ impl Default for Config {
         Self {
             server_commands: HashMap::new(),
             auto_start: true,
-            selection_ui: SelectionUI::LocationList,
+            selection_ui: SelectionUi::LocationList,
             selection_ui_auto_open: true,
             trace: TraceOption::default(),
             diagnostics_enable: true,
@@ -218,9 +218,9 @@ impl Config {
         let res: DeserializableConfig = vim.eval(req.replace("\n", ""))?;
         let loaded_fzf = vim.eval::<_, i64>("get(g:, 'loaded_fzf')")? == 1;
         let selection_ui = match res.selection_ui {
-            Some(s) => SelectionUI::from_str(&s)?,
-            None if loaded_fzf => SelectionUI::Funcref,
-            None => SelectionUI::default(),
+            Some(s) => SelectionUi::from_str(&s)?,
+            None if loaded_fzf => SelectionUi::Funcref,
+            None => SelectionUi::default(),
         };
 
         let diagnostics_list = match res.diagnostics_list {

src/extensions/clangd.rs

@@ -1,4 +1,5 @@
-use crate::{language_client::LanguageClient, utils::ToUrl};
+use crate::language_client::LanguageClient;
+use crate::utils::ToUrl;
 use anyhow::Result;
 use jsonrpc_core::Value;
 use lsp_types::{request::Request, TextDocumentIdentifier};

src/extensions/mod.rs

@@ -1,6 +1,7 @@
 pub mod clangd;
 pub mod gopls;
 pub mod java;
+pub mod rls;
 pub mod rust_analyzer;
 
 use crate::language_client::LanguageClient;

src/extensions/rls.rs

@@ -0,0 +1,88 @@
+use crate::language_client::LanguageClient;
+use crate::types::{VIM_SERVER_STATUS, VIM_SERVER_STATUS_MESSAGE};
+use crate::utils::escape_single_quote;
+use anyhow::Result;
+use jsonrpc_core::Value;
+use serde::{Deserialize, Serialize};
+
+pub mod notification {
+    pub const WINDOW_PROGRESS: &str = "window/progress";
+    pub const RUST_DOCUMENT_BEGIN_BUILD: &str = "rustDocument/beginBuild";
+    pub const RUST_DOCUMENT_DIAGNOSTICS_BEGIN: &str = "rustDocument/diagnosticsBegin";
+    pub const RUST_DOCUMENT_DIAGNOSTICS_END: &str = "rustDocument/diagnosticsEnd";
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct WindowProgressParams {
+    pub title: Option<String>,
+    pub message: Option<String>,
+    pub percentage: Option<f64>,
+    pub done: Option<bool>,
+}
+
+impl LanguageClient {
+    #[tracing::instrument(level = "info", skip(self))]
+    pub fn rls_window_progress(&self, params: &Value) -> Result<()> {
+        let params = WindowProgressParams::deserialize(params)?;
+
+        let done = params.done.unwrap_or(false);
+
+        let mut buf = "LS: ".to_owned();
+
+        if done {
+            buf += "Idle";
+        } else {
+            // For RLS this can be "Build" or "Diagnostics" or "Indexing".
+            buf += params.title.as_ref().map(AsRef::as_ref).unwrap_or("Busy");
+
+            // For RLS this is the crate name, present only if the progress isn't known.
+            if let Some(message) = params.message {
+                buf += &format!(" ({})", &message);
+            }
+            // For RLS this is the progress percentage, present only if the it's known.
+            if let Some(percentage) = params.percentage {
+                buf += &format!(" ({:.1}% done)", percentage);
+            }
+        }
+
+        self.vim()?.command(vec![
+            format!("let {}={}", VIM_SERVER_STATUS, if done { 0 } else { 1 }),
+            format!(
+                "let {}='{}'",
+                VIM_SERVER_STATUS_MESSAGE,
+                &escape_single_quote(buf)
+            ),
+        ])?;
+        Ok(())
+    }
+
+    #[tracing::instrument(level = "info", skip(self))]
+    pub fn rls_handle_begin_build(&self, _params: &Value) -> Result<()> {
+        self.vim()?.command(vec![
+            format!("let {}=1", VIM_SERVER_STATUS),
+            format!("let {}='Rust: build begin'", VIM_SERVER_STATUS_MESSAGE),
+        ])?;
+        Ok(())
+    }
+
+    #[tracing::instrument(level = "info", skip(self))]
+    pub fn rls_handle_diagnostics_begin(&self, _params: &Value) -> Result<()> {
+        self.vim()?.command(vec![
+            format!("let {}=1", VIM_SERVER_STATUS),
+            format!(
+                "let {}='Rust: diagnostics begin'",
+                VIM_SERVER_STATUS_MESSAGE
+            ),
+        ])?;
+        Ok(())
+    }
+
+    #[tracing::instrument(level = "info", skip(self))]
+    pub fn rls_handle_diagnostics_end(&self, _params: &Value) -> Result<()> {
+        self.vim()?.command(vec![
+            format!("let {}=0", VIM_SERVER_STATUS),
+            format!("let {}='Rust: diagnostics end'", VIM_SERVER_STATUS_MESSAGE),
+        ])?;
+        Ok(())
+    }
+}

src/extensions/rust_analyzer.rs

@@ -61,11 +61,11 @@ pub struct InlayHint {
     pub label: String,
 }
 
-impl Into<types::InlayHint> for InlayHint {
-    fn into(self) -> types::InlayHint {
+impl From<InlayHint> for types::InlayHint {
+    fn from(hint: InlayHint) -> Self {
         types::InlayHint {
-            range: self.range,
-            label: self.label,
+            range: hint.range,
+            label: hint.label,
         }
     }
 }