[1083] Fix resolution of "unescape" name

Bug: #1083
Signed-off-by: Arthur Daussy <arthur.daussy@obeo.fr>

Author: adaussy

CHANGELOG.adoc

@@ -18,6 +18,7 @@
 === Bug fixes
 
 - https://github.com/eclipse-syson/syson/issues/870[#870] Fix an issue while computing the name of `VariantMembership`. 
+- https://github.com/eclipse-syson/syson/issues/1083[#1083] Fix an issue where resolving against "unrestricted" name did not work
 
 === Improvements
 

backend/application/syson-application/src/test/java/org/eclipse/syson/application/export/ImportExportTests.java

@@ -178,6 +178,19 @@ public void checkSuccessionAsUsageExplicitSourceTest() throws IOException {
         this.checker.check(input, input);
     }
 
+    @Test
+    @DisplayName("Given a model with unrestricted names, when importing and exporting the model, then the exported text file should be the same as the imported one.")
+    public void checkUnrestrictedNamesResolution() throws IOException {
+        var input = """
+                package p1 {
+                    package 'p 2' {
+                        action def 'A 1';
+                    }
+                    action 'a 2' : 'p 2'::'A 1';
+                }""";
+
+        this.checker.check(input, input);
+    }
     /**
      * Test import/export on test file UseCaseTest.sysml. The content of UseCaseTest.sysml that have been copied below
      * is under LGPL-3.0-only license. The LGPL-3.0-only license is accessible at the root of this repository, in the

backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/helper/NameHelper.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2024 Obeo.
+ * Copyright (c) 2024, 2025 Obeo.
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -63,7 +63,10 @@ public static String escapeString(String str) {
      * @return
      */
     public static String unescapeString(String str) {
-        return StringEscapeUtils.unescapeJava(str);
+        if (str != null && str.length() > 1 && str.startsWith("'") && str.endsWith("'")) {
+            return str.substring(1, str.length() - 1);
+        }
+        return str;
     }
 
     /**

backend/metamodel/syson-sysml-metamodel/src/test/java/org/eclipse/syson/sysml/impl/NamespaceImplTest.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2024 Obeo.
+ * Copyright (c) 2024, 2025 Obeo.
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -45,11 +45,11 @@ public class NamespaceImplTest {
      * package p1 {
      *      part def def1;
      *      package p1x1 {
-     *          part def def1x1;
+     *          part def 'def 1x1';
      *          package p1x1x1 {
-     *              part def def1x1x1 :> def4;
+     *              part def def1x1x1 :> 'def 4';
      *          }
-     *          private part def privatedef1x1 :> p4::def4;
+     *          private part def privatedef1x1 :> 'p 4'::'def 4';
      *      }
      *
      *      package p1x2 {
@@ -73,8 +73,8 @@ public class NamespaceImplTest {
      *      private part def privateDef3
      *  }
      *
-     *  package p4 {
-     *      part def def4;
+     *  package 'p 4' {
+     *      part def 'def 4';
      *  }
      * }
      * </pre>
@@ -149,7 +149,7 @@ private void build() {
             this.def1 = this.builder.createInWithName(PartDefinition.class, this.p1, "Def1");
 
             this.p1x1 = this.builder.createInWithName(Package.class, this.p1, "p1x1");
-            this.def1x1 = this.builder.createInWithName(PartDefinition.class, this.p1x1, "def1x1");
+            this.def1x1 = this.builder.createInWithName(PartDefinition.class, this.p1x1, "def 1x1");
             this.privatedef1x1 = this.builder.createInWithName(PartDefinition.class, this.p1x1, "privatedef1x1");
             this.privatedef1x1.getOwningMembership().setVisibility(VisibilityKind.PRIVATE);
 
@@ -176,8 +176,8 @@ private void build() {
 
 
             this.root2 = this.builder.createWithName(Namespace.class, null);
-            this.p4 = this.builder.createInWithName(Package.class, this.root2, "p9");
-            this.def4 = this.builder.createInWithName(PartDefinition.class, this.p4, "def9");
+            this.p4 = this.builder.createInWithName(Package.class, this.root2, "p 4");
+            this.def4 = this.builder.createInWithName(PartDefinition.class, this.p4, "def 4");
 
             this.builder.addSubclassification(this.def1x1x1, this.def4);
             this.builder.createIn(NamespaceImport.class, this.p1x1x1).setImportedNamespace(this.def4);
@@ -470,7 +470,7 @@ public void resolveLocalSimpleTest() {
         var testModel = new TestModel();
 
         /*      package p1x1 {
-         *          part def def1x1;
+         *          part def 'def 1x1';
          *          package p1x1x1 {
          *              part def def1x1x1;
          *          }
@@ -500,13 +500,14 @@ public void resolveLocalSimpleTest() {
         assertEquals(testModel.p1, testModel.p1.resolveLocal(testModel.p1.getName()).getMemberElement());
     }
 
+
     @DisplayName("Test resolveVisible")
     @Test
     public void resolveVisibleTest() {
         var testModel = new TestModel();
 
         /*      package p1x1 {
-         *          part def def1x1;
+         *          part def 'def 1x1';
          *          package p1x1x1 {
          *              part def def1x1x1;
          *          }
@@ -531,7 +532,7 @@ public void resolveTest() {
         * package p1 {
         *      part def def1;
         *      package p1x1 {
-        *          part def def1x1;
+        *          part def 'def 1x1';
         *          package p1x1x1 {
         *              part def def1x1x1;
         *          }
@@ -568,16 +569,16 @@ public void resolveGlobalTest() {
 
         /*
          *  package p1x1 {
-         *    part def def1x1;
+         *    part def 'def 1x1';
          *    package p1x1x1 {
          *      import p4::*;
-         *      part def def1x1x1 :> def4;
+         *      part def def1x1x1 :> 'def 4';
          *    }
-         *    private part def privatedef1x1 :> p4::def4;
+         *    private part def privatedef1x1 :> 'p 4'::'def 4';
          *  }
          *
-         *  package p4 {
-         *    part def def4;
+         *  package 'p 4' {
+         *    part def 'def 4';
          *  }
          */
 
@@ -601,7 +602,9 @@ public void unqualifiedNameOfTest() {
 
         assertEquals("test 1", testModel.p1.unqualifiedNameOf("test 1"));
         assertEquals("test 2", testModel.p1.unqualifiedNameOf("test 1::test 2"));
+        assertEquals("test 2", testModel.p1.unqualifiedNameOf("'test 1'::test 2"));
         assertEquals("test 3", testModel.p1.unqualifiedNameOf("test 1::test 2::test 3"));
+        assertEquals("test 3", testModel.p1.unqualifiedNameOf("test 1::test 2::'test 3'"));
 
     }
 

doc/content/modules/user-manual/pages/release-notes/2025.4.0.adoc

@@ -10,6 +10,16 @@ In such cases, delete the `SuccessionUsage` graphical node and recreate it graph
 
 - Fix an issue while computing the name of `VariantMembership`.
 This has an impact on name resolution against `Element` contained in `VariantMembership` during the textual import process (e.g. for `EnumerationUsage` literals in `EnumerationDefinition`). 
+- Fix resolution of "unrestricted" names. For example, while importing the following model, the reference to _'p 2'::'A 1'_ is now properly resolved.
+
+```
+package p1 {
+    package 'p 2' {
+        action def 'A 1';
+    }
+    action 'a 2' : 'p 2'::'A 1';
+}
+```
 
 == New features