Merge pull request #231 from mbeddr/merge/MPS-2023.2

Merge maintenance/MPS-2022.3 into maintenance/MPS-2023.2
mbeddr · Nov 11, 2024 · e3a30eb · e3a30eb
2 parents 20cf17f + 7a96d58
commit e3a30eb
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 22 deletions.
diff --git a/.../org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/org.mpsqa.arch.pluginSolution.msd b/.../org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/org.mpsqa.arch.pluginSolution.msd
@@ -20,6 +20,7 @@
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
     <dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
+    <dependency reexport="false">86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -46,6 +47,7 @@
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty)" version="0" />
+    <module reference="86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="6c101563-ba1f-458d-b298-a75634941e0c(org.mpsqa.arch)" version="0" />
     <module reference="96212ac2-423f-4cfb-b211-b58d0546b6bf(org.mpsqa.arch.pluginSolution)" version="0" />

diff --git a/...rg.mpsqa.build/solutions/org.mpsqa.build.allScripts/models/org.mpsqa.build.allScripts.mps b/...rg.mpsqa.build/solutions/org.mpsqa.build.allScripts/models/org.mpsqa.build.allScripts.mps
@@ -7,7 +7,6 @@
   </languages>
   <imports>
     <import index="ffeo" ref="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)" />
-    <import index="jrpl" ref="r:f9ac9a52-9b52-485f-a0e9-7c4ea505964a(org.mpsqa.build._100_allInOne_build)" />
   </imports>
   <registry>
     <language id="798100da-4f0a-421a-b991-71f8c50ce5d2" name="jetbrains.mps.build">

diff --git a/...uages/org.mpsqa.build/solutions/org.mpsqa.build.allScripts/org.mpsqa.build.allScripts.msd b/...uages/org.mpsqa.build/solutions/org.mpsqa.build.allScripts/org.mpsqa.build.allScripts.msd
@@ -12,7 +12,6 @@
   </facets>
   <dependencies>
     <dependency reexport="false">422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)</dependency>
-    <dependency reexport="false">11d4368a-a7e8-4dd9-bfc6-c2de268d1994(org.mpsqa.build)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" version="0" />
@@ -21,7 +20,6 @@
   </languageVersions>
   <dependencyVersions>
     <module reference="422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)" version="0" />
-    <module reference="11d4368a-a7e8-4dd9-bfc6-c2de268d1994(org.mpsqa.build)" version="0" />
     <module reference="b90ee918-6cd5-44ed-9ed3-6696d29afea4(org.mpsqa.build.allScripts)" version="0" />
   </dependencyVersions>
 </solution>

diff --git a/...es/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._030_clones_build.mps b/...es/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._030_clones_build.mps
@@ -7,7 +7,7 @@
   </languages>
   <imports>
     <import index="ffeo" ref="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)" />
-    <import index="2tou" ref="r:18bebd8f-6332-4ffd-b628-cc9dad4ef421(org.mpsqa.build._010_base_build)" />
+    <import index="2tou" ref="r:18bebd8f-6332-4ffd-b628-cc9dad4ef421(org.mpsqa.base.build)" />
   </imports>
   <registry>
     <language id="798100da-4f0a-421a-b991-71f8c50ce5d2" name="jetbrains.mps.build">

diff --git a/...ages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._060_arch_build.mps b/...ages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._060_arch_build.mps
@@ -243,6 +243,9 @@
           <property role="3MwjfP" value="org.mpsqa.arch" />
         </node>
       </node>
+      <node concept="m$_yC" id="2VR19mpiUGU" role="m$_yJ">
+        <ref role="m$_y1" to="ffeo:5lGJ4TajoV9" resolve="jetbrains.mps.ide.migration.workbench" />
+      </node>
     </node>
     <node concept="2G$12M" id="50Wzfz4shz9" role="3989C9">
       <property role="TrG5h" value="org.mpsqa.arch" />
@@ -434,6 +437,11 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="2VR19mpiUB5" role="3bR37C">
+          <node concept="3bR9La" id="2VR19mpiUB6" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:2eDSGe9d1q1" resolve="MPS.Workbench" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="GdL2Wddnv9" role="3989C9">

