Skip to content

ST6RI-888 Owned cross feature implied type not being set #705

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
seidewitz merged 3 commits into from
Oct 20, 2025
Merged

ST6RI-888 Owned cross feature implied type not being set #705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a9b831b
ST6RI-888 Updated version to 0.52.1.
seidewitz Oct 19, 2025
c6cbf94
ST6RI-888 Added tests that fail due to owned cross feature typing bug.
seidewitz Oct 19, 2025
413d42b
ST6RI-888 Corrected caching to fix the owned cross feature typing bug.
seidewitz Oct 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions kerml/src/examples/Simple Tests/Associations.kerml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,12 @@ package Associations {
end x1;
end [0..*] feature y1 redefines y;
}

metaclass M;
assoc XY {
end [0..1] feature x : X {
@M;
}
end feature y : Y;
}
}
2 changes: 1 addition & 1 deletion org.omg.kerml.expressions.xtext.ide/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: org.omg.kerml.xtext.ide
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-Vendor: SysML v2 Submission Team
Bundle-Version: 0.52.0.qualifier
Bundle-Version: 0.52.1.qualifier
Bundle-SymbolicName: org.omg.kerml.expressions.xtext.ide; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.omg.kerml.expressions.xtext,
Expand Down
2 changes: 1 addition & 1 deletion org.omg.kerml.expressions.xtext.ui/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: org.omg.kerml.xtext.ui
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-Vendor: SysML v2 Submission Team
Bundle-Version: 0.52.0.qualifier
Bundle-Version: 0.52.1.qualifier
Bundle-SymbolicName: org.omg.kerml.expressions.xtext.ui; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.omg.kerml.expressions.xtext,
Expand Down
2 changes: 1 addition & 1 deletion org.omg.kerml.expressions.xtext/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Automatic-Module-Name: org.omg.kerml.expressions.xtext
Bundle-ManifestVersion: 2
Bundle-Name: org.omg.kerml.xtext
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-Version: 0.52.0.qualifier
Bundle-Version: 0.52.1.qualifier
Bundle-SymbolicName: org.omg.kerml.expressions.xtext; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.xtext,
Expand Down
2 changes: 1 addition & 1 deletion org.omg.kerml.owl.ide/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: org.omg.kerml.owl.ide
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-Vendor: My Company
Bundle-Version: 0.52.0.qualifier
Bundle-Version: 0.52.1.qualifier
Bundle-SymbolicName: org.omg.kerml.owl.ide;singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.omg.kerml.owl,
Expand Down
2 changes: 1 addition & 1 deletion org.omg.kerml.owl.ui/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: org.omg.kerml.owl.ui
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-Vendor: My Company
Bundle-Version: 0.52.0.qualifier
Bundle-Version: 0.52.1.qualifier
Bundle-SymbolicName: org.omg.kerml.owl.ui;singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.omg.kerml.owl,
Expand Down
2 changes: 1 addition & 1 deletion org.omg.kerml.owl/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: org.omg.sysml.owl
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-Vendor: My Company
Bundle-Version: 0.52.0.qualifier
Bundle-Version: 0.52.1.qualifier
Bundle-SymbolicName: org.omg.kerml.owl;singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.xtext,
Expand Down
2 changes: 1 addition & 1 deletion org.omg.kerml.xpect.tests/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-Name: org.omg.kerml.xpect.tests
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-SymbolicName: org.omg.kerml.xpect.tests;singleton:=true
Bundle-Vendor: SysML v2 Submission Team
Bundle-Version: 0.52.0.qualifier
Bundle-Version: 0.52.1.qualifier
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.xpect.xtext.lib;bundle-version="[0.3.0,0.4.0)",
org.eclipse.xpect.xtext.xbase.lib;bundle-version="[0.3.0,0.4.0)",
Expand Down
52 changes: 52 additions & 0 deletions ...erml.xpect.tests/src/org/omg/kerml/xpect/tests/parsing/ParsingTests_Associations.kerml.xt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
//*
XPECT_SETUP org.omg.kerml.xpect.tests.parsing.KerMLParsingTest
ResourceSet {
ThisFile {}
File {from ="/library/Base.kerml"}
File {from ="/library/Links.kerml"}
File {from ="/library/Occurrences.kerml"}
File {from ="/library/Performances.kerml"}
File {from ="/library/Objects.kerml"}
File {from ="/library/Metaobjects.kerml"}
}
Workspace {
JavaProject {
SrcFolder {
ThisFile {}
File {from ="/library/Base.kerml"}
File {from ="/library/Links.kerml"}
File {from ="/library/Occurrences.kerml"}
File {from ="/library/Performances.kerml"}
File {from ="/library/Objects.kerml"}
File {from ="/library/Metaobjects.kerml"}
}
}
}
END_SETUP
*/

