Merge remote-tracking branch 'origin/master' into fix_lsp_server_multiple_start

Author: analizator1

build.py

@@ -89,13 +89,13 @@ def Exit( self ):
   )$
 """
 
-JDTLS_MILESTONE = '1.36.0'
-JDTLS_BUILD_STAMP = '202405301306'
+JDTLS_MILESTONE = '1.40.0'
+JDTLS_BUILD_STAMP = '202409261450'
 JDTLS_SHA256 = (
-  '028e274d06f4a61cad4ffd56f89ef414a8f65613c6d05d9467651b7fb03dae7b'
+  '7416fc62befa450e32f06ec2b503f2eec5f22f0b1cc12f7b8ee5112bf671cf11'
 )
 
-DEFAULT_RUST_TOOLCHAIN = 'nightly-2024-06-11'
+DEFAULT_RUST_TOOLCHAIN = 'nightly-2024-12-12'
 RUST_ANALYZER_DIR = p.join( DIR_OF_THIRD_PARTY, 'rust-analyzer' )
 
 BUILD_ERROR_MESSAGE = (
@@ -964,7 +964,7 @@ def EnableGoCompleter( args ):
   new_env.pop( 'GOROOT', None )
   new_env[ 'GOBIN' ] = p.join( new_env[ 'GOPATH' ], 'bin' )
 
-  gopls = 'golang.org/x/tools/[email protected].1'
+  gopls = 'golang.org/x/tools/[email protected].2'
   CheckCall( [ go, 'install', gopls ],
              env = new_env,
              quiet = args.quiet,

third_party/tsserver/package.json

@@ -1,6 +1,6 @@
 {
   "description": "ycmd tsserver runtime area with required typescript version and plugins",
   "dependencies": {
-    "typescript": "5.4.5"
+    "typescript": "5.7.2"
   }
 }

ycmd/completers/language_server/language_server_completer.py

@@ -2995,22 +2995,29 @@ def _ResolveFixit( self, request_data, fixit ):
       # provider, but send a LSP Command instead. We can not resolve those with
       # codeAction/resolve!
       if ( 'command' not in code_action or
-           isinstance( code_action[ 'command' ], str ) ):
+           not isinstance( code_action[ 'command' ], str ) ):
         request_id = self.GetConnection().NextRequestId()
         msg = lsp.CodeActionResolve( request_id, code_action )
-        code_action = self.GetConnection().GetResponse(
-            request_id,
-            msg,
-            REQUEST_TIMEOUT_COMMAND )[ 'result' ]
+        try:
+          code_action = self.GetConnection().GetResponse(
+              request_id,
+              msg,
+              REQUEST_TIMEOUT_COMMAND )[ 'result' ]
+        except ResponseFailedException:
+          # Even if resolving has failed, we might still be able to apply
+          # what we have previously received...
+          # See https://github.com/rust-lang/rust-analyzer/issues/18428
+          if not ( 'edit' in code_action or 'command' in code_action ):
+            raise
 
     result = []
     if 'edit' in code_action:
       result.append( self.CodeActionLiteralToFixIt( request_data,
                                                     code_action ) )
 
-    if 'command' in code_action:
+    if command := code_action.get( 'command' ):
       assert not result, 'Code actions with edit and command is not supported.'
-      if isinstance( code_action[ 'command' ], str ):
+      if isinstance( command, str ):
         unresolved_command_fixit = self.CommandToFixIt( request_data,
                                                         code_action )
       else:

ycmd/tests/clangd/subcommands_test.py

@@ -543,6 +543,7 @@ def FixIt_Check_AutoExpand_Resolved( results ):
   } ) )
 
 
+@WithRetry()
 def RunRangedFixItTest( app, rng, expected, chosen_fixit = 0 ):
   contents = ReadFile( PathToTestFile( 'FixIt_Clang_cpp11.cpp' ) )
   args = {
@@ -616,7 +617,6 @@ def test_Subcommands_DefinedSubcommands( self, app ):
     } )
 
 
-  @WithRetry()
   @SharedYcmd
   def test_Subcommands_ServerNotInitialized( self, app ):
     for cmd in [
@@ -646,6 +646,7 @@ def test_Subcommands_ServerNotInitialized( self, app ):
       with self.subTest( cmd = cmd ):
         completer = handlers._server_state.GetFiletypeCompleter( [ 'cpp' ] )
 
+        @WithRetry()
         @patch.object( completer, '_ServerIsInitialized', return_value = False )
         def Test( app, cmd, *args ):
           request = {
@@ -1177,7 +1178,6 @@ def test_Subcommands_FixIt_all( self, app ):
         RunFixItTest( app, line, column, language, filepath, check )
 
 
-  @WithRetry()
   @SharedYcmd
   def test_Subcommands_FixIt_Ranged( self, app ):
     for test in [
@@ -1237,7 +1237,6 @@ def test_Subcommands_FixIt_AlreadyResolved( self, app ):
     assert_that( actual, equal_to( expected ) )
 
 
-  @WithRetry()
   @IsolatedYcmd( { 'clangd_args': [ '-hidden-features' ] } )
   def test_Subcommands_FixIt_ClangdTweaks( self, app ):
     selection = {

ycmd/tests/java/__init__.py

@@ -62,6 +62,10 @@ def StartJavaCompleterServerWithFile( app, file_path ):
                    event_name = 'FileReadyToParse',
                    filepath = file_path,
                    filetype = 'java' ) )
+  WaitUntilJavaCompleterServerReady( app )
+
+
+def WaitUntilJavaCompleterServerReady( app ):
   WaitUntilCompleterServerReady( app, 'java', SERVER_STARTUP_TIMEOUT )
 
 

ycmd/tests/java/server_management_test.py

@@ -36,15 +36,15 @@
                               isolated_app,
                               IsolatedYcmd,
                               StartJavaCompleterServerInDirectory,
-                              StartJavaCompleterServerWithFile )
+                              StartJavaCompleterServerWithFile,
+                              WaitUntilJavaCompleterServerReady )
 from ycmd.tests.test_utils import ( BuildRequest,
                                     CompleterProjectDirectoryMatcher,
                                     LocationMatcher,
                                     MockProcessTerminationTimingOut,
                                     RangeMatcher,
                                     TemporaryTestDir,
-                                    WaitForDiagnosticsToBeReady,
-                                    WaitUntilCompleterServerReady )
+                                    WaitForDiagnosticsToBeReady )
 from ycmd import utils, handlers
 
 
@@ -104,7 +104,7 @@ def test_ServerManagement_RestartServer( self, app ):
       ),
     )
 
-    WaitUntilCompleterServerReady( app, 'java' )
+    WaitUntilJavaCompleterServerReady( app )
 
     app.post_json(
       '/event_notification',
@@ -147,7 +147,7 @@ def test_ServerManagement_WipeWorkspace_NoConfig( self ):
           ),
         )
 
-        WaitUntilCompleterServerReady( app, 'java' )
+        WaitUntilJavaCompleterServerReady( app )
 
         assert_that(
           app.post_json( '/debug_info',
@@ -197,7 +197,7 @@ def test_ServerManagement_WipeWorkspace_WithConfig( self ):
           ),
         )
 
-        WaitUntilCompleterServerReady( app, 'java' )
+        WaitUntilJavaCompleterServerReady( app )
 
         assert_that(
           app.post_json( '/debug_info',
@@ -509,15 +509,19 @@ def test_ServerManagement_ConnectionRaisesWhileShuttingDown( self, app ):
     print( f'pid: { pid }' )
     process = psutil.Process( pid )
 
-    completer = handlers._server_state.GetFiletypeCompleter( [ 'java' ] )
-
     # In this test we mock out the GetResponse method, which is used to send
     # the shutdown request. This means we only send the exit notification. It's
     # possible that the server won't like this, but it seems reasonable for it
     # to actually exit at that point.
-    with patch.object( completer.GetConnection(),
-                       'GetResponse',
-                       side_effect = RuntimeError ):
+    from ycmd.completers.language_server import language_server_completer
+    from ycmd.completers.language_server import language_server_protocol as lsp
+
+    def BrokenShutdown( request_id ):
+      return lsp.BuildRequest( None, 'shutdown', None )
+
+    with patch.object( language_server_completer.lsp,
+                       'Shutdown',
+                       side_effect = BrokenShutdown ):
       app.post_json(
         '/run_completer_command',
         BuildRequest(

ycmd/tests/java/subcommands_test.py

@@ -155,6 +155,7 @@ def RunHierarchyTest( app, kind, direction, location, expected, code ):
   RunTest( app, test )
 
 
+@WithRetry()
 def RunFixItTest( app,
                   description,
                   filepath,
@@ -679,7 +680,6 @@ def test_Subcommands_GoToReferences_NoReferences( self, app ):
                                'Cannot jump to location' ) )
 
 
-  @WithRetry()
   @IsolatedYcmd( {
     'extra_conf_globlist': PathToTestFile( 'multiple_projects', '*' )
   } )
@@ -722,14 +722,11 @@ def test_Subcommands_GoToReferences_MultipleProjects( self, app ):
                                        'com',
                                        'test',
                                        'TestWidgetImpl.java' )
-    for desc, request, expect in [
+    for desc, filepath, line, column, expect in [
         ( 'GoToReferences works across multiple projects',
-          {
-            'command': 'GoToReferences',
-            'filepath': utils_java,
-            'line_num': 5,
-            'column_num': 22,
-          },
+          utils_java,
+          5,
+          22,
           {
             'response': requests.codes.ok,
             'data': contains_inanyorder(
@@ -739,12 +736,9 @@ def test_Subcommands_GoToReferences_MultipleProjects( self, app ):
             )
           } ),
         ( 'GoToReferences works in an unrelated project at the same time',
-          {
-            'command': 'GoToReferences',
-            'filepath': abstract_test_widget,
-            'line_num': 10,
-            'column_num': 15,
-          },
+          abstract_test_widget,
+          10,
+          15,
           {
             'response': requests.codes.ok,
             'data': contains_inanyorder(
@@ -755,16 +749,20 @@ def test_Subcommands_GoToReferences_MultipleProjects( self, app ):
             )
           } ),
     ]:
-      with self.subTest( desc = desc, request = request, expect = expect ):
-        filepath = request[ 'filepath' ]
+      with self.subTest( desc = desc,
+                         filepath = filepath,
+                         line = line,
+                         column = column,
+                         expect = expect ):
         StartJavaCompleterServerWithFile( app, filepath )
 
-
-        RunTest( app, {
-          'description': desc,
-          'request': request,
-          'expect': expect
-        } )
+        RunGoToTest( app,
+                     desc,
+                     filepath,
+                     line,
+                     column,
+                     'GoToReferences',
+                     expect )
 
 
   @WithRetry()
@@ -1102,7 +1100,6 @@ def test_Subcommands_RefactorRename_Unicode( self, app ):
 
 
 
-  @WithRetry()
   @SharedYcmd
   def test_Subcommands_FixIt_SingleDiag_MultipleOption_Insertion( self, app ):
     import os
@@ -1259,7 +1256,6 @@ def test_Subcommands_FixIt_SingleDiag_MultipleOption_Insertion( self, app ):
         RunFixItTest( app, description, filepath, 19, column, fixits_for_line )
 
 
-  @WithRetry()
   @SharedYcmd
   def test_Subcommands_FixIt_SingleDiag_SingleOption_Modify( self, app ):
     filepath = PathToTestFile( 'simple_eclipse_project',
@@ -1327,7 +1323,6 @@ def test_Subcommands_FixIt_SingleDiag_SingleOption_Modify( self, app ):
                   filepath, 27, 12, fixits )
 
 
-  @WithRetry()
   @SharedYcmd
   def test_Subcommands_FixIt_SingleDiag_MultiOption_Delete( self, app ):
     filepath = PathToTestFile( 'simple_eclipse_project',
@@ -1404,7 +1399,6 @@ def test_Subcommands_FixIt_SingleDiag_MultiOption_Delete( self, app ):
                   filepath, 15, 29, fixits )
 
 
-  @WithRetry()
   @SharedYcmd
   def test_Subcommands_FixIt_MultipleDiags( self, app ):
     for description, column, expect_fixits in [
@@ -1626,7 +1620,6 @@ def test_Subcommands_FixIt_Range( self, app ):
     )
 
 
-  @WithRetry()
   @SharedYcmd
   def test_Subcommands_FixIt_NoDiagnostics( self, app ):
     filepath = PathToTestFile( 'simple_eclipse_project',
@@ -1652,7 +1645,6 @@ def test_Subcommands_FixIt_NoDiagnostics( self, app ):
                                      'chunks': instance_of( list ) } ) ) } ) )
 
 
-  @WithRetry()
   @SharedYcmd
   def test_Subcommands_FixIt_Unicode( self, app ):
     fixits = has_entries( {
@@ -1720,7 +1712,6 @@ def test_Subcommands_FixIt_Unicode( self, app ):
                   TEST_JAVA, 13, 1, fixits )
 
 
-  @WithRetry()
   @IsolatedYcmd()
   def test_Subcommands_FixIt_InvalidURI( self, app ):
     filepath = PathToTestFile( 'simple_eclipse_project',

ycmd/tests/rust/__init__.py

@@ -17,11 +17,14 @@
 
 import functools
 import os
+import time
+from pprint import pformat
 
 from ycmd.tests.test_utils import ( BuildRequest,
                                     ClearCompletionsCache,
                                     IgnoreExtraConfOutsideTestsFolder,
                                     IsolatedApp,
+                                    PollForMessagesTimeoutException,
                                     SetUpApp,
                                     StopCompleterServer,
                                     WaitUntilCompleterServerReady )
@@ -52,6 +55,36 @@ def StartRustCompleterServerInDirectory( app, directory ):
   WaitUntilCompleterServerReady( app, 'rust' )
 
 
+def PollForMessages( app, request_data, timeout = 60 ):
+  expiration = time.time() + timeout
+  while True:
+    if time.time() > expiration:
+      raise PollForMessagesTimeoutException( 'Waited for diagnostics to be '
+        f'ready for { timeout } seconds, aborting.' )
+
+    default_args = {
+      'line_num'  : 1,
+      'column_num': 1,
+    }
+    args = dict( default_args )
+    args.update( request_data )
+
+    response = app.post_json( '/receive_messages', BuildRequest( **args ) ).json
+
+    print( f'poll response: { pformat( response ) }' )
+
+    if isinstance( response, bool ):
+      if not response:
+        raise RuntimeError( 'The message poll was aborted by the server' )
+    elif isinstance( response, list ):
+      return response
+    else:
+      raise AssertionError(
+        f'Message poll response was wrong type: { type( response ).__name__ }' )
+
+    time.sleep( 0.25 )
+
+
 def SharedYcmd( test ):
   global shared_app