Skip to content

Commit 6aec4f1

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'master' into update-rust-analyzer
2 parents fb45f41 + e1d867a commit 6aec4f1

File tree

14 files changed

+148
-31
lines changed

14 files changed

+148
-31
lines changed

‎build.py‎

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

92-
JDTLS_MILESTONE = '1.14.0'
93-
JDTLS_BUILD_STAMP = '202207211651'
92+
JDTLS_MILESTONE = '1.23.0'
93+
JDTLS_BUILD_STAMP = '202304271346'
9494
JDTLS_SHA256 = (
95-
'4978ee235049ecba9c65b180b69ef982eedd2f79dc4fd1781610f17939ecd159'
95+
'2363d8c01d5a8260a3d55f8fa008828d26a7b0acf9b173fafca4471ee81a701f'
9696
)
9797

9898
DEFAULT_RUST_TOOLCHAIN = 'nightly-2023-05-11'

‎run_tests.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
os.pathsep +
3434
p.join( DIR_OF_THIRD_PARTY, 'jedi_deps', 'numpydoc' ) )
3535

36-
LOMBOK_VERSION = '1.18.16'
36+
LOMBOK_VERSION = '1.18.26'
3737

3838

3939
def DownloadFileTo( download_url, file_path ):
@@ -355,7 +355,7 @@ def SetUpJavaCompleter():
355355

356356
jar_name = f'lombok-{ LOMBOK_VERSION }.jar'
357357
url = (
358-
f'https://github.com/ycm-core/llvm/releases/download/14.0.5/{ jar_name }'
358+
f'https://github.com/ycm-core/llvm/releases/download/16.0.1/{ jar_name }'
359359
)
360360
file_name = p.join( CACHE, jar_name )
361361

‎third_party/watchdog_deps/watchdog‎

Submodule watchdog updated 70 files

‎ycmd/completers/language_server/language_server_completer.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2048,7 +2048,7 @@ def ConvertNotificationToMessage( self, request_data, notification ):
20482048
try:
20492049
filepath = lsp.UriToFilePath( uri )
20502050
except lsp.InvalidUriException:
2051-
LOGGER.exception( 'Ignoring diagnostics for unrecognized URI' )
2051+
LOGGER.debug( 'Ignoring diagnostics for unrecognized URI %s', uri )
20522052
return None
20532053

20542054
with self._server_info_mutex:

‎ycmd/completers/language_server/language_server_protocol.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,11 @@ def Initialize( request_id, project_directory, extra_capabilities, settings ):
337337
'plaintext',
338338
'markdown'
339339
],
340+
# Buggy servers (jdt.ls) now require this to be set even though it's
341+
# the historical default
342+
'resolveSupport': {
343+
'properties': [ 'documentation', 'detail' ]
344+
},
340345
},
341346
},
342347
'documentSymbol': {

‎ycmd/tests/java/diagnostics_test.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ def ProjectPath( *args ):
7272
'Test.java' )
7373

