Merge pull request #2402 from mbeddr/refactor/fixes-for-secure

Integrate changes needed for SECURE
mbeddr · Apr 22, 2024 · b284ea5 · b284ea5
2 parents 741d736 + 63ea714
commit b284ea5
Show file tree

Hide file tree

Showing 24 changed files with 1,018 additions and 339 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,12 +7,27 @@ Semantic Versioning and the changes are simply documented in reverse chronologic
 
 # April 2024
 
+## com.mbeddr.core
+
+### Added
+
+- Base: Added possibility to explicitly not display roots of concept `IMbeddrIDERoot` in mbeddr menus.
+
 ## com.mbeddr.doc.aspect.ui
 
 ### Fixed
 
 - The documentation Tool is now only updated when the selection changed.
 
+## com.mbeddr.mpsutil
+
+### Fixed
+
+- EditingGuide: `ProgramFragments` support error suppression, i.e. all model-checking errors are suppressed in `ProgramFragments`, so modelchecker will disregard them and not clutter.
+- EditingGuide: Fragment module depends on its original module, to access data that is needed, but in the original module and not copied to the temporary exercise model.
+- Hyperlink: `HyperlinkUtil.openInBrowser()` behaves like no-op instead of raising an exception on null or empty URLs.
+- Asynccell: Stops polling for the calculated value in case the poll-request throws an exception and shows to the user, that the calculation has failed together with the thrown exception, instead of spamming the log on each poll with the exception.
+
 # March 2024
 
 ## com.mbeddr.mpsutils

diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps
@@ -63,9 +63,9 @@
     <import index="eoo2" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.nio.file(JDK/)" />
     <import index="btm1" ref="b0f8641f-bd77-4421-8425-30d9088a82f7/java:org.apache.commons.lang3(org.apache.commons/)" />
     <import index="ni5j" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.regex(JDK/)" />
-    <import index="qkt" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.actionSystem(MPS.IDEA/)" />
-    <import index="ddhc" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ide(MPS.IDEA/)" />
     <import index="b9kz" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.wm.ex(MPS.IDEA/)" />
+    <import index="ddhc" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ide(MPS.IDEA/)" />
+    <import index="qkt" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.actionSystem(MPS.IDEA/)" />
     <import index="qq03" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.actions(MPS.Platform/)" />
     <import index="6xgk" ref="r:6e9ad488-5df2-49e4-8c01-8a7f3812adf7(jetbrains.mps.lang.scopes.runtime)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" implicit="true" />
@@ -4359,6 +4359,29 @@
   </node>
   <node concept="13h7C7" id="IviauXaxW">
     <ref role="13h7C2" to="vs0r:IviauXabd" resolve="IMbeddrIDERoot" />
+    <node concept="13i0hz" id="2daXVy6Qz1j" role="13h7CS">
+      <property role="13i0it" value="true" />
+      <property role="TrG5h" value="isDisplayed" />
+      <node concept="3Tm1VV" id="7jN4X3UX2AX" role="1B3o_S" />
+      <node concept="10P_77" id="7jN4X3UX3Yi" role="3clF45" />
+      <node concept="3clFbS" id="7jN4X3UX2AZ" role="3clF47">
+        <node concept="3clFbF" id="7jN4X3UX40a" role="3cqZAp">
+          <node concept="3clFbT" id="7jN4X3UX409" role="3clFbG">
+            <property role="3clFbU" value="true" />
+          </node>
+        </node>
+      </node>
+      <node concept="P$JXv" id="7jN4X3UX40r" role="lGtFl">
+        <node concept="TZ5HA" id="7jN4X3UX40s" role="TZ5H$">
+          <node concept="1dT_AC" id="7jN4X3UX40t" role="1dT_Ay">
+            <property role="1dT_AB" value="" />
+          </node>
+        </node>
+        <node concept="x79VA" id="7jN4X3UX40u" role="3nqlJM">
+          <property role="x79VB" value="Whether such node can be created from the mbeddr context menu" />
+        </node>
+      </node>
+    </node>
     <node concept="13i0hz" id="IviauXb0g" role="13h7CS">
       <property role="13i0iv" value="true" />
       <property role="13i0it" value="true" />

