From b61a80e5a01a4090da6b148aa8efa51ac19e32d9 Mon Sep 17 00:00:00 2001
From: Klaus Birken <klaus.birken@gmail.com>
Date: Tue, 24 Sep 2024 12:33:02 +0200
Subject: [PATCH] Remove migration hints from enumeration nodes, they came back
 due to a merge error (issue #2522).

---
 .../models/structure.mps                      | 49 ----------------
 .../models/testInstance2.mps                  |  6 +-
 .../models/structure.mps                      | 57 +------------------
 .../models/structure.mps                      | 35 +-----------
 4 files changed, 6 insertions(+), 141 deletions(-)

diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoretransformation.amaltheametamodel/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoretransformation.amaltheametamodel/models/structure.mps
index 87b99410513..3927f77fe88 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoretransformation.amaltheametamodel/models/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoretransformation.amaltheametamodel/models/structure.mps
@@ -8804,86 +8804,37 @@
     <property role="TrG5h" value="BusType" />
     <property role="3F6X1D" value="20746029588650769" />
     <ref role="1H5jkz" node="17qUVvSZm58" resolve="_undefined_" />
-    <node concept="2JgGob" id="17qUVvSZm57" role="lGtFl">
-      <property role="3scbB" value="5CkWgdpp3fb/int_ordinal" />
-      <property role="3sfsH" value="5CkWgdpp0p1/by_name" />
-      <node concept="AxPO7" id="19H6tG8pGh" role="3lCyv">
-        <property role="TrG5h" value="BusType" />
-        <property role="3F6X1D" value="20746029588650769" />
-        <ref role="M4eZT" to="tpck:fKAQMTA" resolve="integer" />
-        <node concept="M4N5e" id="19H6tG8pG9" role="M5hS2">
-          <property role="1uS6qv" value="0" />
-          <property role="1uS6qo" value="_undefined_" />
-        </node>
-        <node concept="M4N5e" id="19H6tG8pGa" role="M5hS2">
-          <property role="1uS6qv" value="1" />
-          <property role="1uS6qo" value="CAN" />
-        </node>
-        <node concept="M4N5e" id="19H6tG8pGb" role="M5hS2">
-          <property role="1uS6qv" value="2" />
-          <property role="1uS6qo" value="TTCAN" />
-        </node>
-        <node concept="M4N5e" id="19H6tG8pGc" role="M5hS2">
-          <property role="1uS6qv" value="3" />
-          <property role="1uS6qo" value="LIN" />
-        </node>
-        <node concept="M4N5e" id="19H6tG8pGd" role="M5hS2">
-          <property role="1uS6qv" value="4" />
-          <property role="1uS6qo" value="FLEXRAY" />
-        </node>
-        <node concept="M4N5e" id="19H6tG8pGe" role="M5hS2">
-          <property role="1uS6qv" value="5" />
-          <property role="1uS6qo" value="ETHERNET" />
-        </node>
-        <node concept="M4N5e" id="19H6tG8pGf" role="M5hS2">
-          <property role="1uS6qv" value="6" />
-          <property role="1uS6qo" value="SPI" />
-        </node>
-        <node concept="M4N5e" id="19H6tG8pGg" role="M5hS2">
-          <property role="1uS6qv" value="7" />
-          <property role="1uS6qo" value="NA" />
-        </node>
-      </node>
-    </node>
     <node concept="25R33" id="17qUVvSZm58" role="25R1y">
       <property role="TrG5h" value="_undefined_" />
       <property role="3tVfz5" value="20746029588650761" />
-      <ref role="2wpffI" node="19H6tG8pG9" />
     </node>
     <node concept="25R33" id="17qUVvSZm59" role="25R1y">
       <property role="TrG5h" value="CAN" />
       <property role="3tVfz5" value="20746029588650762" />
-      <ref role="2wpffI" node="19H6tG8pGa" />
     </node>
     <node concept="25R33" id="17qUVvSZm5a" role="25R1y">
       <property role="TrG5h" value="TTCAN" />
       <property role="3tVfz5" value="20746029588650763" />
-      <ref role="2wpffI" node="19H6tG8pGb" />
     </node>
     <node concept="25R33" id="17qUVvSZm5b" role="25R1y">
       <property role="TrG5h" value="LIN" />
       <property role="3tVfz5" value="20746029588650764" />
-      <ref role="2wpffI" node="19H6tG8pGc" />
     </node>
     <node concept="25R33" id="17qUVvSZm5c" role="25R1y">
       <property role="TrG5h" value="FLEXRAY" />
       <property role="3tVfz5" value="20746029588650765" />
-      <ref role="2wpffI" node="19H6tG8pGd" />
     </node>
     <node concept="25R33" id="17qUVvSZm5d" role="25R1y">
       <property role="TrG5h" value="ETHERNET" />
       <property role="3tVfz5" value="20746029588650766" />
-      <ref role="2wpffI" node="19H6tG8pGe" />
     </node>
     <node concept="25R33" id="17qUVvSZm5e" role="25R1y">
       <property role="TrG5h" value="SPI" />
       <property role="3tVfz5" value="20746029588650767" />
-      <ref role="2wpffI" node="19H6tG8pGf" />
     </node>
     <node concept="25R33" id="17qUVvSZm5f" role="25R1y">
       <property role="TrG5h" value="NA" />
       <property role="3tVfz5" value="20746029588650768" />
-      <ref role="2wpffI" node="19H6tG8pGg" />
     </node>
   </node>
   <node concept="25R3W" id="17qUVvSZm5g">
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.modelImportExport/models/testInstance2.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.modelImportExport/models/testInstance2.mps
index f585fd9bba6..9240df39a86 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.modelImportExport/models/testInstance2.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.modelImportExport/models/testInstance2.mps
@@ -9,12 +9,12 @@
   <registry>
     <language id="8cff051b-53c3-4e5f-bf0a-6688f069e505" name="test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage2">
       <concept id="3289023490928248227" name="test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage2.structure.testClass" flags="ng" index="1f5n3j">
-        <property id="1004768212881491943" name="attr1" index="2R_A2U" />
+        <property id="3289023490928248228" name="attr1" index="1f5n3k" />
       </concept>
     </language>
   </registry>
-  <node concept="1f5n3j" id="7vV01RznhoZ">
-    <property role="2R_A2U" value="1$/val1" />
+  <node concept="1f5n3j" id="2t75AsPxBty">
+    <property role="1f5n3k" value="2Q$Xn1yGomw/val2" />
   </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage2/models/structure.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage2/models/structure.mps
index 31098d12987..94195761845 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage2/models/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage2/models/structure.mps
@@ -7,9 +7,7 @@
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
-  <imports>
-    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
-  </imports>
+  <imports />
   <registry>
     <language id="77948de3-6ef9-452d-b392-d01403e4086f" name="com.mbeddr.mpsutil.ecore">
       <concept id="6180831338628293357" name="com.mbeddr.mpsutil.ecore.structure.EcoreFileInfo" flags="ng" index="2Qj1IR">
@@ -26,31 +24,14 @@
     <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
       <concept id="3348158742936976480" name="jetbrains.mps.lang.structure.structure.EnumerationMemberDeclaration" flags="ng" index="25R33">
         <property id="1421157252384165432" name="memberId" index="3tVfz5" />
-        <reference id="899069222106091871" name="oldMember" index="2wpffI" />
       </concept>
       <concept id="3348158742936976479" name="jetbrains.mps.lang.structure.structure.EnumerationDeclaration" flags="ng" index="25R3W">
         <reference id="1075010451642646892" name="defaultMember" index="1H5jkz" />
         <child id="3348158742936976577" name="members" index="25R1y" />
       </concept>
-      <concept id="6491077959632463275" name="jetbrains.mps.lang.structure.structure.EnumPropertyMigrationInfo" flags="ng" index="3l_iC">
-        <child id="6491077959632463286" name="oldProperty" index="3l_iP" />
-      </concept>
       <concept id="1082978164218" name="jetbrains.mps.lang.structure.structure.DataTypeDeclaration" flags="ng" index="AxPO6">
         <property id="7791109065626895363" name="datatypeId" index="3F6X1D" />
       </concept>
-      <concept id="1082978164219" name="jetbrains.mps.lang.structure.structure.EnumerationDataTypeDeclaration_Old" flags="ng" index="AxPO7">
-        <reference id="1083171729157" name="memberDataType" index="M4eZT" />
-        <child id="1083172003582" name="member" index="M5hS2" />
-      </concept>
-      <concept id="1588368162884797030" name="jetbrains.mps.lang.structure.structure.EnumMigrationInfo" flags="ng" index="2JgGob">
-        <property id="6491077959634662372" name="valueOpMigration" index="3scbB" />
-        <property id="6491077959634650670" name="nameOpMigration" index="3sfsH" />
-        <child id="6491077959632451996" name="oldEnum" index="3lCyv" />
-      </concept>
-      <concept id="1083171877298" name="jetbrains.mps.lang.structure.structure.EnumerationMemberDeclaration_Old" flags="ig" index="M4N5e">
-        <property id="1083923523172" name="externalValue" index="1uS6qo" />
-        <property id="1083923523171" name="internalValue" index="1uS6qv" />
-      </concept>
       <concept id="1169125787135" name="jetbrains.mps.lang.structure.structure.AbstractConceptDeclaration" flags="ig" index="PkWjJ">
         <property id="6714410169261853888" name="conceptId" index="EcuMT" />
         <property id="4628067390765956802" name="abstract" index="R5$K7" />
@@ -65,10 +46,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <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>
@@ -82,13 +60,6 @@
       <property role="TrG5h" value="attr1" />
       <property role="IQ2nx" value="3289023490928248228" />
       <ref role="AX2Wp" node="17qUVvSZm6j" resolve="simpleEnum" />
-      <node concept="3l_iC" id="17qUVvSZm9r" role="lGtFl">
-        <node concept="1TJgyi" id="2Q$Xn1yGom$" role="3l_iP">
-          <property role="IQ2nx" value="3289023490928248228" />
-          <property role="TrG5h" value="attr1" />
-          <ref role="AX2Wp" node="2Q$Xn1yGomy" resolve="simpleEnum" />
-        </node>
-      </node>
     </node>
   </node>
   <node concept="2Qj1IR" id="2Q$Xn1yGom_">
@@ -101,41 +72,17 @@
     <property role="TrG5h" value="simpleEnum" />
     <property role="3F6X1D" value="3289023490928248226" />
     <ref role="1H5jkz" node="17qUVvSZm6l" resolve="val1" />
-    <node concept="2JgGob" id="17qUVvSZm6k" role="lGtFl">
-      <property role="3scbB" value="5CkWgdpp3fb/int_ordinal" />
-      <property role="3sfsH" value="5CkWgdpp0p1/by_name" />
-      <node concept="AxPO7" id="2Q$Xn1yGomy" role="3lCyv">
-        <property role="TrG5h" value="simpleEnum" />
-        <property role="3F6X1D" value="3289023490928248226" />
-        <ref role="M4eZT" to="tpck:fKAQMTA" resolve="integer" />
-        <node concept="M4N5e" id="2Q$Xn1yGomv" role="M5hS2">
-          <property role="1uS6qv" value="0" />
-          <property role="1uS6qo" value="val1" />
-        </node>
-        <node concept="M4N5e" id="2Q$Xn1yGomw" role="M5hS2">
-          <property role="1uS6qv" value="1" />
-          <property role="1uS6qo" value="val2" />
-        </node>
-        <node concept="M4N5e" id="2Q$Xn1yGomx" role="M5hS2">
-          <property role="1uS6qv" value="2" />
-          <property role="1uS6qo" value="val3" />
-        </node>
-      </node>
-    </node>
     <node concept="25R33" id="17qUVvSZm6l" role="25R1y">
       <property role="TrG5h" value="val1" />
       <property role="3tVfz5" value="3289023490928248223" />
-      <ref role="2wpffI" node="2Q$Xn1yGomv" />
     </node>
     <node concept="25R33" id="17qUVvSZm6m" role="25R1y">
       <property role="TrG5h" value="val2" />
       <property role="3tVfz5" value="3289023490928248224" />
-      <ref role="2wpffI" node="2Q$Xn1yGomw" />
     </node>
     <node concept="25R33" id="17qUVvSZm6n" role="25R1y">
       <property role="TrG5h" value="val3" />
       <property role="3tVfz5" value="3289023490928248225" />
-      <ref role="2wpffI" node="2Q$Xn1yGomx" />
     </node>
   </node>
 </model>
diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage6/models/structure.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage6/models/structure.mps
index 3f619d7b2bd..c15b9a664ca 100644
--- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage6/models/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage6/models/structure.mps
@@ -26,7 +26,6 @@
     <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
       <concept id="3348158742936976480" name="jetbrains.mps.lang.structure.structure.EnumerationMemberDeclaration" flags="ng" index="25R33">
         <property id="1421157252384165432" name="memberId" index="3tVfz5" />
-        <reference id="899069222106091871" name="oldMember" index="2wpffI" />
       </concept>
       <concept id="3348158742936976479" name="jetbrains.mps.lang.structure.structure.EnumerationDeclaration" flags="ng" index="25R3W">
         <reference id="1075010451642646892" name="defaultMember" index="1H5jkz" />
@@ -38,19 +37,6 @@
       <concept id="1082978164218" name="jetbrains.mps.lang.structure.structure.DataTypeDeclaration" flags="ng" index="AxPO6">
         <property id="7791109065626895363" name="datatypeId" index="3F6X1D" />
       </concept>
-      <concept id="1082978164219" name="jetbrains.mps.lang.structure.structure.EnumerationDataTypeDeclaration_Old" flags="ng" index="AxPO7">
-        <reference id="1083171729157" name="memberDataType" index="M4eZT" />
-        <child id="1083172003582" name="member" index="M5hS2" />
-      </concept>
-      <concept id="1588368162884797030" name="jetbrains.mps.lang.structure.structure.EnumMigrationInfo" flags="ng" index="2JgGob">
-        <property id="6491077959634662372" name="valueOpMigration" index="3scbB" />
-        <property id="6491077959634650670" name="nameOpMigration" index="3sfsH" />
-        <child id="6491077959632451996" name="oldEnum" index="3lCyv" />
-      </concept>
-      <concept id="1083171877298" name="jetbrains.mps.lang.structure.structure.EnumerationMemberDeclaration_Old" flags="ig" index="M4N5e">
-        <property id="1083923523172" name="externalValue" index="1uS6qo" />
-        <property id="1083923523171" name="internalValue" index="1uS6qv" />
-      </concept>
       <concept id="1169125787135" name="jetbrains.mps.lang.structure.structure.AbstractConceptDeclaration" flags="ig" index="PkWjJ">
         <property id="6714410169261853888" name="conceptId" index="EcuMT" />
         <property id="4628067390765956802" name="abstract" index="R5$K7" />
@@ -81,7 +67,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>
@@ -212,32 +198,13 @@
     <property role="TrG5h" value="enumTest1" />
     <property role="3F6X1D" value="3289023490928248338" />
     <ref role="1H5jkz" node="17qUVvSZm6q" resolve="val1" />
-    <node concept="2JgGob" id="17qUVvSZm6p" role="lGtFl">
-      <property role="3scbB" value="5CkWgdpp3fb/int_ordinal" />
-      <property role="3sfsH" value="5CkWgdpp0p1/by_name" />
-      <node concept="AxPO7" id="2Q$Xn1yGooi" role="3lCyv">
-        <property role="TrG5h" value="enumTest1" />
-        <property role="3F6X1D" value="3289023490928248338" />
-        <ref role="M4eZT" to="tpck:fKAQMTA" resolve="integer" />
-        <node concept="M4N5e" id="2Q$Xn1yGoog" role="M5hS2">
-          <property role="1uS6qv" value="0" />
-          <property role="1uS6qo" value="val1" />
-        </node>
-        <node concept="M4N5e" id="2Q$Xn1yGooh" role="M5hS2">
-          <property role="1uS6qv" value="1" />
-          <property role="1uS6qo" value="val2" />
-        </node>
-      </node>
-    </node>
     <node concept="25R33" id="17qUVvSZm6q" role="25R1y">
       <property role="TrG5h" value="val1" />
       <property role="3tVfz5" value="3289023490928248336" />
-      <ref role="2wpffI" node="2Q$Xn1yGoog" />
     </node>
     <node concept="25R33" id="17qUVvSZm6r" role="25R1y">
       <property role="TrG5h" value="val2" />
       <property role="3tVfz5" value="3289023490928248337" />
-      <ref role="2wpffI" node="2Q$Xn1yGooh" />
     </node>
   </node>
 </model>