Refactor async_clj_omni shared utils into pythonx

Author: SevereOverfl0w

rplugin/python3/async_clj_omni/__init__.py renamed to pythonx/async_clj_omni/__init__.py

@@ -0,0 +1,24 @@
+class Error(Exception):
+    """Base class for exceptions in this module."""
+    pass
+
+def gather_conn_info(vim):
+    try:
+        client = vim.eval("fireplace#client()")
+    except Exception:
+        raise Error
+
+    if client:
+        connection = client.get("connection", {})
+        transport = connection.get("transport")
+
+        if not transport:
+            raise Error
+
+    ns = ""
+    try:
+        ns = vim.eval("fireplace#ns()")
+    except Exception:
+        pass
+
+    return [client, connection, transport, ns]

rplugin/python3/async_clj_omni/async_clj_omni/cider.py renamed to pythonx/async_clj_omni/async_clj_omni/cider.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+
+from cm import register_source
+register_source(name='fireplace',
+                abbreviation='🔥',
+                scopes=['clojure'],
+                word_pattern=r'[\w!$%&*+/:<=>?@\^_~\-\.#]+',
+                priority=9)
+                # TODO early_cache = 0 OR figure out cm_refresh_patterns
+
+import re
+
+class Source:
+    def __init__(self,nvim):
+        self._nvim = nvim
+
+    def cm_refresh(self,info,ctx):
+        matches = ['foo_bar','foo_baz', 'req$\'uire']
+        self._nvim.call('cm#complete', info['name'], ctx, ctx['startcol'], matches, async=True)

pythonx/async_clj_omni/async_clj_omni/fireplace.py

@@ -4,7 +4,7 @@
 import os
 basedir = os.path.dirname(os.path.realpath(__file__))
 sys.path.append(os.path.join(basedir, "../../acid"))
-sys.path.append(os.path.join(basedir, "../../async_clj_omni"))
+sys.path.append(os.path.join(basedir, "../../../../pythonx/async_clj_omni"))
 
 try:
     from acid.nvim import localhost, path_to_ns

pythonx/cm_sources/foo.py

@@ -3,9 +3,10 @@
 import os
 basedir = os.path.dirname(os.path.realpath(__file__))
 sys.path.append(os.path.join(basedir, "vim_nrepl_python_client/"))
-sys.path.append(os.path.join(basedir, "../../async_clj_omni"))
+sys.path.append(os.path.join(basedir, "../../../../pythonx/async_clj_omni"))
 
 from async_clj_omni.cider import cider_gather  # NOQA
+from async_clj_omni import fireplace
 from .base import Base  # NOQA
 import nrepl  # NOQA
 
@@ -35,46 +36,33 @@ def __init__(self, vim):
 
     def gather_candidates(self, context):
         self.debug("Gathering candidates")
-        client = False
-        try:
-            client = self.vim.eval("fireplace#client()")
-        except Exception:
-            pass
-
-        if client:
-            connection = client.get("connection", {})
-            transport = connection.get("transport")
-            if not transport:
-                return []
 
-            ns = ""
-            try:
-                ns = self.vim.eval("fireplace#ns()")
-            except Exception:
-                pass
-
-            host = transport.get("host")
-            port = transport.get("port")
+        try:
+            client, connection, transport, ns = fireplace.gather_conn_info(self.vim)
+        except fireplace.Error:
+            self.exception("Unable to get connection info")
+            return []
 
-            conn_string = "nrepl://{}:{}".format(host, port)
+        host = transport.get("host")
+        port = transport.get("port")
 
-            if conn_string not in self.__conns:
-                conn = nrepl.connect(conn_string)
+        conn_string = "nrepl://{}:{}".format(host, port)
 
-                def global_watch(cmsg, cwc, ckey):
-                    self.debug("Received message for {}".format(conn_string))
-                    self.debug(cmsg)
+        if conn_string not in self.__conns:
+            conn = nrepl.connect(conn_string)
 
-                wc = nrepl.WatchableConnection(conn)
-                self.__conns[conn_string] = wc
-                wc.watch("global_watch", {}, global_watch)
+            def global_watch(cmsg, cwc, ckey):
+                self.debug("Received message for {}".format(conn_string))
+                self.debug(cmsg)
 
-            wc = self.__conns.get(conn_string)
-            self.debug(self.__conns)
+            wc = nrepl.WatchableConnection(conn)
+            self.__conns[conn_string] = wc
+            wc.watch("global_watch", {}, global_watch)
 
-            return cider_gather(Fireplace_nrepl(wc),
-                                context["complete_str"],
-                                connection.get("session"),
-                                ns)
+        wc = self.__conns.get(conn_string)
+        self.debug(self.__conns)
 
-        return []
+        return cider_gather(Fireplace_nrepl(wc),
+                            context["complete_str"],
+                            connection.get("session"),
+                            ns)