[#2902] LSP4J 0.21.2

Signed-off-by: Christian Dietrich <christian.dietrich.opensource@gmail.com>
eclipse-xtext · Jan 10, 2024 · 9f2e95e · 9f2e95e
1 parent aff64b8
commit 9f2e95e
Show file tree

Hide file tree

Showing 13 changed files with 55 additions and 38 deletions.
diff --git a/org.eclipse.xtext.dev-bom/pom.xml b/org.eclipse.xtext.dev-bom/pom.xml
@@ -287,37 +287,37 @@
 			<dependency>
 				<groupId>org.eclipse.lsp4j</groupId>
 				<artifactId>org.eclipse.lsp4j.debug</artifactId>
-				<version>0.21.1</version>
+				<version>0.21.2</version>
 			</dependency>
 			<dependency>
 				<groupId>org.eclipse.lsp4j</groupId>
 				<artifactId>org.eclipse.lsp4j.generator</artifactId>
-				<version>0.21.1</version>
+				<version>0.21.2</version>
 			</dependency>
 			<dependency>
 				<groupId>org.eclipse.lsp4j</groupId>
 				<artifactId>org.eclipse.lsp4j.jsonrpc.debug</artifactId>
-				<version>0.21.1</version>
+				<version>0.21.2</version>
 			</dependency>
 			<dependency>
 				<groupId>org.eclipse.lsp4j</groupId>
 				<artifactId>org.eclipse.lsp4j.jsonrpc</artifactId>
-				<version>0.21.1</version>
+				<version>0.21.2</version>
 			</dependency>
 			<dependency>
 				<groupId>org.eclipse.lsp4j</groupId>
 				<artifactId>org.eclipse.lsp4j.websocket.jakarta</artifactId>
-				<version>0.21.1</version>
+				<version>0.21.2</version>
 			</dependency>
 			<dependency>
 				<groupId>org.eclipse.lsp4j</groupId>
 				<artifactId>org.eclipse.lsp4j.websocket</artifactId>
-				<version>0.21.1</version>
+				<version>0.21.2</version>
 			</dependency>
 			<dependency>
 				<groupId>org.eclipse.lsp4j</groupId>
 				<artifactId>org.eclipse.lsp4j</artifactId>
-				<version>0.21.1</version>
+				<version>0.21.2</version>
 			</dependency>
 			<dependency>
 				<groupId>org.eclipse.platform</groupId>

diff --git a/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF
@@ -14,8 +14,8 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.34.0";visibility:=reexport,
  org.eclipse.core.runtime;bundle-version="3.24.100",
  org.eclipse.xtext.ide;bundle-version="2.34.0",
  org.junit;bundle-version="4.13.2",
- org.eclipse.lsp4j;bundle-version="[0.21.1,0.22.0)";resolution:=optional,
- org.eclipse.lsp4j.jsonrpc;bundle-version="[0.21.1,0.22.0)";resolution:=optional,
+ org.eclipse.lsp4j;bundle-version="[0.21.2,0.22.0)";resolution:=optional,
+ org.eclipse.lsp4j.jsonrpc;bundle-version="[0.21.2,0.22.0)";resolution:=optional,
  org.eclipse.xtext.testlanguages;bundle-version="2.34.0",
  org.eclipse.xtext.testlanguages.ide;bundle-version="2.34.0",
  org.eclipse.emf.mwe2.lib;bundle-version="2.17.0",

diff --git a/org.eclipse.xtext.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.ide/META-INF/MANIFEST.MF
@@ -11,8 +11,8 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.34.0";visibility:=reexport,
  org.eclipse.xtend.lib;bundle-version="2.34.0",
  org.eclipse.core.runtime;bundle-version="3.24.100";resolution:=optional;x-installation:=greedy,
  org.eclipse.equinox.common;bundle-version="3.16.0",
- org.eclipse.lsp4j;bundle-version="[0.21.1,0.22.0)";resolution:=optional,
- org.eclipse.lsp4j.jsonrpc;bundle-version="[0.21.1,0.22.0)";resolution:=optional,
+ org.eclipse.lsp4j;bundle-version="[0.21.2,0.22.0)";resolution:=optional,
+ org.eclipse.lsp4j.jsonrpc;bundle-version="[0.21.2,0.22.0)";resolution:=optional,
  org.eclipse.emf.ecore.change;bundle-version="[2.14.0,3)"
 Import-Package: org.apache.log4j;version="1.2.24"
 Export-Package: org.eclipse.xtext.ide;version="2.34.0";

diff --git a/org.eclipse.xtext.xbase/src/org/eclipse/xtext/xbase/compiler/XbaseCompiler.java b/org.eclipse.xtext.xbase/src/org/eclipse/xtext/xbase/compiler/XbaseCompiler.java
@@ -99,7 +99,6 @@
 
 import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
-import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.inject.Inject;
 
@@ -1106,7 +1105,9 @@ protected void constructorCallToJavaExpression(final XConstructorCall expr, ITre
 		}
 		ITreeAppendable typeAppendable = appendableWithNewKeyword.trace(expr, XbasePackage.Literals.XCONSTRUCTOR_CALL__CONSTRUCTOR, 0);
 		appendConstructedTypeName(expr, typeAppendable);
-		if (hasTypeArguments || (expr.isAnonymousClassConstructorCall() && !explicitTypeArguments.isEmpty() && ((JvmGenericType) constructor.getDeclaringType()).isAnonymous())) {
+		if (hasTypeArguments ||
+				(!explicitTypeArguments.isEmpty() &&
+						canCompileToJavaAnonymousClass(expr))) {
 			if (typeArguments.isEmpty()) {
 				LightweightTypeReference createdType = resolvedTypes.getActualType(expr);
 				typeArguments = createdType.getNamedType().getTypeArguments();
@@ -1132,16 +1133,25 @@ protected void constructorCallToJavaExpression(final XConstructorCall expr, ITre
 	}
 
 	protected void appendConstructedTypeName(XConstructorCall constructorCall, ITreeAppendable typeAppendable) {
-		JvmDeclaredType type = constructorCall.getConstructor().getDeclaringType();
-		if (type instanceof JvmGenericType && ((JvmGenericType) type).isAnonymous()) {
-			typeAppendable.append(Iterables.getLast(type.getSuperTypes()).getType());
+		IResolvedTypes resolvedTypes = batchTypeResolver.resolveTypes(constructorCall);
+		LightweightTypeReference actualType = resolvedTypes.getActualType(constructorCall);
+		if (canCompileToJavaAnonymousClass(constructorCall)) {
+			typeAppendable.append(actualType.getNamedType().getRawTypeReference());
 		} else {
-			IResolvedTypes resolvedTypes = batchTypeResolver.resolveTypes(constructorCall);
-			LightweightTypeReference actualType = resolvedTypes.getActualType(constructorCall).getRawTypeReference();
-			typeAppendable.append(actualType);
+			typeAppendable.append(actualType.getRawTypeReference());
 		}
 	}
-
+
+	/**
+	 * @since 2.34
+	 */
+	protected boolean canCompileToJavaAnonymousClass(XConstructorCall constructorCall) {
+		if (!constructorCall.isAnonymousClassConstructorCall())
+			return false;
+		JvmDeclaredType type = constructorCall.getConstructor().getDeclaringType();
+		return type instanceof JvmGenericType && ((JvmGenericType) type).isAnonymous();
+	}
+
 	/* @Nullable */
 	protected ILocationData getLocationWithNewKeyword(XConstructorCall call) {
 		final ICompositeNode startNode = NodeModelUtils.getNode(call);
@@ -2167,6 +2177,13 @@ protected boolean isVariableDeclarationRequired(XExpression expr, ITreeAppendabl
 				}
 			}
 		}
+		if (expr instanceof XConstructorCall) {
+			XConstructorCall constructorCall = (XConstructorCall) expr;
+			if (constructorCall.isAnonymousClassConstructorCall()) {
+				return isVariableDeclarationRequired((XExpression) container, b, recursive) &&
+					!canCompileToJavaAnonymousClass(constructorCall);
+			}
+		}
 		return super.isVariableDeclarationRequired(expr, b, recursive);
 	}
 

diff --git a/xtext-latest.target b/xtext-latest.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="xtext-latest" sequenceNumber="15">
+<target name="xtext-latest" sequenceNumber="16">
 	<locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/modeling/emf/emf/builds/nightly/latest" />
@@ -29,7 +29,7 @@
 			<repository location="https://download.eclipse.org/eclipse/updates/4.31-I-builds" />
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.21.1"/>
+			<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.21.2"/>
 			<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">

diff --git a/xtext-r202203.target b/xtext-r202203.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="xtext-r202203" sequenceNumber="15">
+<target name="xtext-r202203" sequenceNumber="16">
 	<locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.29"/>
@@ -27,7 +27,7 @@
 			<unit id="org.eclipse.buildship.feature.group" version="0.0.0" />
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.21.1"/>
+			<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.21.2"/>
 			<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">

diff --git a/xtext-r202206.target b/xtext-r202206.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="xtext-r202206" sequenceNumber="15">
+<target name="xtext-r202206" sequenceNumber="16">
 	<locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.30"/>
@@ -26,7 +26,7 @@
 			<unit id="org.eclipse.buildship.feature.group" version="0.0.0" />
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.21.1"/>
+			<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.21.2"/>
 			<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">

diff --git a/xtext-r202209.target b/xtext-r202209.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="xtext-r202209" sequenceNumber="15">
+<target name="xtext-r202209" sequenceNumber="16">
 	<locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.31"/>
@@ -31,7 +31,7 @@
 			<unit id="org.eclipse.buildship.feature.group" version="0.0.0" />
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.21.1"/>
+			<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.21.2"/>
 			<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">

diff --git a/xtext-r202212.target b/xtext-r202212.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="xtext-r202212" sequenceNumber="15">
+<target name="xtext-r202212" sequenceNumber="16">
 	<locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.32"/>
@@ -31,7 +31,7 @@
 			<unit id="org.eclipse.buildship.feature.group" version="0.0.0" />
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.21.1"/>
+			<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.21.2"/>
 			<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">

diff --git a/xtext-r202303.target b/xtext-r202303.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="xtext-r202303" sequenceNumber="15">
+<target name="xtext-r202303" sequenceNumber="16">
 	<locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.33.0"/>
@@ -31,7 +31,7 @@
 			<unit id="org.eclipse.buildship.feature.group" version="0.0.0" />
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.21.1"/>
+			<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.21.2"/>
 			<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">

diff --git a/xtext-r202306.target b/xtext-r202306.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="xtext-r202306" sequenceNumber="15">
+<target name="xtext-r202306" sequenceNumber="16">
 	<locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.34.0"/>
@@ -31,7 +31,7 @@
 			<unit id="org.eclipse.buildship.feature.group" version="0.0.0" />
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.21.1"/>
+			<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.21.2"/>
 			<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">

diff --git a/xtext-r202309.target b/xtext-r202309.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="xtext-r202309" sequenceNumber="15">
+<target name="xtext-r202309" sequenceNumber="16">
 	<locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.35.0"/>
@@ -31,7 +31,7 @@
 			<unit id="org.eclipse.buildship.feature.group" version="0.0.0" />
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.21.1"/>
+			<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.21.2"/>
 			<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">

diff --git a/xtext-r202312.target b/xtext-r202312.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="xtext-r202312" sequenceNumber="15">
+<target name="xtext-r202312" sequenceNumber="16">
 	<locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.36.0"/>
@@ -31,7 +31,7 @@
 			<unit id="org.eclipse.buildship.feature.group" version="0.0.0" />
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.21.1"/>
+			<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.21.2"/>
 			<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">