Merge pull request #847 from JetBrains/feature/update_2022.2.3

Update to MPS 2022.2.3
JetBrains · Jun 3, 2024 · 5c4226e · 5c4226e
2 parents 99cedde + 71bb318
commit 5c4226e
Show file tree

Hide file tree

Showing 14 changed files with 33 additions and 26 deletions.
diff --git a/build.gradle b/build.gradle
@@ -43,7 +43,7 @@ logger.info 'Repository username: {}', project.nexusUsername
 // major version, e.g. '2021.1', '2021.2'
 ext.mpsMajor = '2022.2'
 // optional minor/bugfix number (not added to the final build version)
-ext.mpsMinor = '2'
+ext.mpsMinor = '3'
 // e.g. Beta, EAP, RC
 ext.mpsReleaseType = ''
 

diff --git a/.../build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps b/.../build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
@@ -15277,7 +15277,7 @@
         <property role="2iUeEu" value="https://www.itemis.com/en/it-services/methods-and-tools/mps" />
       </node>
       <node concept="m$f5U" id="1$KnWE8eXE$" role="m$_yh">
-        <ref role="m$f5T" node="1$KnWE8eXEC" />
+        <ref role="m$f5T" node="1$KnWE8eXEC" resolve="de.itemis.mps.changelog" />
       </node>
       <node concept="m$_yC" id="1$KnWE8eXE_" role="m$_yJ">
         <ref role="m$_y1" to="ffeo:4k71ibbKLe8" resolve="jetbrains.mps.core" />

diff --git a/code/celllayout/languages/test.de.itemis.mps.editor.celllayout.lang/models/structure.mps b/code/celllayout/languages/test.de.itemis.mps.editor.celllayout.lang/models/structure.mps
@@ -76,7 +76,7 @@
     <property role="EcuMT" value="4434722703675265042" />
     <property role="TrG5h" value="TestCase_MixedVerticalAndIndent" />
     <property role="19KtqR" value="true" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
   </node>
 </model>
 
diff --git a/...e.slisson.mps.editor.celllayout.runtime/models/de/itemis/mps/editor/celllayout/layout.mps b/...e.slisson.mps.editor.celllayout.runtime/models/de/itemis/mps/editor/celllayout/layout.mps
@@ -10172,7 +10172,7 @@
           </node>
         </node>
         <node concept="2AHcQZ" id="6MTGs0nOrA6" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" />
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
       </node>
       <node concept="3clFb_" id="40e1npHzLFu" role="jymVt">
@@ -11068,7 +11068,7 @@
           </node>
         </node>
         <node concept="2AHcQZ" id="6MTGs0nLO9H" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" />
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
       </node>
       <node concept="2tJIrI" id="40e1npHAjLI" role="jymVt" />
@@ -12551,7 +12551,7 @@
           </node>
         </node>
         <node concept="2AHcQZ" id="6MTGs0nN$Au" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" />
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
       </node>
       <node concept="2tJIrI" id="40e1npHzPBK" role="jymVt" />

diff --git a/...ps.editor.celllayout.runtime/models/test/de/itemis/mps/editor/celllayout/[email protected] b/...ps.editor.celllayout.runtime/models/test/de/itemis/mps/editor/celllayout/[email protected]
@@ -3070,14 +3070,14 @@
           <property role="TrG5h" value="longCellLength" />
         </node>
         <node concept="37vLTw" id="3QbjcQ60Q4h" role="2GsD0m">
-          <ref role="3cqZAo" node="3QbjcQ60KOE" resolve="longCellWidthValues" />
+          <ref role="3cqZAo" node="3QbjcQ60KOE" resolve="longCellLengthValues" />
         </node>
         <node concept="3clFbS" id="3QbjcQ60P2W" role="2LFqv$">
           <node concept="3clFbF" id="3QbjcQ61k6_" role="3cqZAp">
             <node concept="2OqwBi" id="3QbjcQ61k6y" role="3clFbG">
               <node concept="10M0yZ" id="3QbjcQ61k6z" role="2Oq$k0">
-                <ref role="1PxDUh" to="wyt6:~System" />
-                <ref role="3cqZAo" to="wyt6:~System.out" />
+                <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
+                <ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
               </node>
               <node concept="liA8E" id="3QbjcQ61k6$" role="2OqNvi">
                 <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />

