Merge codeAction(s) (#736)

* Merge codeAction(s)

* Print server name

* Fix indentation

* Use empty()

Author: mattn

autoload/lsp/ui/vim/code_action.vim

@@ -32,6 +32,10 @@ function! lsp#ui#vim#code_action#do(option) abort
         let l:range = lsp#utils#range#_get_current_line_range()
     endif
 
+    let l:ctx = {
+    \ 'count': len(l:server_names),
+    \ 'results': [],
+    \}
     let l:bufnr = bufnr('%')
     let l:command_id = lsp#_new_command()
     for l:server_name in l:server_names
@@ -47,48 +51,74 @@ function! lsp#ui#vim#code_action#do(option) abort
                     \   },
                     \ },
                     \ 'sync': l:sync,
-                    \ 'on_notification': function('s:handle_code_action', [l:server_name, l:command_id, l:sync, l:query, l:bufnr]),
+                    \ 'on_notification': function('s:handle_code_action', [l:ctx, l:server_name, l:command_id, l:sync, l:query, l:bufnr]),
                     \ })
     endfor
     echo 'Retrieving code actions ...'
 endfunction
 
-function! s:handle_code_action(server_name, command_id, sync, query, bufnr, data) abort
+function! s:handle_code_action(ctx, server_name, command_id, sync, query, bufnr, data) abort
     " Ignore old request.
     if a:command_id != lsp#_last_command()
         return
     endif
 
-    " Check response error.
-    if lsp#client#is_error(a:data['response'])
-        call lsp#utils#error('Failed to CodeAction for ' . a:server_name . ': ' . lsp#client#error_message(a:data['response']))
+    call add(a:ctx['results'], {
+    \    'server_name': a:server_name,
+    \    'data': a:data,
+    \})
+    let a:ctx['count'] -= 1
+    if a:ctx['count'] ># 0
         return
     endif
 
-    " Check code actions.
-    let l:code_actions = a:data['response']['result']
-    call lsp#log('s:handle_code_action', l:code_actions)
-    if len(l:code_actions) == 0
+    let l:total_code_actions = []
+    for l:result in a:ctx['results']
+        let l:server_name = l:result['server_name']
+        let l:data = l:result['data']
+        " Check response error.
+        if lsp#client#is_error(l:data['response'])
+            call lsp#utils#error('Failed to CodeAction for ' . l:server_name . ': ' . lsp#client#error_message(l:data['response']))
+            continue
+        endif
+
+        " Check code actions.
+        let l:code_actions = l:data['response']['result']
+
+        " Filter code actions.
+        if !empty(a:query)
+            let l:code_actions = filter(l:code_actions, { _, action -> get(action, 'kind', '') =~# '^' . a:query })
+        endif
+        if empty(l:code_actions)
+            continue
+        endif
+
+        for l:code_action in l:code_actions
+            call add(l:total_code_actions, {
+            \    'server_name': l:server_name,
+            \    'code_action': l:code_action,
+            \})
+        endfor
+    endfor
+
+    if len(l:total_code_actions) == 0
         echo 'No code actions found'
         return
     endif
-
-    " Filter code actions.
-    if !empty(a:query)
-        let l:code_actions = filter(l:code_actions, { _, action -> get(action, 'kind', '') =~# '^' . a:query })
-    endif
+    call lsp#log('s:handle_code_action', l:total_code_actions)
 
     " Prompt to choose code actions when empty query provided.
     let l:index = 1
-    if len(l:code_actions) > 1 || empty(a:query)
-        let l:index = inputlist(map(copy(l:code_actions), { i, action ->
-                    \   printf('%s - %s', i + 1, action['title'])
+    if len(l:total_code_actions) > 1 || empty(a:query)
+        let l:index = inputlist(map(copy(l:total_code_actions), { i, action ->
+                    \   printf('%s - [%s] %s', i + 1, action['server_name'], action['code_action']['title'])
                     \ }))
     endif
 
     " Execute code action.
-    if 0 < l:index && l:index <= len(l:code_actions)
-        call s:handle_one_code_action(a:server_name, a:sync, a:bufnr, l:code_actions[l:index - 1])
+    if 0 < l:index && l:index <= len(l:total_code_actions)
+        let l:selected = l:total_code_actions[l:index - 1]
+        call s:handle_one_code_action(l:selected['server_name'], a:sync, a:bufnr, l:selected['code_action'])
     endif
 endfunction