diff --git a/...rg.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.behavior.mps b/...rg.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.behavior.mps
@@ -1862,8 +1862,8 @@
                     <property role="Xl_RC" value=":" />
                   </node>
                 </node>
-                <node concept="2OqwBi" id="2iYG$WahgMP" role="3uHU7w">
-                  <node concept="13iPFW" id="2iYG$WahgMR" role="2Oq$k0" />
+                <node concept="2OqwBi" id="5jtFdSvFtxi" role="3uHU7w">
+                  <node concept="13iPFW" id="5jtFdSvFtxk" role="2Oq$k0" />
                   <node concept="3TrcHB" id="4Wm$DJ9ckpU" role="2OqNvi">
                     <ref role="3TsBF5" to="a1af:78RogMCGEUf" resolve="resultNodeId" />
                   </node>

diff --git a/.../org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.editor.mps b/.../org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.editor.mps
@@ -15,8 +15,6 @@
     <import index="a1af" ref="r:839ac015-7de1-49f3-ac8f-8d7c6d47259d(org.mpsqa.lint.generic.structure)" />
     <import index="qqy" ref="r:baac1a2f-1e52-45fa-95c5-02a3dfae441c(org.mpsqa.lint.generic.util)" />
     <import index="lzb2" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui(MPS.IDEA/)" />
-    <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
-    <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />

diff --git a/....mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.typesystem.mps b/....mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.typesystem.mps
@@ -1390,6 +1390,9 @@
                       <node concept="liA8E" id="1BlvkgWnmMG" role="2OqNvi">
                         <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                         <node concept="2OqwBi" id="106MO2l8VPg" role="37wK5m">
+                          <node concept="liA8E" id="106MO2l8Wbi" role="2OqNvi">
+                            <ref role="37wK5l" to="mhbf:~SModelName.toString()" resolve="toString" />
+                          </node>
                           <node concept="2OqwBi" id="1BlvkgWnmMH" role="2Oq$k0">
                             <node concept="1eOMI4" id="1BlvkgWnmMI" role="2Oq$k0">
                               <node concept="10QFUN" id="1BlvkgWnmMJ" role="1eOMHV">
@@ -1405,9 +1408,6 @@
                               <ref role="37wK5l" to="mhbf:~SModelReference.getName()" resolve="getName" />
                             </node>
                           </node>
-                          <node concept="liA8E" id="106MO2l8Wbi" role="2OqNvi">
-                            <ref role="37wK5l" to="mhbf:~SModelName.toString()" resolve="toString" />
-                          </node>
                         </node>
                       </node>
                     </node>
@@ -4066,6 +4066,9 @@
                                           <node concept="2r$n1x" id="4KreBtcxwNF" role="2r_Bvh">
                                             <ref role="2r$qp6" to="qqy:3ghOW5H_ihW" resolve="location" />
                                             <node concept="2OqwBi" id="4XPt_HawF1P" role="2r_lH1">
+                                              <node concept="liA8E" id="4XPt_HawHe5" role="2OqNvi">
+                                                <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                                              </node>
                                               <node concept="2OqwBi" id="4XPt_HavuJY" role="2Oq$k0">
                                                 <node concept="2JrnkZ" id="4XPt_HavsPR" role="2Oq$k0">
                                                   <node concept="2OqwBi" id="4KreBtcybHx" role="2JrQYb">
@@ -4081,9 +4084,6 @@
                                                   <ref role="37wK5l" to="mhbf:~SModel.getReference()" resolve="getReference" />
                                                 </node>
                                               </node>
-                                              <node concept="liA8E" id="4XPt_HawHe5" role="2OqNvi">
-                                                <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
-                                              </node>
                                             </node>
                                           </node>
                                           <node concept="2r$n1x" id="4KreBtcxwNH" role="2r_Bvh">

diff --git a/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/org.mpsqa.lint.generic.mpl b/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/org.mpsqa.lint.generic.mpl
@@ -95,6 +95,7 @@
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
     <dependency reexport="false">c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)</dependency>
     <dependency reexport="false">b15468d9-435b-45b2-bf51-3f984f734cc4(org.mpsqa.lint.generic.runtime)</dependency>
