Merge branch 'maintenance/mps20213' into merge/mps20213

# Conflicts: # code/languages/com.mbeddr.core/tests/test.ts.core/core.msd
mbeddr · Jul 17, 2024 · 66e8846 · 66e8846
2 parents 6087f4d + 42254e5
commit 66e8846
Show file tree

Hide file tree

Showing 4 changed files with 326 additions and 3 deletions.
diff --git a/....build/solutions/com.mbeddr.core.tests.build/models/com/mbeddr/core/tests/build/build.mps b/....build/solutions/com.mbeddr.core.tests.build/models/com/mbeddr/core/tests/build/build.mps
@@ -724,6 +724,11 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="1f_9YcjST6e" role="3bR37C">
+          <node concept="3bR9La" id="1f_9YcjST6f" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:rD7wKO5Iy" resolve="MPS.TextGen" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="7Ny2UQeBujh" role="2G$12L">
         <property role="BnDLt" value="true" />

diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/languageModels/behavior.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/languageModels/behavior.mps
@@ -120,6 +120,9 @@
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
+        <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
+      </concept>
       <concept id="1092119917967" name="jetbrains.mps.baseLanguage.structure.MulExpression" flags="nn" index="17qRlL" />
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
@@ -3268,6 +3271,43 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbJ" id="5wiMD64QZSv" role="3cqZAp">
+          <node concept="3clFbS" id="5wiMD64QZSx" role="3clFbx">
+            <node concept="3clFbF" id="5wiMD64QyP9" role="3cqZAp">
+              <node concept="2OqwBi" id="5wiMD64Qzl8" role="3clFbG">
+                <node concept="37vLTw" id="5wiMD64QyP7" role="2Oq$k0">
+                  <ref role="3cqZAo" node="29BUUxcmPHg" resolve="token" />
+                </node>
+                <node concept="liA8E" id="5wiMD64Q$by" role="2OqNvi">
+                  <ref role="37wK5l" to="iq8l:1YPL71Yln2O" resolve="add" />
+                  <node concept="2ShNRf" id="5wiMD64Q$AQ" role="37wK5m">
+                    <node concept="1pGfFk" id="5wiMD64QS_r" role="2ShVmc">
+                      <property role="373rjd" value="true" />
+                      <ref role="37wK5l" to="iq8l:6sPmSUBrjFn" resolve="AtomicToken" />
+                      <node concept="Xl_RD" id="5wiMD64QT4$" role="37wK5m">
+                        <property role="Xl_RC" value="(" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbC" id="5wiMD64QWPk" role="3clFbw">
+            <node concept="Rm8GO" id="5wiMD64QYKh" role="3uHU7w">
+              <ref role="1Px2BO" to="iq8l:1YPL71YmUJE" resolve="TypeKind" />
+              <ref role="Rm8GQ" to="iq8l:1YPL71YmUKY" resolve="POINTER" />
+            </node>
+            <node concept="2OqwBi" id="5wiMD64QVRf" role="3uHU7B">
+              <node concept="37vLTw" id="5wiMD64QVBe" role="2Oq$k0">
+                <ref role="3cqZAo" node="29BUUxcmPiB" resolve="child" />
+              </node>
+              <node concept="liA8E" id="5wiMD64QWpT" role="2OqNvi">
+                <ref role="37wK5l" to="iq8l:2W1GNPBdoKb" resolve="getKind" />
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="29BUUxcmZGW" role="3cqZAp">
           <node concept="2OqwBi" id="29BUUxcmZHB" role="3clFbG">
             <node concept="37vLTw" id="29BUUxcmZHA" role="2Oq$k0">
@@ -3281,6 +3321,44 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbJ" id="5wiMD64R3S5" role="3cqZAp">
+          <node concept="3clFbS" id="5wiMD64R3S6" role="3clFbx">
+            <node concept="3clFbF" id="5wiMD64R3S7" role="3cqZAp">
+              <node concept="2OqwBi" id="5wiMD64R3S8" role="3clFbG">
+                <node concept="37vLTw" id="5wiMD64R3S9" role="2Oq$k0">
+                  <ref role="3cqZAo" node="29BUUxcmPHg" resolve="token" />
+                </node>
+                <node concept="liA8E" id="5wiMD64R3Sa" role="2OqNvi">
+                  <ref role="37wK5l" to="iq8l:1YPL71Yln2O" resolve="add" />
+                  <node concept="2ShNRf" id="5wiMD64R3Sb" role="37wK5m">
+                    <node concept="1pGfFk" id="5wiMD64R3Sc" role="2ShVmc">
+                      <property role="373rjd" value="true" />
+                      <ref role="37wK5l" to="iq8l:6sPmSUBrjFn" resolve="AtomicToken" />
+                      <node concept="Xl_RD" id="5wiMD64R3Sd" role="37wK5m">
+                        <property role="Xl_RC" value=")" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbC" id="5wiMD64R3Se" role="3clFbw">
+            <node concept="Rm8GO" id="5wiMD64R3Sf" role="3uHU7w">
+              <ref role="1Px2BO" to="iq8l:1YPL71YmUJE" resolve="TypeKind" />
+              <ref role="Rm8GQ" to="iq8l:1YPL71YmUKY" resolve="POINTER" />
+            </node>
+            <node concept="2OqwBi" id="5wiMD64R3Sg" role="3uHU7B">
+              <node concept="37vLTw" id="5wiMD64R3Sh" role="2Oq$k0">
+                <ref role="3cqZAo" node="29BUUxcmPiB" resolve="child" />
+              </node>
+              <node concept="liA8E" id="5wiMD64R3Si" role="2OqNvi">
+                <ref role="37wK5l" to="iq8l:2W1GNPBdoKb" resolve="getKind" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="5wiMD64QxHl" role="3cqZAp" />
         <node concept="3clFbF" id="29BUUxcmZGZ" role="3cqZAp">
           <node concept="2OqwBi" id="29BUUxcmZHE" role="3clFbG">
             <node concept="37vLTw" id="29BUUxcmZHD" role="2Oq$k0">

diff --git a/code/languages/com.mbeddr.core/tests/test.ts.core/core.msd b/code/languages/com.mbeddr.core/tests/test.ts.core/core.msd
@@ -27,6 +27,7 @@
     <dependency reexport="false">b2da2e1a-b542-47f5-9be0-4dc21efe74a4(com.mbeddr.core.checks)</dependency>
     <dependency reexport="false">1c897ba5-9d43-4035-ac7f-0306495743ac(com.mbeddr.mpsutil.interpreter.test)</dependency>
     <dependency reexport="false">06d68b77-b699-4918-83b8-857e63787800(com.mbeddr.core.unittest)</dependency>
+    <dependency reexport="false">7124e466-fc92-4803-a656-d7a6b7eb3910(MPS.TextGen)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
@@ -80,6 +81,7 @@
     <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
+    <module reference="7124e466-fc92-4803-a656-d7a6b7eb3910(MPS.TextGen)" version="0" />
     <module reference="~_PreferencesModule#com.mbeddr.core.__spreferences.PlatformTemplates(com.mbeddr.core.__spreferences.PlatformTemplates)" version="0" />
     <module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="4" />
     <module reference="2d7fadf5-33f6-4e80-a78f-0f739add2bde(com.mbeddr.core.buildconfig)" version="0" />