// XPECT noErrors ---> ""
package Associations {
datatype X;
class Y;

assoc A {
end x_cross [1..1] feature x : X;
end y_cross [1..*] feature y : Y;
}

assoc B specializes A {
end x1;
end [0..*] feature y1 redefines y;
}

metaclass M;
assoc XY {
// Ensure that the owned cross feature is typed correctly,
// even though getting type of end feature requires resolving
// metadata nam to check if it is SemanticMetadata, which
// requires getting supertypes of end feature, including its types.
end [0..1] #M feature x : X;
end [0..1] #M feature y : Y;
}
}
2 changes: 1 addition & 1 deletion org.omg.kerml.xtext.ide/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: org.omg.kerml.xtext.ide
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-Vendor: SysML v2 Submission Team
Bundle-Version: 0.52.0.qualifier
Bundle-Version: 0.52.1.qualifier
Bundle-SymbolicName: org.omg.kerml.xtext.ide; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.omg.kerml.xtext,
Expand Down
2 changes: 1 addition & 1 deletion org.omg.kerml.xtext.ui/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: org.omg.kerml.xtext.ui
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-Vendor: SysML v2 Submission Team
Bundle-Version: 0.52.0.qualifier
Bundle-Version: 0.52.1.qualifier
Bundle-SymbolicName: org.omg.kerml.xtext.ui; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.omg.kerml.xtext,
Expand Down
2 changes: 1 addition & 1 deletion org.omg.kerml.xtext/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Automatic-Module-Name: org.omg.kerml.xtext
Bundle-ManifestVersion: 2
Bundle-Name: org.omg.kerml.xtext
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-Version: 0.52.0.qualifier
Bundle-Version: 0.52.1.qualifier
Bundle-SymbolicName: org.omg.kerml.xtext; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.xtext,
Expand Down
2 changes: 1 addition & 1 deletion org.omg.sysml.edit/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.omg.sysml.edit;singleton:=true
Automatic-Module-Name: org.omg.sysml.edit
Bundle-Version: 0.52.0.qualifier
Bundle-Version: 0.52.1.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.omg.sysml.lang.sysml.provider.SysMLEditPlugin$Implementation
Bundle-Vendor: %providerName
Expand Down
2 changes: 1 addition & 1 deletion org.omg.sysml.editor.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.omg.sysml.editor.feature"
label="SysML v2 XMI Editor Feature"
version="0.52.0.qualifier"
version="0.52.1.qualifier"
provider-name="SysML v2 Submission Team">

<description url="http://www.example.com/description">
Expand Down
2 changes: 1 addition & 1 deletion org.omg.sysml.editor/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.omg.sysml.editor;singleton:=true
Automatic-Module-Name: org.omg.sysml.editor
Bundle-Version: 0.52.0.qualifier
Bundle-Version: 0.52.1.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.omg.sysml.lang.sysml.presentation.SysMLEditorPlugin$Implementation
Bundle-Vendor: %providerName
Expand Down
2 changes: 1 addition & 1 deletion org.omg.sysml.execution/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.omg.sysml.execution;singleton:=true
Bundle-Version: 0.52.0.qualifier
Bundle-Version: 0.52.1.qualifier
Automatic-Module-Name: org.omg.sysml.execution
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-Name: org.omg.sysml.execution
Expand Down
2 changes: 1 addition & 1 deletion org.omg.sysml.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.omg.sysml.feature"
label="SysML v2 Feature"
version="0.52.0.qualifier"
version="0.52.1.qualifier"
provider-name="SysML v2 Submission Team">

<description url="http://www.example.com/description">
Expand Down
2 changes: 1 addition & 1 deletion org.omg.sysml.interactive.tests/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Tests
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-SymbolicName: org.omg.sysml.interactive.tests;singleton:=true
Bundle-Version: 0.52.0.qualifier
Bundle-Version: 0.52.1.qualifier
Automatic-Module-Name: org.omg.sysml.interactive.tests
Bundle-ActivationPolicy: lazy
Require-Bundle: org.omg.sysml.interactive;bundle-version="0.3.2",
Expand Down
2 changes: 1 addition & 1 deletion org.omg.sysml.interactive/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: org.omg.sysml.interactive
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-SymbolicName: org.omg.sysml.interactive
Bundle-Version: 0.52.0.qualifier
Bundle-Version: 0.52.1.qualifier
Export-Package: org.omg.sysml.interactive
Require-Bundle: org.eclipse.emf.ecore,
com.google.inject,
Expand Down
2 changes: 1 addition & 1 deletion org.omg.sysml.jupyter.jupyterlab/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@systems-modeling/jupyterlab-sysml",
"version": "0.52.0-SNAPSHOT",
"version": "0.52.1-SNAPSHOT",
"description": "A JupyterLab extension for system modeling using SysML",
"repository": "github:Systems-Modeling/SysML-v2-Pilot-Implementation",
"author": "SysML v2 Submission Team",
Expand Down
2 changes: 1 addition & 1 deletion org.omg.sysml.plantuml.eclipse/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: SysML 2 PlantUML visualization for Eclipse
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-SymbolicName: org.omg.sysml.plantuml.eclipse;singleton:=true
Bundle-Version: 0.52.0.qualifier
Bundle-Version: 0.52.1.qualifier
Import-Package: net.sourceforge.plantuml.eclipse.utils;version="1.1.25.himi1",
net.sourceforge.plantuml.ecore,
net.sourceforge.plantuml.text,
Expand Down
2 changes: 1 addition & 1 deletion org.omg.sysml.plantuml.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.omg.sysml.plantuml.feature"
label="SysML v2 PlantUML Visualization Feature"
version="0.52.0.qualifier"
version="0.52.1.qualifier"
provider-name="SysML v2 Submission Team">

