Merge pull request #706 from JetBrains/bugfix/intention_ready_only_ce…

…ll_attribute_20213
JetBrains · Dec 5, 2023 · 6f6370e · 6f6370e
2 parents e6a0c71 + 149003b
commit 6f6370e
Show file tree

Hide file tree

Showing 8 changed files with 346 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,7 +14,7 @@ The project does _not_ follow Semantic Versioning and the changes are documented
 
 ### Added
 
-- mpsutil.intentions: a new style attribute `intentions-in-read-only-cell` is now available to allow intentions in read-only cells.
+- mpsutil.intentions: a new style attribute `intentions-in-read-only-cell` is now available to allow intentions in read-only cells. Single intentions can also be enabled or disabled in those cells through the intention "Toggle Show Intention In Read-Only Cell Annotation".
 - com.mbeddr.mpsutil.editor.querylist: Default editor cells now support style attributes.
 - de.slisson.mps.tables: tables now support a new property `row UI actions (experimental)`: This property adds actions to the MPS toolbar to add a new row above/below the current row or to delete the current row. These actions only work for simple tables that are based on rows (default: *false*).
 

diff --git a/.../build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps b/.../build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
@@ -13002,6 +13002,11 @@
             <ref role="3bR37D" node="54z9_KDR0Ol" resolve="com.mbeddr.mpsutil.intentions" />
           </node>
         </node>
+        <node concept="1SiIV0" id="frLjuw1roZ" role="3bR37C">
+          <node concept="3bR9La" id="frLjuw1rp0" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6L7y" resolve="jetbrains.mps.lang.intentions" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="m$_wf" id="hCVXosGNJH" role="3989C9">

diff --git a/...tionsmenu/com.mbeddr.mpsutil.intentions.runtime/com.mbeddr.mpsutil.intentions.runtime.msd b/...tionsmenu/com.mbeddr.mpsutil.intentions.runtime/com.mbeddr.mpsutil.intentions.runtime.msd
@@ -17,10 +17,12 @@
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="true">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
     <dependency reexport="false">b92f861d-0184-446d-b88b-6dcf0e070241(com.mbeddr.mpsutil.intentions)</dependency>
+    <dependency reexport="false">d7a92d38-f7db-40d0-8431-763b0c3c9f20(jetbrains.mps.lang.intentions)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:654422bf-e75f-44dc-936d-188890a746ce:de.slisson.mps.reflection" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
+    <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
@@ -49,7 +51,13 @@
     <module reference="b92f861d-0184-446d-b88b-6dcf0e070241(com.mbeddr.mpsutil.intentions)" version="0" />
     <module reference="4bff7bbe-ce5f-432e-84bf-60809cb9987c(com.mbeddr.mpsutil.intentions.runtime)" version="0" />
     <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
+    <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
+    <module reference="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67(jetbrains.mps.baseLanguage.lightweightdsl)" version="0" />
+    <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" 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="d7a92d38-f7db-40d0-8431-763b0c3c9f20(jetbrains.mps.lang.intentions)" version="0" />
+    <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
   </dependencyVersions>
 </solution>
 
diff --git a/...nu/com.mbeddr.mpsutil.intentions.runtime/models/com/mbeddr/mpsutil/intentions/runtime.mps b/...nu/com.mbeddr.mpsutil.intentions.runtime/models/com/mbeddr/mpsutil/intentions/runtime.mps
diff --git a/code/intentionsmenu/com.mbeddr.mpsutil.intentions/languageModels/editor.mps b/code/intentionsmenu/com.mbeddr.mpsutil.intentions/languageModels/editor.mps
@@ -233,5 +233,24 @@
       <node concept="3clFbT" id="5qf1oe_$9mE" role="3t49C2" />
     </node>
   </node>