7474
DIAG_MATCHERS_PER_FILE = {
75+
PathToTestFile( DEFAULT_PROJECT_DIR ): empty(),
7576
TestFactory: contains_inanyorder(
7677
has_entries( {
7778
'kind': 'WARNING',

‎ycmd/tests/java/subcommands_test.py‎

Lines changed: 87 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -625,6 +625,7 @@ def test_Subcommands_GoToReferences_MultipleProjects( self, app ):
625625
'response': requests.codes.ok,
626626
'data': contains_inanyorder(
627627
LocationMatcher( filepath, 8, 35 ),
628+
LocationMatcher( filepath, 5, 21 ),
628629
LocationMatcher( PathToTestFile( 'multiple_projects',
629630
'src',
630631
'input',
@@ -662,26 +663,47 @@ def test_Subcommands_GoToReferences( self, app ):
662663

663664
response = app.post_json( '/run_completer_command', event_data ).json
664665

665-
assert_that( response, contains_exactly( has_entries( {
666-
'filepath': PathToTestFile( 'simple_eclipse_project',
667-
'src',
668-
'com',
669-
'test',
670-
'TestFactory.java' ),
671-
'column_num': 9,
672-
'description': " w.doSomethingVaguelyUseful();",
673-
'line_num': 28
674-
} ),
675-
has_entries( {
676-
'filepath': PathToTestFile( 'simple_eclipse_project',
677-
'src',
678-
'com',
679-
'test',
680-
'TestLauncher.java' ),
681-
'column_num': 11,
682-
'description': " w.doSomethingVaguelyUseful();",
683-
'line_num': 32
684-
} ) ) )
666+
assert_that( response, contains_inanyorder(
667+
has_entries( {
668+
'filepath': PathToTestFile( 'simple_eclipse_project',
669+
'src',
670+
'com',
671+
'test',
672+
'AbstractTestWidget.java' ),
673+
'column_num': 15,
674+
'description': " public void doSomethingVaguelyUseful();",
675+
'line_num': 10
676+
} ),
677+
has_entries( {
678+
'filepath': PathToTestFile( 'simple_eclipse_project',
679+
'src',
680+
'com',
681+
'test',
682+
'TestFactory.java' ),
683+
'column_num': 9,
684+
'description': " w.doSomethingVaguelyUseful();",
685+
'line_num': 28
686+
} ),
687+
has_entries( {
688+
'filepath': PathToTestFile( 'simple_eclipse_project',
689+
'src',
690+
'com',
691+
'test',
692+
'TestLauncher.java' ),
693+
'column_num': 11,
694+
'description': " w.doSomethingVaguelyUseful();",
695+
'line_num': 32
696+
} ),
697+
has_entries( {
698+
'filepath': PathToTestFile( 'simple_eclipse_project',
699+
'src',
700+
'com',
701+
'test',
702+
'TestWidgetImpl.java' ),
703+
'column_num': 15,
704+
'description': " public void doSomethingVaguelyUseful() {",
705+
'line_num': 20
706+
} ) ) )
685707

686708

687709
@WithRetry()
@@ -1093,6 +1115,16 @@ def test_Subcommands_FixIt_SingleDiag_MultipleOption_Insertion( self, app ):
10931115
'kind': 'quickassist',
10941116
'text': "Add Javadoc for 'Wimble'"
10951117
} ),
1118+
has_entries( {
1119+
'text': "Sort Members for 'TestFactory.java'"
1120+
} ),
1121+
has_entries( {
1122+
'text': "Add all missing imports"
1123+
} ),
1124+
# NOTE: bug (it seems) in jdt.ls, reports this code action 2x
1125+
has_entries( {
1126+
'text': "Add all missing imports"
1127+
} ),
10961128
)
10971129
} )
10981130

@@ -1154,6 +1186,12 @@ def test_Subcommands_FixIt_SingleDiag_SingleOption_Modify( self, app ):
11541186
has_entries( {
11551187
'text': "Add Javadoc for 'getWidget'"
11561188
} ),
1189+
has_entries( {
1190+
'text': "Sort Members for 'TestFactory.java'"
1191+
} ),
1192+
has_entries( {
1193+
'text': "Add all missing imports"
1194+
} ),
11571195
)
11581196
} )
11591197

@@ -1222,6 +1260,12 @@ def test_Subcommands_FixIt_SingleDiag_MultiOption_Delete( self, app ):
12221260
'text': "Add Javadoc for 'testString'",
12231261
'chunks': instance_of( list )
12241262
} ),
1263+
has_entries( {
1264+
'text': "Sort Members for 'TestFactory.java'"
1265+
} ),
1266+
has_entries( {
1267+
'text': "Add all missing imports"
1268+
} ),
12251269
)
12261270
} )
12271271

@@ -1304,6 +1348,12 @@ def test_Subcommands_FixIt_MultipleDiags( self, app ):
13041348
'text': "Add Javadoc for 'getWidget'",
13051349
'chunks': instance_of( list ),
13061350
} ),
1351+
has_entries( {
1352+
'text': "Sort Members for 'TestFactory.java'"
1353+
} ),
1354+
has_entries( {
1355+
'text': "Add all missing imports"
1356+
} ),
13071357
]
13081358

