Support launching server preinstalled by build tools

ensime_shared/client.py

@@ -193,8 +193,9 @@ def lazy_initialize_ensime():
                 self.log.debug(str(inspect.stack()))
                 self.log.debug('setup(quiet=%s, bootstrap_server=%s) called by %s()',
                                quiet, bootstrap_server, called_by)
-                no_classpath = not os.path.exists(self.launcher.classpath_file)
-                if not bootstrap_server and no_classpath:
+
+                installed = self.launcher.strategy.isinstalled()
+                if not installed and not bootstrap_server:
                     if not quiet:
                         scala = self.launcher.config.get('scala-version')
                         msg = feedback["prompt_server_install"].format(scala_version=scala)
@@ -261,6 +262,7 @@ def reconnect(e):
     def connect_ensime_server(self):
         """Start initial connection with the server."""
         self.log.debug('connect_ensime_server: in')
+        server_v2 = isinstance(self, EnsimeClientV2)
 
         def disable_completely(e):
             if e:
@@ -272,12 +274,12 @@ def disable_completely(e):
             self.number_try_connection -= 1
             if not self.ensime_server:
                 port = self.ensime.http_port()
-                uri = "websocket" if self.launcher.server_v2 else "jerky"
+                uri = "websocket" if server_v2 else "jerky"
                 self.ensime_server = gconfig["ensime_server"].format(port, uri)
             with catch(Exception, disable_completely):
                 from websocket import create_connection
                 # Use the default timeout (no timeout).
-                options = {"subprotocols": ["jerky"]} if self.launcher.server_v2 else {}
+                options = {"subprotocols": ["jerky"]} if server_v2 else {}
                 self.log.debug("About to connect to %s with options %s",
                                self.ensime_server, options)
                 self.ws = create_connection(self.ensime_server, **options)

ensime_shared/config.py

@@ -7,7 +7,7 @@
 
 from ensime_shared.util import Util
 
-BOOTSTRAPS_ROOT = os.path.join(os.environ['HOME'], '.config/ensime-vim/')
+BOOTSTRAPS_ROOT = os.path.join(os.environ['HOME'], '.config', 'ensime-vim')
 """Default directory where ENSIME server bootstrap projects will be created."""
 
 LOG_FORMAT = '%(levelname)-8s <%(asctime)s> (%(filename)s:%(lineno)d) - %(message)s'

ensime_shared/ensime.py

@@ -50,8 +50,9 @@ def __init__(self, vim):
         self._vim = vim
         self.clients = {}
 
+    @property
     def using_server_v2(self):
-        """Whether user has configured the plugin to use ENSIME v2 protocol."""
+        """bool: Whether user has configured the plugin to use ENSIME v2 protocol."""
         return bool(self.get_setting('server_v2', 0))
 
     def get_setting(self, key, default):
@@ -109,10 +110,11 @@ def create_client(self, config_path):
 
         This will launch the ENSIME server for the project as a side effect.
         """
-        server_v2 = self.using_server_v2()
+        config = ProjectConfig(config_path)
         editor = Editor(self._vim)
-        launcher = EnsimeLauncher(self._vim, config_path, server_v2)
-        if server_v2:
+        launcher = EnsimeLauncher(self._vim, config)
+
+        if self.using_server_v2:
             return EnsimeClientV2(editor, self._vim, launcher)
         else:
             return EnsimeClientV1(editor, self._vim, launcher)

ensime_shared/errors.py

@@ -10,6 +10,10 @@ def __init__(self, errno, msg, filename, *args):
         super(InvalidJavaPathError, self).__init__(errno, msg, filename, *args)
 
 
+class LaunchError(RuntimeError):
+    """Raised when ensime-vim cannot launch the ENSIME server."""
+
+
 class Error(object):
     """Represents an error in source code reported by ENSIME."""