Merge branch 'master' into fix-textedit

Author: mattn

README.md

@@ -53,6 +53,24 @@ At the moment, you have two options:
 
 For more information, refer to the readme and documentation of the respective plugins.
 
+## Folding
+
+You can let the language server automatically handle folding for you. To enable this, you have to set `'foldmethod'`, `'foldexpr'` and (optionally) `'foldtext'`:
+
+```vim
+set foldmethod=expr
+  \ foldexpr=lsp#ui#vim#folding#foldexpr()
+  \ foldtext=lsp#ui#vim#folding#foldtext()
+```
+
+If you would like to disable folding globally, you can add this to your configuration:
+
+```vim
+let g:lsp_fold_enabled = 0
+```
+
+Also see `:h vim-lsp-folding`.
+
 ## Supported commands
 
 **Note:**
@@ -146,11 +164,11 @@ Virtual text will use the same highlight groups as signs feature.
 
 ### Highlight references
 
-References to the symbol under the cursor are highlighted by default. To
-disable, set in your configuration:
+Highlight references to the symbol under the cursor. To enable, set in your
+configuration:
 
 ```viml
-let g:lsp_highlight_references_enabled = 0
+let g:lsp_highlight_references_enabled = 1
 ```
 
 To change the style of the highlighting, you can set or link the `lspReference`

autoload/lsp.vim

@@ -191,7 +191,10 @@ function! s:on_text_document_did_save() abort
     if getbufvar(l:buf, '&buftype') ==# 'terminal' | return | endif
     call lsp#log('s:on_text_document_did_save()', l:buf)
     for l:server_name in lsp#get_whitelisted_servers(l:buf)
-        call s:ensure_flush(l:buf, l:server_name, {result->s:call_did_save(l:buf, l:server_name, result, function('s:Noop'))})
+        " We delay the callback by one loop iteration as calls to ensure_flush
+        " can introduce mmap'd file locks that linger on Windows and collide
+        " with the second lang server call preventing saves (see #455)
+        call s:ensure_flush(l:buf, l:server_name, {result->timer_start(0, {result->s:call_did_save(l:buf, l:server_name, result, function('s:Noop'))})})
     endfor
 endfunction
 
@@ -380,6 +383,21 @@ function! lsp#default_get_supported_capabilities(server_info) abort
     \   'workspace': {
     \       'applyEdit': v:true,
     \       'configuration': v:true
+    \   },
+    \   'textDocument': {
+    \       'completion': {
+    \           'completionItemKind': {
+    \              'valueSet': lsp#omni#get_completion_item_kinds()
+    \           }
+    \       },
+    \       'documentSymbol': {
+    \           'symbolKind': {
+    \              'valueSet': lsp#ui#vim#utils#get_symbol_kinds()
+    \           }
+    \       },
+    \       'foldingRange': {
+    \           'lineFoldingOnly': v:true
+    \       }
     \   }
     \ }
 endfunction
@@ -514,6 +532,7 @@ function! s:ensure_changed(buf, server_name, cb) abort
         \   'contentChanges': s:text_changes(a:buf, a:server_name),
         \ }
         \ })
+    call lsp#ui#vim#folding#send_request(a:server_name, a:buf, 0)
 
     let l:msg = s:new_rpc_success('textDocument/didChange sent', { 'server_name': a:server_name, 'path': l:path })
     call lsp#log(l:msg)
@@ -552,6 +571,8 @@ function! s:ensure_open(buf, server_name, cb) abort
         \ },
         \ })
 
+    call lsp#ui#vim#folding#send_request(a:server_name, a:buf, 0)
+
     let l:msg = s:new_rpc_success('textDocument/open sent', { 'server_name': a:server_name, 'path': l:path, 'filetype': getbufvar(a:buf, '&filetype') })
     call lsp#log(l:msg)
     call a:cb(l:msg)
@@ -732,7 +753,9 @@ function! lsp#get_text_document_identifier(...) abort
 endfunction
 
 function! lsp#get_position(...) abort
-    return { 'line': line('.') - 1, 'character': col('.') -1 }
+    let l:line = line('.')
+    let l:char = lsp#utils#to_char('%', l:line, col('.'))
+    return { 'line': l:line - 1, 'character': l:char }
 endfunction
 
 function! s:get_text_document_identifier(buf) abort

autoload/lsp/capabilities.vim

@@ -54,6 +54,14 @@ function! lsp#capabilities#has_implementation_provider(server_name) abort
 endfunction
 
 function! lsp#capabilities#has_code_action_provider(server_name) abort
