Add CiderCompletionManager

Author: SevereOverfl0w

pythonx/async_clj_omni/async_clj_omni/fireplace.py

@@ -1,4 +1,5 @@
-import nrepl  # NOQA
+import nrepl
+from async_clj_omni.cider import cider_gather
 
 class Error(Exception):
     """Base class for exceptions in this module."""
@@ -56,3 +57,31 @@ def watch(self, name, q, callback):
 
     def unwatch(self, name):
         self.wc.unwatch(name)
+
+class CiderCompletionManager:
+    def __init__(self, logger, vim):
+        self.__connmanager = ConnManager(logger)
+        self.__logger = logger
+        self.__vim = vim
+
+    def gather_candidates(self, complete_str):
+        self.__logger.debug("Gathering candidates")
+
+        try:
+            client, connection, transport, ns = gather_conn_info(self.__vim)
+        except Error:
+            self.__logger.exception("Unable to get connection info")
+            return []
+
+        host = transport.get("host")
+        port = transport.get("port")
+
+        conn_string = "nrepl://{}:{}".format(host, port)
+
+        wc = self.__connmanager.get_conn(conn_string)
+
+        return cider_gather(self.__logger,
+                            Fireplace_nrepl(wc),
+                            complete_str,
+                            connection.get("session"),
+                            ns)

rplugin/python3/deoplete/sources/async_clj.py

@@ -5,7 +5,7 @@
 sys.path.append(os.path.join(basedir, "vim_nrepl_python_client/"))
 sys.path.append(os.path.join(basedir, "../../../../pythonx/async_clj_omni"))
 
-from async_clj_omni.cider import cider_gather  # NOQA
+# from async_clj_omni.cider import cider_gather  # NOQA
 from async_clj_omni import fireplace
 from .base import Base  # NOQA
 import deoplete.logger
@@ -18,26 +18,7 @@ def __init__(self, vim):
         self.mark = "CLJ"
         self.filetypes = ['clojure']
         self.rank = 200
-        self.__connmanager = fireplace.ConnManager(deoplete.logger.getLogger('fireplace_conn_manager'))
+        self.__cider_completion_manager = fireplace.CiderCompletionManager(deoplete.logger.getLogger('fireplace_cider_completion_manager'), vim)
 
     def gather_candidates(self, context):
-        self.debug("Gathering candidates")
-
-        try:
-            client, connection, transport, ns = fireplace.gather_conn_info(self.vim)
-        except fireplace.Error:
-            self.exception("Unable to get connection info")
-            return []
-
-        host = transport.get("host")
-        port = transport.get("port")
-
-        conn_string = "nrepl://{}:{}".format(host, port)
-
-        wc = self.__connmanager.get_conn(conn_string)
-
-        return cider_gather(deoplete.logger.getLogger('fireplace_cider_gather'),
-                            fireplace.Fireplace_nrepl(wc),
-                            context["complete_str"],
-                            connection.get("session"),
-                            ns)
+        return self.__cider_completion_manager.gather_candidates(context["complete_str"])