From 3a86819227560cf747bac5f34dd47e542b050c87 Mon Sep 17 00:00:00 2001
From: Klaus Birken <klaus.birken@gmail.com>
Date: Wed, 25 Sep 2024 11:18:49 +0200
Subject: [PATCH] Fix structure aspect of Complex10 test language (issue
 #2522).

---
 ...re.metaModelImport.expectedComplex10.structure.mps | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecore.metaModelImport.expectedComplex10/models/test.com.mbeddr.mpsutil.ecore.metaModelImport.expectedComplex10.structure.mps b/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecore.metaModelImport.expectedComplex10/models/test.com.mbeddr.mpsutil.ecore.metaModelImport.expectedComplex10.structure.mps
index 31b8508cd6a..954c9e88f83 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecore.metaModelImport.expectedComplex10/models/test.com.mbeddr.mpsutil.ecore.metaModelImport.expectedComplex10.structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecore.metaModelImport.expectedComplex10/models/test.com.mbeddr.mpsutil.ecore.metaModelImport.expectedComplex10.structure.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:679ddd2a-675f-4aaf-8311-c8eecf410a8f(test.com.mbeddr.mpsutil.ecoreimporter.testingFrameworkTestLanguageMatch)">
+<model ref="r:679ddd2a-675f-4aaf-8311-c8eecf410a8f(test.com.mbeddr.mpsutil.ecore.metaModelImport.expectedComplex10.structure)">
   <persistence version="9" />
   <languages>
     <use id="77948de3-6ef9-452d-b392-d01403e4086f" name="com.mbeddr.mpsutil.ecore" version="0" />
@@ -7,7 +7,6 @@
   </languages>
   <imports>
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
-    <import index="gj51" ref="r:ab50d504-3c45-46c5-9732-ab1e5b810f3a(test.com.mbeddr.mpsutil.ecore.metaModelImport.expectedComplex10.structure)" implicit="true" />
   </imports>
   <registry>
     <language id="77948de3-6ef9-452d-b392-d01403e4086f" name="com.mbeddr.mpsutil.ecore">
@@ -58,7 +57,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -101,7 +100,7 @@
     <node concept="1TJgyj" id="7CVN7FEkFWy" role="1TKVEi">
       <property role="IQ2ns" value="8807858324542504738" />
       <property role="20kJfa" value="sp2ref2" />
-      <ref role="20lvS9" to="gj51:7CVN7FEkFW9" />
+      <ref role="20lvS9" node="7CVN7FEkFW9" resolve="testClass1" />
     </node>
   </node>
   <node concept="PlHQZ" id="7CVN7FEkFWB">
@@ -164,12 +163,12 @@
     <node concept="1TJgyi" id="17qUVvSZm9K" role="1TKVEl">
       <property role="TrG5h" value="prop1" />
       <property role="IQ2nx" value="1286599818956595824" />
-      <ref role="AX2Wp" to="gj51:apJ4OR7VSO" resolve="enumTest1" />
+      <ref role="AX2Wp" node="apJ4OR7VSO" resolve="enumTest" />
     </node>
     <node concept="1TJgyi" id="17qUVvSZm9M" role="1TKVEl">
       <property role="TrG5h" value="prop2" />
       <property role="IQ2nx" value="1286599818956595826" />
-      <ref role="AX2Wp" to="gj51:apJ4OR7VST" resolve="enumTest2" />
+      <ref role="AX2Wp" node="apJ4OR7VST" resolve="enumTest2" />
     </node>
   </node>
   <node concept="25R3W" id="apJ4OR7VSO">