Merge pull request #1693 from puremourning/update-jdtls

Update to JDTLS 1.23.0

build.py

@@ -89,10 +89,10 @@ def Exit( self ):
   )$
 """
 
-JDTLS_MILESTONE = '1.14.0'
-JDTLS_BUILD_STAMP = '202207211651'
+JDTLS_MILESTONE = '1.23.0'
+JDTLS_BUILD_STAMP = '202304271346'
 JDTLS_SHA256 = (
-  '4978ee235049ecba9c65b180b69ef982eedd2f79dc4fd1781610f17939ecd159'
+  '2363d8c01d5a8260a3d55f8fa008828d26a7b0acf9b173fafca4471ee81a701f'
 )
 
 RUST_TOOLCHAIN = 'nightly-2022-08-17'

run_tests.py

@@ -33,7 +33,7 @@
     os.pathsep +
     p.join( DIR_OF_THIRD_PARTY, 'jedi_deps', 'numpydoc' ) )
 
-LOMBOK_VERSION = '1.18.16'
+LOMBOK_VERSION = '1.18.26'
 
 
 def DownloadFileTo( download_url, file_path ):
@@ -355,7 +355,7 @@ def SetUpJavaCompleter():
 
   jar_name = f'lombok-{ LOMBOK_VERSION }.jar'
   url = (
-    f'https://github.com/ycm-core/llvm/releases/download/14.0.5/{ jar_name }'
+    f'https://github.com/ycm-core/llvm/releases/download/16.0.1/{ jar_name }'
   )
   file_name = p.join( CACHE, jar_name )
 

ycmd/completers/language_server/language_server_completer.py

@@ -2048,7 +2048,7 @@ def ConvertNotificationToMessage( self, request_data, notification ):
       try:
         filepath = lsp.UriToFilePath( uri )
       except lsp.InvalidUriException:
-        LOGGER.exception( 'Ignoring diagnostics for unrecognized URI' )
+        LOGGER.debug( 'Ignoring diagnostics for unrecognized URI %s', uri )
         return None
 
       with self._server_info_mutex:

ycmd/completers/language_server/language_server_protocol.py

@@ -337,6 +337,11 @@ def Initialize( request_id, project_directory, extra_capabilities, settings ):
             'plaintext',
             'markdown'
           ],
+          # Buggy servers (jdt.ls) now require this to be set even though it's
+          # the historical default
+          'resolveSupport': {
+            'properties': [ 'documentation', 'detail' ]
+          },
         },
       },
       'documentSymbol': {

ycmd/tests/java/diagnostics_test.py

@@ -72,6 +72,7 @@ def ProjectPath( *args ):
                                      'Test.java' )
 
 DIAG_MATCHERS_PER_FILE = {
+  PathToTestFile( DEFAULT_PROJECT_DIR ): empty(),
   TestFactory: contains_inanyorder(
     has_entries( {
       'kind': 'WARNING',

ycmd/tests/java/subcommands_test.py

@@ -625,6 +625,7 @@ def test_Subcommands_GoToReferences_MultipleProjects( self, app ):
         'response': requests.codes.ok,
         'data': contains_inanyorder(
           LocationMatcher( filepath, 8, 35 ),
+          LocationMatcher( filepath, 5, 21 ),
           LocationMatcher( PathToTestFile( 'multiple_projects',
                                            'src',
                                            'input',
@@ -662,26 +663,47 @@ def test_Subcommands_GoToReferences( self, app ):
 
     response = app.post_json( '/run_completer_command', event_data ).json
 
-    assert_that( response, contains_exactly( has_entries( {
-             'filepath': PathToTestFile( 'simple_eclipse_project',
-                                         'src',
-                                         'com',
-                                         'test',
-                                         'TestFactory.java' ),
-             'column_num': 9,
-             'description': "      w.doSomethingVaguelyUseful();",
-             'line_num': 28
-           } ),
-           has_entries( {
-             'filepath': PathToTestFile( 'simple_eclipse_project',
-                                         'src',
-                                         'com',
-                                         'test',
-                                         'TestLauncher.java' ),
-             'column_num': 11,
-             'description': "        w.doSomethingVaguelyUseful();",
-             'line_num': 32
-           } ) ) )
+    assert_that( response, contains_inanyorder(
+      has_entries( {
+        'filepath': PathToTestFile( 'simple_eclipse_project',
+                                    'src',
+                                    'com',
+                                    'test',
+                                    'AbstractTestWidget.java' ),
+        'column_num': 15,
+        'description': "  public void doSomethingVaguelyUseful();",
+        'line_num': 10
+      } ),
+      has_entries( {
+        'filepath': PathToTestFile( 'simple_eclipse_project',
+                                    'src',
+                                    'com',
+                                    'test',
+                                    'TestFactory.java' ),
+        'column_num': 9,
+        'description': "      w.doSomethingVaguelyUseful();",
+        'line_num': 28
+      } ),
+      has_entries( {
+        'filepath': PathToTestFile( 'simple_eclipse_project',
+                                    'src',
+                                    'com',
+                                    'test',
+                                    'TestLauncher.java' ),
+        'column_num': 11,
+        'description': "        w.doSomethingVaguelyUseful();",
+        'line_num': 32
+      } ),
+      has_entries( {
+        'filepath': PathToTestFile( 'simple_eclipse_project',
+                                    'src',
+                                    'com',
+                                    'test',
+                                    'TestWidgetImpl.java' ),
+        'column_num': 15,
+        'description': "  public void doSomethingVaguelyUseful() {",
+        'line_num': 20
+      } ) ) )
 
 
   @WithRetry()
@@ -1093,6 +1115,16 @@ def test_Subcommands_FixIt_SingleDiag_MultipleOption_Insertion( self, app ):
               'kind': 'quickassist',
               'text': "Add Javadoc for 'Wimble'"
             } ),
+            has_entries( {
+              'text': "Sort Members for 'TestFactory.java'"
+            } ),
+            has_entries( {
+              'text': "Add all missing imports"
+            } ),
+            # NOTE: bug (it seems) in jdt.ls, reports this code action 2x
+            has_entries( {
+              'text': "Add all missing imports"
+            } ),
           )
         } )
 
@@ -1154,6 +1186,12 @@ def test_Subcommands_FixIt_SingleDiag_SingleOption_Modify( self, app ):
         has_entries( {
           'text': "Add Javadoc for 'getWidget'"
         } ),
+        has_entries( {
+          'text': "Sort Members for 'TestFactory.java'"
+        } ),
+        has_entries( {
+          'text': "Add all missing imports"
+        } ),
       )
     } )
 
@@ -1222,6 +1260,12 @@ def test_Subcommands_FixIt_SingleDiag_MultiOption_Delete( self, app ):
           'text': "Add Javadoc for 'testString'",
           'chunks': instance_of( list )
         } ),
+        has_entries( {
+          'text': "Sort Members for 'TestFactory.java'"
+        } ),
+        has_entries( {
+          'text': "Add all missing imports"
+        } ),
       )
     } )
 
@@ -1304,6 +1348,12 @@ def test_Subcommands_FixIt_MultipleDiags( self, app ):
             'text': "Add Javadoc for 'getWidget'",
             'chunks': instance_of( list ),
           } ),
+          has_entries( {
+            'text': "Sort Members for 'TestFactory.java'"
+          } ),
+          has_entries( {
+            'text': "Add all missing imports"
+          } ),
         ]
 
         FIXITS = {
@@ -1432,6 +1482,9 @@ def test_Subcommands_FixIt_Range( self, app ):
               'text': "Add Javadoc for 'launch'",
               'chunks': instance_of( list ),
             } ),
+            has_entries( {
+              'text': "Sort Members for 'TestLauncher.java'"
+            } ),
           )
         } )
       }
@@ -1448,12 +1501,17 @@ def test_Subcommands_FixIt_NoDiagnostics( self, app ):
                                'test',
                                'TestFactory.java' )
 
+    # No FixIts is no lonber possible due to .. well all this crap
     RunFixItTest( app, "no FixIts means you gotta code it yo' self",
                   filepath, 1, 1, has_entries( {
                     'fixits': contains_inanyorder(
                       has_entries( {
                         'text': 'Change modifiers to final where possible',
                         'chunks': instance_of( list ) } ),
+                      has_entries( {
+                        'text': "Sort Members for 'TestFactory.java'" } ),
+                      has_entries( {
+                        'text': "Add all missing imports" } ),
                       has_entries( { 'text': 'Organize imports',
                                      'chunks': instance_of( list ) } ),
                       has_entries( { 'text': 'Generate toString()',
@@ -1509,6 +1567,9 @@ def test_Subcommands_FixIt_Unicode( self, app ):
         has_entries( {
           'text': "Add Javadoc for 'DoWhatever'"
         } ),
+        has_entries( {
+          'text': "Sort Members for 'Test.java'",
+        } ),
       )
     } )
 
@@ -1573,6 +1634,12 @@ def test_Subcommands_FixIt_InvalidURI( self, app ):
         has_entries( {
           'text': "Add Javadoc for 'getWidget'"
         } ),
+        has_entries( {
+          'text': "Sort Members for 'TestFactory.java'"
+        } ),
+        has_entries( {
+          'text': "Add all missing imports"
+        } ),
       )
     } )
 

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

@@ -14,4 +14,15 @@
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1682720979833</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

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

@@ -3,7 +3,7 @@
 
 DIR_OF_THIS_SCRIPT = p.dirname( p.abspath( __file__ ) )
 DIR_OF_THIRD_PARTY = p.join( DIR_OF_THIS_SCRIPT, '..', '..', '..', '..', '..', 'third_party' )
-PATH_TO_LOMBOK = p.join( DIR_OF_THIRD_PARTY, 'lombok', 'cache', 'lombok-1.18.16.jar' )
+PATH_TO_LOMBOK = p.join( DIR_OF_THIRD_PARTY, 'lombok', 'cache', 'lombok-1.18.26.jar' )
 
 
 def Settings( **kwargs ):

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

@@ -7,6 +7,6 @@ repositories {
 }
 
 dependencies {
-    compileOnly 'org.projectlombok:lombok:1.18.16'
-    annotationProcessor 'org.projectlombok:lombok:1.18.16'
+    compileOnly 'org.projectlombok:lombok:1.18.26'
+    annotationProcessor 'org.projectlombok:lombok:1.18.26'
 }

ycmd/tests/java/testdata/multiple_projects/src/core/.project

@@ -14,4 +14,15 @@
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1682721378093</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

ycmd/tests/java/testdata/multiple_projects/src/input/.project

@@ -14,4 +14,15 @@
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1682721378094</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

ycmd/tests/java/testdata/simple_eclipse_project/.project

@@ -14,4 +14,15 @@
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1682720977901</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

ycmd/tests/java/testdata/simple_gradle_project/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip