Merge pull request #217 from bfredl/error

nvim: show errors in handler on stderr when used as client

Author: bfredl

neovim/api/buffer.py

@@ -125,7 +125,7 @@ def add_highlight(self, hl_group, line, col_start=0,
                             line, col_start, col_end, async=async)
 
     def clear_highlight(self, src_id, line_start=0, line_end=-1, async=True):
-        """clear highlights from the buffer."""
+        """Clear highlights from the buffer."""
         self.request('buffer_clear_highlight', src_id,
                      line_start, line_end, async=async)
 

neovim/api/nvim.py

@@ -146,17 +146,32 @@ def run_loop(self, request_cb, notification_cb,
         This should not be called from a plugin running in the host, which
         already runs the loop and dispatches events to plugins.
         """
+        if err_cb is None:
+            err_cb = sys.stderr.write
+        self._err_cb = err_cb
+
         def filter_request_cb(name, args):
+            name = self._from_nvim(name)
             args = walk(self._from_nvim, args)
-            result = request_cb(self._from_nvim(name), args)
+            try:
+                result = request_cb(name, args)
+            except Exception:
+                msg = ("error caught in request handler '{} {}'\n{}\n\n"
+                       .format(name, args, format_exc_skip(1, 5)))
+                self._err_cb(msg)
+                raise
             return walk(self._to_nvim, result)
 
         def filter_notification_cb(name, args):
-            notification_cb(self._from_nvim(name), walk(self._from_nvim, args))
-
-        if err_cb is None:
-            err_cb = sys.stderr.write
-        self._err_cb = err_cb
+            name = self._from_nvim(name)
+            args = walk(self._from_nvim, args)
+            try:
+                notification_cb(name, args)
+            except Exception:
+                msg = ("error caught in notification handler '{} {}'\n{}\n\n"
+                       .format(name, args, format_exc_skip(1, 5)))
+                self._err_cb(msg)
+                raise
 
         self._session.run(filter_request_cb, filter_notification_cb, setup_cb)
 

neovim/plugin/host.py

@@ -77,7 +77,6 @@ def _wrap_function(self, fn, sync, decode, nvim_bind, name, *args):
                 msg = ("error caught in async handler '{} {}'\n{}\n"
                        .format(name, args, format_exc_skip(1, 5)))
                 self._on_async_err(msg + "\n")
-                raise
 
     def _on_request(self, name, args):
         """Handle a msgpack-rpc request."""