checkFieldType in JvmGenericTypeValidator

eclipse · Feb 5, 2024 · 6e88110 · 6e88110
1 parent 4be3461
commit 6e88110
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 10 deletions.
diff --git a/org.eclipse.xtend.core/src/org/eclipse/xtend/core/validation/XtendValidator.java b/org.eclipse.xtend.core/src/org/eclipse/xtend/core/validation/XtendValidator.java
@@ -498,15 +498,6 @@ protected EObject getContainingAnnotationTarget(XAnnotation annotation) {
 		return eContainer;
 	}
 
-	@Check
-	public void checkXtendFieldNotPrimitiveVoid(XtendField field) {
-		JvmTypeReference declaredFieldType = field.getType();
-		if (isPrimitiveVoid(declaredFieldType)) {
-			error("void is an invalid type for the field " + field.getName(),
-					field.getType(), null, INVALID_USE_OF_TYPE);
-		}
-	}
-
 	@Check
 	public void checkNoTypeNameShadowing(XtendTypeDeclaration type) {
 		String name = type.getName();

diff --git a/org.eclipse.xtext.xbase/src/org/eclipse/xtext/xbase/validation/JvmGenericTypeValidator.java b/org.eclipse.xtext.xbase/src/org/eclipse/xtext/xbase/validation/JvmGenericTypeValidator.java
@@ -19,11 +19,13 @@
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.xtext.common.types.JvmAnnotationType;
 import org.eclipse.xtext.common.types.JvmDeclaredType;
+import org.eclipse.xtext.common.types.JvmField;
 import org.eclipse.xtext.common.types.JvmGenericType;
 import org.eclipse.xtext.common.types.JvmParameterizedTypeReference;
 import org.eclipse.xtext.common.types.JvmSpecializedTypeReference;
 import org.eclipse.xtext.common.types.JvmType;
 import org.eclipse.xtext.common.types.JvmTypeReference;
+import org.eclipse.xtext.common.types.JvmVoid;
 import org.eclipse.xtext.common.types.JvmWildcardTypeReference;
 import org.eclipse.xtext.validation.AbstractDeclarativeValidator;
 import org.eclipse.xtext.validation.Check;
@@ -55,14 +57,22 @@ public void interceptRoot(EObject o) {
 
 	protected void checkJvmGenericTypes(List<? extends EObject> contents) {
 		contents.stream()
-				.filter(e -> !associations.getSourceElements(e).isEmpty())
+				.filter(this::isAssociatedToSource)
 				.filter(JvmGenericType.class::isInstance)
 				.map(JvmGenericType.class::cast)
 				.forEach(this::checkJvmGenericType);
 	}
 
+	private boolean isAssociatedToSource(EObject e) {
+		return !associations.getSourceElements(e).isEmpty();
+	}
+
 	protected void checkJvmGenericType(JvmGenericType type) {
 		checkSuperTypes(type);
+		type.getDeclaredFields().forEach(field -> {
+			if (isAssociatedToSource(field))
+				checkField(field);
+		});
 		checkJvmGenericTypes(type.getMembers());
 	}
 
@@ -135,6 +145,22 @@ protected void checkSuperTypes(JvmGenericType type) {
 		}
 	}
 
+	protected void checkField(JvmField field) {
+		JvmTypeReference declaredFieldType = field.getType();
+		var associated = associations.getPrimarySourceElement(declaredFieldType);
+		if (isPrimitiveVoid(declaredFieldType)) {
+			error("Primitive void cannot be a dependency.",
+					associated, null, INVALID_USE_OF_TYPE);
+		}
+	}
+
+	/**
+	 * Copied from {@link XbaseValidator#isPrimitiveVoid(JvmTypeReference)}
+	 */
+	protected boolean isPrimitiveVoid(JvmTypeReference typeReference) {
+		return typeReference != null && typeReference.getType() != null && !typeReference.getType().eIsProxy() && typeReference.getType() instanceof JvmVoid;
+	}
+
 	private boolean hasCycleInHierarchy(JvmGenericType type, Set<JvmGenericType> processedSuperTypes) {
 		JvmDeclaredType container = type;
 		do {