cleanup deprecated code; improved linters; updated dependency to mpsqa (

#133) * cleanup deprecated code * req.odd: cleanup * req.odd: cleanup * repo_admin: added new linters gradle.lockfile: updated dependency to mpsqa * safety.tutorial: fixed empty line in ontology definitions * safety: cleanup code to get green linters * build: fixed dependencies * build: temporary commented out the test "test.com.fasten.safety.doc2word" --------- Co-authored-by: ratiud <[email protected]>
mbeddr · Jan 12, 2025 · 3abb817 · 3abb817
1 parent e08ecb8
commit 3abb817
Show file tree

Hide file tree

Showing 30 changed files with 543 additions and 501 deletions.
diff --git a/...min/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.filesystem_level.mps b/...min/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.filesystem_level.mps
@@ -12,6 +12,11 @@
     <import index="mjm5" ref="r:1cfdc492-ba5c-44bc-987a-7d4e55b9c1ad(org.mpsqa.lint.generic.linters_library.nodes)" />
   </imports>
   <registry>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
+        <property id="1068580320021" name="value" index="3cmrfH" />
+      </concept>
+    </language>
     <language id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic">
       <concept id="7741759128795045742" name="org.mpsqa.lint.generic.structure.IScriptsParametersAware" flags="ngI" index="2j1LY6">
         <child id="7741759128795065655" name="parValues" index="2j1YRv" />
@@ -23,12 +28,18 @@
         <child id="7741759128795045752" name="exp" index="2j1LYg" />
         <child id="7741759128795065723" name="paramRef" index="2j1YQj" />
       </concept>
-      <concept id="1024891882119954681" name="org.mpsqa.lint.generic.structure.ISeverityLevelAwareChecker" flags="ngI" index="2oM2l5">
-        <property id="1024891882119955433" name="reportLevel" index="2oM2pl" />
-      </concept>
       <concept id="3786325089106496663" name="org.mpsqa.lint.generic.structure.ReuseCheckableScript" flags="ng" index="2wR3oc">
         <reference id="3786325089106496690" name="script" index="2wR3oD" />
       </concept>
+      <concept id="7223240310078271419" name="org.mpsqa.lint.generic.structure.ILinterResultsContainer" flags="ngI" index="3dgnlL">
+        <property id="7223240310078527797" name="failOnlyOnNewResults" index="3dJkfZ" />
+        <child id="7223240310078271420" name="violations" index="3dgnlQ" />
+      </concept>
+      <concept id="7223240310078271416" name="org.mpsqa.lint.generic.structure.ResultEntry" flags="ng" index="3dgnlM">
+        <property id="7223240310078271417" name="result" index="3dgnlN" />
+        <property id="8230153551040655111" name="resultNodeModelId" index="3qxsSb" />
+        <property id="8230153551040654991" name="resultNodeId" index="3qxsY3" />
+      </concept>
     </language>
     <language id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi">
       <concept id="4733039728785194814" name="jetbrains.mps.lang.modelapi.structure.NamedNodeReference" flags="ng" index="ZC_QK">
@@ -48,7 +59,7 @@
     <ref role="2wR3oD" to="mjm5:ST9rMmXyNm" resolve="empty_root_nodes" />
   </node>
   <node concept="2wR3oc" id="4lfwJVE_q9k">
-    <property role="2oM2pl" value="1c_Dn$lNzd7/WARNING" />
+    <property role="3dJkfZ" value="true" />
     <ref role="2wR3oD" to="54p5:4lfwJVEz_X5" resolve="not_used_linters" />
     <node concept="2j1LYv" id="4lfwJVE_q9l" role="2j1YRv">
       <node concept="2j1LYi" id="4lfwJVE_q9m" role="2j1YQj">
@@ -60,6 +71,68 @@
         </node>
       </node>
     </node>
+    <node concept="3dgnlM" id="59o88jXkrEt" role="3dgnlQ">
+      <property role="3dgnlN" value="The Script is not re-used" />
+      <property role="3qxsY3" value="8129340851655595064" />
+      <property role="3qxsSb" value="r:1cfdc492-ba5c-44bc-987a-7d4e55b9c1ad(org.mpsqa.lint.generic.linters_library.nodes)" />
+    </node>
+  </node>
+  <node concept="2wR3oc" id="33N0Tlwri2j">
+    <ref role="2wR3oD" to="54p5:652KpqR3Kk5" resolve="skipped_evaluation_linters" />
+    <node concept="2j1LYv" id="33N0Tlwrit2" role="2j1YRv">
+      <node concept="2j1LYi" id="33N0Tlwrit3" role="2j1YQj">
+        <ref role="2j1LYj" to="54p5:652KpqR3Kk6" resolve="thisNode" />
+      </node>
+      <node concept="2tJFMh" id="33N0Tlwrn3G" role="2j1LYg">
+        <node concept="ZC_QK" id="33N0TlwrncH" role="2tJFKM">
+          <ref role="2aWVGs" node="33N0Tlwri2j" resolve="skipped_evaluation_linters" />
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="2wR3oc" id="59o88jXknTy">
+    <ref role="2wR3oD" to="mjm5:7x_pNDEe0ZH" resolve="named_root_nodes_with_same_name_in_same_model" />
+  </node>
+  <node concept="2wR3oc" id="59o88jXkokh">
+    <property role="3dJkfZ" value="true" />
+    <ref role="2wR3oD" to="mjm5:30a3800NEqs" resolve="root_node_name_contains_only_ascii_characters" />
+    <node concept="3dgnlM" id="59o88jXkupE" role="3dgnlQ">
+      <property role="3dgnlN" value="The root node contains invalid characters. Allowed characters are: '[a-zA-Z0-9_ .-]+'" />
+      <property role="3qxsY3" value="9296093159908589" />
+      <property role="3qxsSb" value="r:d0c90e07-6fcc-4e69-9139-5c3fe98e4772(com.mbeddr.formal.safety.gsn.doc.migration)" />
+    </node>
+    <node concept="3dgnlM" id="59o88jXkupF" role="3dgnlQ">
+      <property role="3dgnlN" value="The root node contains invalid characters. Allowed characters are: '[a-zA-Z0-9_ .-]+'" />
+      <property role="3qxsY3" value="5649897883596794487" />
+      <property role="3qxsSb" value="r:d7458d19-60ce-4f7a-a838-9ee1ecb1ba89(com.fasten.safety.hiphops.sandbox._010_smoke)" />
+    </node>
+    <node concept="3dgnlM" id="59o88jXkupG" role="3dgnlQ">
+      <property role="3dgnlN" value="The root node contains invalid characters. Allowed characters are: '[a-zA-Z0-9_ .-]+'" />
+      <property role="3qxsY3" value="5649897883596809288" />
+      <property role="3qxsSb" value="r:d7458d19-60ce-4f7a-a838-9ee1ecb1ba89(com.fasten.safety.hiphops.sandbox._010_smoke)" />
+    </node>
+    <node concept="3dgnlM" id="59o88jXkupH" role="3dgnlQ">
+      <property role="3dgnlN" value="The root node contains invalid characters. Allowed characters are: '[a-zA-Z0-9_ .-]+'" />
+      <property role="3qxsY3" value="3731513482755160528" />
+      <property role="3qxsSb" value="r:d7272d49-be4c-48bc-8ddb-711079cdb64b(test.fasten.safety.hiphops._010_arch_models)" />
+    </node>
+  </node>
+  <node concept="2wR3oc" id="59o88jXkoEz">
+    <ref role="2wR3oD" to="mjm5:7e2zrEq$4i5" resolve="nodes_commented_out_but_referenced_from_non_commented_models" />
+  </node>
+  <node concept="2wR3oc" id="59o88jXkp5i">
+    <ref role="2wR3oD" to="mjm5:3bllPAaXzR6" resolve="root_nodes_with_too_many_descendants" />
+    <node concept="2j1LYv" id="59o88jXkqrY" role="2j1YRv">
+      <node concept="2j1LYi" id="59o88jXkqrZ" role="2j1YQj">
+        <ref role="2j1LYj" to="mjm5:3bllPAaX_eB" resolve="maxNumberOfDecendants" />
+      </node>
+      <node concept="3cmrfG" id="59o88jXkqw_" role="2j1LYg">
+        <property role="3cmrfH" value="20000" />
+      </node>
+    </node>
+  </node>
+  <node concept="2wR3oc" id="59o88jXkres">
+    <ref role="2wR3oD" to="mjm5:5FxxG02Td7T" resolve="node_with_smodelattribute_other_than_attribute" />
   </node>
 </model>
 
diff --git a/.../com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.behavior_level.mps b/.../com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.behavior_level.mps
@@ -12,6 +12,11 @@
     <import index="54p5" ref="r:3e5efb66-1a16-46d1-89d2-26142a5dcdaa(org.mpsqa.lint.generic.linters_library.meta)" />
   </imports>
   <registry>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
+        <property id="1070475926801" name="value" index="Xl_RC" />
+      </concept>
+    </language>
     <language id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic">
       <concept id="7741759128795045742" name="org.mpsqa.lint.generic.structure.IScriptsParametersAware" flags="ngI" index="2j1LY6">
         <child id="7741759128795065655" name="parValues" index="2j1YRv" />
@@ -23,12 +28,12 @@
         <child id="7741759128795045752" name="exp" index="2j1LYg" />
         <child id="7741759128795065723" name="paramRef" index="2j1YQj" />
       </concept>
-      <concept id="1024891882119954681" name="org.mpsqa.lint.generic.structure.ISeverityLevelAwareChecker" flags="ngI" index="2oM2l5">
-        <property id="1024891882119955433" name="reportLevel" index="2oM2pl" />
-      </concept>
       <concept id="3786325089106496663" name="org.mpsqa.lint.generic.structure.ReuseCheckableScript" flags="ng" index="2wR3oc">
         <reference id="3786325089106496690" name="script" index="2wR3oD" />
       </concept>
+      <concept id="7223240310078271419" name="org.mpsqa.lint.generic.structure.ILinterResultsContainer" flags="ngI" index="3dgnlL">
+        <property id="7223240310078527797" name="failOnlyOnNewResults" index="3dJkfZ" />
+      </concept>
     </language>
     <language id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi">
       <concept id="4733039728785194814" name="jetbrains.mps.lang.modelapi.structure.NamedNodeReference" flags="ng" index="ZC_QK">
@@ -45,7 +50,7 @@
     <ref role="2wR3oD" to="i8ub:3pz5R1DHoLR" resolve="behavior_methods_with_same_signature" />
   </node>
   <node concept="2wR3oc" id="4lfwJVE_q9k">
-    <property role="2oM2pl" value="1c_Dn$lNzd7/WARNING" />
+    <property role="3dJkfZ" value="true" />
     <ref role="2wR3oD" to="54p5:4lfwJVEz_X5" resolve="not_used_linters" />
     <node concept="2j1LYv" id="4lfwJVE_q9l" role="2j1YRv">
       <node concept="2j1LYi" id="4lfwJVE_q9m" role="2j1YQj">
@@ -58,5 +63,48 @@
       </node>
     </node>
   </node>
+  <node concept="2wR3oc" id="33N0Tlwri2j">
+    <ref role="2wR3oD" to="54p5:652KpqR3Kk5" resolve="skipped_evaluation_linters" />
+    <node concept="2j1LYv" id="33N0Tlwrit2" role="2j1YRv">
+      <node concept="2j1LYi" id="33N0Tlwrit3" role="2j1YQj">
+        <ref role="2j1LYj" to="54p5:652KpqR3Kk6" resolve="thisNode" />
+      </node>
+      <node concept="2tJFMh" id="33N0Tlwrn3G" role="2j1LYg">
+        <node concept="ZC_QK" id="33N0TlwrncH" role="2tJFKM">
+          <ref role="2aWVGs" node="33N0Tlwri2j" resolve="skipped_evaluation_linters" />
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="2wR3oc" id="33N0TlwszwB">
+    <ref role="2wR3oD" to="i8ub:3bllPAaPI3W" resolve="empty_behavior_aspects" />
+  </node>
+  <node concept="2wR3oc" id="59o88jXjprO">
+    <ref role="2wR3oD" to="i8ub:3cj_LrgPwdF" resolve="mandatory_virtual_method_override" />
+    <node concept="2j1LYv" id="59o88jXjrZ5" role="2j1YRv">
+      <node concept="2j1LYi" id="59o88jXjrZ6" role="2j1YQj">
+        <ref role="2j1LYj" to="i8ub:3cj_LrgPwgC" resolve="methodName" />
+      </node>
+      <node concept="Xl_RD" id="59o88jXjrZ7" role="2j1LYg">
+        <property role="Xl_RC" value="renderReadable" />
+      </node>
+    </node>
+    <node concept="2j1LYv" id="59o88jXjrzT" role="2j1YRv">
+      <node concept="2j1LYi" id="59o88jXjrzU" role="2j1YQj">
+        <ref role="2j1LYj" to="i8ub:3cj_LrgPwgE" resolve="parentConceptName" />
+      </node>
+      <node concept="Xl_RD" id="59o88jXjrzV" role="2j1LYg">
+        <property role="Xl_RC" value="Expression" />
+      </node>
+    </node>
+    <node concept="2j1LYv" id="59o88jXjpHG" role="2j1YRv">
+      <node concept="2j1LYi" id="59o88jXjpHH" role="2j1YQj">
+        <ref role="2j1LYj" to="i8ub:3cj_LrgP$aX" resolve="languageName" />
+      </node>
+      <node concept="Xl_RD" id="59o88jXjpVf" role="2j1LYg">
+        <property role="Xl_RC" value="com.mbeddr.formal.base.expressions" />
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/...om.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.expression_level.mps b/...om.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.expression_level.mps
@@ -23,9 +23,6 @@
         <child id="7741759128795045752" name="exp" index="2j1LYg" />
         <child id="7741759128795065723" name="paramRef" index="2j1YQj" />
       </concept>
-      <concept id="1024891882119954681" name="org.mpsqa.lint.generic.structure.ISeverityLevelAwareChecker" flags="ngI" index="2oM2l5">
-        <property id="1024891882119955433" name="reportLevel" index="2oM2pl" />
-      </concept>
       <concept id="3786325089106496663" name="org.mpsqa.lint.generic.structure.ReuseCheckableScript" flags="ng" index="2wR3oc">
         <reference id="3786325089106496690" name="script" index="2wR3oD" />
       </concept>
@@ -45,7 +42,6 @@
     <ref role="2wR3oD" to="ewdl:3pz5R1DPwMT" resolve="cast_to_specific_SNodeType" />
   </node>
   <node concept="2wR3oc" id="4lfwJVE_q9k">
-    <property role="2oM2pl" value="1c_Dn$lNzd7/WARNING" />
     <ref role="2wR3oD" to="54p5:4lfwJVEz_X5" resolve="not_used_linters" />
     <node concept="2j1LYv" id="4lfwJVE_q9l" role="2j1YRv">
       <node concept="2j1LYi" id="4lfwJVE_q9m" role="2j1YQj">
@@ -58,5 +54,18 @@
       </node>
     </node>
   </node>
+  <node concept="2wR3oc" id="33N0Tlwri2j">
+    <ref role="2wR3oD" to="54p5:652KpqR3Kk5" resolve="skipped_evaluation_linters" />
+    <node concept="2j1LYv" id="33N0Tlwrit2" role="2j1YRv">
+      <node concept="2j1LYi" id="33N0Tlwrit3" role="2j1YQj">
+        <ref role="2j1LYj" to="54p5:652KpqR3Kk6" resolve="thisNode" />
+      </node>
+      <node concept="2tJFMh" id="33N0Tlwrn3G" role="2j1LYg">
+        <node concept="ZC_QK" id="33N0TlwrncH" role="2tJFKM">
+          <ref role="2aWVGs" node="33N0Tlwri2j" resolve="skipped_evaluation_linters" />
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/...com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.generator_level.mps b/...com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.generator_level.mps
@@ -23,12 +23,18 @@
         <child id="7741759128795045752" name="exp" index="2j1LYg" />
         <child id="7741759128795065723" name="paramRef" index="2j1YQj" />
       </concept>
-      <concept id="1024891882119954681" name="org.mpsqa.lint.generic.structure.ISeverityLevelAwareChecker" flags="ngI" index="2oM2l5">
-        <property id="1024891882119955433" name="reportLevel" index="2oM2pl" />
-      </concept>
       <concept id="3786325089106496663" name="org.mpsqa.lint.generic.structure.ReuseCheckableScript" flags="ng" index="2wR3oc">
         <reference id="3786325089106496690" name="script" index="2wR3oD" />
       </concept>
+      <concept id="7223240310078271419" name="org.mpsqa.lint.generic.structure.ILinterResultsContainer" flags="ngI" index="3dgnlL">
+        <property id="7223240310078527797" name="failOnlyOnNewResults" index="3dJkfZ" />
+        <child id="7223240310078271420" name="violations" index="3dgnlQ" />
+      </concept>
+      <concept id="7223240310078271416" name="org.mpsqa.lint.generic.structure.ResultEntry" flags="ng" index="3dgnlM">
+        <property id="7223240310078271417" name="result" index="3dgnlN" />
+        <property id="8230153551040655111" name="resultNodeModelId" index="3qxsSb" />
+        <property id="8230153551040654991" name="resultNodeId" index="3qxsY3" />
+      </concept>
     </language>
     <language id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi">
       <concept id="4733039728785194814" name="jetbrains.mps.lang.modelapi.structure.NamedNodeReference" flags="ng" index="ZC_QK">
@@ -45,7 +51,7 @@
     <ref role="2wR3oD" to="vi29:4aEqBbbsVSI" resolve="empty_generators" />
   </node>
   <node concept="2wR3oc" id="4lfwJVE_q9k">
-    <property role="2oM2pl" value="1c_Dn$lNzd7/WARNING" />
+    <property role="3dJkfZ" value="true" />
     <ref role="2wR3oD" to="54p5:4lfwJVEz_X5" resolve="not_used_linters" />
     <node concept="2j1LYv" id="4lfwJVE_q9l" role="2j1YRv">
       <node concept="2j1LYi" id="4lfwJVE_q9m" role="2j1YQj">
@@ -57,6 +63,24 @@
         </node>
       </node>
     </node>
+    <node concept="3dgnlM" id="59o88jXkHO6" role="3dgnlQ">
+      <property role="3dgnlN" value="The Script is not re-used" />
+      <property role="3qxsY3" value="1024891882118332503" />
+      <property role="3qxsSb" value="r:bad17717-3824-425b-aeb4-5578f6caf605(org.mpsqa.lint.mps_lang.linters_library.generator_aspect)" />
+    </node>
+  </node>
+  <node concept="2wR3oc" id="33N0Tlwri2j">
+    <ref role="2wR3oD" to="54p5:652KpqR3Kk5" resolve="skipped_evaluation_linters" />
+    <node concept="2j1LYv" id="33N0Tlwrit2" role="2j1YRv">
+      <node concept="2j1LYi" id="33N0Tlwrit3" role="2j1YQj">
+        <ref role="2j1LYj" to="54p5:652KpqR3Kk6" resolve="thisNode" />
+      </node>
+      <node concept="2tJFMh" id="33N0Tlwrn3G" role="2j1LYg">
+        <node concept="ZC_QK" id="33N0TlwrncH" role="2tJFKM">
+          <ref role="2aWVGs" node="33N0Tlwri2j" resolve="skipped_evaluation_linters" />
+        </node>
+      </node>
+    </node>
   </node>
 </model>