diff --git a/....itemis.mps.changelog/generator/templates/[email protected] b/....itemis.mps.changelog/generator/templates/[email protected]
@@ -204,7 +204,7 @@
       <property role="36QftV" value="true" />
       <ref role="30HIoZ" to="b7vt:Po4Z58Iad0" resolve="IReleaseHeader" />
       <node concept="j$656" id="1$KnWE8j07h" role="1lVwrX">
-        <ref role="v9R2y" node="1$KnWE8j07f" resolve="reduce_VersionDateReleaseHeader" />
+        <ref role="v9R2y" node="1$KnWE8j07f" resolve="reduce_ReleaseHeader" />
       </node>
     </node>
     <node concept="3aamgX" id="1$KnWE8j2hb" role="3acgRq">

diff --git a/code/changelog/de.itemis.mps.changelog/models/de.itemis.mps.changelog.behavior.mps b/code/changelog/de.itemis.mps.changelog/models/de.itemis.mps.changelog.behavior.mps
@@ -362,7 +362,7 @@
     </node>
     <node concept="13i0hz" id="6aVQm8Wgor_" role="13h7CS">
       <property role="TrG5h" value="isAfter" />
-      <ref role="13i0hy" node="6aVQm8Wg3U3" resolve="isBefore" />
+      <ref role="13i0hy" node="6aVQm8Wg3U3" resolve="isAfter" />
       <node concept="3Tm1VV" id="6aVQm8WgorA" role="1B3o_S" />
       <node concept="3clFbS" id="6aVQm8WgorF" role="3clF47">
         <node concept="Jncv_" id="6aVQm8Wgrj1" role="3cqZAp">
@@ -584,7 +584,7 @@
     </node>
     <node concept="13i0hz" id="6aVQm8Wge9B" role="13h7CS">
       <property role="TrG5h" value="isAfter" />
-      <ref role="13i0hy" node="6aVQm8Wg3U3" resolve="isBefore" />
+      <ref role="13i0hy" node="6aVQm8Wg3U3" resolve="isAfter" />
       <node concept="3Tm1VV" id="6aVQm8Wge9C" role="1B3o_S" />
       <node concept="3clFbS" id="6aVQm8Wge9H" role="3clF47">
         <node concept="Jncv_" id="6aVQm8Wgf58" role="3cqZAp">
@@ -835,7 +835,7 @@
             <node concept="2OqwBi" id="2r0ijgcUPiy" role="37wK5m">
               <node concept="2JrnkZ" id="1$KnWE8r2zm" role="2Oq$k0">
                 <node concept="37vLTw" id="1$KnWE8r0Mq" role="2JrQYb">
-                  <ref role="3cqZAo" node="1$KnWE8r0Ml" resolve="f" />
+                  <ref role="3cqZAo" node="1$KnWE8r0Ml" resolve="node" />
                 </node>
               </node>
               <node concept="liA8E" id="2r0ijgcUPiA" role="2OqNvi">

diff --git a/code/changelog/de.itemis.mps.changelog/models/de.itemis.mps.changelog.editor.mps b/code/changelog/de.itemis.mps.changelog/models/de.itemis.mps.changelog.editor.mps
@@ -853,7 +853,7 @@
   </node>
   <node concept="PKFIW" id="Po4Z58wqHS">
     <property role="TrG5h" value="DummyForGrammarCells" />
-    <ref role="1XX52x" to="tpck:gw2VY9q" />
+    <ref role="1XX52x" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="3F0ifn" id="Po4Z58wqHT" role="2wV5jI">
       <property role="3F0ifm" value="Workaround to fix contributions to BaseConcept generated by grammarCells." />
     </node>
@@ -1399,7 +1399,7 @@
             <node concept="3clFbF" id="1$KnWE8DAOt" role="3cqZAp">
               <node concept="2OqwBi" id="1$KnWE8DAOu" role="3clFbG">
                 <node concept="37vLTw" id="1$KnWE8DAOv" role="2Oq$k0">