+    let l:capabilities = lsp#get_server_capabilities(a:server_name)
+    if !empty(l:capabilities) && has_key(l:capabilities, 'codeActionProvider')
+        if type(l:capabilities['codeActionProvider']) == type({})
+            if has_key(l:capabilities['codeActionProvider'], 'codeActionKinds') && type(l:capabilities['codeActionProvider']['codeActionKinds']) == type([])
+                return len(l:capabilities['codeActionProvider']['codeActionKinds']) != 0
+            endif
+        endif
+    endif
     return s:has_bool_provider(a:server_name, 'codeActionProvider')
 endfunction
 
@@ -65,6 +73,10 @@ function! lsp#capabilities#has_document_highlight_provider(server_name) abort
     return s:has_bool_provider(a:server_name, 'documentHighlightProvider')
 endfunction
 
+function! lsp#capabilities#has_folding_range_provider(server_name) abort
+    return s:has_bool_provider(a:server_name, 'foldingRangeProvider')
+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)

autoload/lsp/omni.vim

@@ -318,7 +318,7 @@ function! s:apply_text_edits() abort
     " expand textEdit range, for omni complet inserted text.
     let l:text_edit = get(l:user_data, s:user_data_key, {})
     if !empty(l:text_edit)
-        let l:expanded_text_edit = s:expand_range(l:text_edit, len(v:completed_item['word']))
+        let l:expanded_text_edit = s:expand_range(l:text_edit, strchars(v:completed_item['word']))
         call add(l:all_text_edits, l:expanded_text_edit)
     endif
 
@@ -369,4 +369,8 @@ function! s:get_cursor_pos_and_edit_length(text_edit) abort
     return [l:pos, l:length]
 endfunction
 
+function! lsp#omni#get_completion_item_kinds() abort
+    return map(keys(s:kind_text_mappings), {idx, key -> str2nr(key)})
+endfunction
+
 " }}}

autoload/lsp/ui/vim.vim

@@ -193,6 +193,7 @@ function! s:document_format(sync) abort
 
     " TODO: ask user to select server for formatting
     let l:server = l:servers[0]
+    redraw | echo 'Formatting document ...'
     call lsp#send_request(l:server, {
         \ 'method': 'textDocument/formatting',
         \ 'params': {
@@ -205,8 +206,6 @@ function! s:document_format(sync) abort
         \ 'sync': a:sync,
         \ 'on_notification': function('s:handle_text_edit', [l:server, s:last_req_id, 'document format']),
         \ })
-
-    echo 'Formatting document ...'
 endfunction
 
 function! lsp#ui#vim#document_format_sync() abort
@@ -253,13 +252,16 @@ function! s:document_format_range(sync) abort
     let l:server = l:servers[0]
 
     let [l:start_lnum, l:start_col, l:end_lnum, l:end_col] = s:get_visual_selection_pos()
+    let l:start_char = lsp#utils#to_char('%', l:start_lnum, l:start_col)
+    let l:end_char = lsp#utils#to_char('%', l:end_lnum, l:end_col)
+    redraw | echo 'Formatting document range ...'
     call lsp#send_request(l:server, {
         \ 'method': 'textDocument/rangeFormatting',
         \ 'params': {
         \   'textDocument': lsp#get_text_document_identifier(),
         \   'range': {
-        \       'start': { 'line': l:start_lnum - 1, 'character': l:start_col - 1 },
-        \       'end': { 'line': l:end_lnum - 1, 'character': l:end_col - 1 },
+        \       'start': { 'line': l:start_lnum - 1, 'character': l:start_char },
+        \       'end': { 'line': l:end_lnum - 1, 'character': l:end_char },
         \   },
         \   'options': {
         \       'tabSize': getbufvar(bufnr('%'), '&shiftwidth'),
@@ -269,8 +271,6 @@ function! s:document_format_range(sync) abort
         \ 'sync': a:sync,
         \ 'on_notification': function('s:handle_text_edit', [l:server, s:last_req_id, 'range format']),
         \ })
-
-    echo 'Formatting document range ...'
 endfunction
 
 function! lsp#ui#vim#document_range_format_sync() abort
@@ -349,9 +349,11 @@ function! s:get_visual_selection_range() abort
     if l:column_end - 1 > len(getline(l:line_end))
       let l:column_end = len(getline(l:line_end)) + 1
     endif
