Support view expanded macro

maralla · Aug 29, 2024 · c25ff7d · c25ff7d
1 parent 3898de7
commit c25ff7d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/autoload/completor/popup.vim b/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: ['─', '│', '─', '│', '╭', '┐', '┘', '└'],
         \ })

diff --git a/pythonx/completers/lsp/ext/__init__.py b/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)
diff --git a/pythonx/completers/lsp/ext/rust.py b/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'