diff --git a/....core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps b/....core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
@@ -8083,6 +8083,21 @@
                               </node>
                             </node>
                           </node>
+                          <node concept="3clFbJ" id="7jN4X3UX8Up" role="3cqZAp">
+                            <node concept="3clFbS" id="7jN4X3UX8Ur" role="3clFbx">
+                              <node concept="3N13vt" id="2yoIUpb$_Ne" role="3cqZAp" />
+                            </node>
+                            <node concept="3fqX7Q" id="CZOBkuwhkX" role="3clFbw">
+                              <node concept="2OqwBi" id="CZOBkuwhkZ" role="3fr31v">
+                                <node concept="37vLTw" id="CZOBkuwhl0" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="4augEjZSVuv" resolve="createNode" />
+                                </node>
+                                <node concept="2qgKlT" id="CZOBkuwhl1" role="2OqNvi">
+                                  <ref role="37wK5l" to="hwgx:2daXVy6Qz1j" resolve="isDisplayed" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
                           <node concept="3cpWs8" id="4augEjZSVuF" role="3cqZAp">
                             <node concept="3cpWsn" id="4augEjZSVuG" role="3cpWs9">
                               <property role="TrG5h" value="category" />
@@ -23307,7 +23322,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="6ZwHRE4RkEE" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="7Ti21AGhhKC" role="jymVt" />

diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/editor.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/editor.mps
@@ -462,14 +462,14 @@
         <child id="6856661361479798957" name="actions" index="130p63" />
         <child id="6856661361479732085" name="cell" index="130CDr" />
       </concept>
-      <concept id="4874944647490522665" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell2_IsApplicable" flags="ig" index="1eYwpX" />
-      <concept id="4874944647490524676" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell2_Execute" flags="ig" index="1eYxTg" />
-      <concept id="4874944647490471126" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell2" flags="ng" index="1eYWM2">
+      <concept id="4874944647490522665" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell_IsApplicable" flags="ig" index="1eYwpX" />
+      <concept id="4874944647490524676" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell_Execute" flags="ig" index="1eYxTg" />
+      <concept id="4874944647490471126" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell" flags="ng" index="1eYWM2">
         <child id="4874944647490523335" name="matchingText" index="1eYxyj" />
         <child id="4874944647490523330" name="isApplicable" index="1eYxym" />
         <child id="4874944647490524677" name="execute" index="1eYxTh" />
       </concept>
-      <concept id="4874944647490471525" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell2_MatchingText" flags="ig" index="1eYWSL" />
+      <concept id="4874944647490471525" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell_MatchingText" flags="ig" index="1eYWSL" />
       <concept id="7363578995839203705" name="com.mbeddr.mpsutil.grammarcells.structure.FlagCell" flags="sg" stub="1984422498400729024" index="1kHk_G">
         <property id="7617962380315063287" name="flagText" index="ZjSer" />
         <property id="8224407690718723337" name="doNotGenerateNodeSubstituteAction" index="ZpkCL" />

diff --git a/.../languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/editor.mps b/.../languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/editor.mps
@@ -389,14 +389,14 @@
         <child id="8207263695490893799" name="symbols" index="2ElW$Z" />
       </concept>
       <concept id="8945098465480383073" name="com.mbeddr.mpsutil.grammarcells.structure.OptionalCell_TransformationText" flags="ig" index="ZYGn8" />
-      <concept id="4874944647490522665" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell2_IsApplicable" flags="ig" index="1eYwpX" />
-      <concept id="4874944647490524676" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell2_Execute" flags="ig" index="1eYxTg" />
-      <concept id="4874944647490471126" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell2" flags="ng" index="1eYWM2">
+      <concept id="4874944647490522665" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell_IsApplicable" flags="ig" index="1eYwpX" />
+      <concept id="4874944647490524676" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell_Execute" flags="ig" index="1eYxTg" />
+      <concept id="4874944647490471126" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell" flags="ng" index="1eYWM2">
         <child id="4874944647490523335" name="matchingText" index="1eYxyj" />
         <child id="4874944647490523330" name="isApplicable" index="1eYxym" />
         <child id="4874944647490524677" name="execute" index="1eYxTh" />
       </concept>