13091359
FIXITS = {
@@ -1432,6 +1482,9 @@ def test_Subcommands_FixIt_Range( self, app ):
14321482
'text': "Add Javadoc for 'launch'",
14331483
'chunks': instance_of( list ),
14341484
} ),
1485+
has_entries( {
1486+
'text': "Sort Members for 'TestLauncher.java'"
1487+
} ),
14351488
)
14361489
} )
14371490
}
@@ -1448,12 +1501,17 @@ def test_Subcommands_FixIt_NoDiagnostics( self, app ):
14481501
'test',
14491502
'TestFactory.java' )
14501503

1504+
# No FixIts is no lonber possible due to .. well all this crap
14511505
RunFixItTest( app, "no FixIts means you gotta code it yo' self",
14521506
filepath, 1, 1, has_entries( {
14531507
'fixits': contains_inanyorder(
14541508
has_entries( {
14551509
'text': 'Change modifiers to final where possible',
14561510
'chunks': instance_of( list ) } ),
1511+
has_entries( {
1512+
'text': "Sort Members for 'TestFactory.java'" } ),
1513+
has_entries( {
1514+
'text': "Add all missing imports" } ),
14571515
has_entries( { 'text': 'Organize imports',
14581516
'chunks': instance_of( list ) } ),
14591517
has_entries( { 'text': 'Generate toString()',
@@ -1509,6 +1567,9 @@ def test_Subcommands_FixIt_Unicode( self, app ):
15091567
has_entries( {
15101568
'text': "Add Javadoc for 'DoWhatever'"
15111569
} ),
1570+
has_entries( {
1571+
'text': "Sort Members for 'Test.java'",
1572+
} ),
15121573
)
15131574
} )
15141575

@@ -1573,6 +1634,12 @@ def test_Subcommands_FixIt_InvalidURI( self, app ):
15731634
has_entries( {
15741635
'text': "Add Javadoc for 'getWidget'"
15751636
} ),
1637+
has_entries( {
1638+
'text': "Sort Members for 'TestFactory.java'"
1639+
} ),
1640+
has_entries( {
1641+
'text': "Add all missing imports"
1642+
} ),
15761643
)
15771644
} )
15781645

‎ycmd/tests/java/testdata/extra_confs/simple_extra_conf_project/.project‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,15 @@
1414
<natures>
1515
<nature>org.eclipse.jdt.core.javanature</nature>
1616
</natures>
17+
<filteredResources>
18+
<filter>
19+
<id>1682720979833</id>
20+
<name></name>
21+
<type>30</type>
22+
<matcher>
23+
<id>org.eclipse.core.resources.regexFilterMatcher</id>
24+
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
25+
</matcher>
26+
</filter>
27+
</filteredResources>
1728
</projectDescription>

‎ycmd/tests/java/testdata/lombok_project/.ycm_extra_conf.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
DIR_OF_THIS_SCRIPT = p.dirname( p.abspath( __file__ ) )
55
DIR_OF_THIRD_PARTY = p.join( DIR_OF_THIS_SCRIPT, '..', '..', '..', '..', '..', 'third_party' )
6-
PATH_TO_LOMBOK = p.join( DIR_OF_THIRD_PARTY, 'lombok', 'cache', 'lombok-1.18.16.jar' )
6+
PATH_TO_LOMBOK = p.join( DIR_OF_THIRD_PARTY, 'lombok', 'cache', 'lombok-1.18.26.jar' )
77

88

99
def Settings( **kwargs ):

‎ycmd/tests/java/testdata/lombok_project/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ repositories {
77
}
88

99
dependencies {
10-
compileOnly 'org.projectlombok:lombok:1.18.16'
11-
annotationProcessor 'org.projectlombok:lombok:1.18.16'
10+
compileOnly 'org.projectlombok:lombok:1.18.26'
11+
annotationProcessor 'org.projectlombok:lombok:1.18.26'
1212
}

0 commit comments

Comments
 (0)