Add more flexibility to the way we find the ICompositeNode for an object

Signed-off-by: Sebastian Zarnekow <sebastian.zarnekow@gmail.com>
eclipse-xtext · Feb 4, 2024 · 59784bc · 59784bc
1 parent a144255
commit 59784bc
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/INodeReference.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/INodeReference.java
@@ -8,17 +8,24 @@
  *******************************************************************************/
 package org.eclipse.xtext.nodemodel;
 
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtext.nodemodel.impl.NodeModelBuilder;
 import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
 
 /**
  * An EMF object might store the node model information differently from the default adapter
  * based approach. If it implements {@link INodeReference}, it will be queried by 
- * {@link NodeModelUtils#getNode(org.eclipse.emf.ecore.EObject)}.   
+ * {@link NodeModelUtils#getNode(org.eclipse.emf.ecore.EObject)}.
  * 
- * @since 2.34
+ * Alternatively, the {@link EObject} might contain an adapter for the {@link ICompositeNode ICompositeNode.class}
+ * which also implements {@link INodeReference}. This is mostly meant as a compatiblity mode
+ * for existing EMF packages that cannot be altered in a way that the EObject itself fulfills this
+ * interface.
  * 
  * @see NodeModelBuilder#associateWithSemanticElement(ICompositeNode, org.eclipse.emf.ecore.EObject)
+ * @see NodeModelUtils#getNode(org.eclipse.emf.ecore.EObject)
+ * 
+ * @since 2.34
  */
 public interface INodeReference {
 

diff --git a/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/NodeModelUtils.java b/org.eclipse.xtext/src/org/eclipse/xtext/nodemodel/util/NodeModelUtils.java
@@ -12,6 +12,7 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.util.EcoreUtil;
@@ -111,7 +112,11 @@ public static ICompositeNode getNode(/* @Nullable */ EObject object) {
 		if (object instanceof INodeReference) {
 			return ((INodeReference) object).getNode();
 		}
-		return (ICompositeNode) EcoreUtil.getExistingAdapter(object, ICompositeNode.class);
+		Adapter adapter = EcoreUtil.getExistingAdapter(object, ICompositeNode.class);
+		if (adapter instanceof INodeReference) {
+			return ((INodeReference) adapter).getNode();
+		}
+		return (ICompositeNode) adapter;
 	}
 
 	/**