Multiple correctness fixes

Author: martskins

autoload/LanguageClient.vim

@@ -123,7 +123,11 @@ function! s:useVirtualText() abort
         return l:use
     endif
 
-    return exists('*nvim_buf_set_virtual_text')
+    if exists('*nvim_buf_set_virtual_text')
+        return 'All'
+    else
+        return 'No'
+    endif
 endfunction
 
 function! s:IsTrue(v) abort
@@ -1313,15 +1317,15 @@ function! LanguageClient#java_classFileContents(...) abort
     return LanguageClient#Call('java/classFileContents', l:params, l:Callback)
 endfunction
 
-function! LanguageClient#codeLensAction(...) abort
+function! LanguageClient#handleCodeLensAction(...) abort
     let l:Callback = get(a:000, 1, v:null)
     let l:params = {
                 \ 'filename': LSP#filename(),
                 \ 'line': LSP#line(),
                 \ 'character': LSP#character(),
                 \ }
     call extend(l:params, get(a:000, 0, {}))
-    return LanguageClient#Call('LanguageClient_CodeLensAction', l:params, l:Callback)
+    return LanguageClient#Call('LanguageClient/handleCodeLensAction', l:params, l:Callback)
 endfunction
 
 function! LanguageClient_contextMenuItems() abort

doc/LanguageClient.txt

@@ -344,7 +344,7 @@ Default: >
 
 Specify whether to use virtual text to display diagnostics.
 
-Default: "CodeLens" whenever virtual text is supported.
+Default: "All" whenever virtual text is supported.
 Valid Options: "All" | "No" | "CodeLens" | "Diagnostics"
 
 2.26 g:LanguageClient_useFloatingHover *g:LanguageClient_useFloatingHover*
@@ -499,7 +499,7 @@ Computes and displays the codeLens for the currently open file.
 *LanguageClient_textDocument_codeLensAction()*
 Signature: LanguageClient#textDocument_codeLensAction(...)
 
-Runs the action associated with the codeLens at the current line. If does
+Runs the action associated with the codeLens at the current line. It does
 nothing if the codeLens is not actionable.
 
 *LanguageClient#textDocument_documentSymbol()*

src/language_server_protocol.rs

@@ -851,14 +851,20 @@ impl LanguageClient {
                 }
             }
             "rust-analyzer.runSingle" | "rust-analyzer.run" => {
+                let has_term: i32 = self.vim()?.eval("exists(':terminal')")?;
+                if has_term == 0 {
+                    bail!("Terminal support is required for this action");
+                }
+
                 if let Some(ref args) = cmd.arguments {
-                    let args = args[0].clone();
-                    let bin: String =
-                        try_get("bin", &args)?.ok_or_else(|| err_msg("no bin found"))?;
-                    let arguments: Vec<String> = try_get("args", &args)?.unwrap_or_else(|| vec![]);
-                    let cmd = format!("term {} {}", bin, arguments.join(" "));
-                    let cmd = cmd.replace('"', "");
-                    self.vim()?.command(cmd)?;
+                    if let Some(args) = args.first().cloned() {
+                        let bin: String =
+                            try_get("bin", &args)?.ok_or_else(|| err_msg("no bin found"))?;
+                        let arguments: Vec<String> = try_get("args", &args)?.unwrap_or_default();
+                        let cmd = format!("term {} {}", bin, arguments.join(" "));
+                        let cmd = cmd.replace('"', "");
+                        self.vim()?.command(cmd)?;
+                    }
                 }
             }
             // TODO: implement all other rust-analyzer actions
@@ -1781,7 +1787,13 @@ impl LanguageClient {
         let mut code_lens: Vec<CodeLens> =
             self.get(|state| state.code_lens.get(filename.as_str()).cloned().unwrap())?;
         code_lens.retain(|cl| cl.range.start.line == line);
-        if code_lens.len() != 1 {
+        if code_lens.is_empty() {
+            warn!("No actions associated with this codeLens");
+            return Ok(Value::Null);
+        }
+
+        if code_lens.len() > 1 {
+            warn!("Mulitple actions associated with this codeLens");
             return Ok(Value::Null);
         }
 
@@ -2619,25 +2631,17 @@ impl LanguageClient {
         // code lens
         if UseVirtualText::All == use_virtual_text || UseVirtualText::CodeLens == use_virtual_text {
             let filename = self.vim()?.get_filename(params)?;
-            let code_lenses = self.get(|state| {
-                state
-                    .code_lens
-                    .get(&filename)
-                    .cloned()
-                    .unwrap_or_else(|| vec![])
-            })?;
+            let code_lenses =
+                self.get(|state| state.code_lens.get(&filename).cloned().unwrap_or_default())?;
 
             for cl in code_lenses {
-                if cl.command.is_none() {
-                    continue;
+                if let Some(command) = cl.command {
+                    virtual_texts.push(VirtualText {
+                        line: cl.range.start.line,
+                        text: command.title,
+                        hl_group: "Comment".into(),
+                    })
                 }
-                let command = cl.command.unwrap();
-
-                virtual_texts.push(VirtualText {
-                    line: cl.range.start.line,
-                    text: command.title,
-                    hl_group: "Comment".into(),
-                })
             }
         }
 

src/types.rs

@@ -32,7 +32,7 @@ pub const REQUEST__NCM2OnComplete: &str = "LanguageClient_NCM2OnComplete";
 pub const REQUEST__ExplainErrorAtPoint: &str = "languageClient/explainErrorAtPoint";
 pub const REQUEST__FindLocations: &str = "languageClient/findLocations";
 pub const REQUEST__DebugInfo: &str = "languageClient/debugInfo";
-pub const REQUEST__CodeLensAction: &str = "LanguageClient_CodeLensAction";
+pub const REQUEST__CodeLensAction: &str = "LanguageClient/handleCodeLensAction";
 pub const NOTIFICATION__HandleBufNewFile: &str = "languageClient/handleBufNewFile";
 pub const NOTIFICATION__HandleFileType: &str = "languageClient/handleFileType";
 pub const NOTIFICATION__HandleTextChanged: &str = "languageClient/handleTextChanged";
@@ -243,7 +243,7 @@ impl State {
             wait_output_timeout: Duration::from_secs(10),
             hoverPreview: HoverPreviewOption::default(),
             completionPreferTextEdit: false,
-            use_virtual_text: UseVirtualText::CodeLens,
+            use_virtual_text: UseVirtualText::All,
             echo_project_root: true,
             loggingFile: None,
             loggingLevel: log::LevelFilter::Warn,