<description url="http://www.example.com/description">
Expand Down
2 changes: 1 addition & 1 deletion org.omg.sysml.plantuml/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-Name: SysML 2 PlantUML visualization
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-SymbolicName: org.omg.sysml.plantuml
Automatic-Module-Name: org.omg.sysml.plantuml
Bundle-Version: 0.52.0.qualifier
Bundle-Version: 0.52.1.qualifier
Export-Package: org.omg.sysml.plantuml
Import-Package: com.google.common.collect,
com.google.inject;version="1.3.0",
Expand Down
2 changes: 1 addition & 1 deletion org.omg.sysml.xpect.tests/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: org.omg.sysml.xpect.tests
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-SymbolicName: org.omg.sysml.xpect.tests;singleton:=true
Bundle-Version: 0.52.0.qualifier
Bundle-Version: 0.52.1.qualifier
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.xpect.xtext.lib;bundle-version="0.3.0",
org.eclipse.xpect.xtext.xbase.lib;bundle-version="[0.3.0,0.4.0)",
Expand Down
2 changes: 1 addition & 1 deletion org.omg.sysml.xtext.ide/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: org.omg.sysml.xtext.ide
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-Vendor: SysML v2 Submission Team
Bundle-Version: 0.52.0.qualifier
Bundle-Version: 0.52.1.qualifier
Bundle-SymbolicName: org.omg.sysml.xtext.ide; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.omg.sysml.xtext,
Expand Down
2 changes: 1 addition & 1 deletion org.omg.sysml.xtext.ui/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Automatic-Module-Name: org.omg.sysml.xtext.ui
Bundle-ManifestVersion: 2
Bundle-Name: org.omg.sysml.xtext.ui
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-Version: 0.52.0.qualifier
Bundle-Version: 0.52.1.qualifier
Bundle-SymbolicName: org.omg.sysml.xtext.ui; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.omg.sysml;bundle-version="0.2.0",
Expand Down
2 changes: 1 addition & 1 deletion org.omg.sysml.xtext/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: org.omg.sysml.xtext
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-Vendor: SysML v2 Submission Team
Bundle-Version: 0.52.0.qualifier
Bundle-Version: 0.52.1.qualifier
Bundle-SymbolicName: org.omg.sysml.xtext; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.xtext,
Expand Down
2 changes: 1 addition & 1 deletion org.omg.sysml/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-Version: 0.52.0.qualifier
Bundle-Version: 0.52.1.qualifier
Bundle-ClassPath: .,
lib/sysml-v2-api-client-all.jar
Bundle-SymbolicName: org.omg.sysml;singleton:=true
Expand Down
9 changes: 6 additions & 3 deletions org.omg.sysml/src/org/omg/sysml/adapter/FeatureAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,9 +544,12 @@ public boolean isComputeRedefinitions() {

public EList<Type> getAllTypes() {
if (types == null) {
types = new NonNotifyingEObjectEList<Type>(Type.class, (InternalEObject)getTarget(), SysMLPackage.FEATURE__TYPE);
getTypes(types, new HashSet<Feature>());
removeRedundantTypes(types);
EList<Type> allTypes = new NonNotifyingEObjectEList<Type>(Type.class, (InternalEObject)getTarget(), SysMLPackage.FEATURE__TYPE);
getTypes(allTypes, new HashSet<Feature>());
removeRedundantTypes(allTypes);
// Note: Cache must be set only after completion of computation of types, in order to correctly
// a possible circular recursive call back to this method.
types = allTypes;
}
return types;
}
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

<properties>
<revision>0.52.0-SNAPSHOT</revision>
<revision>0.52.1-SNAPSHOT</revision>
<tycho-version>4.0.13</tycho-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
Expand Down
10 changes: 7 additions & 3 deletions sysml/src/examples/Simple Tests/ConnectionTest.sysml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ package ConnectionTest {

connection {
part q;
end [2] ref end1 ::> d1 :> q;
end ref end1 ::> d1 :> q;
end end2 ::> d2;
}

Expand All @@ -54,7 +54,11 @@ package ConnectionTest {
part def B;

connection def AB {
end a : A;
end b : B crosses a.b;
end [1] item a : A {
@M;
}
end b : B;
}

metadata def M;
}