reflect reviews

Author: ompugao

autoload/lsp.vim

@@ -631,7 +631,7 @@ function! lsp#default_get_supported_capabilities(server_info) abort
     \   'window': {
     \       'workDoneProgress': g:lsp_work_done_progress_enabled ? v:true : v:false,
     \       'showDocument': {
-    \           'support': g:lsp_experimental_show_document ? v:true : v:false,
+    \           'support': g:lsp_show_document ? v:true : v:false,
     \       },
     \   },
     \   'workspace': {
@@ -948,13 +948,36 @@ function! s:on_request(server_name, id, request) abort
     elseif a:request['method'] ==# 'window/workDoneProgress/create'
         call s:send_response(a:server_name, { 'id': a:request['id'], 'result': v:null})
     elseif a:request['method'] ==# 'window/showDocument'
-        if !g:lsp_experimental_show_document | return | endif
-        let l:cmd = g:lsp_show_document_command
+        if !g:lsp_show_document | return | endif
+        let l:uri = a:request['params']['uri']
+        if !lsp#utils#is_file_uri(l:uri)
+            call s:send_response(a:server_name, { 'id': a:request['id'], 'result': {'success': v:false}})
+            return
+        endif
+        let l:path = lsp#utils#uri_to_path(l:uri)
+        let l:loc = {
+            \ 'filename': l:path,
+            \ 'lnum': 1,
+            \ 'col': 1,
+            \ }
         if has_key(a:request['params'], 'selection')
-            let l:cmd .= ' +' . a:request['params']['selection']['start']['line']
+            let [l:line, l:col] = lsp#utils#position#lsp_to_vim(l:path, a:request['selection']['start'])
+            let l:loc['lnum'] = l:line
+            let l:loc['col'] = l:col
+        endif
+
+        let l:takefocus = v:true
+        if has_key(a:request['params'], 'takeFocus') && (!a:request['params']['takeFocus'])
+            let l:takefocus = v:false
+        endif
+        let l:lastbuf = bufnr('%')
+        let l:lastlnum = line('.')
+        let l:lastcol = col('.')
+
+        call lsp#utils#location#_open_vim_list_item(l:loc, '')
+        if !l:takefocus
+            execute 'buffer ' . l:lastbuf . ' | call cursor('.l:lastlnum.','.l:lastcol.')'
         endif
-        let l:cmd .= ' ' . lsp#utils#uri_to_path(a:request['params']['uri'])
-        execute l:cmd
         call s:send_response(a:server_name, { 'id': a:request['id'], 'result': {'success': v:true}})
     else
         " TODO: for now comment this out until we figure out a better solution.

doc/vim-lsp.txt

@@ -2244,8 +2244,8 @@ workspace folder.
 ==============================================================================
 Show Document                                         *vim-lsp-show-document*
 
-Show Document is an experimental feature of vim-lsp. To enable this, set
-`let g:lsp_experimental_show_document = 1`.
+Show Document is a feature of vim-lsp to allow language servers to open a
+document in vim. To enable this, set `let g:lsp_show_document = 1`.
 
 When the client and the server supports Show Document, the client open a file
 requested from the server.

plugin/lsp.vim

@@ -88,8 +88,7 @@ let g:lsp_get_supported_capabilities = get(g:, 'lsp_get_supported_capabilities',
 let g:lsp_document_symbol_detail = get(g:, 'lsp_document_symbol_detail', 0)
 
 let g:lsp_experimental_workspace_folders = get(g:, 'lsp_experimental_workspace_folders', 0)
-let g:lsp_experimental_show_document = get(g:, 'lsp_experimental_show_document', 0)
-let g:lsp_show_document_command = get(g:, 'lsp_show_document_command', 'edit')
+let g:lsp_show_document = get(g:, 'lsp_show_document', 0)
 
 if g:lsp_auto_enable
     augroup lsp_auto_enable