+    <dependency reexport="false" scope="generate-into">1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.lang.smodel.query)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -153,6 +154,7 @@
     <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
     <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
+    <module reference="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.lang.smodel.query)" version="0" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="c7fb639f-be78-4307-89b0-b5959c3fa8c8(jetbrains.mps.lang.text)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />

diff --git a/...qa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.modules.mps b/...qa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.modules.mps
@@ -1285,12 +1285,12 @@
                                           </node>
                                           <node concept="TSZUe" id="3$9W3co6PWq" role="2OqNvi">
                                             <node concept="2OqwBi" id="3$9W3co6PWs" role="25WWJ7">
-                                              <node concept="37vLTw" id="3$9W3co6PWt" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="3$9W3co6PW9" resolve="file" />
-                                              </node>
                                               <node concept="liA8E" id="4XPt_HaJrH0" role="2OqNvi">
                                                 <ref role="37wK5l" to="eoo2:~Path.toString()" resolve="toString" />
                                               </node>
+                                              <node concept="37vLTw" id="3$9W3co6PWt" role="2Oq$k0">
+                                                <ref role="3cqZAo" node="3$9W3co6PW9" resolve="file" />
+                                              </node>
                                             </node>
                                           </node>
                                         </node>

diff --git a/...generic.sandbox/models/org.mpsqa.lint.generic.sandbox._010_smoke_user_defined_linters.mps b/...generic.sandbox/models/org.mpsqa.lint.generic.sandbox._010_smoke_user_defined_linters.mps
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <model ref="r:ca411a1b-a962-4e17-b6ba-52f6a5b63c94(org.mpsqa.lint.generic.sandbox._010_smoke_user_defined_linters)">
   <persistence version="9" />
+  <attribute name="doNotGenerate" value="false" />
   <languages>
     <use id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic" version="1" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />

diff --git a/....generic.sandbox/models/org.mpsqa.lint.mps_lang.linters_library.performance_generator.mps b/....generic.sandbox/models/org.mpsqa.lint.mps_lang.linters_library.performance_generator.mps
@@ -672,7 +672,7 @@
                     </node>
                     <node concept="3cpWs8" id="7H5j78q03d7" role="3cqZAp">
                       <node concept="3cpWsn" id="7H5j78q03d8" role="3cpWs9">
-                        <property role="TrG5h" value="resources" />
+                        <property role="TrG5h" value="_resources" />
                         <node concept="3uibUv" id="7H5j78q0356" role="1tU5fm">
                           <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
                           <node concept="3uibUv" id="7H5j78q0359" role="11_B2D">
@@ -712,7 +712,7 @@
                               <ref role="3uigEE" to="yo81:5mqBoD3U3WC" resolve="IResource" />
                             </node>
                             <node concept="37vLTw" id="7H5j78q03de" role="I$8f6">
-                              <ref role="3cqZAo" node="7H5j78q03d8" resolve="resources" />
+                              <ref role="3cqZAo" node="7H5j78q03d8" resolve="_resources" />
                             </node>
                           </node>
                         </node>

diff --git a/...s_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.behavior_aspect.mps b/...s_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.behavior_aspect.mps
@@ -12,10 +12,10 @@
     <import index="1i04" ref="r:3270011d-8b2d-4938-8dff-d256a759e017(jetbrains.mps.lang.behavior.structure)" />
     <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" />
     <import index="zn9m" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.util(MPS.IDEA/)" />
+    <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
-    <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
     <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" />
-    <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
+    <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
     <import index="csvn" ref="r:a91e42c5-728b-4866-86c4-d97454f4aee4(jetbrains.mps.lang.behavior.behavior)" implicit="true" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />

diff --git a/...qa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.tests.mps b/...qa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.tests.mps
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <model ref="r:8d96b76e-8650-466c-a80c-f6b600139e7b(org.mpsqa.lint.mps_lang.linters_library.tests)">
   <persistence version="9" />
-  <attribute name="doNotGenerate" value="false" />
   <languages>
     <use id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />