Merge pull request #325 from maralla/code-action

Support code action

Author: maralla

autoload/completor.vim

@@ -141,9 +141,37 @@ function! completor#do(action, ...) range
     let args = a:000
   endif
 
-  let meta = {'range': [a:firstline, a:lastline]}
+  let start_col = 0
+  let end_col = 0
+
+  if mode() ==# 'v'
+    let start_col = col("'<")
+    let end_col = col("'>")
+  endif
+
+  if start_col == 0
+    let start_col = col('.')
+  endif
+
+  if end_col == 0
+    let end_col = col('.')
+  endif
+
+  let meta = {
+        \ 'range': [a:firstline, a:lastline],
+        \ 'text_range': {
+        \    'start': {'line': a:firstline-1, 'col': start_col-1},
+        \    'end':   {'line': a:lastline-1,  'col': end_col-1}
+        \  }
+        \ }
   let status = completor#action#current_status()
 
+  if !empty(args) && type(args[-1]) == v:t_dict
+    let args[-1]['meta'] = meta
+  else
+    let args = args + [{'meta': meta}]
+  endif
+
   let s:timer = timer_start(g:completor_completion_delay, {t->s:do_action(action, meta, status, args)})
   return ''
 endfunction

autoload/completor/action.vim

@@ -345,6 +345,14 @@ function! completor#action#trigger(items)
     silent edit!
   elseif action ==# 'format'
     call s:format(items)
+  elseif action ==# 'menu'
+    if !empty(items)
+      if completor#support_popup()
+        call completor#popup#menu(s:action, items)
+      else
+        echo "popup window not supported"
+      endif
+    endif
   elseif action ==# 'view'
     if !empty(items)
       if completor#support_popup()

autoload/completor/popup.vim

@@ -561,7 +561,7 @@ func completor#popup#view(content, ft)
         \ zindex: 32000,
         \ filter: function('s:scroll_filter'),
         \ filtermode: 'n',
-        \ padding: [1, 1, 1, 1],
+        \ padding: [0, 1, 0, 1],
         \ border: [1, 1, 1, 1],
         \ borderchars: ['─', '│', '─', '│', '╭', '┐', '┘', '└'],
         \ })
@@ -571,6 +571,52 @@ func completor#popup#view(content, ft)
 endfunc
 
 
+" content: [{'title': 'xxx', 'data': 'json-string'}, ...]
+func completor#popup#menu(action, content)
+  let items = []
+  for item in a:content
+    call add(items, item['title'])
+  endfor
+
+  call popup_menu(items, #{
+        \ moved: 'any',
+        \ pos: 'botleft',
+        \ line: 'cursor-1',
+        \ col: 'cursor',
+        \ zindex: 32000,
+        \ padding: [0, 0, 0, 0],
+        \ border: [1, 1, 1, 1],
+        \ borderchars: ['─', '│', '─', '│', '╭', '┐', '┘', '└'],
+        \ callback: {id, result -> s:menu_callback(result, a:action, a:content)},
+        \ filter: function('s:menu_filter')
+        \ })
+endfunc
+
+
+func s:menu_filter(id, key)
+  let k = a:key
+  if a:key == "\<C-j>"
+    let k = "\<DOWN>"
+  elseif a:key == "\<C-k>"
+    let k = "\<UP>"
+  elseif a:key == "q"
+    let k = "\<ESC>"
+  endif
+
+  return popup_filter_menu(a:id, k)
+endfunc
+
+
+func s:menu_callback(result, action, content)
+  if a:result < 0
+    return
+  endif
+
+  let data = a:content[a:result-1].data
+  call completor#do(a:action .. '_callback', data)
+endfunc
+
+
 func s:scroll_filter(id, key)
   if a:key == "\<DOWN>" || a:key == "\<C-j>"
     call win_execute(a:id, "normal! \<C-d>")

pythonx/completers/lsp/__init__.py

@@ -6,14 +6,14 @@
 import os
 import json
 import io
-from completor import Completor, vim, import_completer, get
+from completor import Completor, vim, get
 from completor.compat import to_unicode
 
 from . import ext
 from .models import Initialize, DidOpen, Completion, DidChange, DidSave, \
     Definition, Format, Rename, Hover, Initialized, Implementation, \
     References, DidChangeConfiguration, Symbol, Signature, DocumentSymbol, \
-    CodeAction
+    CodeAction, CodeResolve
 from .action import gen_jump_list, get_completion_word, gen_hover_doc, \
     filter_items, parse_symbols, rename
 from .utils import gen_uri
@@ -128,7 +128,46 @@ def rename_request(self, name):
 
     def code_action(self, action):
         uri = gen_uri(self.filename)
-        c = CodeAction(uri, action)
+        meta = (self.current_options or {}).get(b'meta', {})
+        c = CodeAction(uri, action, text_range=meta.get('text_range'))
+        req_id, req = c.to_request()
+        self.current_id = req_id
+        return req
+
+    def code_action_callback(self, data):
+        if not data:
+            return ''
+
+        try:
+            data = json.loads(data[0])
+        except Exception as e:
+            logger.exception(e)
+            return ''
+
+        edit = data.get('edit')
+        if edit:
+            uri = gen_uri(self.filename)
+            changes = edit.get('changes')
+            edits = None
+            if changes:
+                edits = changes.get(uri)
+            else:
+                changes = edit.get('documentChanges')
+                if not changes:
+                    return
+                for change in changes:
+                    if change['textDocument']['uri'] == uri:
+                        edits = change['edits']
+                        break
+
+            if not edits:
+                return ''
+
+            res = vim.Dictionary(data=[edits], action='format')
+            self.trigger_action(res)
+            return ''
+
+        c = CodeResolve(params=data)
         req_id, req = c.to_request()
         self.current_id = req_id
         return req
@@ -173,6 +212,11 @@ def _gen_action_args(self, action, args):
                 return ''
             return self.code_action([args[0]])
 
+        if action == b'code_action_callback':
+            if not args:
+                return ''
+            return self.code_action_callback([args[0]])
+
         if action == b'hover':
             return self.position_request(Hover)
 
@@ -185,7 +229,7 @@ def _gen_action_args(self, action, args):
         return ''
 
     def gen_request(self, action, args):
-        self.current_options = None
+        self.current_options = {}
         if args:
             last = args[-1]
             if isinstance(last, (dict, vim.Dictionary)):
@@ -350,12 +394,38 @@ def on_code_action(self, data):
         if not item:
             return []
 
-        item = item[0]
-        if not item or 'edit' not in item:
+        items = []
+        try:
+            for v in item:
+                data = json.dumps(v)
+                items.append({'title': v['title'], 'data': json.dumps(v)})
+        except Exception as e:
+            logger.exception(e)
             return []
 
-        rename(item['edit'])
-        return vim.Dictionary(data=[], action='rename')
+        return vim.Dictionary(data=items, action='menu')
+
+        # item = item[0]
+        # if not item or 'edit' not in item:
+        #     return []
+        #
+        # rename(item['edit'])
+        # return vim.Dictionary(data=[], action='rename')
+
+    def on_code_action_callback(self, data):
+        logger.info("code_action_callback -> %r", data)
+        if not data:
+            return []
+
+        try:
+            changes = data[0]['edit']['documentChanges']
+            if len(changes) != 1:
+                return []
+        except Exception as e:
+            logger.exception(e)
+            return []
+
+        return vim.Dictionary(data=[changes[0]['edits']], action='format')
 
     def on_hover(self, data):
         logger.info("hover -> %r", data)

pythonx/completers/lsp/ext/__init__.py

@@ -15,4 +15,8 @@ def on_data(action, ft, data):
     if not data:
         return []
 
+    if ft == 'rust':
+        from .rust import on_data
+        return on_data(action, data)
+
     return vim.Dictionary(data=data, action='view', ft=ft)

pythonx/completers/lsp/ext/rust.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+from completor import vim
 from ..models import Completion
 
 
@@ -8,13 +9,28 @@ def get_action_handler(action):
         return ViewHir
     if action == b'view_mir':
         return ViewMir
+    if action == b'expand_macro':
+        return ExpandMacro
 
     return ''
 
 
+def on_data(action, data):
+    if action == b'expand_macro':
+        try:
+            data = [data[0]['expansion']]
+        except Exception:
+            return []
+    return vim.Dictionary(data=data, action='view', ft='rust')
+
+
 class ViewHir(Completion):
     method = 'rust-analyzer/viewHir'
 
 
 class ViewMir(Completion):
     method = 'rust-analyzer/viewMir'
+
+
+class ExpandMacro(Completion):
+    method = 'rust-analyzer/expandMacro'

pythonx/completers/lsp/models.py

@@ -76,7 +76,17 @@ def to_dict(self):
                             'snippetSupport': False,
                             'commitCharactersSupport': False,
                         }
-                    }
+                    },
+                    'codeAction': {
+                        'codeActionLiteralSupport': {
+                            'codeActionKind': {
+                                'valueSet': ['quickfix'],
+                            }
+                        },
+                        'resolveSupport': {
+                            'properties': ['edit'],
+                        }
+                    },
                 }
             },
             'rootUri': self.workspace[0]['uri'],
@@ -198,24 +208,45 @@ def to_dict(self):
 class CodeAction(Base):
     method = 'textDocument/codeAction'
 
-    def __init__(self, uri, action=None):
+    def __init__(self, uri, action=None, text_range=None):
         self.uri = uri
         self.action = action
+        self.text_range = text_range
 
     def to_dict(self):
         r = {
             'textDocument': {
                 'uri': self.uri
             },
-            'context': {}
+            'context': {
+                'diagnostics': []
+            }
         }
 
         if self.action is not None:
             r['context']['only'] = self.action
 
+        if self.text_range:
+            start = self.text_range[b'start']
+            end = self.text_range[b'end']
+            r['range'] = {
+                'start': {'line': start[b'line'], 'character': start[b'col']},
+                'end': {'line': end[b'line'], 'character': end[b'col']}
+            }
+
         return r
 
 
+class CodeResolve(Base):
+    method = 'codeAction/resolve'
+
+    def __init__(self, params):
+        self.params = params
+
+    def to_dict(self):
+        return self.params
+
+
 class DocumentSymbol(Format):
     method = 'textDocument/documentSymbol'
 

pythonx/completor/__init__.py

@@ -276,8 +276,12 @@ def handle_stream(self, name, action, msg):
         res = self.on_stream(action, msg)
         if res is None:
             return
+
+        self.trigger_action(res)
+
+    def trigger_action(self, data):
         try:
-            vim_action_trigger(res)
+            vim_action_trigger(data)
         except vim.error as e:
             logger.exception(e)