respect TextDocumentSaveRegistrationOptions - fixes #29

prabirshrestha · Aug 26, 2017 · dfdfb5f · dfdfb5f
1 parent 161ffdc
commit dfdfb5f
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 7 deletions.
diff --git a/autoload/lsp.vim b/autoload/lsp.vim
@@ -133,16 +133,29 @@ function! s:call_did_save(buf, server_name, result, cb) abort
 
     let l:server = s:servers[a:server_name]
     let l:path = lsp#utils#get_buffer_uri(a:buf)
+
+    let [l:supports_did_save, l:did_save_options] = lsp#capabilities#get_text_document_save_registration_options(a:server_name)
+    if !l:supports_did_save
+        let l:msg = s:new_rpc_success('---> ignoring textDocument/didSave. not supported by server', { 'server_name': a:server_name, 'path': l:path })
+        call lsp#log(l:msg)
+        call a:cb(l:msg)
+        return
+    endif
+
     let l:buffers = l:server['buffers']
     let l:buffer_info = l:buffers[l:path]
 
-    " TODO: handle text when includeText is defined in TextDocumentSaveRegistrationOptions
+    let l:params = {
+        \ 'textDocument': s:get_text_document_identifier(a:buf, l:buffer_info),
+        \ }
+
+    if l:did_save_options['includeText']
+        let l:params['text'] = s:get_text_document_text(a:buf)
+    endif
 
     call s:send_notification(a:server_name, {
         \ 'method': 'textDocument/didSave',
-        \ 'params': {
-        \   'textDocument': s:get_text_document_identifier(a:buf, l:buffer_info),
-        \ },
+        \ 'params': l:params,
         \ })
 
     let l:msg = s:new_rpc_success('textDocument/didSave sent', { 'server_name': a:server_name, 'path': l:path })
@@ -321,7 +334,7 @@ function! s:ensure_changed(buf, server_name, cb) abort
         \ 'params': {
         \   'textDocument': s:get_text_document_identifier(a:buf, l:buffer_info),
         \   'contentChanges': [
-        \       { 'text': join(getbufline(a:buf, 1, '$'), "\n") },
+        \       { 'text': s:get_text_document_text(a:buf) },
         \   ],
         \ }
         \ })
@@ -487,14 +500,16 @@ function! lsp#get_whitelisted_servers(...) abort
     return l:active_servers
 endfunction
 
-
+function! s:get_text_document_text(buf) abort
+    return join(getbufline(a:buf, 1, '$'), "\n")
+endfunction
 
 function! s:get_text_document(buf, buffer_info) abort
     return {
         \ 'uri': lsp#utils#get_buffer_uri(a:buf),
         \ 'languageId': &filetype,
         \ 'version': a:buffer_info['version'],
-        \ 'text': join(getbufline(a:buf, 1, '$'), "\n"),
+        \ 'text': s:get_text_document_text(a:buf),
         \ }
 endfunction
 

diff --git a/autoload/lsp/capabilities.vim b/autoload/lsp/capabilities.vim
@@ -34,3 +34,16 @@ endfunction
 function! lsp#capabilities#has_workspace_symbol_provider(server_name) abort
     return s:has_bool_provider(a:server_name, 'workspaceSymbolProvider')
 endfunction
+
+" [supports_did_save (boolean), { 'includeText': boolean }]
+function! lsp#capabilities#get_text_document_save_registration_options(server_name) abort
+    let l:capabilities = lsp#get_server_capabilities(a:server_name)
+    if !empty(l:capabilities) && has_key(l:capabilities, 'textDocumentSync') && type(l:capabilities['textDocumentSync']) == type({})
+        if has_key(l:capabilities['textDocumentSync'], 'save')
+            return [1, {
+                \ 'includeText': has_key(l:capabilities['textDocumentSync']['save'], 'includeText') ? l:capabilities['textDocumentSync']['save']['includeText'] : 0,
+                \ }]
+        endif
+    endif
+    return [0, {}]
+endfunction