ST6RI-984 (original) Values computed while a reference is transiently unresolved are kept after it resolves

.github/workflows/build.yml

@@ -9,6 +9,7 @@
 name: Java CI with Maven
 
 on:
+  workflow_dispatch:
   push:
     branches: [ "master" ]
   pull_request:

org.omg.kerml.expressions.xtext.ide/META-INF/MANIFEST.MF

@@ -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.63.0.qualifier
+Bundle-Version: 0.63.1.qualifier
 Bundle-SymbolicName: org.omg.kerml.expressions.xtext.ide; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.omg.kerml.expressions.xtext,

org.omg.kerml.expressions.xtext.ui/META-INF/MANIFEST.MF

@@ -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.63.0.qualifier
+Bundle-Version: 0.63.1.qualifier
 Bundle-SymbolicName: org.omg.kerml.expressions.xtext.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.omg.kerml.expressions.xtext,
@@ -19,7 +19,7 @@ Require-Bundle: org.omg.kerml.expressions.xtext,
  org.eclipse.xtext.builder,
  org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
  org.eclipse.xtend.lib;bundle-version="2.14.0";resolution:=optional,
- org.omg.sysml;bundle-version="0.63.0",
+ org.omg.sysml;bundle-version="0.63.1",
  org.eclipse.xtext.common.types.ui
 Import-Package: org.apache.log4j
 Export-Package: org.omg.kerml.expressions.xtext.ui.quickfix,

org.omg.kerml.expressions.xtext/META-INF/MANIFEST.MF

@@ -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.63.0.qualifier
+Bundle-Version: 0.63.1.qualifier
 Bundle-SymbolicName: org.omg.kerml.expressions.xtext; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.xtext,
@@ -13,8 +13,8 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.xtext.util,
  org.eclipse.xtend.lib;bundle-version="2.14.0",
  org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
- org.omg.sysml.model.bundle;bundle-version="0.63.0",
- org.omg.sysml;bundle-version="0.63.0",
+ org.omg.sysml.model.bundle;bundle-version="0.63.1",
+ org.omg.sysml;bundle-version="0.63.1",
  org.eclipse.uml2.uml,
  org.eclipse.uml2.uml.resources,
  org.eclipse.xtext.common.types,

org.omg.kerml.owl.ide/META-INF/MANIFEST.MF

@@ -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.63.0.qualifier
+Bundle-Version: 0.63.1.qualifier
 Bundle-SymbolicName: org.omg.kerml.owl.ide;singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.omg.kerml.owl,

org.omg.kerml.owl.ui/META-INF/MANIFEST.MF

@@ -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.63.0.qualifier
+Bundle-Version: 0.63.1.qualifier
 Bundle-SymbolicName: org.omg.kerml.owl.ui;singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.omg.kerml.owl,

org.omg.kerml.owl/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: org.omg.sysml.owl
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-Vendor: My Company
-Bundle-Version: 0.63.0.qualifier
+Bundle-Version: 0.63.1.qualifier
 Bundle-SymbolicName: org.omg.kerml.owl;singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.xtext,

org.omg.kerml.xpect.tests/META-INF/MANIFEST.MF

@@ -4,17 +4,17 @@ 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.63.0.qualifier
+Bundle-Version: 0.63.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)",
  org.eclipse.emf.codegen;bundle-version="2.6.0",
  org.eclipse.xtext.xbase;bundle-version="2.9.2",
  org.eclipse.xtext.ui.shared;bundle-version="2.14.0",
- org.omg.sysml;bundle-version="0.63.0",
- org.omg.sysml.logic.bundle;bundle-version="0.63.0",
- org.omg.kerml.xtext;bundle-version="0.63.0",
- org.omg.kerml.xtext.ui;bundle-version="0.63.0",
+ org.omg.sysml;bundle-version="0.63.1",
+ org.omg.sysml.logic.bundle;bundle-version="0.63.1",
+ org.omg.kerml.xtext;bundle-version="0.63.1",
+ org.omg.kerml.xtext.ui;bundle-version="0.63.1",
  org.aopalliance;bundle-version="1.0.0"
 Bundle-ActivationPolicy: lazy
 Export-Package: org.omg.kerml.xpect,

org.omg.kerml.xtext.ide/META-INF/MANIFEST.MF

@@ -4,13 +4,13 @@ Bundle-ManifestVersion: 2
 Bundle-Name: org.omg.kerml.xtext.ide
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-Vendor: SysML v2 Submission Team
-Bundle-Version: 0.63.0.qualifier
+Bundle-Version: 0.63.1.qualifier
 Bundle-SymbolicName: org.omg.kerml.xtext.ide; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.omg.kerml.xtext,
  org.eclipse.xtext.ide,
  org.eclipse.xtend.lib,
  org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