-                  <ref role="3cqZAo" node="1$KnWE8DAOj" resolve="method" />
+                  <ref role="3cqZAo" node="1$KnWE8DAOj" resolve="createNewElementStrategyMethod" />
                 </node>
                 <node concept="liA8E" id="1$KnWE8DAOw" role="2OqNvi">
                   <ref role="37wK5l" to="t6h5:~Method.setAccessible(boolean)" resolve="setAccessible" />
@@ -1417,7 +1417,7 @@
                 </node>
                 <node concept="2OqwBi" id="1$KnWE8DAO_" role="33vP2m">
                   <node concept="37vLTw" id="1$KnWE8DAOA" role="2Oq$k0">
-                    <ref role="3cqZAo" node="1$KnWE8DAOj" resolve="method" />
+                    <ref role="3cqZAo" node="1$KnWE8DAOj" resolve="createNewElementStrategyMethod" />
                   </node>
                   <node concept="liA8E" id="1$KnWE8DAOB" role="2OqNvi">
                     <ref role="37wK5l" to="t6h5:~Method.invoke(java.lang.Object,java.lang.Object...)" resolve="invoke" />
@@ -1473,7 +1473,7 @@
             <node concept="3clFbF" id="1$KnWE8DAOS" role="3cqZAp">
               <node concept="2OqwBi" id="1$KnWE8DAOT" role="3clFbG">
                 <node concept="37vLTw" id="1$KnWE8DAOU" role="2Oq$k0">
-                  <ref role="3cqZAo" node="1$KnWE8DAOM" resolve="method2" />
+                  <ref role="3cqZAo" node="1$KnWE8DAOM" resolve="executeMethod" />
                 </node>
                 <node concept="liA8E" id="1$KnWE8DAOV" role="2OqNvi">
                   <ref role="37wK5l" to="t6h5:~Method.setAccessible(boolean)" resolve="setAccessible" />
@@ -1486,7 +1486,7 @@
             <node concept="3clFbF" id="1$KnWE8DAOX" role="3cqZAp">
               <node concept="2OqwBi" id="1$KnWE8DAOY" role="3clFbG">
                 <node concept="37vLTw" id="1$KnWE8DAOZ" role="2Oq$k0">
-                  <ref role="3cqZAo" node="1$KnWE8DAOM" resolve="method2" />
+                  <ref role="3cqZAo" node="1$KnWE8DAOM" resolve="executeMethod" />
                 </node>
                 <node concept="liA8E" id="1$KnWE8DAP0" role="2OqNvi">
                   <ref role="37wK5l" to="t6h5:~Method.invoke(java.lang.Object,java.lang.Object...)" resolve="invoke" />

diff --git a/code/changelog/de.itemis.mps.changelog/models/de.itemis.mps.changelog.intentions.mps b/code/changelog/de.itemis.mps.changelog/models/de.itemis.mps.changelog.intentions.mps
@@ -703,7 +703,7 @@
           <node concept="2OqwBi" id="1$KnWE8t37w" role="3clFbG">
             <node concept="2OqwBi" id="1$KnWE8t37x" role="2Oq$k0">
               <node concept="37vLTw" id="1$KnWE8t37y" role="2Oq$k0">
-                <ref role="3cqZAo" node="1$KnWE8t36Q" resolve="selectedWords" />
+                <ref role="3cqZAo" node="1$KnWE8t36Q" resolve="selectedElements" />
               </node>
               <node concept="1uHKPH" id="1$KnWE8t37z" role="2OqNvi" />
             </node>
@@ -718,7 +718,7 @@
           <node concept="2OqwBi" id="1$KnWE8t37B" role="3clFbG">
             <node concept="2OqwBi" id="1$KnWE8t37C" role="2Oq$k0">
               <node concept="37vLTw" id="1$KnWE8t37D" role="2Oq$k0">
-                <ref role="3cqZAo" node="1$KnWE8t36Q" resolve="selectedWords" />
+                <ref role="3cqZAo" node="1$KnWE8t36Q" resolve="selectedElements" />
               </node>
               <node concept="7r0gD" id="1$KnWE8t37E" role="2OqNvi">
                 <node concept="3cmrfG" id="1$KnWE8t37F" role="7T0AP">

