Simplify prompt and shorthand

Author: hkupty

plugin/acid.vim

@@ -9,7 +9,25 @@ function! AcidOpfunc(callback, block)
   endif
   let s:ret = getreg('s')
   call setreg('s', s:tmp)
-  exec a:callback 'opfunc' s:ret
+  exec a:callback s:ret
+endfunction
+
+function! AcidPrompt(callback)
+  call inputsave()
+  let s:ret = input(a:callback . " → ")
+  call inputrestore()
+  exec a:callback s:ret
+endfunction
+
+function! AcidShorthand(callback, shorthand)
+  let s:tmp = getreg('s')
+  let s:iskw = &iskeyword
+  setl iskeyword+=/
+  silent exec a:shorthand
+  exec "setl iskeyword=".s:iskw
+  let s:ret = getreg('s')
+  call setreg('s', s:tmp)
+  exec a:callback s:ret
 endfunction
 
 function! s:require()

rplugin/python3/acid/commands/__init__.py

@@ -82,18 +82,20 @@ def build_interfaces(cls, nvim):
                 convert_case(cmd_name)
             )
             mapping = getattr(
-                cls, 'shortand_mapping',"{}{}".format(
+                cls, 'shorthand_mapping',"{}{}".format(
                     mapping, mapping[-1]
                 ) if mapping is not None else None
             )
             mapping = nvim.vars.get(shorthand_mapping, mapping)
+            shorthand = cls.shorthand
             cmd.append(silent_map(
-                mapping, ':{} shorthand<CR>'.format(cmd_name)
+                mapping,
+                ':call AcidShorthand("{}", "{}")<CR>'.format(cmd_name, shorthand)
             ))
 
         if hasattr(cls, 'prompt'):
-            prompt = 'command! -buffer -nargs=0 {}Prompt AcidCommand {} prompt'
-            cmd.append(prompt.format(cmd_name, cls.name))
+            prompt = 'command! -buffer -nargs=0 {}Prompt call AcidPrompt("{}")'
+            cmd.append(prompt.format(cmd_name, cmd_name))
 
         return cmd
 

rplugin/python3/acid/commands/eval.py

@@ -12,28 +12,8 @@ class Command(BaseCommand):
     opfunc = True
     nargs='*'
     op = "eval"
+    shorthand = '''normal! mx$?^("sy%`x'''
 
-    def prompt(self):
-        self.nvim.call("inputsave")
-        ret = self.nvim.call("input", "acid - eval> ")
-        self.nvim.call("inputrestore")
-        return ret
+    def prepare_payload(self, *args):
 
-    def shorthand(self):
-        cmd = '''silent exec 'normal! mx$?^("sy%`x' | nohl'''
-        self.nvim.command(cmd)
-        return self.nvim.funcs.getreg('s')
-
-    def prepare_payload(self, mode, *args):
-        ns = get_acid_ns(self.nvim)
-
-        if mode == 'shorthand':
-            ret = self.shorthand()
-        elif mode == 'prompt':
-            ret = self.prompt()
-        elif mode == 'opfunc':
-            ret = " ".join(args)
-        else:
-            ret = " ".join([mode, *args])
-
-        return {"code": ret, "ns": ns}
+        return {"code": " ".join(args), "ns": get_acid_ns(self.nvim)}

rplugin/python3/acid/commands/format_edn.py

@@ -13,18 +13,5 @@ class Command(BaseCommand):
     nargs='*'
     op = "format-edn"
 
-    def prompt(self):
-        self.nvim.call("inputsave")
-        ret = self.nvim.call("input", "acid - format-edn> ")
-        self.nvim.call("inputrestore")
-        return ret
-
-    def prepare_payload(self, mode, *args):
-        if mode == 'prompt':
-            ret = self.prompt()
-        elif mode == 'opfunc':
-            ret = " ".join(args)
-        else:
-            ret = " ".join([mode, *args])
-
-        return {'edn': ret, 'pprint-fn': 'clojure.pprint/pprint'}
+    def prepare_payload(self, *args):
+        return {'edn': " ".join(args), 'pprint-fn': 'clojure.pprint/pprint'}

rplugin/python3/acid/commands/goto.py

@@ -11,19 +11,7 @@ class Command(BaseCommand):
     handlers = ['Goto']
     op = "info"
     shorthand_mapping = 'gd'
+    shorthand="call setreg('s', expand('<cword>'))"
 
-    def shorthand(self):
-        iskw = self.nvim.current.buffer.options['iskeyword']
-        self.nvim.current.buffer.options['iskeyword'] = \
-            ','.join(set(iskw.split(',')) | {"/"})
-        data = self.nvim.funcs.expand('<cword>')
-        self.nvim.current.buffer.options['iskeyword'] = iskw
-        return data
-
-    def prepare_payload(self, mode, *args):
-        ns = path_to_ns(self.nvim)
-        if mode == 'shorthand':
-            data = self.shorthand()
-        else:
-            data = mode
-        return {"symbol": data, "ns": ns}
+    def prepare_payload(self, *args):
+        return {"symbol": " ".join(args), "ns": path_to_ns(self.nvim)}

rplugin/python3/acid/commands/usage.py

@@ -7,11 +7,10 @@ class Command(BaseCommand):
     priority = 0
     cmd_name = 'AcidFindUsage'
     handlers = ['Usage']
-    mapping = 'gu'
     with_acid = True
     op = "info"
+    shorthand_mapping = 'gu'
+    shorthand="call setreg('s', expand('<cword>'))"
 
     def prepare_payload(self, *args):
-        data = self.nvim.funcs.expand('<cword>')
-        ns = path_to_ns(self.nvim)
-        return {"symbol": data, "ns": ns}
+        return {"symbol": " ".join(args), "ns": path_to_ns(self.nvim)}