- org.omg.kerml.expressions.xtext;bundle-version="0.63.0",
- org.omg.kerml.expressions.xtext.ide;bundle-version="0.63.0"
+ org.omg.kerml.expressions.xtext;bundle-version="0.63.1",
+ org.omg.kerml.expressions.xtext.ide;bundle-version="0.63.1"
 Export-Package: org.omg.kerml.xtext.ide.contentassist.antlr

org.omg.kerml.xtext.ui/META-INF/MANIFEST.MF

@@ -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.63.0.qualifier
+Bundle-Version: 0.63.1.qualifier
 Bundle-SymbolicName: org.omg.kerml.xtext.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.omg.kerml.xtext,
@@ -19,12 +19,12 @@ Require-Bundle: org.omg.kerml.xtext,
  org.eclipse.xtext.builder,
  org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
  org.eclipse.xtend.lib;bundle-version="2.14.0";resolution:=optional,
- org.omg.sysml.model.bundle;bundle-version="0.63.0",
- org.omg.sysml.logic.bundle;bundle-version="0.63.0",
- org.omg.sysml;bundle-version="0.63.0",
- org.omg.kerml.expressions.xtext;bundle-version="0.63.0",
- org.omg.kerml.expressions.xtext.ide;bundle-version="0.63.0",
- org.omg.kerml.expressions.xtext.ui;bundle-version="0.63.0",
+ org.omg.sysml.model.bundle;bundle-version="0.63.1",
+ org.omg.sysml.logic.bundle;bundle-version="0.63.1",
+ org.omg.sysml;bundle-version="0.63.1",
+ org.omg.kerml.expressions.xtext;bundle-version="0.63.1",
+ org.omg.kerml.expressions.xtext.ide;bundle-version="0.63.1",
+ org.omg.kerml.expressions.xtext.ui;bundle-version="0.63.1",
  org.eclipse.xtext.common.types.ui,
  org.eclipse.emf.ecore.editor
 Import-Package: org.apache.log4j

org.omg.kerml.xtext/META-INF/MANIFEST.MF

@@ -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.63.0.qualifier
+Bundle-Version: 0.63.1.qualifier
 Bundle-SymbolicName: org.omg.kerml.xtext; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.xtext,
@@ -13,12 +13,12 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.xtext.util,
  org.eclipse.xtend.lib;bundle-version="2.14.0",
  org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
- org.omg.sysml.model.bundle;bundle-version="0.63.0",
- org.omg.sysml.logic.bundle;bundle-version="0.63.0",
- org.omg.sysml;bundle-version="0.63.0",
+ org.omg.sysml.model.bundle;bundle-version="0.63.1",
+ org.omg.sysml.logic.bundle;bundle-version="0.63.1",
+ org.omg.sysml;bundle-version="0.63.1",
  org.eclipse.uml2.uml,
  org.eclipse.uml2.uml.resources,
- org.omg.kerml.expressions.xtext;bundle-version="0.63.0",
+ org.omg.kerml.expressions.xtext;bundle-version="0.63.1",
  com.google.gson,
  org.eclipse.xtext.common.types,
  org.objectweb.asm;bundle-version="9.3.0";resolution:=optional

org.omg.kerml.xtext/src/org/omg/kerml/xtext/linking/KerMLLazyLinkingResource.java

@@ -1,6 +1,7 @@
 /*****************************************************************************
  * SysML 2 Pilot Implementation
  * Copyright (c) 2024 Model Driven Solutions, Inc.
+ * Copyright (c) 2026 Budapest University of Technology and Economics
  *    
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the Eclipse Public License as published by
@@ -18,16 +19,57 @@
  * 
  * Contributors:
  *  Ed Seidewitz, MDS
+ *  Vince Molnár, BME
  * 
  *****************************************************************************/
 package org.omg.kerml.xtext.linking;
 
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Deque;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
 import org.eclipse.xtext.linking.lazy.LazyLinkingResource;
+import org.eclipse.xtext.nodemodel.INode;
+import org.eclipse.xtext.util.Triple;
 
 public class KerMLLazyLinkingResource extends LazyLinkingResource {
 
+	/**
+	 * For each lazy link being resolved in the current thread, innermost first, the actions that forget the
+	 * failures to resolve the lazy links nested in its resolution.
+	 */
+	private static final ThreadLocal<Deque<List<Runnable>>> resolutions = ThreadLocal.withInitial(ArrayDeque::new);
+
 	public void clearUnresolvableURIFragments() {
 		getUnresolvableURIFragments().clear();
 	}
 
+	/**
+	 * A failure to resolve a lazy link during the resolution of another one may be due to the elements excluded
+	 * while that resolution is in progress, so it is cached only until that resolution ends.
+	 */
+	@Override
+	protected EObject getEObject(String uriFragment, Triple<EObject, EReference, INode> triple) throws AssertionError {
+		boolean wasUnresolvable = getUnresolvableURIFragments().contains(uriFragment);
+		Deque<List<Runnable>> inProgress = resolutions.get();
+		inProgress.push(new ArrayList<>());
+		EObject result = null;
+		try {
+			result = super.getEObject(uriFragment, triple);
+			return result;
+		} finally {
+			inProgress.pop().forEach(Runnable::run);
+			if (result == null && !wasUnresolvable && !inProgress.isEmpty()) {
+				inProgress.peek().add(() -> forgetUnresolvable(uriFragment));
+			}
+		}
+	}
+
+	private synchronized void forgetUnresolvable(String uriFragment) {
+		getUnresolvableURIFragments().remove(uriFragment);
+	}
+
 }