+  <node concept="24kQdi" id="frLjuvPGID">
+    <ref role="1XX52x" to="tegv:frLjuvP$7P" resolve="ShowIntentionInReadyOnlyCell" />
+    <node concept="3EZMnI" id="frLjuvPGIE" role="2wV5jI">
+      <node concept="2iRkQZ" id="frLjuvPGIF" role="2iSdaV" />
+      <node concept="3EZMnI" id="frLjuvPGIG" role="3EZMnx">
+        <node concept="3F0ifn" id="frLjuvPHyu" role="3EZMnx">
+          <property role="3F0ifm" value="show intention in ready-only cell:" />
+        </node>
+        <node concept="3F0A7n" id="frLjuvPGII" role="3EZMnx">
+          <ref role="1NtTu8" to="tegv:frLjuvPGIB" resolve="flag" />
+        </node>
+        <node concept="2iRfu4" id="frLjuvPGJo" role="2iSdaV" />
+        <node concept="3vyZuw" id="frLjuvPGJp" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+      </node>
+      <node concept="2SsqMj" id="frLjuvPGJq" role="3EZMnx" />
+    </node>
+  </node>
 </model>
 
diff --git a/code/intentionsmenu/com.mbeddr.mpsutil.intentions/languageModels/intentions.mps b/code/intentionsmenu/com.mbeddr.mpsutil.intentions/languageModels/intentions.mps
@@ -53,6 +53,9 @@
       <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">
+        <property id="1068580123138" name="value" index="3clFbU" />
+      </concept>
       <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
@@ -84,10 +87,29 @@
         <child id="2522969319638093993" name="descriptionFunction" index="2ZfVej" />
       </concept>
     </language>
+    <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
+      <concept id="5455284157993911077" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitProperty" flags="ng" index="2pJxcG">
+        <reference id="5455284157993911078" name="property" index="2pJxcJ" />
+        <child id="1595412875168045201" name="initValue" index="28ntcv" />
+      </concept>
+      <concept id="5455284157993863837" name="jetbrains.mps.lang.quotation.structure.NodeBuilder" flags="nn" index="2pJPEk">
+        <child id="5455284157993863838" name="quotedNode" index="2pJPEn" />
+      </concept>
+      <concept id="5455284157993863840" name="jetbrains.mps.lang.quotation.structure.NodeBuilderNode" flags="nn" index="2pJPED">
+        <reference id="5455284157993910961" name="concept" index="2pJxaS" />
+        <child id="5455284157993911099" name="values" index="2pJxcM" />
+      </concept>
+      <concept id="6985522012210254362" name="jetbrains.mps.lang.quotation.structure.NodeBuilderPropertyExpression" flags="nn" index="WxPPo">
+        <child id="6985522012210254363" name="expression" index="WxPPp" />
+      </concept>
+    </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
+      <concept id="1140725362528" name="jetbrains.mps.lang.smodel.structure.Link_SetTargetOperation" flags="nn" index="2oxUTD">
+        <child id="1140725362529" name="linkTarget" index="2oxUTC" />
+      </concept>
       <concept id="1138757581985" name="jetbrains.mps.lang.smodel.structure.Link_SetNewChildOperation" flags="nn" index="zfrQC" />
       <concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
       <concept id="1171315804604" name="jetbrains.mps.lang.smodel.structure.Model_RootsOperation" flags="nn" index="2RRcyG">
@@ -329,5 +351,82 @@
       </node>
     </node>
   </node>
