Skip to content

Commit 69f9025

Browse files
bstaleticbstaletic
committed
Upgrade completers
- JDT v1.31.0 - R-A 2024-06-11 - TSServer 5.4.5 - Gopls 0.15.3
1 parent 85847ba commit 69f9025

File tree

5 files changed

+69
-21
lines changed

5 files changed

+69
-21
lines changed

‎build.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,13 @@ def Exit( self ):
8989
)$
9090
"""
9191

92-
JDTLS_MILESTONE = '1.31.0'
93-
JDTLS_BUILD_STAMP = '202401111522'
92+
JDTLS_MILESTONE = '1.36.0'
93+
JDTLS_BUILD_STAMP = '202405301306'
9494
JDTLS_SHA256 = (
95-
'6c25f62d0b74d1dd92ab19afbafbe5041eb06c2b853eab57f7f42fe6feb01f7c'
95+
'028e274d06f4a61cad4ffd56f89ef414a8f65613c6d05d9467651b7fb03dae7b'
9696
)
9797

98-
DEFAULT_RUST_TOOLCHAIN = 'nightly-2023-08-18'
98+
DEFAULT_RUST_TOOLCHAIN = 'nightly-2024-06-11'
9999
RUST_ANALYZER_DIR = p.join( DIR_OF_THIRD_PARTY, 'rust-analyzer' )
100100

101101
BUILD_ERROR_MESSAGE = (
@@ -945,7 +945,7 @@ def EnableGoCompleter( args ):
945945
new_env.pop( 'GOROOT', None )
946946
new_env[ 'GOBIN' ] = p.join( new_env[ 'GOPATH' ], 'bin' )
947947

948-
gopls = 'golang.org/x/tools/gopls@v0.14.0'
948+
gopls = 'golang.org/x/tools/gopls@v0.15.3'
949949
CheckCall( [ go, 'install', gopls ],
950950
env = new_env,
951951
quiet = args.quiet,

‎third_party/tsserver/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"description": "ycmd tsserver runtime area with required typescript version and plugins",
33
"dependencies": {
4-
"typescript": "5.1.6"
4+
"typescript": "5.4.5"
55
}
66
}

‎ycmd/tests/java/subcommands_test.py‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -695,15 +695,10 @@ def test_Subcommands_GoToReferences_MultipleProjects( self, app ):
695695
{
696696
'response': requests.codes.ok,
697697
'data': contains_inanyorder(
698-
# NOTE: Yes, jdt doubles the references in the second project.
699698
LocationMatcher( abstract_test_widget, 10, 15 ),
700699
LocationMatcher( test_factory, 28, 9 ),
701700
LocationMatcher( test_launcher, 32, 11 ),
702701
LocationMatcher( test_widget_impl, 18, 15 ),
703-
LocationMatcher( abstract_test_widget, 10, 15 ),
704-
LocationMatcher( test_factory, 28, 9 ),
705-
LocationMatcher( test_launcher, 32, 11 ),
706-
LocationMatcher( test_widget_impl, 18, 15 )
707702
)
708703
} ),
709704
]:
@@ -1193,7 +1188,7 @@ def test_Subcommands_FixIt_SingleDiag_MultipleOption_Insertion( self, app ):
11931188
} ),
11941189
has_entries( {
11951190
'kind': 'quickassist',
1196-
'text': "Add Javadoc for 'Wimble'"
1191+
'text': "Add Javadoc comment"
11971192
} ),
11981193
has_entries( {
11991194
'text': "Sort Members for 'TestFactory.java'"
@@ -1264,7 +1259,7 @@ def test_Subcommands_FixIt_SingleDiag_SingleOption_Modify( self, app ):
12641259
),
12651260
} ),
12661261
has_entries( {
1267-
'text': "Add Javadoc for 'getWidget'"
1262+
'text': "Add Javadoc comment"
12681263
} ),
12691264
has_entries( {
12701265
'text': "Sort Members for 'TestFactory.java'"
@@ -1337,7 +1332,7 @@ def test_Subcommands_FixIt_SingleDiag_MultiOption_Delete( self, app ):
13371332
} ),
13381333
has_entries( {
13391334
'kind': 'quickassist',
1340-
'text': "Add Javadoc for 'testString'",
1335+
'text': "Add Javadoc comment",
13411336
'chunks': instance_of( list )
13421337
} ),
13431338
has_entries( {
@@ -1346,6 +1341,9 @@ def test_Subcommands_FixIt_SingleDiag_MultiOption_Delete( self, app ):
13461341
has_entries( {
13471342
'text': "Add all missing imports"
13481343
} ),
1344+
has_entries( {
1345+
'text': "Add @SuppressWarnings 'unused' to 'testString'"
1346+
} ),
13491347
)
13501348
} )
13511349

@@ -1425,7 +1423,7 @@ def test_Subcommands_FixIt_MultipleDiags( self, app ):
14251423
'chunks': instance_of( list ),
14261424
} ),
14271425
has_entries( {
1428-
'text': "Add Javadoc for 'getWidget'",
1426+
'text': "Add Javadoc comment",
14291427
'chunks': instance_of( list ),
14301428
} ),
14311429
has_entries( {
@@ -1559,7 +1557,7 @@ def test_Subcommands_FixIt_Range( self, app ):
15591557
'chunks': instance_of( list ),
15601558
} ),
15611559
has_entries( {
1562-
'text': "Add Javadoc for 'launch'",
1560+
'text': "Add Javadoc comment",
15631561
'chunks': instance_of( list ),
15641562
} ),
15651563
has_entries( {
@@ -1658,7 +1656,7 @@ def test_Subcommands_FixIt_Unicode( self, app ):
16581656
'chunks': instance_of( list ),
16591657
} ),
16601658
has_entries( {
1661-
'text': "Add Javadoc for 'DoWhatever'"
1659+
'text': "Add Javadoc comment"
16621660
} ),
16631661
has_entries( {
16641662
'text': "Sort Members for 'Test.java'",
@@ -1725,7 +1723,7 @@ def test_Subcommands_FixIt_InvalidURI( self, app ):
17251723
),
17261724
} ),
17271725
has_entries( {
1728-
'text': "Add Javadoc for 'getWidget'"
1726+
'text': "Add Javadoc comment"
17291727
} ),
17301728
has_entries( {
17311729
'text': "Sort Members for 'TestFactory.java'"

‎ycmd/tests/rust/diagnostics_test.py‎

Lines changed: 51 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838

3939

4040
MAIN_FILEPATH = PathToTestFile( 'common', 'src', 'main.rs' )
41+
TEST_FILEPATH = PathToTestFile( 'common', 'src', 'test.rs' )
4142
DIAG_MATCHERS_PER_FILE = {
4243
MAIN_FILEPATH: contains_inanyorder(
4344
has_entries( {
@@ -50,7 +51,55 @@
5051
( 14, 13 ),
5152
( 14, 19 ) ) ),
5253
'fixit_available': False
53-
} )
54+
} ),
55+
has_entries( {
56+
'kind': 'WARNING',
57+
'text': 'unused variable: `a`\n`#[warn(unused_variables)]` '
58+
'on by default [unused_variables]',
59+
'location': LocationMatcher( MAIN_FILEPATH, 20, 9 ),
60+
'location_extent': RangeMatcher( MAIN_FILEPATH, ( 20, 9 ), ( 20, 10 ) ),
61+
'ranges': contains_exactly( RangeMatcher( MAIN_FILEPATH,
62+
( 20, 9 ),
63+
( 20, 10 ) ) ),
64+
'fixit_available': False
65+
} ),
66+
has_entries( {
67+
'kind': 'HINT',
68+
'text': 'if this is intentional, '
69+
'prefix it with an underscore: `_a` [unused_variables]',
70+
'location': LocationMatcher( MAIN_FILEPATH, 20, 9 ),
71+
'location_extent': RangeMatcher( MAIN_FILEPATH, ( 20, 9 ), ( 20, 10 ) ),
72+
'ranges': contains_exactly( RangeMatcher( MAIN_FILEPATH,
73+
( 20, 9 ),
74+
( 20, 10 ) ) ),
75+
'fixit_available': False
76+
} ),
77+
),
78+
TEST_FILEPATH: contains_inanyorder(
79+
has_entries( {
80+
'kind': 'WARNING',
81+
'text': 'function cannot return without recursing\n'
82+
'a `loop` may express intention better if this is '
83+
'on purpose\n'
84+
'`#[warn(unconditional_recursion)]` on by default '
85+
'[unconditional_recursion]',
86+
'location': LocationMatcher( TEST_FILEPATH, 11, 1 ),
87+
'location_extent': RangeMatcher( TEST_FILEPATH, ( 11, 1 ), ( 11, 14 ) ),
88+
'ranges': contains_exactly( RangeMatcher( TEST_FILEPATH,
89+
( 11, 1 ),
90+
( 11, 14 ) ) ),
91+
'fixit_available': False
92+
} ),
93+
has_entries( {
94+
'kind': 'HINT',
95+
'text': 'recursive call site [unconditional_recursion]',
96+
'location': LocationMatcher( TEST_FILEPATH, 14, 5 ),
97+
'location_extent': RangeMatcher( TEST_FILEPATH, ( 14, 5 ), ( 14, 15 ) ),
98+
'ranges': contains_exactly( RangeMatcher( TEST_FILEPATH,
99+
( 14, 5 ),
100+
( 14, 15 ) ) ),
101+
'fixit_available': False
102+
} ),
54103
)
55104
}
56105

@@ -102,6 +151,7 @@ def test_Diagnostics_FileReadyToParse( self, app ):
102151
assert_that( results, DIAG_MATCHERS_PER_FILE[ filepath ] )
103152

104153

154+
@WithRetry()
105155
@SharedYcmd
106156
def test_Diagnostics_Poll( self, app ):
107157
project_dir = PathToTestFile( 'common' )

‎ycmd/tests/typescript/diagnostics_test.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@ def test_Diagnostics_FileReadyToParse( self, app ):
7070
'kind': 'ERROR',
7171
'text': 'Expected 1-2 arguments, but got 0.',
7272
'location': LocationMatcher( filepath, 37, 5 ),
73-
'location_extent': RangeMatcher( filepath, ( 37, 5 ), ( 37, 12 ) ),
73+
'location_extent': RangeMatcher( filepath, ( 37, 5 ), ( 37, 10 ) ),
7474
'ranges': contains_exactly(
75-
RangeMatcher( filepath, ( 37, 5 ), ( 37, 12 ) ) ),
75+
RangeMatcher( filepath, ( 37, 5 ), ( 37, 10 ) ) ),
7676
'fixit_available': False
7777
} ),
7878
has_entries( {

0 commit comments

Comments
 (0)