org.omg.sysml.edit/META-INF/MANIFEST.MF

@@ -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.63.0.qualifier
+Bundle-Version: 0.63.1.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.omg.sysml.lang.sysml.provider.SysMLEditPlugin$Implementation
 Bundle-Vendor: %providerName
@@ -13,5 +13,5 @@ Export-Package: org.omg.sysml.lang.sysml.provider
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.edit;visibility:=reexport,
  org.eclipse.uml2.common.edit;visibility:=reexport,
- org.omg.sysml.model.bundle;bundle-version="0.63.0";visibility:=reexport
+ org.omg.sysml.model.bundle;bundle-version="0.63.1";visibility:=reexport
 Bundle-ActivationPolicy: lazy

org.omg.sysml.editor.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.omg.sysml.editor.feature"
       label="SysML v2 XMI Editor Feature"
-      version="0.63.0.qualifier"
+      version="0.63.1.qualifier"
       provider-name="SysML v2 Submission Team">
 
    <description url="http://www.example.com/description">

org.omg.sysml.editor/META-INF/MANIFEST.MF

@@ -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.63.0.qualifier
+Bundle-Version: 0.63.1.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.omg.sysml.lang.sysml.presentation.SysMLEditorPlugin$Implementation
 Bundle-Vendor: %providerName

org.omg.sysml.execution/META-INF/MANIFEST.MF

@@ -1,13 +1,13 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.omg.sysml.execution;singleton:=true
-Bundle-Version: 0.63.0.qualifier
+Bundle-Version: 0.63.1.qualifier
 Automatic-Module-Name: org.omg.sysml.execution
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-Name: org.omg.sysml.execution
 Bundle-Vendor: SysML v2 Submission Team
 Bundle-ActivationPolicy: lazy
 Export-Package: org.omg.sysml.execution.expressions
-Require-Bundle: org.omg.sysml.model.bundle;bundle-version="0.63.0",
- org.omg.sysml.logic.bundle;bundle-version="0.63.0",
- org.omg.sysml;bundle-version="0.63.0"
+Require-Bundle: org.omg.sysml.model.bundle;bundle-version="0.63.1",
+ org.omg.sysml.logic.bundle;bundle-version="0.63.1",
+ org.omg.sysml;bundle-version="0.63.1"

org.omg.sysml.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.omg.sysml.feature"
       label="SysML v2 Feature"
-      version="0.63.0.qualifier"
+      version="0.63.1.qualifier"
       provider-name="SysML v2 Submission Team">
 
    <description url="http://www.example.com/description">

org.omg.sysml.interactive.tests/META-INF/MANIFEST.MF

@@ -3,15 +3,15 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Tests
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-SymbolicName: org.omg.sysml.interactive.tests;singleton:=true
-Bundle-Version: 0.63.0.qualifier
+Bundle-Version: 0.63.1.qualifier
 Automatic-Module-Name: org.omg.sysml.interactive.tests
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.omg.sysml.interactive;bundle-version="0.63.0",
+Require-Bundle: org.omg.sysml.interactive;bundle-version="0.63.1",
  org.junit;bundle-version="4.12.0",
- org.omg.sysml.model.bundle;bundle-version="0.63.0",
- org.omg.sysml.logic.bundle;bundle-version="0.63.0",
- org.omg.sysml;bundle-version="0.63.0",
+ org.omg.sysml.model.bundle;bundle-version="0.63.1",
+ org.omg.sysml.logic.bundle;bundle-version="0.63.1",
+ org.omg.sysml;bundle-version="0.63.1",
  org.eclipse.xtext;bundle-version="2.22.0",
- org.omg.kerml.xtext;bundle-version="0.63.0",
- org.omg.sysml.xtext;bundle-version="0.63.0",
- org.omg.kerml.xpect.tests;bundle-version="0.63.0"
+ org.omg.kerml.xtext;bundle-version="0.63.1",
+ org.omg.sysml.xtext;bundle-version="0.63.1",
+ org.omg.kerml.xpect.tests;bundle-version="0.63.1"