Merge pull request #1 from szarnekow/pr-1627

Remove xtend.lib dependency
eclipse · Feb 19, 2024 · bc46dd7 · bc46dd7
2 parents 2b752f2 + 217df6d
commit bc46dd7
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 18 deletions.
diff --git a/org.eclipse.lemminx/pom.xml b/org.eclipse.lemminx/pom.xml
@@ -216,12 +216,6 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<!-- FIXME this should not be required -->
-		<dependency>
-		    <groupId>org.eclipse.xtend</groupId>
-		    <artifactId>org.eclipse.xtend.lib</artifactId>
-		    <version>2.33.0</version>
-		</dependency>
 		<dependency>
 			<groupId>org.eclipse.lsp4j</groupId>
 			<artifactId>org.eclipse.lsp4j.jsonrpc</artifactId>

diff --git a/org.eclipse.lemminx/src/main/java/org/eclipse/lemminx/client/CodeLensKindCapabilities.java b/org.eclipse.lemminx/src/main/java/org/eclipse/lemminx/client/CodeLensKindCapabilities.java
@@ -13,8 +13,7 @@
 
 import java.util.List;
 
-import org.eclipse.xtext.xbase.lib.Pure;
-import org.eclipse.xtext.xbase.lib.util.ToStringBuilder;
+import org.eclipse.lsp4j.jsonrpc.util.ToStringBuilder;
 
 /**
  * Specific capabilities for the `CodeLensKind`.
@@ -48,7 +47,6 @@ public CodeLensKindCapabilities(final List<String> valueSet) {
 	 * If this property is not present the client only supports the codeLens kinds
 	 * from `File` to `Array` as defined in the initial version of the protocol.
 	 */
-	@Pure
 	public List<String> getValueSet() {
 		return this.valueSet;
 	}
@@ -66,15 +64,13 @@ public void setValueSet(final List<String> valueSet) {
 	}
 
 	@Override
-	@Pure
 	public String toString() {
 		ToStringBuilder b = new ToStringBuilder(this);
 		b.add("valueSet", this.valueSet);
 		return b.toString();
 	}
 
 	@Override
-	@Pure
 	public boolean equals(final Object obj) {
 		if (this == obj) {
 			return true;
@@ -97,7 +93,6 @@ public boolean equals(final Object obj) {
 	}
 
 	@Override
-	@Pure
 	public int hashCode() {
 		return 31 * 1 + ((this.valueSet == null) ? 0 : this.valueSet.hashCode());
 	}

diff --git a/...clipse.lemminx/src/main/java/org/eclipse/lemminx/client/ExtendedCodeLensCapabilities.java b/...clipse.lemminx/src/main/java/org/eclipse/lemminx/client/ExtendedCodeLensCapabilities.java
@@ -12,8 +12,7 @@
 package org.eclipse.lemminx.client;
 
 import org.eclipse.lsp4j.DynamicRegistrationCapabilities;
-import org.eclipse.xtext.xbase.lib.Pure;
-import org.eclipse.xtext.xbase.lib.util.ToStringBuilder;
+import org.eclipse.lsp4j.jsonrpc.util.ToStringBuilder;
 
 /**
  * Extended capabilities specific to the `textDocument/codeLens` request. This capability doesn't belong to LSP specification. See proposal at 
@@ -52,7 +51,6 @@ public ExtendedCodeLensCapabilities(final CodeLensKindCapabilities codeLensKind,
 	 * Specific capabilities for the `CodeLensKind` in the `textDocument/codeLens`
 	 * request.
 	 */
-	@Pure
 	public CodeLensKindCapabilities getCodeLensKind() {
 		return this.codeLensKind;
 	}
@@ -66,7 +64,6 @@ public void setCodeLensKind(final CodeLensKindCapabilities codeLensKind) {
 	}
 
 	@Override
-	@Pure
 	public String toString() {
 		ToStringBuilder b = new ToStringBuilder(this);
 		b.add("codeLensKind", this.codeLensKind);
@@ -75,7 +72,6 @@ public String toString() {
 	}
 
 	@Override
-	@Pure
 	public boolean equals(final Object obj) {
 		if (this == obj) {
 			return true;
@@ -101,7 +97,6 @@ public boolean equals(final Object obj) {
 	}
 
 	@Override
-	@Pure
 	public int hashCode() {
 		return 31 * super.hashCode() + ((this.codeLensKind == null) ? 0 : this.codeLensKind.hashCode());
 	}