Constant expressions must be resolved for component property types

Fix eclipse-pde#973
ptziegler · Dec 3, 2023 · cabf70b · cabf70b
1 parent aa435fb
commit cabf70b
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/...pse.pde.ds.annotations/src/org/eclipse/pde/ds/internal/annotations/AnnotationVisitor.java b/...pse.pde.ds.annotations/src/org/eclipse/pde/ds/internal/annotations/AnnotationVisitor.java
@@ -75,6 +75,7 @@
 import org.eclipse.jdt.core.dom.MethodDeclaration;
 import org.eclipse.jdt.core.dom.Modifier;
 import org.eclipse.jdt.core.dom.NormalAnnotation;
+import org.eclipse.jdt.core.dom.QualifiedName;
 import org.eclipse.jdt.core.dom.SingleMemberAnnotation;
 import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
 import org.eclipse.jdt.core.dom.StringLiteral;
@@ -1373,7 +1374,14 @@ private void collectComponentPropertyTypes(IDSDocumentFactory dsFactory,
 	}
 
 	private void setPropertyValue(IDSProperty property, Expression expression) {
-		if (expression instanceof StringLiteral string) {
+		if (expression instanceof QualifiedName name) {
+			Object constantExpressionValue = name.resolveConstantExpressionValue();
+			if (constantExpressionValue == null) {
+				removeAttribute(property, IDSConstants.ATTRIBUTE_PROPERTY_VALUE, null);
+			} else {
+				property.setPropertyValue(constantExpressionValue.toString());
+			}
+		} else if (expression instanceof StringLiteral string) {
 			property.setPropertyValue(string.getLiteralValue());
 		} else if (expression instanceof ArrayInitializer array) {
 			removeAttribute(property, IDSConstants.ATTRIBUTE_PROPERTY_VALUE, null);
@@ -1385,6 +1393,8 @@ private void setPropertyValue(IDSProperty property, Expression expression) {
 						return string.getLiteralValue();
 					} else if (arrayExpression instanceof TypeLiteral type) {
 						return type.getType().resolveBinding().getQualifiedName();
+					} else if (expression instanceof QualifiedName name) {
+						return String.valueOf(name.resolveConstantExpressionValue());
 					}
 					return expression.toString();
 				}).collect(Collectors.joining(TextUtil.getDefaultLineDelimiter()));