-      <concept id="4874944647490471525" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell2_MatchingText" flags="ig" index="1eYWSL" />
+      <concept id="4874944647490471525" name="com.mbeddr.mpsutil.grammarcells.structure.SideTransformationCell_MatchingText" flags="ig" index="1eYWSL" />
       <concept id="484443907672824414" name="com.mbeddr.mpsutil.grammarcells.structure.FlagCell_SubstituteCondition" flags="ig" index="3gMsPO" />
       <concept id="7363578995839203705" name="com.mbeddr.mpsutil.grammarcells.structure.FlagCell" flags="sg" stub="1984422498400729024" index="1kHk_G">
         <property id="7617962380315063287" name="flagText" index="ZjSer" />

diff --git a/...com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.actionsfilter/languageModels/behavior.mps b/...com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.actionsfilter/languageModels/behavior.mps
@@ -8,9 +8,9 @@
   <imports>
     <import index="ykkq" ref="r:7171fd48-62d6-4c67-ab22-d7d6b8fa4653(com.mbeddr.mpsutil.actionsfilter.runtime)" />
     <import index="au0v" ref="r:ae24f9b4-2210-4864-8fbf-79fb5fb02754(com.mbeddr.mpsutil.actionsfilter.structure)" />
+    <import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
     <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
-    <import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
@@ -79,6 +79,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
+      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT" />
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
@@ -490,6 +491,29 @@
       <node concept="3clFbS" id="5ReuVUpd_x1" role="2VODD2" />
     </node>
   </node>
+  <node concept="13h7C7" id="2jUI4_LR4Qq">
+    <ref role="13h7C2" to="au0v:2jUI4_LQRKG" resolve="ConceptFunction_ApplicationInfo" />
+    <node concept="13hLZK" id="2jUI4_LR4Qr" role="13h7CW">
+      <node concept="3clFbS" id="2jUI4_LR4Qs" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="2jUI4_LR4Q_" role="13h7CS">
+      <property role="TrG5h" value="getType" />
+      <ref role="13i0hy" to="tpek:27DJnJtIQ9C" resolve="getType" />
+      <node concept="3Tm1VV" id="2jUI4_LR4QA" role="1B3o_S" />
+      <node concept="3clFbS" id="2jUI4_LR4QF" role="3clF47">
+        <node concept="3clFbF" id="2jUI4_LR4Zw" role="3cqZAp">
+          <node concept="2c44tf" id="2jUI4_LR5b4" role="3clFbG">
+            <node concept="3uibUv" id="2jUI4_LR5d3" role="2c44tc">
+              <ref role="3uigEE" to="bd8o:~ApplicationInfo" resolve="ApplicationInfo" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tqbb2" id="2jUI4_LR4QG" role="3clF45">
+        <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
+      </node>
+    </node>
+  </node>
   <node concept="13h7C7" id="2jUI4_LQMcJ">
     <ref role="13h7C2" to="au0v:2jUI4_LQLA2" resolve="ActivationCondition" />
     <node concept="13hLZK" id="2jUI4_LQMcK" role="13h7CW">
@@ -555,27 +579,69 @@
       <node concept="3Tqbb2" id="2jUI4_LQMd1" role="3clF45" />
     </node>
   </node>
-  <node concept="13h7C7" id="2jUI4_LR4Qq">
-    <ref role="13h7C2" to="au0v:2jUI4_LQRKG" resolve="ConceptFunction_ApplicationInfo" />
-    <node concept="13hLZK" id="2jUI4_LR4Qr" role="13h7CW">
-      <node concept="3clFbS" id="2jUI4_LR4Qs" role="2VODD2" />
+  <node concept="13h7C7" id="5wANKxaV9gi">
+    <property role="3GE5qa" value="toolBar" />
+    <ref role="13h7C2" to="au0v:6nrtUqYelxV" resolve="ToolBarAction" />
+    <node concept="13hLZK" id="5wANKxaV9gj" role="13h7CW">
+      <node concept="3clFbS" id="5wANKxaV9gk" role="2VODD2" />
     </node>
