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

mbeddr · Sep 17, 2024 · 7269f9c · 7269f9c
2 parents 4e8f442 + 38fd3c1
commit 7269f9c
Show file tree

Hide file tree

Showing 55 changed files with 18,593 additions and 12,380 deletions.
diff --git a/.github/workflows/build_mpsqa.yml b/.github/workflows/build_mpsqa.yml
@@ -79,7 +79,7 @@ jobs:
         configuration-cache-enabled: true
 
     - name: Archive distribution
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: org.mpsqa.allInOne
         path: build/artifacts/org.mpsqa.allInOne/
diff --git a/build.gradle b/build.gradle
@@ -216,6 +216,10 @@ task build_lint_analysis_languages(type: BuildLanguages, dependsOn: []) {
     script scriptFile("build-lint-analysis-languages.xml")
 }
 
+task build_profile_languages(type: BuildLanguages, dependsOn: []) {
+    script scriptFile("build-profile-languages.xml")
+}
+
 task build_sandboxes(type: BuildLanguages) {
     dependsOn 'build_base_languages'
     dependsOn 'build_unused_languages'
@@ -234,6 +238,7 @@ tasks.register('build_main_languages') {
     dependsOn 'build_arch_languages'
     dependsOn 'build_deprecation_analysis_languages'
     dependsOn 'build_lint_analysis_languages'
+	dependsOn 'build_profile_languages'
 }
 
 tasks.register('build_all_languages') {

diff --git a/...uages/org.mpsqa.base.errors_suppressor/models/org.mpsqa.base.errors_suppressor.editor.mps b/...uages/org.mpsqa.base.errors_suppressor/models/org.mpsqa.base.errors_suppressor.editor.mps
@@ -95,6 +95,20 @@
         </node>
         <node concept="2iRfu4" id="1k2QJ73R6Q2" role="2iSdaV" />
       </node>
+      <node concept="3EZMnI" id="28p3jNfoJ4_" role="3EZMnx">
+        <node concept="VPM3Z" id="28p3jNfoJ4A" role="3F10Kt" />
+        <node concept="3F0ifn" id="28p3jNfoJ4B" role="3EZMnx">
+          <property role="3F0ifm" value="don't suppress in editor" />
+          <node concept="VechU" id="28p3jNfoJ4C" role="3F10Kt">
+            <property role="Vb096" value="fLwANPu/blue" />
+          </node>
+        </node>
+        <node concept="3F0A7n" id="28p3jNfoJ4G" role="3EZMnx">
+          <ref role="1NtTu8" to="hkkt:28p3jNfo5_$" resolve="disableInEditor" />
+        </node>
+        <node concept="2iRfu4" id="28p3jNfoJ4E" role="2iSdaV" />
+      </node>
+      <node concept="3F0ifn" id="28p3jNfoJ4t" role="3EZMnx" />
       <node concept="3F0ifn" id="1DrnXKMSm$9" role="3EZMnx">
         <property role="3F0ifm" value="---" />
       </node>

diff --git a/...es/org.mpsqa.base.errors_suppressor/models/org.mpsqa.base.errors_suppressor.structure.mps b/...es/org.mpsqa.base.errors_suppressor/models/org.mpsqa.base.errors_suppressor.structure.mps
@@ -88,6 +88,11 @@
       <property role="TrG5h" value="severity" />
       <ref role="AX2Wp" node="1DrnXKMSoVq" resolve="ESeverityLevelSuppressor" />
     </node>
+    <node concept="1TJgyi" id="28p3jNfo5_$" role="1TKVEl">
+      <property role="IQ2nx" value="2457009626535713124" />
+      <property role="TrG5h" value="disableInEditor" />
+      <ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
+    </node>
   </node>
   <node concept="25R3W" id="1DrnXKMSoVq">
     <property role="3F6X1D" value="1899217067217882842" />

diff --git a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.build/models/org.mpsqa.base.build.mps b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.build/models/org.mpsqa.base.build.mps
@@ -823,6 +823,7 @@
         </node>
         <node concept="1SiIV0" id="1DrnXKNQ6UZ" role="3bR37C">
           <node concept="3bR9La" id="1DrnXKNQ6V0" role="1SiIV1">
+            <property role="3bR36h" value="true" />
             <ref role="3bR37D" to="ffeo:7Kfy9QB6LfQ" resolve="jetbrains.mps.kernel" />
           </node>
         </node>
@@ -874,6 +875,17 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="2qjDvIjudtT" role="3bR37C">
+          <node concept="3bR9La" id="2qjDvIjudtU" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1TaHNgiIbJb" resolve="MPS.Platform" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="2qjDvIjudtV" role="3bR37C">
+          <node concept="3bR9La" id="2qjDvIjudtW" role="1SiIV1">
+            <property role="3bR36h" value="true" />
+            <ref role="3bR37D" to="ffeo:1TaHNgiIbIZ" resolve="MPS.Editor" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="1DrnXKNQ6gP" role="2G$12L">
         <property role="BnDLt" value="true" />

diff --git a/...ppressor.pluginSolution/models/org.mpsqa.base.errors_suppressor.pluginSolution.plugin.mps b/...ppressor.pluginSolution/models/org.mpsqa.base.errors_suppressor.pluginSolution.plugin.mps
diff --git a/...base.errors_suppressor.pluginSolution/org.mpsqa.base.errors_suppressor.pluginSolution.msd b/...base.errors_suppressor.pluginSolution/org.mpsqa.base.errors_suppressor.pluginSolution.msd
@@ -17,8 +17,10 @@
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)</dependency>
-    <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
+    <dependency reexport="true">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
     <dependency reexport="false">bc0be9e0-3b05-4108-89c1-9ae0623ef4fe(org.mpsqa.base.errors_suppressor)</dependency>
+    <dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
+    <dependency reexport="true">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -28,6 +30,7 @@
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <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:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:7ab1a6fa-0a11-4b95-9e48-75f363d6cb00:jetbrains.mps.lang.generator.plan" version="2" />
@@ -43,7 +46,10 @@
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
     <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
     <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
+    <module reference="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" version="0" />
+    <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="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="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />

diff --git a/...ages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._080_lint_build.mps b/...ages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._080_lint_build.mps
@@ -104,6 +104,7 @@
         <child id="5253498789149547704" name="dependencies" index="3bR37C" />
       </concept>
       <concept id="5253498789149585690" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleDependencyOnModule" flags="ng" index="3bR9La">
+        <property id="5253498789149547713" name="reexport" index="3bR36h" />
         <reference id="5253498789149547705" name="module" index="3bR37D" />
       </concept>
       <concept id="763829979718664966" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleResources" flags="ng" index="3rtmxn">
@@ -119,8 +120,12 @@
       <concept id="4278635856200794926" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleDependencyExtendLanguage" flags="ng" index="1Busua">
         <reference id="4278635856200794928" name="language" index="1Busuk" />
       </concept>
+      <concept id="3189788309731981027" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleSolutionRuntime" flags="ng" index="1E0d5M">
+        <reference id="3189788309731981028" name="solution" index="1E0d5P" />
+      </concept>
       <concept id="3189788309731840247" name="jetbrains.mps.build.mps.structure.BuildMps_Solution" flags="ng" index="1E1JtA" />
       <concept id="3189788309731840248" name="jetbrains.mps.build.mps.structure.BuildMps_Language" flags="ng" index="1E1JtD">
+        <child id="3189788309731917348" name="runtime" index="1E1XAP" />
         <child id="9200313594498201639" name="generator" index="1TViLv" />
       </concept>
       <concept id="322010710375871467" name="jetbrains.mps.build.mps.structure.BuildMps_AbstractModule" flags="ng" index="3LEN3z">
@@ -226,6 +231,9 @@
       <node concept="m$_yC" id="30a3800NyCh" role="m$_yJ">
         <ref role="m$_y1" to="ffeo:5lGJ4Taqfsl" resolve="jetbrains.mps.ide.modelchecker" />
       </node>
+      <node concept="m$_yC" id="72L9LYdx1cL" role="m$_yJ">
+        <ref role="m$_y1" to="ffeo:ymnOULATpW" resolve="jetbrains.mps.testing" />
+      </node>
       <node concept="3_J27D" id="3dqUbgQmcyK" role="m_cZH">
         <node concept="3Mxwew" id="3dqUbgQmcyU" role="3MwsjC">
           <property role="3MwjfP" value="org.mpsqa.lint" />
@@ -303,11 +311,6 @@
             <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
           </node>
         </node>
-        <node concept="1SiIV0" id="3ywQ_KXEkXW" role="3bR37C">
-          <node concept="3bR9La" id="3ywQ_KXEkXX" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="3ywQ_KXEkXY" role="3bR37C">
           <node concept="3bR9La" id="3ywQ_KXEkXZ" role="1SiIV1">
             <ref role="3bR37D" to="ffeo:1TaHNgiIbJb" resolve="MPS.Platform" />
@@ -356,6 +359,16 @@
               <ref role="3bR37D" to="ffeo:1TaHNgiIbJb" resolve="MPS.Platform" />
             </node>
           </node>
+          <node concept="1SiIV0" id="2BH05OgeO6E" role="3bR37C">
+            <node concept="3bR9La" id="2BH05OgeO6F" role="1SiIV1">
+              <ref role="3bR37D" to="ffeo:7Kfy9QB6Lc2" resolve="jetbrains.mps.lang.typesystem" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="3mJ3k6P96ir" role="3bR37C">
+            <node concept="3bR9La" id="3mJ3k6P96is" role="1SiIV1">
+              <ref role="3bR37D" node="3mJ3k6P7dwI" resolve="org.mpsqa.lint.generic.runtime" />
+            </node>
+          </node>
         </node>
         <node concept="1SiIV0" id="FwejNQA_4B" role="3bR37C">
           <node concept="3bR9La" id="FwejNQA_4C" role="1SiIV1">
@@ -377,11 +390,6 @@
             <ref role="3bR37D" to="ffeo:7Kfy9QB6Lh7" resolve="jetbrains.mps.typesystemEngine" />
           </node>
         </node>
-        <node concept="1SiIV0" id="4lfwJVEBWf$" role="3bR37C">
-          <node concept="3bR9La" id="4lfwJVEBWf_" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:4SM2EuqHUPF" resolve="jetbrains.mps.lang.modelapi" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="1UFFkMN1f2K" role="3bR37C">
           <node concept="Rbm2T" id="1UFFkMN1f2L" role="1SiIV1">
             <ref role="1E1Vl2" to="ffeo:7Kfy9QB6L9O" resolve="jetbrains.mps.lang.smodel" />
@@ -397,6 +405,29 @@
             <ref role="1Busuk" to="ffeo:3HV74$ebibC" resolve="jetbrains.mps.lang.text" />
           </node>
         </node>
+        <node concept="1SiIV0" id="3mJ3k6P96id" role="3bR37C">
+          <node concept="3bR9La" id="3mJ3k6P96ie" role="1SiIV1">
+            <ref role="3bR37D" node="3mJ3k6P7dwI" resolve="org.mpsqa.lint.generic.runtime" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="18IBE40n0gr" role="3bR37C">
+          <node concept="3bR9La" id="18IBE40n0gs" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6LaO" resolve="jetbrains.mps.lang.structure" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="18IBE40n0gG" role="3bR37C">
+          <node concept="Rbm2T" id="18IBE40n0gH" role="1SiIV1">
+            <ref role="1E1Vl2" to="ffeo:3ZgZ1njKuFL" resolve="jetbrains.mps.lang.smodel.query" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="1BlvkgWy3qU" role="3bR37C">
+          <node concept="3bR9La" id="1BlvkgWy3qV" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
+          </node>
+        </node>
+        <node concept="1E0d5M" id="3mJ3k6P96iq" role="1E1XAP">
+          <ref role="1E0d5P" node="3mJ3k6P7dwI" resolve="org.mpsqa.lint.generic.runtime" />
+        </node>
       </node>
       <node concept="1E1JtD" id="3ghOW5HWiKq" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -468,6 +499,71 @@
           </node>
         </node>
       </node>
+      <node concept="1E1JtA" id="3mJ3k6P7dwI" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="org.mpsqa.lint.generic.runtime" />
+        <property role="3LESm3" value="b15468d9-435b-45b2-bf51-3f984f734cc4" />
+        <node concept="398BVA" id="3mJ3k6P7dwM" role="3LF7KH">
+          <ref role="398BVh" node="3dqUbgQmcyv" resolve="mpsqa.lint.home" />
+          <node concept="2Ry0Ak" id="3mJ3k6P7dwQ" role="iGT6I">
+            <property role="2Ry0Am" value="solutions" />
+            <node concept="2Ry0Ak" id="3mJ3k6P96gQ" role="2Ry0An">
+              <property role="2Ry0Am" value="org.mpsqa.lint.generic.runtime" />
+              <node concept="2Ry0Ak" id="3mJ3k6P96gT" role="2Ry0An">
+                <property role="2Ry0Am" value="org.mpsqa.lint.generic.runtime.msd" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="3mJ3k6P96ht" role="3bR37C">
+          <node concept="3bR9La" id="3mJ3k6P96hu" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6Lc2" resolve="jetbrains.mps.lang.typesystem" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="3mJ3k6P96h_" role="3bR37C">
+          <node concept="3bR9La" id="3mJ3k6P96hA" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1TaHNgiIbJb" resolve="MPS.Platform" />
+          </node>
+        </node>
+        <node concept="1BupzO" id="3mJ3k6P96hO" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="3mJ3k6P96hP" role="1HemKq">
+            <node concept="398BVA" id="3mJ3k6P96hD" role="3LXTmr">
+              <ref role="398BVh" node="3dqUbgQmcyv" resolve="mpsqa.lint.home" />
+              <node concept="2Ry0Ak" id="3mJ3k6P96hE" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="3mJ3k6P96hF" role="2Ry0An">
+                  <property role="2Ry0Am" value="org.mpsqa.lint.generic.runtime" />
+                  <node concept="2Ry0Ak" id="3mJ3k6P96hG" role="2Ry0An">
+                    <property role="2Ry0Am" value="models" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="3mJ3k6P96hQ" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
+        <node concept="3rtmxn" id="1a2SdCkOOB6" role="3bR31x">
+          <node concept="3LXTmp" id="1a2SdCkOOB7" role="3rtmxm">
+            <node concept="3qWCbU" id="1a2SdCkOOB8" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="398BVA" id="1a2SdCkOOB9" role="3LXTmr">
+              <ref role="398BVh" node="3dqUbgQmcyv" resolve="mpsqa.lint.home" />
+              <node concept="2Ry0Ak" id="1a2SdCkOOBa" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="1a2SdCkOOBb" role="2Ry0An">
+                  <property role="2Ry0Am" value="org.mpsqa.lint.generic.runtime" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
       <node concept="1E1JtA" id="3ywQ_KXEkYC" role="2G$12L">
         <property role="TrG5h" value="org.mpsqa.lint.generic.linters_library" />
         <property role="3LESm3" value="a86f8e91-0c59-4691-a7ce-49b7e2c7c3a9" />
@@ -485,6 +581,7 @@
         </node>
         <node concept="1SiIV0" id="3ywQ_KXEkZh" role="3bR37C">
           <node concept="3bR9La" id="3ywQ_KXEkZi" role="1SiIV1">
+            <property role="3bR36h" value="true" />
             <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
           </node>
         </node>
@@ -751,6 +848,11 @@
             <ref role="3bR37D" to="ffeo:3qkjbZn808a" resolve="jetbrains.mps.lang.constraints.rules.runtime" />
           </node>
         </node>
+        <node concept="1SiIV0" id="5ILDA6EXOVE" role="3bR37C">
+          <node concept="3bR9La" id="5ILDA6EXOVF" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:ymnOULAU0H" resolve="jetbrains.mps.lang.test" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="55IIr" id="3dqUbgQmcy$" role="auvoZ" />