Merge pull request #1714 from bstaletic/clangd-touch-up

Minor clangd completer fixes
ycm-core · Oct 6, 2023 · adce5d8 · adce5d8
2 parents e755af6 + c102680
commit adce5d8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/ycmd/completers/cpp/clangd_completer.py b/ycmd/completers/cpp/clangd_completer.py
@@ -313,6 +313,9 @@ def GetCustomSubcommands( self ):
 
 
   def GoToAlternateFile( self, request_data ):
+    if not self.ServerIsReady():
+      raise RuntimeError( 'Server is initializing. Please wait.' )
+
     request_id = self.GetConnection().NextRequestId()
     uri = lsp.FilePathToUri( request_data[ 'filepath' ] )
     request  = lsp.BuildRequest( request_id,

diff --git a/ycmd/completers/language_server/language_server_completer.py b/ycmd/completers/language_server/language_server_completer.py
@@ -2843,6 +2843,9 @@ def ResolveFixit( self, request_data ):
 
 
   def ExecuteCommand( self, request_data, args ):
+    if not self.ServerIsReady():
+      raise RuntimeError( 'Server is initializing. Please wait.' )
+
     if not args:
       raise ValueError( 'Must specify a command to execute' )
 

diff --git a/ycmd/tests/clangd/subcommands_test.py b/ycmd/tests/clangd/subcommands_test.py
@@ -606,6 +606,7 @@ def test_Subcommands_DefinedSubcommands( self, app ):
   @SharedYcmd
   def test_Subcommands_ServerNotInitialized( self, app ):
     for cmd in [
+      'ExecuteCommand',
       'FixIt',
       'Format',
       'GetDoc',
@@ -617,10 +618,14 @@ def test_Subcommands_ServerNotInitialized( self, app ):
       'GoToCallers',
       'GoToDeclaration',
       'GoToDefinition',
-      'GoToInclude',
+      'GoToDocumentOutline',
+      'GoToImprecise',
       'GoToImplementation',
+      'GoToInclude',
       'GoToReferences',
+      'GoToType',
       'RefactorRename',
+      'GoToAlternateFile',
     ]:
       with self.subTest( cmd = cmd ):
         completer = handlers._server_state.GetFiletypeCompleter( [ 'cpp' ] )