+  <node concept="2S6QgY" id="frLjuvYWqn">
+    <property role="TrG5h" value="addShowIntentionInReadyOnlyCellAnnotation" />
+    <property role="2ZfUl0" value="true" />
+    <ref role="2ZfgGC" to="tp3j:2c3oNEsfcpP" resolve="BaseIntentionDeclaration" />
+    <node concept="2Sbjvc" id="frLjuvYWqo" role="2ZfgGD">
+      <node concept="3clFbS" id="frLjuvYWqp" role="2VODD2">
+        <node concept="3clFbJ" id="frLjuvYWqq" role="3cqZAp">
+          <node concept="3clFbS" id="frLjuvYWqr" role="3clFbx">
+            <node concept="3clFbF" id="frLjuw0cXz" role="3cqZAp">
+              <node concept="2OqwBi" id="frLjuw0dAJ" role="3clFbG">
+                <node concept="2OqwBi" id="frLjuw0d6X" role="2Oq$k0">
+                  <node concept="2Sf5sV" id="frLjuw0cXy" role="2Oq$k0" />
+                  <node concept="3CFZ6_" id="frLjuw0dpC" role="2OqNvi">
+                    <node concept="3CFYIy" id="frLjuw0dq8" role="3CFYIz">
+                      <ref role="3CFYIx" to="tegv:frLjuvP$7P" resolve="ShowIntentionInReadyOnlyCell" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="2oxUTD" id="frLjuw0dP$" role="2OqNvi">
+                  <node concept="2pJPEk" id="frLjuw0dUN" role="2oxUTC">
+                    <node concept="2pJPED" id="frLjuw0dUP" role="2pJPEn">
+                      <ref role="2pJxaS" to="tegv:frLjuvP$7P" resolve="ShowIntentionInReadyOnlyCell" />
+                      <node concept="2pJxcG" id="frLjuw0e7u" role="2pJxcM">
+                        <ref role="2pJxcJ" to="tegv:frLjuvPGIB" resolve="flag" />
+                        <node concept="WxPPo" id="frLjuw0eaF" role="28ntcv">
+                          <node concept="3clFbT" id="frLjuw0eaE" role="WxPPp">
+                            <property role="3clFbU" value="true" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="frLjuvYWrz" role="3clFbw">
+            <node concept="2OqwBi" id="frLjuvYWr$" role="2Oq$k0">
+              <node concept="2Sf5sV" id="frLjuvYWr_" role="2Oq$k0" />
+              <node concept="3CFZ6_" id="frLjuvYWrA" role="2OqNvi">
+                <node concept="3CFYIy" id="frLjuvYWrB" role="3CFYIz">
+                  <ref role="3CFYIx" to="tegv:frLjuvP$7P" resolve="ShowIntentionInReadyOnlyCell" />
+                </node>
+              </node>
+            </node>
+            <node concept="3w_OXm" id="frLjuvYWrC" role="2OqNvi" />
+          </node>
+          <node concept="9aQIb" id="frLjuvYWrD" role="9aQIa">
+            <node concept="3clFbS" id="frLjuvYWrE" role="9aQI4">
+              <node concept="3clFbF" id="frLjuvYWrF" role="3cqZAp">
+                <node concept="2OqwBi" id="frLjuvYWrG" role="3clFbG">
+                  <node concept="2OqwBi" id="frLjuvYWrH" role="2Oq$k0">
+                    <node concept="2Sf5sV" id="frLjuvYWrI" role="2Oq$k0" />
+                    <node concept="3CFZ6_" id="frLjuvYWrJ" role="2OqNvi">
+                      <node concept="3CFYIy" id="frLjuvYWrK" role="3CFYIz">
+                        <ref role="3CFYIx" to="tegv:frLjuvP$7P" resolve="ShowIntentionInReadyOnlyCell" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3YRAZt" id="frLjuvYWrL" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2S6ZIM" id="frLjuvYWrM" role="2ZfVej">
+      <node concept="3clFbS" id="frLjuvYWrN" role="2VODD2">
+        <node concept="3clFbF" id="frLjuvYWrO" role="3cqZAp">
+          <node concept="Xl_RD" id="frLjuvYWrP" role="3clFbG">
+            <property role="Xl_RC" value="Toggle Show Intention In Read-Only Cell Annotation" />
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/code/intentionsmenu/com.mbeddr.mpsutil.intentions/languageModels/structure.mps b/code/intentionsmenu/com.mbeddr.mpsutil.intentions/languageModels/structure.mps
@@ -55,5 +55,21 @@
       <ref role="AX2Wp" to="tpck:fKAOsGN" resolve="string" />
     </node>
   </node>
