Merge pull request #236 from bfredl/handle

api: export Object.handle and make Buffer.number non-blocking

neovim/api/buffer.py

@@ -128,7 +128,7 @@ def valid(self):
     @property
     def number(self):
         """Get the buffer number."""
-        return self.request('nvim_buf_get_number')
+        return self.handle
 
 
 class Range(object):

neovim/api/common.py

@@ -1,6 +1,8 @@
 """Code shared between the API classes."""
 import functools
 
+from msgpack import unpackb
+
 from ..compat import unicode_errors_default
 
 
@@ -21,6 +23,7 @@ def __init__(self, session, code_data):
         """
         self._session = session
         self.code_data = code_data
+        self.handle = unpackb(code_data[1])
         self.api = RemoteApi(self, self._api_prefix)
         self.vars = RemoteMap(self, self._api_prefix + 'get_var',
                               self._api_prefix + 'set_var')

test/test_window.py

@@ -103,3 +103,17 @@ def test_number():
     eq(vim.current.window.number, curnum + 1)
     vim.command('bot split')
     eq(vim.current.window.number, curnum + 2)
+
+
+@with_setup(setup=cleanup)
+def test_handle():
+    hnd1 = vim.current.window.handle
+    vim.command('bot split')
+    hnd2 = vim.current.window.handle
+    ok(hnd2 != hnd1)
+    vim.command('bot split')
+    hnd3 = vim.current.window.handle
+    ok(hnd3 != hnd1)
+    ok(hnd3 != hnd2)
+    vim.command('wincmd w')
+    eq(vim.current.window.handle,hnd1)