Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrades for jdt.ls, gopls and tsserver #1772

Merged
merged 3 commits into from
Dec 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions build.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion third_party/tsserver/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"description": "ycmd tsserver runtime area with required typescript version and plugins",
"dependencies": {
"typescript": "5.4.5"
"typescript": "5.7.2"
}
}
14 changes: 9 additions & 5 deletions ycmd/tests/java/server_management_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Loading