-    <node concept="13i0hz" id="2jUI4_LR4Q_" role="13h7CS">
-      <property role="TrG5h" value="getType" />
-      <ref role="13i0hy" to="tpek:27DJnJtIQ9C" resolve="getType" />
-      <node concept="3Tm1VV" id="2jUI4_LR4QA" role="1B3o_S" />
-      <node concept="3clFbS" id="2jUI4_LR4QF" role="3clF47">
-        <node concept="3clFbF" id="2jUI4_LR4Zw" role="3cqZAp">
-          <node concept="2c44tf" id="2jUI4_LR5b4" role="3clFbG">
-            <node concept="3uibUv" id="2jUI4_LR5d3" role="2c44tc">
-              <ref role="3uigEE" to="bd8o:~ApplicationInfo" resolve="ApplicationInfo" />
+    <node concept="13i0hz" id="5wANKxaV9gt" role="13h7CS">
+      <property role="TrG5h" value="refersToActionId" />
+      <ref role="13i0hy" node="5ReuVUpdzR3" resolve="refersToActionId" />
+      <node concept="3Tm1VV" id="5wANKxaV9gu" role="1B3o_S" />
+      <node concept="3clFbS" id="5wANKxaV9gz" role="3clF47">
+        <node concept="3cpWs6" id="5wANKxaV9D4" role="3cqZAp">
+          <node concept="1Wc70l" id="5wANKxaV9D5" role="3cqZAk">
+            <node concept="3y3z36" id="5wANKxaV9D6" role="3uHU7B">
+              <node concept="10Nm6u" id="5wANKxaV9D7" role="3uHU7w" />
+              <node concept="37vLTw" id="5wANKxaV9D8" role="3uHU7B">
+                <ref role="3cqZAo" node="5wANKxaV9g$" resolve="id" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="5wANKxaV9D9" role="3uHU7w">
+              <node concept="37vLTw" id="5wANKxaV9Da" role="2Oq$k0">
+                <ref role="3cqZAo" node="5wANKxaV9g$" resolve="id" />
+              </node>
+              <node concept="liA8E" id="5wANKxaV9Db" role="2OqNvi">
+                <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
+                <node concept="2OqwBi" id="5wANKxaV9Dc" role="37wK5m">
+                  <node concept="13iPFW" id="5wANKxaV9Dd" role="2Oq$k0" />
+                  <node concept="3TrcHB" id="5wANKxaV9De" role="2OqNvi">
+                    <ref role="3TsBF5" to="au0v:6nrtUqYfdz4" resolve="actionID" />
+                  </node>
+                </node>
+              </node>
             </node>
           </node>
         </node>
       </node>
-      <node concept="3Tqbb2" id="2jUI4_LR4QG" role="3clF45">
-        <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
+      <node concept="37vLTG" id="5wANKxaV9g$" role="3clF46">
+        <property role="TrG5h" value="id" />
+        <node concept="17QB3L" id="5wANKxaV9g_" role="1tU5fm" />
+      </node>
+      <node concept="10P_77" id="5wANKxaV9gA" role="3clF45" />
+    </node>
+  </node>
+  <node concept="13h7C7" id="5wANKxaV9kB">
+    <property role="3GE5qa" value="toolBar" />
+    <ref role="13h7C2" to="au0v:6nrtUqYelxW" resolve="ToolBarSeparator" />
+    <node concept="13hLZK" id="5wANKxaV9kC" role="13h7CW">
+      <node concept="3clFbS" id="5wANKxaV9kD" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="5wANKxaV9kM" role="13h7CS">
+      <property role="TrG5h" value="refersToActionId" />
+      <ref role="13i0hy" node="5ReuVUpdzR3" resolve="refersToActionId" />
+      <node concept="3Tm1VV" id="5wANKxaV9kN" role="1B3o_S" />
+      <node concept="3clFbS" id="5wANKxaV9kS" role="3clF47">
+        <node concept="3clFbF" id="5wANKxaV9kX" role="3cqZAp">
+          <node concept="3clFbT" id="5wANKxaV9kW" role="3clFbG" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="5wANKxaV9kT" role="3clF46">
+        <property role="TrG5h" value="id" />
+        <node concept="17QB3L" id="5wANKxaV9kU" role="1tU5fm" />
       </node>
+      <node concept="10P_77" id="5wANKxaV9kV" role="3clF45" />
     </node>
   </node>
 </model>