Add code lens sign (#1189)

Author: martskins

src/language_server_protocol.rs

@@ -180,6 +180,12 @@ impl LanguageClient {
             ));
         }
 
+        let cld = self.get_config(|c| c.code_lens_display.clone())?;
+        cmds.push(format!(
+            "sign define LanguageClientCodeLens text={} texthl={}",
+            cld.sign_text, cld.sign_texthl
+        ));
+
         self.vim()?.command(cmds)?;
         Ok(())
     }
@@ -2912,10 +2918,11 @@ impl LanguageClient {
     #[tracing::instrument(level = "info", skip(self))]
     fn get_signs_to_display(&self, filename: &str, viewport: &Viewport) -> Result<Vec<Sign>> {
         let max_signs = self.get_config(|c| c.diagnostics_signs_max.unwrap_or(std::usize::MAX))?;
-        let signs: Vec<_> = self.get_state(|state| {
+        let mut signs = vec![];
+        let mut diagnostics: Vec<Sign> = self.get_state(|state| {
             let diagnostics = state.diagnostics.get(filename).cloned().unwrap_or_default();
             let mut diagnostics = diagnostics
-                .iter()
+                .into_iter()
                 .filter(|diag| viewport.overlaps(diag.range))
                 .sorted_by_key(|diag| {
                     (
@@ -2925,14 +2932,22 @@ impl LanguageClient {
                 })
                 .collect_vec();
             diagnostics.dedup_by_key(|diag| diag.range.start.line);
-            diagnostics
-                .into_iter()
-                .take(max_signs)
+            diagnostics.iter().map(Into::into).collect_vec()
+        })?;
+
+        let mut code_lenses: Vec<Sign> = self.get_state(|state| {
+            let ccll = state.code_lens.get(filename).cloned().unwrap_or_default();
+            let ccll = ccll
+                .iter()
+                .filter(|cl| viewport.overlaps(cl.range))
                 .map(Into::into)
-                .collect()
+                .collect_vec();
+            ccll
         })?;
 
-        Ok(signs)
+        signs.append(&mut diagnostics);
+        signs.append(&mut code_lenses);
+        Ok(signs.into_iter().take(max_signs).collect())
     }
 
     #[tracing::instrument(level = "info", skip(self))]

src/sign.rs

@@ -1,4 +1,4 @@
-use lsp_types::{Diagnostic, DiagnosticSeverity};
+use lsp_types::{CodeLens, Diagnostic, DiagnosticSeverity};
 use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
@@ -19,3 +19,13 @@ impl From<&Diagnostic> for Sign {
         Sign { id, line, name }
     }
 }
+
+impl From<&CodeLens> for Sign {
+    fn from(code_lens: &CodeLens) -> Self {
+        let line = code_lens.range.start.line;
+        let name = "LanguageClientCodeLens".to_owned();
+        let id = 95_000 + line as u64;
+
+        Sign { id, line, name }
+    }
+}

src/types.rs

@@ -356,12 +356,16 @@ impl FromStr for DiagnosticsList {
 #[serde(rename_all = "camelCase")]
 pub struct CodeLensDisplay {
     pub virtual_texthl: String,
+    pub sign_text: String,
+    pub sign_texthl: String,
 }
 
 impl Default for CodeLensDisplay {
     fn default() -> Self {
         CodeLensDisplay {
             virtual_texthl: "LanguageClientCodeLens".into(),
+            sign_text: "🔍".to_owned(),
+            sign_texthl: "Todo".to_owned(),
         }
     }
 }