Add shutdown implementation

Author: martskins

autoload/LanguageClient.vim

@@ -1360,6 +1360,18 @@ function! LanguageClient#workspace_executeCommand(command, ...) abort
     return LanguageClient#Call('workspace/executeCommand', l:params, l:Callback)
 endfunction
 
+function! s:shutdownCallback(...) abort
+    call LanguageClient#exit()
+    echom '[LC] Server shutdown complete'
+endfunction
+
+function! LanguageClient#shutdown() abort
+    return LanguageClient#Call('shutdown', {
+                \ 'languageId': &filetype,
+                \ },
+                \ function('s:shutdownCallback'))
+endfunction
+
 function! LanguageClient#exit() abort
     return LanguageClient#Notify('exit', {
                 \ 'languageId': &filetype,

plugin/LanguageClient.vim

@@ -151,7 +151,7 @@ function! LanguageClient_textDocument_switchSourceHeader(...)
 endfunction
 
 command! -nargs=* LanguageClientStart :call LanguageClient#startServer(<f-args>)
-command! LanguageClientStop :call LanguageClient#exit()
+command! LanguageClientStop call LanguageClient#shutdown()
 
 augroup languageClient
     autocmd!

src/language_server_protocol.rs

@@ -2782,6 +2782,21 @@ impl LanguageClient {
         Ok(Value::Null)
     }
 
+    #[tracing::instrument(level = "info", skip(self))]
+    pub fn shutdown(&self, params: &Value) -> Result<Value> {
+        let filename = self.vim()?.get_filename(params)?;
+        let language_id = self.vim()?.get_language_id(&filename, params)?;
+
+        let _: () = self.get_client(&Some(language_id.clone()))?
+            .call(lsp_types::request::Shutdown::METHOD, Value::Null)?;
+
+        self.vim()?
+            .rpcclient
+            .notify("setbufvar", json!([filename, VIM_IS_SERVER_RUNNING, 0]))?;
+
+        Ok(Value::Null)
+    }
+
     #[tracing::instrument(level = "info", skip(self))]
     pub fn exit(&self, params: &Value) -> Result<()> {
         let filename = self.vim()?.get_filename(params)?;
@@ -2794,13 +2809,10 @@ impl LanguageClient {
             error!("Error: {:?}", err);
         }
 
-        self.vim()?
-            .rpcclient
-            .notify("setbufvar", json!([filename, VIM_IS_SERVER_RUNNING, 0]))?;
-
         if let Err(err) = self.cleanup(&language_id) {
             error!("Error: {:?}", err);
         }
+
         Ok(())
     }
 
@@ -3901,10 +3913,21 @@ impl LanguageClient {
             return Ok(());
         }
 
+        // we don't want to restart if the server was shut down by the user, so check
+        // VIM_IS_SERVER_RUNNING as that should be true at this point only if the server exited
+        // unexpectedly.
+        let filename = self.vim()?.get_filename(&Value::Null)?;
+        let is_running: u8 = self
+            .vim()?
+            .getbufvar(filename.as_str(), VIM_IS_SERVER_RUNNING)?;
+        let is_running = is_running == 1;
+        if !is_running {
+            return Ok(());
+        }
+
         self.vim()?
             .rpcclient
             .notify("s:ExecuteAutocmd", "LanguageServerCrashed")?;
-        let filename = self.vim()?.get_filename(&Value::Null)?;
         self.vim()?
             .rpcclient
             .notify("setbufvar", json!([filename, VIM_IS_SERVER_RUNNING, 0]))?;

src/rpchandler.rs

@@ -97,6 +97,7 @@ impl LanguageClient {
             request::ResolveCompletionItem::METHOD => self.completion_item_resolve(&params),
             request::ExecuteCommand::METHOD => self.workspace_execute_command(&params),
             request::ApplyWorkspaceEdit::METHOD => self.workspace_apply_edit(&params),
+            request::Shutdown::METHOD => self.shutdown(&params),
             request::DocumentHighlightRequest::METHOD => {
                 self.text_document_document_highlight(&params)
             }