mpsqa.lint: integrate checks into the logical view

mbeddr · Sep 11, 2024 · 0feb1ad · 0feb1ad
1 parent 0737cc1
commit 0feb1ad
Show file tree

Hide file tree

Showing 26 changed files with 5,128 additions and 522 deletions.
diff --git a/build.gradle b/build.gradle
@@ -92,6 +92,7 @@ dependencies {
     mps "com.jetbrains:mps:$mpsVersion"
     antLib "org.apache.ant:ant-junit:1.10.6"
     antLib "org.jacoco:org.jacoco.ant:0.8.12"
+    languageLibs "com.mbeddr:logicalview.checks:2022.3+"
 }
 
 repositories {
@@ -127,6 +128,13 @@ if (project.skipResolveMps) {
     }
 }
 
+task resolveLanguageLibs(type: Sync) {
+    from {
+        configurations.languageLibs.resolve().collect { zipTree(it) }
+    }
+    into "$buildDir/dependencies"
+}
+
 // tools needed for compiler support in ant calls
 ext.buildScriptClasspath = project.configurations.antLib.fileCollection { true } +
         project.files("$project.jdk_home/lib/tools.jar")
@@ -160,7 +168,7 @@ task configureJava {
 
 // All MPS tasks depend on configureJava and resolveMps
 tasks.withType(RunAntScript).configureEach {
-    dependsOn(configureJava, resolveMps)
+    dependsOn(configureJava, resolveMps, resolveLanguageLibs)
 }
 
 File scriptFile(String name) {

diff --git a/build/scripts/build_all_scripts.xml b/build/scripts/build_all_scripts.xml
diff --git a/code/languages/org.mpsqa.build/.mps/libraries.xml b/code/languages/org.mpsqa.build/.mps/libraries.xml
@@ -19,6 +19,22 @@
             </Library>
           </value>
         </entry>
+        <entry key="com.mbeddr.logicalview.checks">
+          <value>
+            <Library>
+              <option name="name" value="com.mbeddr.logicalview.checks" />
+              <option name='path' value='$PROJECT_DIR$/../../../build/dependencies/com.mbeddr.logicalview.checks' />            
+   			    </Library>
+          </value>
+        </entry>
+        <entry key="com.mbeddr.logicalview.checks.all">
+          <value>
+            <Library>
+              <option name="name" value="com.mbeddr.logicalview.checks.all" />
+              <option name='path' value='$PROJECT_DIR$/../../../build/dependencies/com.mbeddr.logicalview.checks.all' />            
+   			    </Library>
+          </value>
+        </entry>
       </map>
     </option>
   </component>

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
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
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <solution name="org.mpsqa.build.allScripts" uuid="b90ee918-6cd5-44ed-9ed3-6696d29afea4" moduleVersion="0" compileInMPS="true">
   <models>
-    <modelRoot contentPath="${module}" type="default">
+    <modelRoot type="default" contentPath="${module}">
       <sourceRoot location="models" />
     </modelRoot>
   </models>
@@ -13,16 +13,16 @@
   <sourcePath />
   <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>
+    <dependency reexport="false">2f1b9ad0-e494-4dc6-bc3c-c0a94a6f39ec(com.mbeddr.logicalview.checks.build)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" version="0" />
     <language slang="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" version="7" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
   </languageVersions>
   <dependencyVersions>
+    <module reference="2f1b9ad0-e494-4dc6-bc3c-c0a94a6f39ec(com.mbeddr.logicalview.checks.build)" version="0" />
     <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/...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
@@ -8,6 +8,7 @@
   <imports>
     <import index="2tou" ref="r:18bebd8f-6332-4ffd-b628-cc9dad4ef421(org.mpsqa.base.build)" />
     <import index="ffeo" ref="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)" />
+    <import index="btyb" ref="r:f164422f-f930-4439-ba9a-ecdd8fa81ba8(com.mbeddr.logicalview.checks.build)" />
   </imports>
   <registry>
     <language id="798100da-4f0a-421a-b991-71f8c50ce5d2" name="jetbrains.mps.build">
@@ -208,6 +209,21 @@
         <ref role="398BVh" node="3dqUbgQmcyu" resolve="mps.home" />
       </node>
     </node>
+    <node concept="2sgV4H" id="6g1zsXb1dZH" role="1l3spa">
+      <ref role="1l3spb" to="btyb:2OOCWIyjp5F" resolve="com.mbeddr.logicalview.checks" />
+      <node concept="398BVA" id="6g1zsXb1fuk" role="2JcizS">
+        <ref role="398BVh" node="3dqUbgQmcyt" resolve="mpsqa.home" />
+        <node concept="2Ry0Ak" id="6g1zsXb1ful" role="iGT6I">
+          <property role="2Ry0Am" value="build" />
+          <node concept="2Ry0Ak" id="6g1zsXb1fum" role="2Ry0An">
+            <property role="2Ry0Am" value="dependencies" />
+            <node concept="2Ry0Ak" id="1o7kAwnmbcg" role="2Ry0An">
+              <property role="2Ry0Am" value="com.mbeddr.logicalview.checks" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="1l3spV" id="3dqUbgQmcyx" role="1l3spN">
       <node concept="m$_wl" id="3dqUbgQmcyE" role="39821P">
         <ref role="m_rDy" node="3dqUbgQmcyy" resolve="org.mpsqa.lint" />
@@ -245,6 +261,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="5L4RWVyF2tA" role="m$_yJ">
+        <ref role="m$_y1" to="btyb:2OOCWIyjp63" resolve="com.mbeddr.logicalview.checks" />
+      </node>
       <node concept="3_J27D" id="3dqUbgQmcyK" role="m_cZH">
         <node concept="3Mxwew" id="3dqUbgQmcyU" role="3MwsjC">
           <property role="3MwjfP" value="org.mpsqa.lint" />
@@ -375,9 +394,20 @@
               <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 concept="1SiIV0" id="5KthR_XS94G" role="3bR37C">
+            <node concept="3bR9La" id="5KthR_XS94H" role="1SiIV1">
+              <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="5KthR_XS94I" role="3bR37C">
+            <node concept="3bR9La" id="5KthR_XS94J" role="1SiIV1">
+              <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="6g1zsXb1fuA" role="3bR37C">
+            <node concept="3bR9La" id="6g1zsXb1fuB" role="1SiIV1">
+              <property role="3bR36h" value="true" />
+              <ref role="3bR37D" to="btyb:2OOCWIyjp61" resolve="com.mbeddr.logicalview.checks.runtime" />
             </node>
           </node>
         </node>
@@ -439,6 +469,33 @@
             <ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
           </node>
         </node>
+        <node concept="1SiIV0" id="5KthR_XS94p" role="3bR37C">
+          <node concept="3bR9La" id="5KthR_XS94q" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:44LXwdzyvTi" resolve="Annotations" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="5KthR_XS94r" role="3bR37C">
+          <node concept="3bR9La" id="5KthR_XS94s" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6LfQ" resolve="jetbrains.mps.kernel" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="5KthR_XS94t" role="3bR37C">
+          <node concept="3bR9La" id="5KthR_XS94u" role="1SiIV1">
+            <property role="3bR36h" value="true" />
+            <ref role="3bR37D" to="ffeo:rD7wKO6k$" resolve="MPS.Generator" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="5KthR_XS94E" role="3bR37C">
+          <node concept="Rbm2T" id="5KthR_XS94F" role="1SiIV1">
+            <ref role="1E1Vl2" to="ffeo:7Kfy9QB6L2l" resolve="jetbrains.mps.baseLanguage.logging" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="6g1zsXb1fup" role="3bR37C">
+          <node concept="3bR9La" id="6g1zsXb1fuq" role="1SiIV1">
+            <property role="3bR36h" value="true" />
+            <ref role="3bR37D" to="btyb:2OOCWIyjp61" resolve="com.mbeddr.logicalview.checks.runtime" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="3ghOW5HWiKq" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -574,6 +631,22 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="5KthR_XS958" role="3bR37C">
+          <node concept="3bR9La" id="5KthR_XS959" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:44LXwdzyvTi" resolve="Annotations" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="5KthR_XS95a" role="3bR37C">
+          <node concept="3bR9La" id="5KthR_XS95b" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6LfQ" resolve="jetbrains.mps.kernel" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="fwHrUeX5ee" role="3bR37C">
+          <node concept="3bR9La" id="fwHrUeX5ef" role="1SiIV1">
+            <property role="3bR36h" value="true" />
+            <ref role="3bR37D" to="btyb:2OOCWIyjp61" resolve="com.mbeddr.logicalview.checks.runtime" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="3ywQ_KXEkYC" role="2G$12L">
         <property role="TrG5h" value="org.mpsqa.lint.generic.linters_library" />

diff --git a/.../org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._100_allInOne_build.mps b/.../org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._100_allInOne_build.mps
@@ -16,6 +16,7 @@
     <import index="91f2" ref="r:4924ad27-94e5-4602-a74a-ba87607fcdcc(org.mpsqa.build._070_deprecated_build)" />
     <import index="390y" ref="r:7cf4c5c6-be6b-461a-9752-5a87d0b55129(org.mpsqa.build._080_lint_build)" />
     <import index="htun" ref="r:d5c51f7e-ae84-4374-a97c-990f1646bb5a(org.mpsqa.build._090_profile_build)" />
+    <import index="btyb" ref="r:f164422f-f930-4439-ba9a-ecdd8fa81ba8(com.mbeddr.logicalview.checks.build)" />
   </imports>
   <registry>
     <language id="798100da-4f0a-421a-b991-71f8c50ce5d2" name="jetbrains.mps.build">
@@ -156,6 +157,9 @@
       <node concept="m$_yC" id="3ALipV_2n6_" role="m$_yJ">
         <ref role="m$_y1" to="hx16:2XCAdv5uaeq" resolve="org.mpsqa.testing.build" />
       </node>
+      <node concept="m$_yC" id="1D$BtZ1Lq05" role="m$_yJ">
+        <ref role="m$_y1" to="btyb:73Pj8z_m9Xe" resolve="com.mbeddr.logicalview.checks.build" />
+      </node>
       <node concept="m$_yB" id="fm3v0X36N2" role="m$_yh">
         <ref role="m$_yA" node="5Xjjs0Nf2r4" resolve="org.mpsqa.build" />
       </node>
@@ -211,6 +215,21 @@
     <node concept="2sgV4H" id="6ueixcLDxdq" role="1l3spa">
       <ref role="1l3spb" to="htun:6Z3QA_yyZMM" resolve="org.mpsqa.profile" />
     </node>
+    <node concept="2sgV4H" id="6g1zsXb1fxg" role="1l3spa">
+      <ref role="1l3spb" to="btyb:2OOCWIyjp5F" resolve="com.mbeddr.logicalview.checks" />
+      <node concept="398BVA" id="6g1zsXb1fxs" role="2JcizS">
+        <ref role="398BVh" node="3PN66LDqBU_" resolve="mpsqa.home" />
+        <node concept="2Ry0Ak" id="6g1zsXb1fxv" role="iGT6I">
+          <property role="2Ry0Am" value="build" />
+          <node concept="2Ry0Ak" id="6g1zsXb1fxy" role="2Ry0An">
+            <property role="2Ry0Am" value="dependencies" />
+            <node concept="2Ry0Ak" id="1D$BtZ1Lq06" role="2Ry0An">
+              <property role="2Ry0Am" value="com.mbeddr.logicalview.checks" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="10PD9b" id="3PN66LDqBUz" role="10PD9s" />
     <node concept="3b7kt6" id="3PN66LDqBU$" role="10PD9s" />
     <node concept="398rNT" id="3PN66LDqBU_" role="1l3spd">
@@ -377,6 +396,11 @@
           <ref role="3bR37D" to="hx16:2XCAdv5uaH8" resolve="org.mpsqa.testing.build" />
         </node>
       </node>
+      <node concept="1SiIV0" id="1o7kAwnmbaF" role="3bR37C">
+        <node concept="3bR9La" id="1o7kAwnmbaG" role="1SiIV1">
+          <ref role="3bR37D" to="btyb:73Pj8z_m9Xt" resolve="com.mbeddr.logicalview.checks.build" />
+        </node>
+      </node>
     </node>
   </node>
 </model>

diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/org.mpsqa.build.msd b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/org.mpsqa.build.msd
@@ -15,13 +15,15 @@
     <dependency reexport="false">422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)</dependency>
     <dependency reexport="false">5e8cea6b-997f-49b1-a8d8-dc2a7a6fa657(org.mpsqa.base.build)</dependency>
     <dependency reexport="false">3bf16f17-7850-4b1d-804b-c60206298996(org.mpsqa.testing.build)</dependency>
+    <dependency reexport="false">2f1b9ad0-e494-4dc6-bc3c-c0a94a6f39ec(com.mbeddr.logicalview.checks.build)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" version="0" />
     <language slang="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" version="7" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
   </languageVersions>
   <dependencyVersions>
+    <module reference="2f1b9ad0-e494-4dc6-bc3c-c0a94a6f39ec(com.mbeddr.logicalview.checks.build)" version="0" />
     <module reference="422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)" version="0" />
     <module reference="5e8cea6b-997f-49b1-a8d8-dc2a7a6fa657(org.mpsqa.base.build)" version="0" />
     <module reference="11d4368a-a7e8-4dd9-bfc6-c2de268d1994(org.mpsqa.build)" version="0" />

diff --git a/code/languages/org.mpsqa.clones/.mps/libraries.xml b/code/languages/org.mpsqa.clones/.mps/libraries.xml
@@ -11,6 +11,14 @@
             </Library>
           </value>
         </entry>
+        <entry key="com.mbeddr.logicalview.checks">
+          <value>
+            <Library>
+              <option name="name" value="com.mbeddr.logicalview.checks" />
+              <option name='path' value='$PROJECT_DIR$/../../../build/dependencies/com.mbeddr.logicalview.checks' />            
+   			    </Library>
+          </value>
+        </entry>
       </map>
     </option>
   </component>

diff --git a/code/languages/org.mpsqa.lint/.mps/libraries.xml b/code/languages/org.mpsqa.lint/.mps/libraries.xml
@@ -3,6 +3,14 @@
   <component name="ProjectLibraryManager">
     <option name="libraries">
       <map>
+        <entry key="mps-qa.base">
+          <value>
+            <Library>
+              <option name="name" value="mps-qa.base" />
+              <option name="path" value="${mpsqa.home}/code/languages/org.mpsqa.base" />
+            </Library>
+          </value>
+        </entry>
         <entry key="mps-qa.build">
           <value>
             <Library>
@@ -11,6 +19,14 @@
             </Library>
           </value>
         </entry>
+        <entry key="com.mbeddr.logicalview.checks">
+          <value>
+            <Library>
+              <option name="name" value="com.mbeddr.logicalview.checks" />
+              <option name='path' value='$PROJECT_DIR$/../../../build/dependencies/com.mbeddr.logicalview.checks' />            
+   			    </Library>
+          </value>
+        </entry>
       </map>
     </option>
   </component>