From 4b037505568f89e18abb55b449b28d2cac8a4c8c Mon Sep 17 00:00:00 2001 From: Boris Staletic Date: Tue, 3 Dec 2024 00:11:48 +0100 Subject: [PATCH 1/3] Upgrade jdt.ls to v1.42.0 --- build.py | 6 +++--- ycmd/tests/java/server_management_test.py | 14 +++++++++----- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/build.py b/build.py index d21b021186..fbc6b5c7be 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 469f3222f5..87700424c0 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( From 7cc4ee2cd85bc3eb0703ac4072c0da931d86ba25 Mon Sep 17 00:00:00 2001 From: Boris Staletic Date: Tue, 3 Dec 2024 00:12:15 +0100 Subject: [PATCH 2/3] Upgrade gopls to v0.16.2 --- build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.py b/build.py index fbc6b5c7be..5b3313388b 100755 --- a/build.py +++ b/build.py @@ -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/gopls@v0.16.1' + gopls = 'golang.org/x/tools/gopls@v0.16.2' CheckCall( [ go, 'install', gopls ], env = new_env, quiet = args.quiet, From d6d035c407609f690c7d8fdcc2b7351153faad84 Mon Sep 17 00:00:00 2001 From: Boris Staletic Date: Tue, 3 Dec 2024 00:12:30 +0100 Subject: [PATCH 3/3] Upgrade tsserver to v5.7.2 --- third_party/tsserver/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/tsserver/package.json b/third_party/tsserver/package.json index 402b5a9040..d79e378bb9 100644 --- a/third_party/tsserver/package.json +++ b/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" } }