ST6RI-830 Added resolution for global qualification

Author: TheKorpos

org.omg.kerml.xtext/src/org/omg/kerml/xtext/naming/QualifiedNamesUtil.java

@@ -0,0 +1,36 @@
+/**
+ * SysML 2 Pilot Implementation
+ * Copyright (C) 2025 Model Driven Solutions, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * @license LGPL-3.0-or-later <http://spdx.org/licenses/LGPL-3.0-or-later>
+ * 
+ * Contributors:
+ *   Laszlo Gati, MDS
+ */
+package org.omg.kerml.xtext.naming;
+
+import org.eclipse.xtext.naming.QualifiedName;
+
+public class QualifiedNamesUtil {
+	
+	public static final String GLOBAL_CLASSIFIER_SYMBOL = "$";
+	
+	public static boolean isGlobalNameQualification(QualifiedName qualifiedName) {
+		return qualifiedName != null &&
+				qualifiedName.getSegmentCount() > 0 &&
+				GLOBAL_CLASSIFIER_SYMBOL.equals(qualifiedName.getFirstSegment()); 
+	}
+}

org.omg.kerml.xtext/src/org/omg/kerml/xtext/scoping/KerMLGlobalScope.xtend

@@ -38,6 +38,7 @@ import org.eclipse.xtext.scoping.impl.AbstractScope
 import org.omg.sysml.lang.sysml.Namespace
 import org.omg.sysml.lang.sysml.SysMLPackage
 import org.omg.sysml.lang.sysml.Element
+import org.omg.kerml.xtext.naming.QualifiedNamesUtil
 
 class KerMLGlobalScope extends AbstractScope {
 
@@ -78,25 +79,38 @@ class KerMLGlobalScope extends AbstractScope {
 	}
 
 	override getSingleElement(QualifiedName name) {
+		val isGlobalQualification = QualifiedNamesUtil.isGlobalNameQualification(name)
+		val qualifiedName = isGlobalQualification? name.skipFirst(1) : name
+			
 		var IEObjectDescription result = null
-		if (name.segmentCount > 0) {
-			val rootName = QualifiedName.create(name.firstSegment)
-			val root = outer.getSingleElement(rootName)
-			if (root !== null) {
-				if (name.segmentCount == 1) {
-					if (referenceType == SysMLPackage.eINSTANCE.membership) {
-						var eObject = EcoreUtil.resolve(root.EObjectOrProxy, resource)
-						result = if (eObject.eIsProxy) null 
-							else EObjectDescription.create(name, (eObject as Element).owningMembership)
-					} else if (referenceType.isInstance(root.EObjectOrProxy)) {
-						result = root;
+		
+		if (qualifiedName.segmentCount > 0) {
+			if (isGlobalQualification) {
+				//search the context resource first
+				val rootNS = resource.contents.head as Namespace
+				result = scopeFor(rootNS).getSingleElement(qualifiedName)
+			}		
+			
+			if (result === null) {
+				val rootName = QualifiedName.create(qualifiedName.firstSegment)
+				val root = outer.getSingleElement(rootName)
+				if (root !== null) {
+					if (qualifiedName.segmentCount == 1) {
+						if (referenceType == SysMLPackage.eINSTANCE.membership) {
+							var eObject = EcoreUtil.resolve(root.EObjectOrProxy, resource)
+							result = if (eObject.eIsProxy) null 
+								else EObjectDescription.create(qualifiedName, (eObject as Element).owningMembership)
+						} else if (referenceType.isInstance(root.EObjectOrProxy)) {
+							result = root;
+						}
+					} else if (root.EObjectOrProxy instanceof Namespace) {
+						result = scopeFor(EcoreUtil.resolve(root.EObjectOrProxy, resource) as Namespace).
+							getSingleElement(qualifiedName.skipFirst(1)).addQualification(qualifiedName.firstSegment)	
 					}
-				} else if (root.EObjectOrProxy instanceof Namespace) {
-					result = scopeFor(EcoreUtil.resolve(root.EObjectOrProxy, resource) as Namespace).
-						getSingleElement(name.skipFirst(1)).addQualification(name.firstSegment)	
 				}
 			}
 		}
+		
 		return result.filter
 	}
 

org.omg.kerml.xtext/src/org/omg/kerml/xtext/scoping/KerMLScope.xtend

@@ -56,6 +56,7 @@ import com.google.inject.Inject
 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.QualifiedNamesUtil
 
 class KerMLScope extends AbstractScope implements ISysMLScope {
 
@@ -167,10 +168,14 @@ class KerMLScope extends AbstractScope implements ISysMLScope {
 	}
 
 	override getSingleElement(QualifiedName name) {
-		val result = resolveInScope(name, true);
-		if (!result.isEmpty) result.get(0)
-		else if (parent !== null && !isShadowing) parent.getSingleElement(name)
-		else null
+		if (QualifiedNamesUtil.isGlobalNameQualification(name)){
+			parent.getSingleElement(name)
+		} else {
+			val result = resolveInScope(name, true);
+			if (!result.isEmpty) result.get(0)
+			else if (parent !== null && !isShadowing) parent.getSingleElement(name)
+			else null
+		}
 	}
 
 	override getLocalElementsByName(QualifiedName name) {