diff --git a/code/changelog/de.itemis.mps.changelog/models/de.itemis.mps.changelog.structure.mps b/code/changelog/de.itemis.mps.changelog/models/de.itemis.mps.changelog.structure.mps
@@ -69,7 +69,7 @@
     <property role="EcuMT" value="961540447467216844" />
     <property role="TrG5h" value="Changelog" />
     <property role="19KtqR" value="true" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyi" id="Po4Z58IlRD" role="1TKVEl">
       <property role="IQ2nx" value="961540447471754729" />
       <property role="TrG5h" value="headerType" />
@@ -105,7 +105,7 @@
   <node concept="1TIwiD" id="Po4Z58tnOo">
     <property role="EcuMT" value="961540447467306264" />
     <property role="TrG5h" value="Release" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="Po4Z58trdf" role="1TKVEi">
       <property role="IQ2ns" value="961540447467320143" />
       <property role="20lmBu" value="fLJjDmT/aggregation" />
@@ -159,7 +159,7 @@
   <node concept="1TIwiD" id="Po4Z58tnPb">
     <property role="EcuMT" value="961540447467306315" />
     <property role="TrG5h" value="VersionDateReleaseHeader" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="Po4Z58trdd" role="1TKVEi">
       <property role="IQ2ns" value="961540447467320141" />
       <property role="20lmBu" value="fLJjDmT/aggregation" />
@@ -182,7 +182,7 @@
   <node concept="1TIwiD" id="Po4Z58tnPe">
     <property role="EcuMT" value="961540447467306318" />
     <property role="TrG5h" value="SemanticVersion" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyi" id="Po4Z58tnPf" role="1TKVEl">
       <property role="IQ2nx" value="961540447467306319" />
       <property role="TrG5h" value="major" />
@@ -210,7 +210,7 @@
   <node concept="1TIwiD" id="Po4Z58tBpZ">
     <property role="EcuMT" value="961540447467370111" />
     <property role="TrG5h" value="ChangeSection" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="Po4Z58tBq_" role="1TKVEi">
       <property role="IQ2ns" value="961540447467370149" />
       <property role="20lmBu" value="fLJjDmT/aggregation" />

diff --git a/code/changelog/de.itemis.mps.changelog/models/de.itemis.mps.changelog.typesystem.mps b/code/changelog/de.itemis.mps.changelog/models/de.itemis.mps.changelog.typesystem.mps
@@ -686,7 +686,7 @@
                   <node concept="2OqwBi" id="43oF0KsSIOX" role="3clFbG">
                     <node concept="3S9uib" id="43oF0KsSIxh" role="2Oq$k0">
                       <node concept="37vLTw" id="43oF0KsSHEY" role="3S9DZi">
-                        <ref role="3cqZAo" node="43oF0KsSE6Y" resolve="map" />
+                        <ref role="3cqZAo" node="43oF0KsSE6Y" resolve="countMap" />
                       </node>
                     </node>
                     <node concept="liA8E" id="43oF0KsSJTN" role="2OqNvi">

diff --git a/code/debug/languages/de.itemis.mps.debug/de.itemis.mps.debug.mpl b/code/debug/languages/de.itemis.mps.debug/de.itemis.mps.debug.mpl
@@ -112,6 +112,7 @@
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
     <language slang="l:ad93155d-79b2-4759-b10c-55123e763903:jetbrains.mps.lang.messages" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />

diff --git a/...ges/de.itemis.mps.editor.pagination.demolang/de.itemis.mps.editor.pagination.demolang.mpl b/...ges/de.itemis.mps.editor.pagination.demolang/de.itemis.mps.editor.pagination.demolang.mpl
@@ -21,6 +21,7 @@
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
+    <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
     <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
     <language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
@@ -34,7 +35,9 @@
     <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
     <language slang="l:ad93155d-79b2-4759-b10c-55123e763903:jetbrains.mps.lang.messages" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />

diff --git a/.../pagination/languages/de.itemis.mps.editor.pagination/de.itemis.mps.editor.pagination.mpl b/.../pagination/languages/de.itemis.mps.editor.pagination/de.itemis.mps.editor.pagination.mpl
@@ -100,6 +100,7 @@
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
+    <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
     <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
     <language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
@@ -113,9 +114,11 @@
     <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
     <language slang="l:ad93155d-79b2-4759-b10c-55123e763903:jetbrains.mps.lang.messages" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />