Allow switching JavaScript project with RestartServer

Start Tern on the FileReadyToParse event.
Add Tern configuration file to debugging information.

ycmd/completers/javascript/tern_completer.py

@@ -97,7 +97,7 @@ def FindTernProjectFile( starting_directory ):
   for folder in utils.PathsToAllParentFolders( starting_directory ):
     tern_project = os.path.join( folder, '.tern-project' )
     if os.path.exists( tern_project ):
-      return ( tern_project, True )
+      return tern_project
 
   # As described here: http://ternjs.net/doc/manual.html#server a global
   # .tern-config file is also supported for the Tern server. This can provide
@@ -107,9 +107,9 @@ def FindTernProjectFile( starting_directory ):
   # to be anything other than annoying.
   tern_config = os.path.expanduser( '~/.tern-config' )
   if GlobalConfigExists( tern_config ):
-    return ( tern_config, False )
+    return tern_config
 
-  return ( None, False )
+  return None
 
 
 class TernCompleter( Completer ):
@@ -127,21 +127,16 @@ def __init__( self, user_options ):
 
     self._do_tern_project_check = False
 
-    # Used to determine the absolute path of files returned by the tern server.
-    # When a .tern_project file exists, paths are returned relative to it.
-    # Otherwise, they are returned relative to the working directory of the tern
-    # server.
-    self._server_paths_relative_to = None
-
     self._server_handle = None
     self._server_port = None
     self._server_stdout = None
     self._server_stderr = None
 
-    self._StartServer()
+    self._server_working_dir = None
+    self._server_project_file = None
 
 
-  def _WarnIfMissingTernProject( self ):
+  def _WarnIfMissingTernProject( self, request_data ):
     # The Tern server will operate without a .tern-project file. However, it
     # does not operate optimally, and will likely lead to issues reported that
     # JavaScript completion is not working properly. So we raise a warning if we
@@ -150,34 +145,19 @@ def _WarnIfMissingTernProject( self ):
     # We do this check after the server has started because the server does
     # have nonzero use without a project file, however limited. We only do this
     # check once, though because the server can only handle one project at a
-    # time. This doesn't catch opening a file which is not part of the project
-    # or any of those things, but we can only do so much. We'd like to enhance
-    # ycmd to handle this better, but that is a FIXME for now.
-    if self._ServerIsRunning() and self._do_tern_project_check:
-      self._do_tern_project_check = False
-
-      current_dir = utils.GetCurrentDirectory()
-      ( tern_project, is_project ) = FindTernProjectFile( current_dir )
-      if not tern_project:
-        _logger.warning( 'No .tern-project file detected: ' + current_dir )
-        raise RuntimeError( 'Warning: Unable to detect a .tern-project file '
-                            'in the hierarchy before ' + current_dir +
-                            ' and no global .tern-config file was found. '
-                            'This is required for accurate JavaScript '
-                            'completion. Please see the User Guide for '
-                            'details.' )
-      else:
-        _logger.info( 'Detected Tern configuration file at: ' + tern_project )
-
-        # Paths are relative to the project file if it exists, otherwise they
-        # are relative to the working directory of Tern server (which is the
-        # same as the working directory of ycmd).
-        self._server_paths_relative_to = (
-          os.path.dirname( tern_project ) if is_project else current_dir )
-
-        _logger.info( 'Tern paths are relative to: '
-                      + self._server_paths_relative_to )
+    # time.
+    if not self._ServerIsRunning() or not self._do_tern_project_check:
+      return
 
+    self._do_tern_project_check = False
+    filepath = request_data[ 'filepath' ]
+    if not FindTernProjectFile( filepath ):
+      raise RuntimeError( 'Warning: Unable to detect a .tern-project file '
+                          'in the hierarchy before ' + filepath +
+                          ' and no global .tern-config file was found. '
+                          'This is required for accurate JavaScript '
+                          'completion. Please see the User Guide for '
+                          'details.' )
 
 
   def _GetServerAddress( self ):
@@ -241,7 +221,9 @@ def BuildDoc( completion ):
 
 
   def OnFileReadyToParse( self, request_data ):
-    self._WarnIfMissingTernProject()
+    self._StartServer( request_data )
+
+    self._WarnIfMissingTernProject( request_data )
 
     # Keep tern server up to date with the file data. We do this by sending an
     # empty request just containing the file data
@@ -257,7 +239,7 @@ def OnFileReadyToParse( self, request_data ):
   def GetSubcommandsMap( self ):
     return {
       'RestartServer':  ( lambda self, request_data, args:
-                                         self._RestartServer() ),
+                                         self._RestartServer( request_data ) ),
       'StopServer':     ( lambda self, request_data, args:
                                          self._StopServer() ),
       'GoToDefinition': ( lambda self, request_data, args:
@@ -281,13 +263,19 @@ def SupportedFiletypes( self ):
 
   def DebugInfo( self, request_data ):
     with self._server_state_mutex:
+      extras = [
+        responses.DebugInfoItem( key = 'configuration file',
+                                 value = self._server_project_file )
+      ]
+
       tern_server = responses.DebugInfoServer(
         name = 'Tern',
         handle = self._server_handle,
         executable = PATH_TO_TERN_BINARY,
         address = SERVER_HOST,
         port = self._server_port,
-        logfiles = [ self._server_stdout, self._server_stderr ] )
+        logfiles = [ self._server_stdout, self._server_stderr ],
+        extras = extras )
 
       return responses.BuildDebugInfoResponse( name = 'JavaScript',
                                                servers = [ tern_server ] )
@@ -387,17 +375,28 @@ def _ServerPathToAbsolute( self, path ):
     if os.path.isabs( path ):
       return path
 
-    return os.path.join( self._server_paths_relative_to, path )
+    return os.path.join( self._server_working_dir, path )
 
 
   # TODO: this function is way too long. Consider refactoring it.
-  def _StartServer( self ):
+  def _StartServer( self, request_data ):
     with self._server_state_mutex:
       if self._ServerIsRunning():
         return
 
       _logger.info( 'Starting Tern server...' )
 
+      filepath = request_data[ 'filepath' ]
+      self._server_project_file = FindTernProjectFile( filepath )
+      if not self._server_project_file:
+        _logger.warning( 'No .tern-project file detected: %s', filepath )
+        self._server_working_dir = os.path.dirname( filepath )
+      else:
+        _logger.info( 'Detected Tern configuration file at: %s',
+                      self._server_project_file )
+        self._server_working_dir = os.path.dirname( self._server_project_file )
+      _logger.info( 'Tern paths are relative to: %s', self._server_working_dir )
+
       self._server_port = utils.GetUnusedLocalhostPort()
 
       if _logger.isEnabledFor( logging.DEBUG ):
@@ -430,10 +429,12 @@ def _StartServer( self ):
         # 3.4+ on other platforms.
         with utils.OpenForStdHandle( self._server_stdout ) as stdout:
           with utils.OpenForStdHandle( self._server_stderr ) as stderr:
-            self._server_handle = utils.SafePopen( command,
-                                                  stdin = PIPE,
-                                                  stdout = stdout,
-                                                  stderr = stderr )
+            self._server_handle = utils.SafePopen(
+              command,
+              stdin = PIPE,
+              stdout = stdout,
+              stderr = stderr,
+              cwd = self._server_working_dir )
       except Exception:
         _logger.exception( 'Unable to start Tern server' )
         self._CleanUp()
@@ -453,10 +454,10 @@ def _StartServer( self ):
         _logger.warning( 'Tern server did not start successfully' )
 
 
-  def _RestartServer( self ):
+  def _RestartServer( self, request_data ):
     with self._server_state_mutex:
       self._StopServer()
-      self._StartServer()
+      self._StartServer( request_data )
 
 
   def _StopServer( self ):
@@ -477,6 +478,7 @@ def _StopServer( self ):
 
   def _CleanUp( self ):
     utils.CloseStandardStreams( self._server_handle )
+
     self._server_handle = None
     self._server_port = None
     if not self._server_keep_logfiles:
@@ -487,6 +489,9 @@ def _CleanUp( self ):
         utils.RemoveIfExists( self._server_stderr )
         self._server_stderr = None
 
+    self._server_working_dir = None
+    self._server_project_file = None
+
 
   def _ServerIsRunning( self ):
     return utils.ProcessIsRunning( self._server_handle )

ycmd/tests/javascript/__init__.py

@@ -25,14 +25,11 @@
 import functools
 import os
 
-from ycmd.tests.test_utils import ( ClearCompletionsCache,
-                                    CurrentWorkingDirectory, IsolatedApp,
-                                    SetUpApp, StopCompleterServer,
+from ycmd.tests.test_utils import ( BuildRequest, ClearCompletionsCache,
+                                    IsolatedApp, SetUpApp, StopCompleterServer,
                                     WaitUntilCompleterServerReady )
-from ycmd.utils import GetCurrentDirectory
 
 shared_app = None
-shared_current_dir = None
 
 
 def PathToTestFile( *args ):
@@ -45,21 +42,27 @@ def setUpPackage():
   by all tests using the SharedYcmd decorator in this package. Additional
   configuration that is common to these tests, like starting a semantic
   subserver, should be done here."""
-  global shared_app, shared_current_dir
+  global shared_app
 
   shared_app = SetUpApp()
-  shared_current_dir = GetCurrentDirectory()
-  os.chdir( PathToTestFile() )
-  WaitUntilCompleterServerReady( shared_app, 'javascript' )
+  StartJavaScriptCompleterServerInDirectory( shared_app, PathToTestFile() )
 
 
 def tearDownPackage():
   """Cleans up the tests using the SharedYcmd decorator in this package. It is
   executed once after running all the tests in the package."""
-  global shared_app, shared_current_dir
+  global shared_app
 
   StopCompleterServer( shared_app, 'javascript' )
-  os.chdir( shared_current_dir )
+
+
+def StartJavaScriptCompleterServerInDirectory( app, directory ):
+  app.post_json( '/event_notification',
+                 BuildRequest(
+                   filepath = os.path.join( directory, 'test.js' ),
+                   event_name = 'FileReadyToParse',
+                   filetype = 'javascript' ) )
+  WaitUntilCompleterServerReady( shared_app, 'javascript' )
 
 
 def SharedYcmd( test ):
@@ -77,17 +80,6 @@ def Wrapper( *args, **kwargs ):
 
 
 def IsolatedYcmd( test ):
-  """Defines a decorator to be attached to tests of this package. This decorator
-  passes a unique ycmd application as a parameter. It should be used on tests
-  that change the server state in a irreversible way (ex: a semantic subserver
-  is stopped or restarted) or expect a clean state (ex: no semantic subserver
-  started, no .ycm_extra_conf.py loaded, etc).
-
-  Do NOT attach it to test generators but directly to the yielded tests."""
-  return IsolatedYcmdInDirectory( PathToTestFile() )
-
-
-def IsolatedYcmdInDirectory( directory ):
   """Defines a decorator to be attached to tests of this package. This decorator
   passes a unique ycmd application as a parameter running in the directory
   supplied. It should be used on tests that change the server state in a
@@ -96,14 +88,11 @@ def IsolatedYcmdInDirectory( directory ):
   loaded, etc).
 
   Do NOT attach it to test generators but directly to the yielded tests."""
-  def Decorator( test ):
-    @functools.wraps( test )
-    def Wrapper( *args, **kwargs ):
-      with IsolatedApp() as app:
-        try:
-          with CurrentWorkingDirectory( directory ):
-            test( app, *args, **kwargs )
-        finally:
-          StopCompleterServer( app, 'javascript' )
-    return Wrapper
-  return Decorator
+  @functools.wraps( test )
+  def Wrapper( *args, **kwargs ):
+    with IsolatedApp() as app:
+      try:
+        test( app, *args, **kwargs )
+      finally:
+        StopCompleterServer( app, 'javascript' )
+  return Wrapper

ycmd/tests/javascript/debug_info_test.py

@@ -44,7 +44,11 @@ def DebugInfo_test( app ):
         'address': instance_of( str ),
         'port': instance_of( int ),
         'logfiles': contains( instance_of( str ),
-                              instance_of( str ) )
+                              instance_of( str ) ),
+        'extras': contains( has_entries( {
+          'key': 'configuration file',
+          'value': instance_of( str )
+        } ) )
       } ) ),
       'items': empty()
     } ) )