feat(react): migration to MPS 2024.1

Author: slisson

mps/.mps/migration.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="MigrationProperties">
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_3.CleanStubForeignMethodIds" value="executed" />
     <entry key="project.baseline.version" value="232" />
+    <entry key="project.migrated.version" value="241" />
   </component>
-</project>
+</project>

mps/modules/ReactDemoLanguage.editor/models/ReactDemoLanguage.editor.modelix.mps

@@ -26,7 +26,7 @@
       </concept>
       <concept id="8876946878573903262" name="org.modelix.mps.react.structure.ConceptRenderer" flags="ng" index="gmrQT">
         <reference id="8310867745953086698" name="concept" index="3JBHV4" />
-        <child id="8876946878573903455" name="component" index="gmrTS" />
+        <child id="8876946878573903455" name="components" index="gmrTS" />
       </concept>
       <concept id="5355184975888307501" name="org.modelix.mps.react.structure.StateVariable" flags="ng" index="2o1qlL">
         <child id="5355184975888310505" name="initializer" index="2o1p2P" />
@@ -55,7 +55,7 @@
       </concept>
       <concept id="5355184975881056557" name="org.modelix.mps.react.structure.NamedRendererBase" flags="ng" index="2rHO5L">
         <child id="5355184975881056561" name="parameters" index="2rHO5H" />
-        <child id="5355184975881056562" name="component" index="2rHO5I" />
+        <child id="5355184975881056562" name="components" index="2rHO5I" />
       </concept>
       <concept id="2833354970324905743" name="org.modelix.mps.react.structure.RenderNode" flags="ng" index="1nBVpq">
         <child id="2833354970324905746" name="nodeToRender" index="1nBVp7" />
@@ -1091,7 +1091,7 @@
             <property role="Xl_RC" value="Beispiel" />
           </node>
           <node concept="3z9kRR" id="G39ofCeJ1I" role="3z8GDl">
-            <ref role="3z9kRQ" node="G39ofCeJ0i" resolve="accTitll" />
+            <ref role="3z9kRQ" node="G39ofCeJ0i" resolve="accTitle" />
           </node>
         </node>
       </node>

mps/modules/ReactDemoLanguage.sandbox/ReactDemoLanguage.sandbox.msd

@@ -6,7 +6,7 @@
     </modelRoot>
   </models>
   <facets>
-    <facet compile="mps" classes="mps" ext="no" type="java">
+    <facet type="java" compile="mps" classes="mps" ext="no">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>

mps/modules/ReactDemoLanguage/ReactDemoLanguage.mpl

@@ -6,7 +6,7 @@
     </modelRoot>
   </models>
   <facets>
-    <facet compile="mps" classes="mps" ext="yes" type="java">
+    <facet type="java" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
@@ -19,7 +19,7 @@
         </modelRoot>
       </models>
       <facets>
-        <facet compile="mps" classes="mps" ext="no" type="java">
+        <facet type="java" compile="mps" classes="mps" ext="no">
           <classes generated="true" path="${module}/generator/classes_gen" />
         </facet>
       </facets>

mps/modules/ReactDemoLanguage/models/ReactDemoLanguage.structure.mps

@@ -49,7 +49,7 @@
     <property role="EcuMT" value="3030577733520086760" />
     <property role="TrG5h" value="ReactRoot" />
     <property role="19KtqR" value="true" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="2vPZMAmue7o" role="1TKVEi">
       <property role="IQ2ns" value="2879488090856546776" />
       <property role="20lmBu" value="fLJjDmT/aggregation" />
@@ -64,7 +64,7 @@
   <node concept="1TIwiD" id="2vPZMAmue7m">
     <property role="EcuMT" value="2879488090856546774" />
     <property role="TrG5h" value="Element" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyi" id="2vPZMAmue7n" role="1TKVEl">
       <property role="IQ2nx" value="2879488090856546775" />
       <property role="TrG5h" value="label" />
@@ -75,7 +75,7 @@
     <property role="EcuMT" value="2879488090872081360" />
     <property role="TrG5h" value="TreeNode" />
     <property role="19KtqR" value="true" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="2vPZMAnpuJh" role="PzmwI">
       <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
     </node>
@@ -101,7 +101,7 @@
     <property role="EcuMT" value="2879488090880630244" />
     <property role="TrG5h" value="ReadOrEdit" />
     <property role="19KtqR" value="true" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyi" id="2vPZMAnWa4r" role="1TKVEl">
       <property role="IQ2nx" value="2879488090881171739" />
       <property role="TrG5h" value="a" />
@@ -122,13 +122,13 @@
     <property role="EcuMT" value="223742654175067082" />
     <property role="TrG5h" value="Blank" />
     <property role="19KtqR" value="true" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
   </node>
   <node concept="1TIwiD" id="G39ofDDj5m">
     <property role="EcuMT" value="793519207838200150" />
     <property role="TrG5h" value="NewTree" />
     <property role="19KtqR" value="true" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="G39ofDDjEL" role="PzmwI">
       <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
     </node>
@@ -143,7 +143,7 @@
   <node concept="1TIwiD" id="2NkZbYerWzG">
     <property role="EcuMT" value="3230484732390131948" />
     <property role="TrG5h" value="NewTreeItem" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="2NkZbYerX97" role="PzmwI">
       <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
     </node>
@@ -169,7 +169,7 @@
     <property role="EcuMT" value="2646768005436038431" />
     <property role="TrG5h" value="WidgetTest" />
     <property role="19KtqR" value="true" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyi" id="2iVdnDeSAqk" role="1TKVEl">
       <property role="IQ2nx" value="2646768005436040852" />
       <property role="TrG5h" value="text" />
@@ -195,7 +195,7 @@
     <property role="EcuMT" value="6637716746545074245" />
     <property role="TrG5h" value="RefTest" />
     <property role="19KtqR" value="true" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="5KtU3pXwbBQ" role="1TKVEi">
       <property role="IQ2ns" value="6637716746545445366" />
       <property role="20kJfa" value="target" />
@@ -209,7 +209,7 @@
     <property role="EcuMT" value="3693585498076077970" />
     <property role="TrG5h" value="ErrorChecking" />
     <property role="19KtqR" value="true" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="3d2g73CmY$t" role="PzmwI">
       <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
     </node>
@@ -224,7 +224,7 @@
     <property role="TrG5h" value="Record" />
     <property role="19KtqR" value="true" />
     <property role="3GE5qa" value="record" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="1XYAF4MuRh6" role="1TKVEi">
       <property role="IQ2ns" value="2269421348088149062" />
       <property role="20lmBu" value="fLJjDmT/aggregation" />
@@ -241,7 +241,7 @@
     <property role="TrG5h" value="Member" />
     <property role="19KtqR" value="true" />
     <property role="34LRSv" value="member" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="1XYAF4MuQFh" role="PzmwI">
       <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
     </node>
@@ -258,7 +258,7 @@
     <property role="3GE5qa" value="record" />
     <property role="TrG5h" value="Type" />
     <property role="R5$K7" value="true" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
   </node>
   <node concept="1TIwiD" id="1XYAF4MuSsK">
     <property role="EcuMT" value="2269421348088153904" />

mps/modules/org.modelix.mps.notation.impl.baseLanguage/org.modelix.mps.notation.impl.baseLanguage.msd

@@ -6,7 +6,7 @@
     </modelRoot>
   </models>
   <facets>
-    <facet compile="mps" classes="mps" ext="yes" type="java">
+    <facet type="java" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
@@ -24,7 +24,7 @@
     <language slang="l:515552c7-fcc0-4ab4-9789-2f3c49344e85:jetbrains.mps.baseLanguage.varVariable" version="0" />
     <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
     <language slang="l:4caf0310-491e-41f5-8a9b-2006b3a94898:jetbrains.mps.execution.util" version="0" />
-    <language slang="l:6b3888c1-9802-44d8-8baf-f8e6c33ed689:jetbrains.mps.kotlin" version="11" />
+    <language slang="l:6b3888c1-9802-44d8-8baf-f8e6c33ed689:jetbrains.mps.kotlin" version="13" />
     <language slang="l:b17a9ec8-44a5-40a1-9216-058d277424eb:jetbrains.mps.kotlin.internal" version="0" />
     <language slang="l:9e4ff22b-60f1-43ef-a50b-f9f0fcec22e0:jetbrains.mps.kotlin.javaRefs" version="0" />
     <language slang="l:eb56ebf4-df56-438e-af06-fc1cd08b495a:jetbrains.mps.kotlin.smodel" version="0" />

mps/modules/org.modelix.mps.notation/org.modelix.mps.notation.mpl

@@ -6,7 +6,7 @@
     </modelRoot>
   </models>
   <facets>
-    <facet compile="mps" classes="mps" ext="yes" type="java">
+    <facet type="java" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
@@ -19,7 +19,7 @@
         </modelRoot>
       </models>
       <facets>
-        <facet compile="mps" classes="mps" ext="no" type="java">
+        <facet type="java" compile="mps" classes="mps" ext="no">
           <classes generated="true" path="${module}/generator/classes_gen" />
         </facet>
       </facets>
@@ -40,7 +40,7 @@
         <language slang="l:515552c7-fcc0-4ab4-9789-2f3c49344e85:jetbrains.mps.baseLanguage.varVariable" version="0" />
         <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
         <language slang="l:4caf0310-491e-41f5-8a9b-2006b3a94898:jetbrains.mps.execution.util" version="0" />
-        <language slang="l:6b3888c1-9802-44d8-8baf-f8e6c33ed689:jetbrains.mps.kotlin" version="11" />
+        <language slang="l:6b3888c1-9802-44d8-8baf-f8e6c33ed689:jetbrains.mps.kotlin" version="13" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
         <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="4" />
         <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />

mps/modules/org.modelix.mps.react.ide/models/org.modelix.mps.react.ide.plugin.mps

@@ -247,7 +247,7 @@
             <node concept="liA8E" id="2vPZMAmtTPa" role="2OqNvi">
               <ref role="37wK5l" to="kt01:~Clipboard.setContents(java.awt.datatransfer.Transferable,java.awt.datatransfer.ClipboardOwner)" resolve="setContents" />
               <node concept="37vLTw" id="2vPZMAmtTPb" role="37wK5m">
-                <ref role="3cqZAo" node="2vPZMAmtRxJ" resolve="stringSelection" />
+                <ref role="3cqZAo" node="2vPZMAmtRxJ" resolve="s" />
               </node>
               <node concept="10Nm6u" id="2vPZMAmtTPc" role="37wK5m" />
             </node>

mps/modules/org.modelix.mps.react.ide/org.modelix.mps.react.ide.msd

@@ -6,7 +6,7 @@
     </modelRoot>
   </models>
   <facets>
-    <facet compile="mps" classes="mps" ext="yes" type="java">
+    <facet type="java" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>

mps/modules/org.modelix.mps.react.impl.baseLanguage/org.modelix.mps.react.impl.baseLanguage.msd

@@ -42,7 +42,6 @@
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
-    <module reference="0a7577d1-d4e5-431d-98b1-fae38f9aee80(org.modelix.model.repositoryconcepts)" version="0" />
     <module reference="208eaf68-fd3a-497a-a4b6-4923ff457c3b(org.modelix.mps.editor.common.stubs)" version="0" />
     <module reference="472b2a37-8fd8-48c2-911a-4dd23131201d(org.modelix.mps.react.impl.baseLanguage)" version="0" />
     <module reference="83a7cbdc-dd9d-4dad-be97-957aa1b07375(org.modelix.mps.react.ssr.stubs)" version="0" />