+  <node concept="1TIwiD" id="frLjuvP$7P">
+    <property role="TrG5h" value="ShowIntentionInReadyOnlyCell" />
+    <property role="EcuMT" value="278032644708909557" />
+    <ref role="1TJDcQ" to="tpck:2ULFgo8_XDk" resolve="NodeAttribute" />
+    <node concept="1TJgyi" id="frLjuvPGIB" role="1TKVEl">
+      <property role="IQ2nx" value="278032644708944807" />
+      <property role="TrG5h" value="flag" />
+      <ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
+    </node>
+    <node concept="M6xJ_" id="frLjuvP$7Q" role="lGtFl">
+      <property role="Hh88m" value="showIntentionInReadyOnlyCell" />
+      <node concept="trNpa" id="frLjuvP$7R" role="EQaZv">
+        <ref role="trN6q" to="tp3j:2c3oNEsfcpP" resolve="BaseIntentionDeclaration" />
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/...il.intentions.sandboxlang/models/com.mbeddr.mpsutil.intentions.sandboxlang.intentions.mps b/...il.intentions.sandboxlang/models/com.mbeddr.mpsutil.intentions.sandboxlang.intentions.mps
@@ -43,6 +43,7 @@
       </concept>
     </language>
     <language id="b92f861d-0184-446d-b88b-6dcf0e070241" name="com.mbeddr.mpsutil.intentions">
+      <concept id="278032644708909557" name="com.mbeddr.mpsutil.intentions.structure.ShowIntentionInReadyOnlyCell" flags="ng" index="2s3oj2" />
       <concept id="5846558918537398687" name="com.mbeddr.mpsutil.intentions.structure.IntentionGroupAnnotation" flags="ng" index="1SWQZ3">
         <property id="5846558918537400330" name="label" index="1SWRpm" />
       </concept>
@@ -248,5 +249,45 @@
       </node>
     </node>
   </node>
+  <node concept="2S6QgY" id="frLjuvPz1B">
+    <property role="TrG5h" value="ChildIntentionNotVisible" />
+    <ref role="2ZfgGC" to="iikq:5qf1oe_GcsF" resolve="IChild" />
+    <node concept="2S6ZIM" id="frLjuvPz1C" role="2ZfVej">
+      <node concept="3clFbS" id="frLjuvPz1D" role="2VODD2">
+        <node concept="3clFbF" id="frLjuvPz1E" role="3cqZAp">
+          <node concept="Xl_RD" id="frLjuvPz1F" role="3clFbG">
+            <property role="Xl_RC" value="Not Visible In Ready-Only Cell" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2Sbjvc" id="frLjuvPz1G" role="2ZfgGD">
+      <node concept="3clFbS" id="frLjuvPz1H" role="2VODD2">
+        <node concept="3clFbF" id="frLjuvPz1I" role="3cqZAp">
+          <node concept="37vLTI" id="frLjuvPz1J" role="3clFbG">
+            <node concept="Xl_RD" id="frLjuvPz1K" role="37vLTx">
+              <property role="Xl_RC" value="Changed" />
+            </node>
+            <node concept="2OqwBi" id="frLjuvPz1L" role="37vLTJ">
+              <node concept="2OqwBi" id="frLjuvPz1M" role="2Oq$k0">
+                <node concept="2Sf5sV" id="frLjuvPz1N" role="2Oq$k0" />
+                <node concept="2Xjw5R" id="frLjuvPz1O" role="2OqNvi">
+                  <node concept="1xMEDy" id="frLjuvPz1P" role="1xVPHs">
+                    <node concept="chp4Y" id="frLjuvPz1Q" role="ri$Ld">
+                      <ref role="cht4Q" to="iikq:5qf1oe_GcsA" resolve="Root" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3TrcHB" id="frLjuvPz1R" role="2OqNvi">
+                <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2s3oj2" id="frLjuw0Btu" role="lGtFl" />
+  </node>
 </model>