Remove ServerTerminated in C♯ completer

ServerTerminated is the inverse of ServerIsActive so we remove one
and use the other instead.

ycmd/completers/cs/cs_completer.py

@@ -201,17 +201,17 @@ def GetSubcommandsMap( self ):
       'GetDoc'                           : ( lambda self, request_data, args:
          self._SolutionSubcommand( request_data,
                                    method = '_GetDoc' ) ),
+      'ServerIsActive'                   : ( lambda self, request_data, args:
+         self._SolutionSubcommand( request_data,
+                                   method = 'ServerIsActive',
+                                   no_request_data = True ) ),
       'ServerRunning'                    : ( lambda self, request_data, args:
          self._SolutionSubcommand( request_data,
                                    method = 'ServerIsRunning',
                                    no_request_data = True ) ),
       'ServerReady'                      : ( lambda self, request_data, args:
          self._SolutionSubcommand( request_data,
                                    method = 'ServerIsReady',
-                                   no_request_data = True ) ),
-      'ServerTerminated'                 : ( lambda self, request_data, args:
-         self._SolutionSubcommand( request_data,
-                                   method = 'ServerTerminated',
                                    no_request_data = True ) )
     }
 
@@ -300,6 +300,12 @@ def DebugInfo( self, request_data ):
       return 'OmniSharp Server is not running'
 
 
+  def ServerIsActive( self, request_data = None ):
+    """ Check if the server process has already terminated. """
+    return self._CheckSingleOrAllActive( request_data,
+                                         lambda i: i.ServerIsActive() )
+
+
   def ServerIsRunning( self, request_data = None ):
     """ Check if our OmniSharp server is running. """
     return self._CheckSingleOrAllActive( request_data,
@@ -312,12 +318,6 @@ def ServerIsReady( self, request_data = None ):
                                          lambda i: i.ServerIsReady() )
 
 
-  def ServerTerminated( self, request_data = None ):
-    """ Check if the server process has already terminated. """
-    return self._CheckSingleOrAllActive( request_data,
-                                         lambda i: i.ServerTerminated() )
-
-
   def _CheckSingleOrAllActive( self, request_data, action ):
     if request_data is not None:
       solutioncompleter = self._GetSolutionCompleter( request_data )
@@ -409,7 +409,7 @@ def _StopServer( self ):
     self._TryToStopServer()
 
     # Kill it if it's still up
-    if not self.ServerTerminated() and self._omnisharp_phandle is not None:
+    if self.ServerIsActive():
       self._logger.info( 'Killing OmniSharp server' )
       self._omnisharp_phandle.kill()
 
@@ -425,7 +425,7 @@ def _TryToStopServer( self ):
       except:
         pass
       for _ in range( 10 ):
-        if self.ServerTerminated():
+        if not self.ServerIsActive():
           return
         time.sleep( .1 )
 
@@ -580,11 +580,6 @@ def ServerIsReady( self ):
       return False
 
 
-  def ServerTerminated( self ):
-    """ Check if the server process has already terminated. """
-    return not utils.ProcessIsRunning( self._omnisharp_phandle )
-
-
   def _SolutionFile( self ):
     """ Find out which solution file server was started with """
     return self._solution_path

ycmd/tests/cs/cs_handlers_test.py

@@ -57,11 +57,11 @@ def _WaitUntilOmniSharpServerReady( self, filename ):
         success = True
         break
       request = self._BuildRequest( completer_target = 'filetype_default',
-                                    command_arguments = [ 'ServerTerminated' ],
+                                    command_arguments = [ 'ServerIsActive' ],
                                     filepath = filename,
                                     filetype = 'cs' )
       result = self._app.post_json( '/run_completer_command', request ).json
-      if result:
+      if not result:
         raise RuntimeError( "OmniSharp failed during startup." )
       time.sleep( 0.2 )
       retries = retries - 1