+    let l:char_start = lsp#utils#to_char('%', l:line_start, l:column_start)
+    let l:char_end = lsp#utils#to_char('%', l:line_end, l:column_end)
     return {
-          \ 'start': { 'line': l:line_start - 1, 'character': l:column_start - 1 },
-          \ 'end': { 'line': l:line_end - 1, 'character': l:column_end - 1 },
+          \ 'start': { 'line': l:line_start - 1, 'character': l:char_start },
+          \ 'end': { 'line': l:line_end - 1, 'character': l:char_end },
           \}
 endfunction
 
@@ -486,7 +488,7 @@ function! s:handle_location(ctx, server, type, data) abort "ctx = {counter, list
                 botright copen
             else
                 let l:lines = readfile(fnameescape(l:loc['filename']))
-                call lsp#ui#vim#output#preview(l:lines, {
+                call lsp#ui#vim#output#preview(a:server, l:lines, {
                             \   'statusline': ' LSP Peek ' . a:type,
                             \   'cursor': { 'line': l:loc['lnum'], 'col': l:loc['col'], 'align': g:lsp_peek_alignment },
                             \   'filetype': &filetype
@@ -508,14 +510,24 @@ function! s:handle_rename_prepare(server, last_req_id, type, data) abort
 
     let l:range = a:data['response']['result']
     let l:lines = getline(1, '$')
-    if l:range['start']['line'] ==# l:range['end']['line']
-        let l:name = l:lines[l:range['start']['line']][l:range['start']['character'] : l:range['end']['character']-1]
+    let l:start_line = l:range['start']['line'] + 1
+    let l:start_char = l:range['start']['character']
+    let l:start_col = lsp#utils#to_col('%', l:start_line, l:start_char)
+    let l:end_line = l:range['end']['line'] + 1
+    let l:end_char = l:range['end']['character']
+    let l:end_col = lsp#utils#to_col('%', l:end_line, l:end_char)
+    if l:start_line ==# l:end_line
+        let l:name = l:lines[l:start_line - 1][l:start_col - 1 : l:end_col - 2]
     else
-        let l:name = l:lines[l:range['start']['line']][l:range['start']['character'] :]
-        for l:i in range(l:range['start']['line']+1, l:range['end']['line']-1)
+        let l:name = l:lines[l:start_line - 1][l:start_col - 1 :]
+        for l:i in range(l:start_line, l:end_line - 2)
             let l:name .= "\n" . l:lines[l:i]
         endfor
-        let l:name .= l:lines[l:range['end']['line']][: l:range['end']['character']-1]
+        if l:end_col - 2 < 0
+            let l:name .= "\n"
+        else
+            let l:name .= l:lines[l:end_line - 1][: l:end_col - 2]
+        endif
     endif
 
     call timer_start(1, {x->s:rename(a:server, input('new name: ', l:name), l:range['start'])})
@@ -548,7 +560,7 @@ function! s:handle_text_edit(server, last_req_id, type, data) abort
 
     call lsp#utils#text_edit#apply_text_edits(a:data['request']['params']['textDocument']['uri'], a:data['response']['result'])
 
-    echo 'Document formatted'
+    redraw | echo 'Document formatted'
 endfunction
 
 function! s:handle_code_action(server, last_req_id, type, data) abort

autoload/lsp/ui/vim/diagnostics.vim

@@ -51,6 +51,10 @@ function! lsp#ui#vim#diagnostics#document_diagnostics() abort
     endif
 endfunction
 
+" Returns a diagnostic object, or empty dictionary if no diagnostics are available.
+"
+" Note: Consider renaming this method (s/diagnostics/diagnostic) to make
+" it clear that it returns just one diagnostic, not a list.
 function! lsp#ui#vim#diagnostics#get_diagnostics_under_cursor() abort
     let l:diagnostics = s:get_all_buffer_diagnostics()
     if !len(l:diagnostics)
@@ -60,7 +64,7 @@ function! lsp#ui#vim#diagnostics#get_diagnostics_under_cursor() abort
     let l:line = line('.')
     let l:col = col('.')
 
-    let l:closest_diagnostics = {}
+    let l:closest_diagnostic = {}
     let l:closest_distance = -1
 
     for l:diagnostic in l:diagnostics
@@ -72,13 +76,13 @@ function! lsp#ui#vim#diagnostics#get_diagnostics_under_cursor() abort
         if l:line == l:start_line
             let l:distance = abs(l:start_col - l:col)
             if l:closest_distance < 0 || l:distance < l:closest_distance
-                let l:closest_diagnostics = l:diagnostic
+                let l:closest_diagnostic = l:diagnostic
                 let l:closest_distance = l:distance
             endif
         endif
     endfor
 
-    return l:closest_diagnostics
+    return l:closest_diagnostic
 endfunction
 
 function! lsp#ui#vim#diagnostics#next_error() abort