bump LSP4J version 0.14.0 to 0.20.1 (#1498)

* bump LSP4J version 0.14.0 to 0.20.1 * bump junit version 5.9.1 to 5.9.2 * bump gson version 2.10 to 2.10.1 * remove org.eclipse.xtend.lib from dependencyManagement(Transitive by LSP4J)
eclipse · Mar 6, 2023 · d764495 · d764495
1 parent fe8beb4
commit d764495
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 10 deletions.
diff --git a/org.eclipse.lemminx/src/main/java/org/eclipse/lemminx/XMLTextDocumentService.java b/org.eclipse.lemminx/src/main/java/org/eclipse/lemminx/XMLTextDocumentService.java
@@ -89,6 +89,7 @@
 import org.eclipse.lsp4j.LinkedEditingRanges;
 import org.eclipse.lsp4j.Location;
 import org.eclipse.lsp4j.LocationLink;
+import org.eclipse.lsp4j.PrepareRenameDefaultBehavior;
 import org.eclipse.lsp4j.PrepareRenameParams;
 import org.eclipse.lsp4j.PrepareRenameResult;
 import org.eclipse.lsp4j.PublishDiagnosticsParams;
@@ -106,6 +107,7 @@
 import org.eclipse.lsp4j.WorkspaceEdit;
 import org.eclipse.lsp4j.jsonrpc.CancelChecker;
 import org.eclipse.lsp4j.jsonrpc.messages.Either;
+import org.eclipse.lsp4j.jsonrpc.messages.Either3;
 import org.eclipse.lsp4j.jsonrpc.validation.NonNull;
 import org.eclipse.lsp4j.services.TextDocumentService;
 
@@ -353,9 +355,18 @@ public CompletableFuture<List<? extends TextEdit>> rangeFormatting(DocumentRange
 	}
 
 	@Override
-	public CompletableFuture<Either<Range, PrepareRenameResult>> prepareRename(PrepareRenameParams params) {
+	public CompletableFuture<Either3<Range, PrepareRenameResult, PrepareRenameDefaultBehavior>> prepareRename(PrepareRenameParams params) {
 		return computeDOMAsync(params.getTextDocument(), (xmlDocument, cancelChecker) -> {
-			return getXMLLanguageService().prepareRename(xmlDocument, params.getPosition(), cancelChecker);
+			Either<Range, PrepareRenameResult> either = getXMLLanguageService().prepareRename(xmlDocument, params.getPosition(), cancelChecker);
+			if (either != null) {
+				if (either.isLeft()) {
+					return Either3.forFirst((Range) either.get());
+				} else {
+					return Either3.forSecond((PrepareRenameResult) either.get());
+				}
+			} else {
+				return Either3.forThird(new PrepareRenameDefaultBehavior());
+			}
 		});
 	}
 

diff --git a/org.eclipse.lemminx/src/main/resources/META-INF/native-image/reflect-config.json b/org.eclipse.lemminx/src/main/resources/META-INF/native-image/reflect-config.json
@@ -1525,6 +1525,22 @@
 			"name": "value"
 		}]
 	},
+	{
+		"name": "org.eclipse.lsp4j.NotebookDocumentClientCapabilities",
+		"allDeclaredFields": true,
+		"methods": [{
+			"name": "<init>",
+			"parameterTypes": []
+		}]
+	},
+	{
+		"name": "org.eclipse.lsp4j.NotebookDocumentSyncClientCapabilities",
+		"allDeclaredFields": true,
+		"methods": [{
+			"name": "<init>",
+			"parameterTypes": []
+		}]
+	},
 	{
 		"name": "org.eclipse.lsp4j.OnTypeFormattingCapabilities",
 		"allDeclaredFields": true,
@@ -1533,6 +1549,13 @@
 			"parameterTypes": []
 		}]
 	},
+	{
+		"name": "org.eclipse.lsp4j.adapters.DocumentDiagnosticReportTypeAdapter",
+		"methods": [{
+			"name": "<init>",
+			"parameterTypes": []
+		}]
+	},
 	{
 		"name": "org.eclipse.lsp4j.ParameterInformationCapabilities",
 		"allDeclaredFields": true,
@@ -1691,6 +1714,12 @@
 			"name": "value"
 		}]
 	},
+	{
+		"name": "org.eclipse.lsp4j.PrepareRenameDefaultBehavior",
+		"fields": [{
+			"name": "defaultBehavior"
+		}]
+	},
 	{
 		"name": "org.eclipse.lsp4j.ResourceOperation",
 		"allDeclaredFields": true

diff --git a/pom.xml b/pom.xml
@@ -8,8 +8,8 @@
 	<description>LemMinX is a XML Language Server Protocol (LSP), and can be used with any editor that supports LSP, to offer an outstanding XML editing experience</description>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<lsp4j.version>0.14.0</lsp4j.version>
-		<junit.version>5.9.1</junit.version>
+		<lsp4j.version>0.20.1</lsp4j.version>
+		<junit.version>5.9.2</junit.version>
 	</properties>
 	<url>https://github.com/eclipse/lemminx</url>
 	<licenses>
@@ -46,7 +46,7 @@
 			<dependency>
 				<groupId>com.google.code.gson</groupId>
 				<artifactId>gson</artifactId>
-				<version>2.10</version>
+				<version>2.10.1</version>
 			</dependency>
 			<dependency>
 				<groupId>org.eclipse.lsp4j</groupId>
@@ -85,11 +85,6 @@
 				<artifactId>org.eclipse.lsp4j.jsonrpc</artifactId>
 				<version>${lsp4j.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.eclipse.xtend</groupId>
-				<artifactId>org.eclipse.xtend.lib</artifactId>
-				<version>2.16.0.M1</version>
-			</dependency>
 			<dependency>
 				<groupId>org.junit.jupiter</groupId>
 				<artifactId>junit-jupiter-api</artifactId>