diff --git a/build.py b/build.py index d21b02118..fbc6b5c7b 100755 --- a/build.py +++ b/build.py @@ -89,10 +89,10 @@ def Exit( self ): )$ """ -JDTLS_MILESTONE = '1.36.0' -JDTLS_BUILD_STAMP = '202405301306' +JDTLS_MILESTONE = '1.42.0' +JDTLS_BUILD_STAMP = '202411281516' JDTLS_SHA256 = ( - '028e274d06f4a61cad4ffd56f89ef414a8f65613c6d05d9467651b7fb03dae7b' + '75d26dc03f886c089958a668dc8baede1a559a6e83bf12c96070a4ee199dc58e' ) DEFAULT_RUST_TOOLCHAIN = 'nightly-2024-12-12' diff --git a/ycmd/tests/java/server_management_test.py b/ycmd/tests/java/server_management_test.py index 469f3222f..87700424c 100644 --- a/ycmd/tests/java/server_management_test.py +++ b/ycmd/tests/java/server_management_test.py @@ -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(