implement vim_call_function wrapper

Author: bfredl

neovim/api/nvim.py

@@ -1,4 +1,5 @@
 """Main Nvim interface."""
+import functools
 import os
 
 from msgpack import ExtType
@@ -73,6 +74,7 @@ def __init__(self, session, channel_id, metadata):
         self.windows = RemoteSequence(session, 'vim_get_windows')
         self.tabpages = RemoteSequence(session, 'vim_get_tabpages')
         self.current = Current(session)
+        self.funcs = Funcs(self)
         self.error = NvimError
 
     def with_hook(self, hook):
@@ -124,6 +126,10 @@ def eval(self, string, async=False):
         """Evaluate a vimscript expression."""
         return self._session.request('vim_eval', string, async=async)
 
+    def call(self, name, *args):
+        """Call a vimscript function."""
+        return self._session.request('vim_call_function', name, args)
+
     def strwidth(self, string):
         """Return the number of display cells `string` occupies.
 
@@ -257,6 +263,17 @@ def tabpage(self, tabpage):
         return self._session.request('vim_set_current_tabpage', tabpage)
 
 
+class Funcs(object):
+
+    """Helper class for functional vimscript interface."""
+
+    def __init__(self, nvim):
+        self._nvim = nvim
+
+    def __getattr__(self, name):
+        return functools.partial(self._nvim.call, name)
+
+
 class ExtHook(SessionHook):
     def __init__(self, types):
         self.types = types

test/test_vim.py

@@ -3,6 +3,13 @@
 from nose.tools import with_setup, eq_ as eq, ok_ as ok
 from common import vim, cleanup
 
+def source(code):
+    fd, fname = tempfile.mkstemp()
+    with os.fdopen(fd,'w') as f:
+        f.write(code)
+    vim.command('source '+fname)
+    os.unlink(fname)
+
 
 @with_setup(setup=cleanup)
 def test_command():
@@ -29,6 +36,16 @@ def test_eval():
     vim.command('let g:v2 = [1, 2, {"v3": 3}]')
     eq(vim.eval('g:'), {'v1': 'a', 'v2': [1, 2, {'v3': 3}]})
 
+@with_setup(setup=cleanup)
+def test_call():
+    eq(vim.funcs.join(['first', 'last'], ', '), 'first, last')
+    source("""
+        function! Testfun(a,b)
+            return string(a:a).":".a:b
+        endfunction
+    """)
+    eq(vim.funcs.Testfun(3, 'alpha'), '3:alpha')
+
 
 @with_setup(setup=cleanup)
 def test_strwidth():