ST6RI-894 Updated resolution of redefinition target names.

seidewitz · seidewitz · commit dc186f18c927 · 2025-11-19T00:52:41.000-05:00
Skip the redefining feature entirely when resolving its redefined
feature name.
diff --git a/org.omg.kerml.xtext/src/org/omg/kerml/xtext/scoping/KerMLScope.xtend b/org.omg.kerml.xtext/src/org/omg/kerml/xtext/scoping/KerMLScope.xtend
@@ -57,6 +57,7 @@ import org.eclipse.xtext.naming.IQualifiedNameConverter
 import org.eclipse.emf.ecore.util.EcoreUtil
 import org.omg.sysml.util.NamespaceUtil
 import org.omg.kerml.xtext.naming.QualifiedNameUtil
+import org.omg.sysml.lang.sysml.Redefinition
 
 class KerMLScope extends AbstractScope implements ISysMLScope {
 	
@@ -265,7 +266,9 @@ class KerMLScope extends AbstractScope implements ISysMLScope {
 			
 			NamespaceUtil.addAdditionalMembersTo(ns)
 			for (mem: ns.ownedMembership.clone) { // Clone to avoid any possible ConcurrentModificationException.
-				if (!scopeProvider.visited.contains(mem)) {
+				if (!(scopeProvider.visited.contains(mem) || 
+				     mem instanceof OwningMembership && skip instanceof Redefinition && 
+				     (skip as Redefinition).owningType == mem.memberElement)) {
 					if (includeAll || isInsideScope || mem.visibility == VisibilityKind.PUBLIC || 
 						     mem.visibility == VisibilityKind.PROTECTED && isInheriting) {
 
@@ -371,7 +374,7 @@ class KerMLScope extends AbstractScope implements ISysMLScope {
 			val newRedefined = new HashSet()
 			if (redefined !== null) {
 				newRedefined.addAll(redefined)
-				newRedefined.addAll(TypeUtil.getFeaturesRedefinedBy(ns, skip))
+				newRedefined.addAll(TypeUtil.getFeaturesRedefinedBy(ns, if (skip instanceof Redefinition) skip.owningFeature else null))
 			}
 			
 			// Note: All specializations are traversed, even if a resolution is found, in order to check for possible redefinitions inherited
diff --git a/org.omg.kerml.xtext/src/org/omg/kerml/xtext/validation/KerMLValidator.xtend b/org.omg.kerml.xtext/src/org/omg/kerml/xtext/validation/KerMLValidator.xtend
@@ -599,7 +599,7 @@ class KerMLValidator extends AbstractKerMLValidator {
 		val crossFeature = FeatureUtil.getCrossFeatureOf(f)
 		val ownedCrossFeature = f.ownedCrossFeature()
 		if (crossFeature !== null) {
-			val redefinedFeatures = FeatureUtil.getRedefinedFeaturesWithComputedOf(f, null);
+			val redefinedFeatures = FeatureUtil.getRedefinedFeaturesWithComputedOf(f);
 			if (redefinedFeatures.map[rf | FeatureUtil.getCrossFeatureOf(rf)].
 				exists[cf | cf !== null && !TypeUtil.specializes(crossFeature, cf)]) {
 				if (f.ownedCrossSubsetting === null) {
diff --git a/org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/ExpressionEvaluator.java b/org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/ExpressionEvaluator.java
@@ -97,7 +97,7 @@ protected InvocationExpression instantiateInvocation(InvocationExpression expres
 				TypeUtil.addOwnedFeatureTo(instantiation, newParameter);
 				
 				newParameter.setDirection(parameter.getDirection());
-				for (Feature redefinedFeature: FeatureUtil.getRedefinedFeaturesWithComputedOf(parameter, null)) {
+				for (Feature redefinedFeature: FeatureUtil.getRedefinedFeaturesWithComputedOf(parameter)) {
 					Redefinition newRedefinition = SysMLFactory.eINSTANCE.createRedefinition();
 					newRedefinition.setRedefinedFeature(redefinedFeature);
 					newRedefinition.setRedefiningFeature(newParameter);
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/FeatureAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/FeatureAdapter.java
@@ -57,7 +57,6 @@
 import org.omg.sysml.lang.sysml.Type;
 import org.omg.sysml.lang.sysml.TypeFeaturing;
 import org.omg.sysml.lang.sysml.VisibilityKind;
-import org.omg.sysml.lang.sysml.impl.RedefinitionImpl;
 import org.omg.sysml.util.ConnectorUtil;
 import org.omg.sysml.util.ElementUtil;
 import org.omg.sysml.util.ExpressionUtil;
@@ -302,7 +301,7 @@ protected void addOwnedCrossFeatureSpecialization() {
 				addImplicitGeneralType(SysMLPackage.eINSTANCE.getFeatureTyping(), type);
 			}
 			
-			for (Feature redefinedFeature: FeatureUtil.getRedefinedFeaturesWithComputedOf((Feature)owner, null)) {
+			for (Feature redefinedFeature: FeatureUtil.getRedefinedFeaturesWithComputedOf((Feature)owner)) {
 				if (redefinedFeature.isEnd()) {
 					Feature crossFeature = getCrossFeatureOf(redefinedFeature);
 					if (crossFeature != null) {
@@ -500,7 +499,7 @@ public Set<Feature> getAllRedefinedFeatures() {
 	
 	public void addAllRedefinedFeaturesTo(Set<Feature> redefinedFeatures) {
 		redefinedFeatures.add(getTarget());
-		getRedefinedFeaturesWithComputed(null).stream().forEach(redefinedFeature->{
+		getRedefinedFeaturesWithComputed().stream().forEach(redefinedFeature->{
 			if (redefinedFeature != null && !redefinedFeatures.contains(redefinedFeature)) {
 				FeatureUtil.addAllRedefinedFeaturesTo(redefinedFeature, redefinedFeatures);
 			}
@@ -509,15 +508,15 @@ public void addAllRedefinedFeaturesTo(Set<Feature> redefinedFeatures) {
 	
 	// Computed Redefinition
 	
-	public List<Feature> getRedefinedFeaturesWithComputed(Element skip) {
+	public List<Feature> getRedefinedFeaturesWithComputed() {
 		Feature target = getTarget();
 		
-		addComputedRedefinitions(skip);
+		addComputedRedefinitions(null);
 		EList<Redefinition> redefinitions = target.getOwnedRedefinition();
 		
 		List<Feature> redefinedFeatures = new ArrayList<>();
 		redefinitions.stream().
-			map(r->r == skip? ((RedefinitionImpl)r).basicGetRedefinedFeature(): r.getRedefinedFeature()).
+			map(Redefinition::getRedefinedFeature).
 			filter(f->f != null).
 			forEachOrdered(redefinedFeatures::add);
 		
@@ -877,7 +876,7 @@ public void addOwnedCrossFeatureTypeFeaturing() {
 					
 					addFeaturingType(cartesianProductFeature);
 
-					for (Feature redefinedFeature: FeatureUtil.getRedefinedFeaturesWithComputedOf(owningFeature, null)) {
+					for (Feature redefinedFeature: FeatureUtil.getRedefinedFeaturesWithComputedOf(owningFeature)) {
 						if (redefinedFeature.isEnd()) {
 							Feature crossFeature = getCrossFeatureOf(redefinedFeature);
 							if (crossFeature != null) {
diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_namingFeature_InvocationDelegate.java b/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_namingFeature_InvocationDelegate.java
@@ -40,7 +40,7 @@ public Feature_namingFeature_InvocationDelegate(EOperation operation) {
 	public Object dynamicInvoke(InternalEObject target, EList<?> arguments) throws InvocationTargetException {
 		Feature self = (Feature) target;
 		
-		return FeatureUtil.getRedefinedFeaturesWithComputedOf(self, null).stream().
+		return FeatureUtil.getRedefinedFeaturesWithComputedOf(self).stream().
 				findFirst().orElse(null);
 	}
 
diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_redefines_InvocationDelegate.java b/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_redefines_InvocationDelegate.java
@@ -41,7 +41,7 @@ public Object dynamicInvoke(InternalEObject target, EList<?> arguments) throws I
 		Feature self = (Feature) target;
 		Feature redefinedFeature = (Feature) arguments.get(0);
 		
-		return FeatureUtil.getRedefinedFeaturesWithComputedOf(self, null).
+		return FeatureUtil.getRedefinedFeaturesWithComputedOf(self).
 				contains(redefinedFeature);
 	}
 
diff --git a/org.omg.sysml/src/org/omg/sysml/util/FeatureUtil.java b/org.omg.sysml/src/org/omg/sysml/util/FeatureUtil.java
@@ -37,7 +37,6 @@
 import org.omg.sysml.adapter.FeatureAdapter;
 import org.omg.sysml.lang.sysml.Behavior;
 import org.omg.sysml.lang.sysml.CrossSubsetting;
-import org.omg.sysml.lang.sysml.Element;
 import org.omg.sysml.lang.sysml.Expression;
 import org.omg.sysml.lang.sysml.Feature;
 import org.omg.sysml.lang.sysml.FeatureChaining;
@@ -195,8 +194,8 @@ public static List<Feature> getRedefinedFeaturesOf(Feature feature) {
 		return getFeatureAdapter(feature).getRedefinedFeatures();
 	}
 	
-	public static List<Feature> getRedefinedFeaturesWithComputedOf(Feature feature, Element skip) {
-		return getFeatureAdapter(feature).getRedefinedFeaturesWithComputed(skip);
+	public static List<Feature> getRedefinedFeaturesWithComputedOf(Feature feature) {
+		return getFeatureAdapter(feature).getRedefinedFeaturesWithComputed();
 	}
 	
 	public static void forceComputeRedefinitionsFor(Feature feature) {
diff --git a/org.omg.sysml/src/org/omg/sysml/util/TypeUtil.java b/org.omg.sysml/src/org/omg/sysml/util/TypeUtil.java
@@ -97,9 +97,10 @@ public static Collection<Feature> getAllFeaturesRedefinedBy(Type type) {
 				collect(Collectors.toSet());
 	}
 	
-	public static List<Feature> getFeaturesRedefinedBy(Type type, Element skip) {
+	public static List<Feature> getFeaturesRedefinedBy(Type type, Feature skip) {
 		return type.getOwnedFeature().stream().
-				flatMap(feature->FeatureUtil.getRedefinedFeaturesWithComputedOf(feature, skip).stream()).
+				filter(feature->feature != skip).
+				flatMap(feature->FeatureUtil.getRedefinedFeaturesWithComputedOf(feature).stream()).
 				toList();
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public Feature_namingFeature_InvocationDelegate(EOperation operation) {`
`40`	`40`	`public Object dynamicInvoke(InternalEObject target, EList<?> arguments) throws InvocationTargetException {`
`41`	`41`	`Feature self = (Feature) target;`
`42`	`42`
`43`		`- return FeatureUtil.getRedefinedFeaturesWithComputedOf(self, null).stream().`
	`43`	`+ return FeatureUtil.getRedefinedFeaturesWithComputedOf(self).stream().`
`44`	`44`	`findFirst().orElse(null);`
`45`	`45`	`}`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public Object dynamicInvoke(InternalEObject target, EList<?> arguments) throws I`
`41`	`41`	`Feature self = (Feature) target;`
`42`	`42`	`Feature redefinedFeature = (Feature) arguments.get(0);`
`43`	`43`
`44`		`- return FeatureUtil.getRedefinedFeaturesWithComputedOf(self, null).`
	`44`	`+ return FeatureUtil.getRedefinedFeaturesWithComputedOf(self).`
`45`	`45`	`contains(redefinedFeature);`
`46`	`46`	`}`
`47`	`47`
Original file line number	Diff line number	Diff line change
`@@ -97,9 +97,10 @@ public static Collection<Feature> getAllFeaturesRedefinedBy(Type type) {`
`97`	`97`	`collect(Collectors.toSet());`
`98`	`98`	`}`
`99`	`99`
`100`		`- public static List<Feature> getFeaturesRedefinedBy(Type type, Element skip) {`
	`100`	`+ public static List<Feature> getFeaturesRedefinedBy(Type type, Feature skip) {`
`101`	`101`	`return type.getOwnedFeature().stream().`
`102`		`- flatMap(feature->FeatureUtil.getRedefinedFeaturesWithComputedOf(feature, skip).stream()).`
	`102`	`+ filter(feature->feature != skip).`
	`103`	`+ flatMap(feature->FeatureUtil.getRedefinedFeaturesWithComputedOf(feature).stream()).`
`103`	`104`	`toList();`
`104`	`105`	`}`
`105`	`106`