From 2c8a00a52b67643eb8ff652d9346749a02bb9caa Mon Sep 17 00:00:00 2001
From: slisson <sl@q60.de>
Date: Fri, 13 Dec 2024 16:48:47 +0100
Subject: [PATCH 1/8] fix(treenotation): overlapping buttons

---
 .../mbeddr/mpsutil/treenotation/runtime.mps   | 938 +++++++++++++-----
 1 file changed, 689 insertions(+), 249 deletions(-)

diff --git a/code/treenotation/com.mbeddr.mpsutil.treenotation.runtime/models/com/mbeddr/mpsutil/treenotation/runtime.mps b/code/treenotation/com.mbeddr.mpsutil.treenotation.runtime/models/com/mbeddr/mpsutil/treenotation/runtime.mps
index f5e3cfaef1..c94c744803 100644
--- a/code/treenotation/com.mbeddr.mpsutil.treenotation.runtime/models/com/mbeddr/mpsutil/treenotation/runtime.mps
+++ b/code/treenotation/com.mbeddr.mpsutil.treenotation.runtime/models/com/mbeddr/mpsutil/treenotation/runtime.mps
@@ -90,7 +90,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1095950406618" name="jetbrains.mps.baseLanguage.structure.DivExpression" flags="nn" index="FJ1c_" />
@@ -159,7 +159,7 @@
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
-      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
         <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
       </concept>
       <concept id="1109279763828" name="jetbrains.mps.baseLanguage.structure.TypeVariableDeclaration" flags="ng" index="16euLQ" />
@@ -239,7 +239,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -271,7 +271,7 @@
       <concept id="1184952934362" name="jetbrains.mps.baseLanguage.structure.DimensionExpression" flags="nn" index="3$GHV9">
         <child id="1184953288404" name="expression" index="3$I4v7" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -366,7 +366,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -4146,6 +4146,15 @@
       <node concept="3clFbS" id="7uOgiTd7jX" role="3clF47" />
     </node>
     <node concept="3Tm1VV" id="7uOgiTcFuL" role="1B3o_S" />
+    <node concept="2tJIrI" id="HnFYK1iIgR" role="jymVt" />
+    <node concept="3clFb_" id="HnFYK1iIz4" role="jymVt">
+      <property role="TrG5h" value="withoutMargin" />
+      <node concept="3clFbS" id="HnFYK1iIz7" role="3clF47" />
+      <node concept="3Tm1VV" id="HnFYK1iIz8" role="1B3o_S" />
+      <node concept="3uibUv" id="HnFYK1iIwx" role="3clF45">
+        <ref role="3uigEE" node="7uOgiTcFuK" resolve="IBounds" />
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="7uOgiTcFEM">
     <property role="TrG5h" value="EditorCellBounds" />
@@ -4387,6 +4396,21 @@
         </node>
       </node>
     </node>
+    <node concept="3clFb_" id="HnFYK1jzW8" role="jymVt">
+      <property role="TrG5h" value="withoutMargin" />
+      <node concept="3Tm1VV" id="HnFYK1jzWa" role="1B3o_S" />
+      <node concept="3uibUv" id="HnFYK1jzWb" role="3clF45">
+        <ref role="3uigEE" node="7uOgiTcFuK" resolve="IBounds" />
+      </node>
+      <node concept="3clFbS" id="HnFYK1jzWc" role="3clF47">
+        <node concept="3clFbF" id="HnFYK1j_tY" role="3cqZAp">
+          <node concept="Xjq3P" id="HnFYK1j_tX" role="3clFbG" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="HnFYK1jzWd" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" />
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="7uOgiTcHWY">
     <property role="TrG5h" value="TransposedBounds" />
@@ -4690,6 +4714,35 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
+    <node concept="2tJIrI" id="HnFYK1iQYZ" role="jymVt" />
+    <node concept="3clFb_" id="HnFYK1iQiw" role="jymVt">
+      <property role="TrG5h" value="withoutMargin" />
+      <node concept="3Tm1VV" id="HnFYK1iQiy" role="1B3o_S" />
+      <node concept="3uibUv" id="HnFYK1iQiz" role="3clF45">
+        <ref role="3uigEE" node="7uOgiTcFuK" resolve="IBounds" />
+      </node>
+      <node concept="3clFbS" id="HnFYK1iQi$" role="3clF47">
+        <node concept="3clFbF" id="HnFYK1iXoI" role="3cqZAp">
+          <node concept="2ShNRf" id="HnFYK1iXoG" role="3clFbG">
+            <node concept="1pGfFk" id="HnFYK1jybB" role="2ShVmc">
+              <property role="373rjd" value="true" />
+              <ref role="37wK5l" node="7uOgiTcI3D" resolve="TransposedBounds" />
+              <node concept="2OqwBi" id="HnFYK1iU_3" role="37wK5m">
+                <node concept="37vLTw" id="HnFYK1iTY3" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7uOgiTcHYU" resolve="myBounds" />
+                </node>
+                <node concept="liA8E" id="HnFYK1iVjp" role="2OqNvi">
+                  <ref role="37wK5l" node="HnFYK1iIz4" resolve="withoutMargin" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="HnFYK1iQi_" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" />
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="7GMtHW6rH5Q">
     <property role="TrG5h" value="Button" />
@@ -10655,51 +10708,44 @@
                 <node concept="10Oyi0" id="1QtoRzIxEU4" role="1tU5fm" />
               </node>
             </node>
-            <node concept="3clFbJ" id="1QtoRzIxEUe" role="3cqZAp">
-              <node concept="3clFbS" id="1QtoRzIxEUf" role="3clFbx">
-                <node concept="3clFbF" id="1QtoRzIxEUg" role="3cqZAp">
-                  <node concept="37vLTI" id="1QtoRzIxEUh" role="3clFbG">
-                    <node concept="3cpWs3" id="1QtoRzIxEUi" role="37vLTx">
-                      <node concept="3cpWs3" id="1QtoRzIxEUj" role="3uHU7B">
-                        <node concept="3cpWs3" id="1QtoRzIxEUk" role="3uHU7B">
-                          <node concept="3cpWs3" id="1QtoRzIxEUl" role="3uHU7B">
-                            <node concept="10M0yZ" id="1QtoRzIxEUm" role="3uHU7B">
+            <node concept="3clFbJ" id="HnFYK10O1n" role="3cqZAp">
+              <node concept="3clFbS" id="HnFYK10O1p" role="3clFbx">
+                <node concept="3clFbF" id="HnFYK12oSO" role="3cqZAp">
+                  <node concept="37vLTI" id="HnFYK12yDi" role="3clFbG">
+                    <node concept="3cpWs3" id="HnFYK12RDx" role="37vLTx">
+                      <node concept="3cpWs3" id="HnFYK12DTH" role="3uHU7B">
+                        <node concept="3cpWs3" id="HnFYK12DTI" role="3uHU7B">
+                          <node concept="3cpWs3" id="HnFYK12DTJ" role="3uHU7B">
+                            <node concept="10M0yZ" id="HnFYK12DTK" role="3uHU7B">
                               <ref role="3cqZAo" node="1QtoRzH9jr6" resolve="BUTTON_SIZE" />
                               <ref role="1PxDUh" node="7GMtHW6rH5Q" resolve="Button" />
                             </node>
-                            <node concept="37vLTw" id="1QtoRzIxF0w" role="3uHU7w">
+                            <node concept="37vLTw" id="HnFYK12DWy" role="3uHU7w">
                               <ref role="3cqZAo" node="2vEHhzn1F4$" resolve="BUTTON_MARGIN" />
                             </node>
                           </node>
-                          <node concept="10M0yZ" id="1QtoRzIxEUn" role="3uHU7w">
+                          <node concept="10M0yZ" id="HnFYK12DTL" role="3uHU7w">
                             <ref role="3cqZAo" node="1QtoRzH9jr6" resolve="BUTTON_SIZE" />
                             <ref role="1PxDUh" node="7GMtHW6rH5Q" resolve="Button" />
                           </node>
                         </node>
-                        <node concept="37vLTw" id="1QtoRzIxF3Q" role="3uHU7w">
+                        <node concept="37vLTw" id="HnFYK12DZk" role="3uHU7w">
                           <ref role="3cqZAo" node="2vEHhzn1F4$" resolve="BUTTON_MARGIN" />
                         </node>
                       </node>
-                      <node concept="37vLTw" id="1QtoRzIxEUo" role="3uHU7w">
-                        <ref role="3cqZAo" node="1QtoRzIxEU6" resolve="overlapInsertButtonWithChildCell" />
+                      <node concept="10M0yZ" id="HnFYK138EP" role="3uHU7w">
+                        <ref role="3cqZAo" node="1QtoRzH9jr6" resolve="BUTTON_SIZE" />
+                        <ref role="1PxDUh" node="7GMtHW6rH5Q" resolve="Button" />
                       </node>
                     </node>
-                    <node concept="37vLTw" id="1QtoRzIxEUp" role="37vLTJ">
+                    <node concept="37vLTw" id="HnFYK12oSM" role="37vLTJ">
                       <ref role="3cqZAo" node="1QtoRzIxEU3" resolve="childMinWidth" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="22lmx$" id="1QtoRzIxEUq" role="3clFbw">
-                <node concept="37vLTw" id="1QtoRzIxEUr" role="3uHU7w">
-                  <ref role="3cqZAo" node="1QtoRzIxETE" resolve="isLast" />
-                </node>
-                <node concept="37vLTw" id="1QtoRzIxEUs" role="3uHU7B">
-                  <ref role="3cqZAo" node="1QtoRzIxET$" resolve="isFirst" />
-                </node>
-              </node>
-              <node concept="9aQIb" id="1QtoRzIxEUt" role="9aQIa">
-                <node concept="3clFbS" id="1QtoRzIxEUu" role="9aQI4">
+              <node concept="9aQIb" id="HnFYK11Bz6" role="9aQIa">
+                <node concept="3clFbS" id="HnFYK11Bz7" role="9aQI4">
                   <node concept="3clFbF" id="1QtoRzIxEUv" role="3cqZAp">
                     <node concept="37vLTI" id="1QtoRzIxEUw" role="3clFbG">
                       <node concept="37vLTw" id="1QtoRzIxEUx" role="37vLTJ">
@@ -10733,6 +10779,58 @@
                   </node>
                 </node>
               </node>
+              <node concept="1Wc70l" id="HnFYK114zT" role="3clFbw">
+                <node concept="37vLTw" id="HnFYK11cSi" role="3uHU7w">
+                  <ref role="3cqZAo" node="1QtoRzIxETE" resolve="isLast" />
+                </node>
+                <node concept="37vLTw" id="HnFYK10WrF" role="3uHU7B">
+                  <ref role="3cqZAo" node="1QtoRzIxET$" resolve="isFirst" />
+                </node>
+              </node>
+              <node concept="3eNFk2" id="HnFYK11wFe" role="3eNLev">
+                <node concept="3clFbS" id="HnFYK11wFf" role="3eOfB_">
+                  <node concept="3clFbF" id="1QtoRzIxEUg" role="3cqZAp">
+                    <node concept="37vLTI" id="1QtoRzIxEUh" role="3clFbG">
+                      <node concept="3cpWs3" id="1QtoRzIxEUi" role="37vLTx">
+                        <node concept="3cpWs3" id="1QtoRzIxEUj" role="3uHU7B">
+                          <node concept="3cpWs3" id="1QtoRzIxEUk" role="3uHU7B">
+                            <node concept="3cpWs3" id="1QtoRzIxEUl" role="3uHU7B">
+                              <node concept="10M0yZ" id="1QtoRzIxEUm" role="3uHU7B">
+                                <ref role="3cqZAo" node="1QtoRzH9jr6" resolve="BUTTON_SIZE" />
+                                <ref role="1PxDUh" node="7GMtHW6rH5Q" resolve="Button" />
+                              </node>
+                              <node concept="37vLTw" id="1QtoRzIxF0w" role="3uHU7w">
+                                <ref role="3cqZAo" node="2vEHhzn1F4$" resolve="BUTTON_MARGIN" />
+                              </node>
+                            </node>
+                            <node concept="10M0yZ" id="1QtoRzIxEUn" role="3uHU7w">
+                              <ref role="3cqZAo" node="1QtoRzH9jr6" resolve="BUTTON_SIZE" />
+                              <ref role="1PxDUh" node="7GMtHW6rH5Q" resolve="Button" />
+                            </node>
+                          </node>
+                          <node concept="37vLTw" id="1QtoRzIxF3Q" role="3uHU7w">
+                            <ref role="3cqZAo" node="2vEHhzn1F4$" resolve="BUTTON_MARGIN" />
+                          </node>
+                        </node>
+                        <node concept="37vLTw" id="1QtoRzIxEUo" role="3uHU7w">
+                          <ref role="3cqZAo" node="1QtoRzIxEU6" resolve="overlapInsertButtonWithChildCell" />
+                        </node>
+                      </node>
+                      <node concept="37vLTw" id="1QtoRzIxEUp" role="37vLTJ">
+                        <ref role="3cqZAo" node="1QtoRzIxEU3" resolve="childMinWidth" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="22lmx$" id="HnFYK11Ir3" role="3eO9$A">
+                  <node concept="37vLTw" id="HnFYK11Ir4" role="3uHU7w">
+                    <ref role="3cqZAo" node="1QtoRzIxETE" resolve="isLast" />
+                  </node>
+                  <node concept="37vLTw" id="HnFYK11Ir5" role="3uHU7B">
+                    <ref role="3cqZAo" node="1QtoRzIxET$" resolve="isFirst" />
+                  </node>
+                </node>
+              </node>
             </node>
             <node concept="3clFbH" id="1QtoRzIyrHT" role="3cqZAp" />
             <node concept="3cpWs8" id="1QtoRzIFZBD" role="3cqZAp">
@@ -10756,142 +10854,287 @@
             </node>
             <node concept="3clFbJ" id="1QtoRzIyDKg" role="3cqZAp">
               <node concept="3clFbS" id="1QtoRzIyDKi" role="3clFbx">
-                <node concept="3clFbJ" id="1QtoRzJ1Gqu" role="3cqZAp">
-                  <node concept="3clFbS" id="1QtoRzJ1Gqw" role="3clFbx">
-                    <node concept="3clFbF" id="1QtoRzJ3e3y" role="3cqZAp">
-                      <node concept="37vLTI" id="1QtoRzJ3e3z" role="3clFbG">
-                        <node concept="2ShNRf" id="1QtoRzJ3e3$" role="37vLTx">
-                          <node concept="1pGfFk" id="1QtoRzJ3e3_" role="2ShVmc">
-                            <property role="373rjd" value="true" />
-                            <ref role="37wK5l" node="1QtoRzIvQcK" resolve="BoundsWithMargin" />
-                            <node concept="37vLTw" id="1QtoRzJ3e3A" role="37wK5m">
-                              <ref role="3cqZAo" node="1QtoRzIAELX" resolve="childBounds" />
-                            </node>
-                            <node concept="3cmrfG" id="1QtoRzJ418l" role="37wK5m">
-                              <property role="3cmrfH" value="0" />
+                <node concept="3cpWs8" id="HnFYK17ZAj" role="3cqZAp">
+                  <node concept="3cpWsn" id="HnFYK17ZAm" role="3cpWs9">
+                    <property role="TrG5h" value="leftMargin" />
+                    <node concept="10Oyi0" id="HnFYK17ZAh" role="1tU5fm" />
+                    <node concept="3cmrfG" id="HnFYK1eD2N" role="33vP2m">
+                      <property role="3cmrfH" value="0" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbJ" id="HnFYK14qi4" role="3cqZAp">
+                  <node concept="3clFbS" id="HnFYK14qi6" role="3clFbx">
+                    <node concept="3clFbF" id="HnFYK18hbt" role="3cqZAp">
+                      <node concept="37vLTI" id="HnFYK18hbv" role="3clFbG">
+                        <node concept="FJ1c_" id="HnFYK16O_M" role="37vLTx">
+                          <node concept="3cmrfG" id="HnFYK16OPg" role="3uHU7w">
+                            <property role="3cmrfH" value="2" />
+                          </node>
+                          <node concept="37vLTw" id="HnFYK16Fqu" role="3uHU7B">
+                            <ref role="3cqZAo" node="1QtoRzIFZBG" resolve="margin" />
+                          </node>
+                        </node>
+                        <node concept="37vLTw" id="HnFYK18hbz" role="37vLTJ">
+                          <ref role="3cqZAo" node="HnFYK17ZAm" resolve="leftMargin" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="9aQIb" id="HnFYK15s4I" role="9aQIa">
+                    <node concept="3clFbS" id="HnFYK15s4J" role="9aQI4">
+                      <node concept="3clFbF" id="HnFYK19lMM" role="3cqZAp">
+                        <node concept="37vLTI" id="HnFYK19w6n" role="3clFbG">
+                          <node concept="FJ1c_" id="HnFYK19PQz" role="37vLTx">
+                            <node concept="3cmrfG" id="HnFYK19Q61" role="3uHU7w">
+                              <property role="3cmrfH" value="2" />
                             </node>
-                            <node concept="37vLTw" id="1QtoRzJ3e3C" role="37wK5m">
+                            <node concept="37vLTw" id="HnFYK19DjL" role="3uHU7B">
                               <ref role="3cqZAo" node="1QtoRzIFZBG" resolve="margin" />
                             </node>
-                            <node concept="3cmrfG" id="1QtoRzJ3e3D" role="37wK5m">
-                              <property role="3cmrfH" value="0" />
-                            </node>
-                            <node concept="3cmrfG" id="1QtoRzJ3e3E" role="37wK5m">
-                              <property role="3cmrfH" value="0" />
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="1y4W85" id="1QtoRzJ3e3F" role="37vLTJ">
-                          <node concept="37vLTw" id="1QtoRzJ3e3G" role="1y58nS">
-                            <ref role="3cqZAo" node="1QtoRzI$xoO" resolve="i" />
                           </node>
-                          <node concept="37vLTw" id="1QtoRzJ3e3H" role="1y566C">
-                            <ref role="3cqZAo" node="1QtoRzIxjez" resolve="childrenBounds" />
+                          <node concept="37vLTw" id="HnFYK19lMK" role="37vLTJ">
+                            <ref role="3cqZAo" node="HnFYK17ZAm" resolve="leftMargin" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="37vLTw" id="1QtoRzJ1VR9" role="3clFbw">
-                    <ref role="3cqZAo" node="1QtoRzIxET$" resolve="isFirst" />
-                  </node>
-                  <node concept="3eNFk2" id="1QtoRzJ2vCL" role="3eNLev">
-                    <node concept="37vLTw" id="1QtoRzJ2E3D" role="3eO9$A">
-                      <ref role="3cqZAo" node="1QtoRzIxETE" resolve="isLast" />
+                  <node concept="3eNFk2" id="HnFYK14XxN" role="3eNLev">
+                    <node concept="37vLTw" id="HnFYK155Hn" role="3eO9$A">
+                      <ref role="3cqZAo" node="1QtoRzIxET$" resolve="isFirst" />
                     </node>
-                    <node concept="3clFbS" id="1QtoRzJ2vCN" role="3eOfB_">
-                      <node concept="3clFbF" id="1QtoRzJ3A9$" role="3cqZAp">
-                        <node concept="37vLTI" id="1QtoRzJ3A9_" role="3clFbG">
-                          <node concept="2ShNRf" id="1QtoRzJ3A9A" role="37vLTx">
-                            <node concept="1pGfFk" id="1QtoRzJ3A9B" role="2ShVmc">
-                              <property role="373rjd" value="true" />
-                              <ref role="37wK5l" node="1QtoRzIvQcK" resolve="BoundsWithMargin" />
-                              <node concept="37vLTw" id="1QtoRzJ3A9C" role="37wK5m">
-                                <ref role="3cqZAo" node="1QtoRzIAELX" resolve="childBounds" />
-                              </node>
-                              <node concept="37vLTw" id="1QtoRzJ3A9D" role="37wK5m">
-                                <ref role="3cqZAo" node="1QtoRzIFZBG" resolve="margin" />
+                    <node concept="3clFbS" id="HnFYK14XxP" role="3eOfB_">
+                      <node concept="3SKdUt" id="HnFYK1cHnf" role="3cqZAp">
+                        <node concept="1PaTwC" id="HnFYK1cHng" role="1aUNEU">
+                          <node concept="3oM_SD" id="HnFYK1cOtj" role="1PaTwD">
+                            <property role="3oM_SC" value="align" />
+                          </node>
+                          <node concept="3oM_SD" id="HnFYK1cOtk" role="1PaTwD">
+                            <property role="3oM_SC" value="center" />
+                          </node>
+                          <node concept="3oM_SD" id="HnFYK1cOtl" role="1PaTwD">
+                            <property role="3oM_SC" value="of" />
+                          </node>
+                          <node concept="3oM_SD" id="HnFYK1cOtm" role="1PaTwD">
+                            <property role="3oM_SC" value="the" />
+                          </node>
+                          <node concept="3oM_SD" id="HnFYK1cOtn" role="1PaTwD">
+                            <property role="3oM_SC" value="delete" />
+                          </node>
+                          <node concept="3oM_SD" id="HnFYK1cOto" role="1PaTwD">
+                            <property role="3oM_SC" value="button" />
+                          </node>
+                          <node concept="3oM_SD" id="HnFYK1cOtp" role="1PaTwD">
+                            <property role="3oM_SC" value="with" />
+                          </node>
+                          <node concept="3oM_SD" id="HnFYK1cOtq" role="1PaTwD">
+                            <property role="3oM_SC" value="the" />
+                          </node>
+                          <node concept="3oM_SD" id="HnFYK1cOtr" role="1PaTwD">
+                            <property role="3oM_SC" value="center" />
+                          </node>
+                          <node concept="3oM_SD" id="HnFYK1cOts" role="1PaTwD">
+                            <property role="3oM_SC" value="of" />
+                          </node>
+                          <node concept="3oM_SD" id="HnFYK1cOtt" role="1PaTwD">
+                            <property role="3oM_SC" value="the" />
+                          </node>
+                          <node concept="3oM_SD" id="HnFYK1cOtu" role="1PaTwD">
+                            <property role="3oM_SC" value="child" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbF" id="HnFYK1agaN" role="3cqZAp">
+                        <node concept="37vLTI" id="HnFYK1aHbk" role="3clFbG">
+                          <node concept="3cpWsd" id="HnFYK1bVyy" role="37vLTx">
+                            <node concept="FJ1c_" id="HnFYK1crul" role="3uHU7w">
+                              <node concept="3cmrfG" id="HnFYK1crHN" role="3uHU7w">
+                                <property role="3cmrfH" value="2" />
                               </node>
-                              <node concept="3cmrfG" id="1QtoRzJ4Cw$" role="37wK5m">
-                                <property role="3cmrfH" value="0" />
+                              <node concept="2OqwBi" id="HnFYK1c9HS" role="3uHU7B">
+                                <node concept="37vLTw" id="HnFYK1c5NC" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="1QtoRzIAELX" resolve="childBounds" />
+                                </node>
+                                <node concept="liA8E" id="HnFYK1cgXD" role="2OqNvi">
+                                  <ref role="37wK5l" node="7uOgiTcFwM" resolve="getWidth" />
+                                </node>
                               </node>
-                              <node concept="3cmrfG" id="1QtoRzJ3A9F" role="37wK5m">
-                                <property role="3cmrfH" value="0" />
+                            </node>
+                            <node concept="3cpWs3" id="HnFYK1b_v8" role="3uHU7B">
+                              <node concept="3cpWs3" id="HnFYK1b9a3" role="3uHU7B">
+                                <node concept="10M0yZ" id="HnFYK1b0fw" role="3uHU7B">
+                                  <ref role="3cqZAo" node="1QtoRzH9jr6" resolve="BUTTON_SIZE" />
+                                  <ref role="1PxDUh" node="7GMtHW6rH5Q" resolve="Button" />
+                                </node>
+                                <node concept="37vLTw" id="HnFYK1bo0P" role="3uHU7w">
+                                  <ref role="3cqZAo" node="2vEHhzn1F4$" resolve="BUTTON_MARGIN" />
+                                </node>
                               </node>
-                              <node concept="3cmrfG" id="1QtoRzJ3A9G" role="37wK5m">
-                                <property role="3cmrfH" value="0" />
+                              <node concept="10M0yZ" id="HnFYK1bM9M" role="3uHU7w">
+                                <ref role="3cqZAo" node="1QtoRzHrmj5" resolve="BUTTON_HALF_SIZE" />
+                                <ref role="1PxDUh" node="7GMtHW6rH5Q" resolve="Button" />
                               </node>
                             </node>
                           </node>
-                          <node concept="1y4W85" id="1QtoRzJ3A9H" role="37vLTJ">
-                            <node concept="37vLTw" id="1QtoRzJ3A9I" role="1y58nS">
-                              <ref role="3cqZAo" node="1QtoRzI$xoO" resolve="i" />
+                          <node concept="37vLTw" id="HnFYK1agaL" role="37vLTJ">
+                            <ref role="3cqZAo" node="HnFYK17ZAm" resolve="leftMargin" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbF" id="HnFYK1dhiI" role="3cqZAp">
+                        <node concept="37vLTI" id="HnFYK1dsu7" role="3clFbG">
+                          <node concept="2YIFZM" id="HnFYK1dD03" role="37vLTx">
+                            <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
+                            <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
+                            <node concept="3cmrfG" id="HnFYK1dKzm" role="37wK5m">
+                              <property role="3cmrfH" value="0" />
                             </node>
-                            <node concept="37vLTw" id="1QtoRzJ3A9J" role="1y566C">
-                              <ref role="3cqZAo" node="1QtoRzIxjez" resolve="childrenBounds" />
+                            <node concept="2YIFZM" id="HnFYK1dXL7" role="37wK5m">
+                              <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
+                              <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
+                              <node concept="37vLTw" id="HnFYK1e8W6" role="37wK5m">
+                                <ref role="3cqZAo" node="1QtoRzIFZBG" resolve="margin" />
+                              </node>
+                              <node concept="37vLTw" id="HnFYK1epuB" role="37wK5m">
+                                <ref role="3cqZAo" node="HnFYK17ZAm" resolve="leftMargin" />
+                              </node>
                             </node>
                           </node>
+                          <node concept="37vLTw" id="HnFYK1dhiG" role="37vLTJ">
+                            <ref role="3cqZAo" node="HnFYK17ZAm" resolve="leftMargin" />
+                          </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="9aQIb" id="1QtoRzJ2Ntf" role="9aQIa">
-                    <node concept="3clFbS" id="1QtoRzJ2Ntg" role="9aQI4">
-                      <node concept="3cpWs8" id="1QtoRzIItUn" role="3cqZAp">
-                        <node concept="3cpWsn" id="1QtoRzIItUq" role="3cpWs9">
-                          <property role="TrG5h" value="halfMargin" />
-                          <node concept="10Oyi0" id="1QtoRzIItUl" role="1tU5fm" />
-                          <node concept="FJ1c_" id="1QtoRzIJuUg" role="33vP2m">
-                            <node concept="3cmrfG" id="1QtoRzIJva$" role="3uHU7w">
-                              <property role="3cmrfH" value="2" />
+                  <node concept="3eNFk2" id="HnFYK15cFz" role="3eNLev">
+                    <node concept="37vLTw" id="HnFYK15l6y" role="3eO9$A">
+                      <ref role="3cqZAo" node="1QtoRzIxETE" resolve="isLast" />
+                    </node>
+                    <node concept="3clFbS" id="HnFYK15cF_" role="3eOfB_">
+                      <node concept="3cpWs8" id="HnFYK1fsmu" role="3cqZAp">
+                        <node concept="3cpWsn" id="HnFYK1fsmx" role="3cpWs9">
+                          <property role="TrG5h" value="rightMargin" />
+                          <node concept="10Oyi0" id="HnFYK1fsms" role="1tU5fm" />
+                          <node concept="3cpWsd" id="HnFYK1fKns" role="33vP2m">
+                            <node concept="FJ1c_" id="HnFYK1fKnt" role="3uHU7w">
+                              <node concept="3cmrfG" id="HnFYK1fKnu" role="3uHU7w">
+                                <property role="3cmrfH" value="2" />
+                              </node>
+                              <node concept="2OqwBi" id="HnFYK1fKnv" role="3uHU7B">
+                                <node concept="37vLTw" id="HnFYK1fKnw" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="1QtoRzIAELX" resolve="childBounds" />
+                                </node>
+                                <node concept="liA8E" id="HnFYK1fKnx" role="2OqNvi">
+                                  <ref role="37wK5l" node="7uOgiTcFwM" resolve="getWidth" />
+                                </node>
+                              </node>
                             </node>
-                            <node concept="1eOMI4" id="1QtoRzIIU3Q" role="3uHU7B">
-                              <node concept="3cpWs3" id="1QtoRzIJdWZ" role="1eOMHV">
-                                <node concept="3cmrfG" id="1QtoRzIJedj" role="3uHU7w">
-                                  <property role="3cmrfH" value="1" />
+                            <node concept="3cpWs3" id="HnFYK1fKny" role="3uHU7B">
+                              <node concept="3cpWs3" id="HnFYK1fKnz" role="3uHU7B">
+                                <node concept="10M0yZ" id="HnFYK1fKn$" role="3uHU7B">
+                                  <ref role="3cqZAo" node="1QtoRzH9jr6" resolve="BUTTON_SIZE" />
+                                  <ref role="1PxDUh" node="7GMtHW6rH5Q" resolve="Button" />
                                 </node>
-                                <node concept="37vLTw" id="1QtoRzIJ6eV" role="3uHU7B">
-                                  <ref role="3cqZAo" node="1QtoRzIFZBG" resolve="margin" />
+                                <node concept="37vLTw" id="HnFYK1fKqm" role="3uHU7w">
+                                  <ref role="3cqZAo" node="2vEHhzn1F4$" resolve="BUTTON_MARGIN" />
                                 </node>
                               </node>
+                              <node concept="10M0yZ" id="HnFYK1fKn_" role="3uHU7w">
+                                <ref role="3cqZAo" node="1QtoRzHrmj5" resolve="BUTTON_HALF_SIZE" />
+                                <ref role="1PxDUh" node="7GMtHW6rH5Q" resolve="Button" />
+                              </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="3clFbF" id="1QtoRzIzQAd" role="3cqZAp">
-                        <node concept="37vLTI" id="1QtoRzIDVLo" role="3clFbG">
-                          <node concept="2ShNRf" id="1QtoRzIEqwt" role="37vLTx">
-                            <node concept="1pGfFk" id="1QtoRzIFbge" role="2ShVmc">
-                              <property role="373rjd" value="true" />
-                              <ref role="37wK5l" node="1QtoRzIvQcK" resolve="BoundsWithMargin" />
-                              <node concept="37vLTw" id="1QtoRzIFr2K" role="37wK5m">
-                                <ref role="3cqZAo" node="1QtoRzIAELX" resolve="childBounds" />
-                              </node>
-                              <node concept="37vLTw" id="1QtoRzIJDdn" role="37wK5m">
-                                <ref role="3cqZAo" node="1QtoRzIItUq" resolve="halfMargin" />
-                              </node>
-                              <node concept="37vLTw" id="1QtoRzIK2TA" role="37wK5m">
-                                <ref role="3cqZAo" node="1QtoRzIItUq" resolve="halfMargin" />
-                              </node>
-                              <node concept="3cmrfG" id="1QtoRzIKp$I" role="37wK5m">
-                                <property role="3cmrfH" value="0" />
+                      <node concept="3clFbF" id="HnFYK1hldN" role="3cqZAp">
+                        <node concept="37vLTI" id="HnFYK1hzP_" role="3clFbG">
+                          <node concept="37vLTw" id="HnFYK1hldL" role="37vLTJ">
+                            <ref role="3cqZAo" node="HnFYK1fsmx" resolve="rightMargin" />
+                          </node>
+                          <node concept="2YIFZM" id="HnFYK1hH63" role="37vLTx">
+                            <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
+                            <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
+                            <node concept="3cmrfG" id="HnFYK1hH64" role="37wK5m">
+                              <property role="3cmrfH" value="0" />
+                            </node>
+                            <node concept="2YIFZM" id="HnFYK1hH65" role="37wK5m">
+                              <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
+                              <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
+                              <node concept="37vLTw" id="HnFYK1hH66" role="37wK5m">
+                                <ref role="3cqZAo" node="1QtoRzIFZBG" resolve="margin" />
                               </node>
-                              <node concept="3cmrfG" id="1QtoRzIKvq_" role="37wK5m">
-                                <property role="3cmrfH" value="0" />
+                              <node concept="37vLTw" id="HnFYK1hH67" role="37wK5m">
+                                <ref role="3cqZAo" node="HnFYK1fsmx" resolve="rightMargin" />
                               </node>
                             </node>
                           </node>
-                          <node concept="1y4W85" id="1QtoRzI$6NK" role="37vLTJ">
-                            <node concept="37vLTw" id="1QtoRzIBupG" role="1y58nS">
-                              <ref role="3cqZAo" node="1QtoRzI$xoO" resolve="i" />
+                        </node>
+                      </node>
+                      <node concept="3clFbF" id="HnFYK1g9NY" role="3cqZAp">
+                        <node concept="37vLTI" id="HnFYK1gjZl" role="3clFbG">
+                          <node concept="3cpWsd" id="HnFYK1gBrX" role="37vLTx">
+                            <node concept="37vLTw" id="HnFYK1gRfI" role="3uHU7w">
+                              <ref role="3cqZAo" node="HnFYK1fsmx" resolve="rightMargin" />
                             </node>
-                            <node concept="37vLTw" id="1QtoRzIzQAb" role="1y566C">
-                              <ref role="3cqZAo" node="1QtoRzIxjez" resolve="childrenBounds" />
+                            <node concept="37vLTw" id="HnFYK1gtEv" role="3uHU7B">
+                              <ref role="3cqZAo" node="1QtoRzIFZBG" resolve="margin" />
                             </node>
                           </node>
+                          <node concept="37vLTw" id="HnFYK1g9NW" role="37vLTJ">
+                            <ref role="3cqZAo" node="HnFYK17ZAm" resolve="leftMargin" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="1Wc70l" id="HnFYK14EsI" role="3clFbw">
+                    <node concept="37vLTw" id="HnFYK14O0n" role="3uHU7w">
+                      <ref role="3cqZAo" node="1QtoRzIxETE" resolve="isLast" />
+                    </node>
+                    <node concept="37vLTw" id="HnFYK14ydZ" role="3uHU7B">
+                      <ref role="3cqZAo" node="1QtoRzIxET$" resolve="isFirst" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="HnFYK167mL" role="3cqZAp">
+                  <node concept="37vLTI" id="HnFYK167mM" role="3clFbG">
+                    <node concept="2ShNRf" id="HnFYK167mN" role="37vLTx">
+                      <node concept="1pGfFk" id="HnFYK167mO" role="2ShVmc">
+                        <property role="373rjd" value="true" />
+                        <ref role="37wK5l" node="1QtoRzIvQcK" resolve="BoundsWithMargin" />
+                        <node concept="37vLTw" id="HnFYK167mP" role="37wK5m">
+                          <ref role="3cqZAo" node="1QtoRzIAELX" resolve="childBounds" />
+                        </node>
+                        <node concept="37vLTw" id="HnFYK16X$_" role="37wK5m">
+                          <ref role="3cqZAo" node="HnFYK17ZAm" resolve="leftMargin" />
+                        </node>
+                        <node concept="3cpWsd" id="HnFYK17bdB" role="37wK5m">
+                          <node concept="37vLTw" id="HnFYK17lbw" role="3uHU7w">
+                            <ref role="3cqZAo" node="HnFYK17ZAm" resolve="leftMargin" />
+                          </node>
+                          <node concept="37vLTw" id="HnFYK167mR" role="3uHU7B">
+                            <ref role="3cqZAo" node="1QtoRzIFZBG" resolve="margin" />
+                          </node>
+                        </node>
+                        <node concept="3cmrfG" id="HnFYK167mS" role="37wK5m">
+                          <property role="3cmrfH" value="0" />
+                        </node>
+                        <node concept="3cmrfG" id="HnFYK167mT" role="37wK5m">
+                          <property role="3cmrfH" value="0" />
                         </node>
                       </node>
                     </node>
+                    <node concept="1y4W85" id="HnFYK167mU" role="37vLTJ">
+                      <node concept="37vLTw" id="HnFYK167mV" role="1y58nS">
+                        <ref role="3cqZAo" node="1QtoRzI$xoO" resolve="i" />
+                      </node>
+                      <node concept="37vLTw" id="HnFYK167mW" role="1y566C">
+                        <ref role="3cqZAo" node="1QtoRzIxjez" resolve="childrenBounds" />
+                      </node>
+                    </node>
                   </node>
                 </node>
               </node>
@@ -11031,12 +11274,17 @@
                       </node>
                     </node>
                     <node concept="2OqwBi" id="2rPTijxCTiC" role="3uHU7B">
-                      <node concept="3M$PaV" id="2rPTijxCTiD" role="2Oq$k0">
-                        <ref role="3M$S_o" node="2rPTijxCTiT" resolve="childBounds" />
-                      </node>
                       <node concept="AQDAd" id="2rPTijxCTiE" role="2OqNvi">
                         <ref role="37wK5l" node="7GMtHW6$cnn" resolve="getCenterX" />
                       </node>
+                      <node concept="2OqwBi" id="HnFYK1lbCm" role="2Oq$k0">
+                        <node concept="3M$PaV" id="2rPTijxCTiD" role="2Oq$k0">
+                          <ref role="3M$S_o" node="2rPTijxCTiT" resolve="childBounds" />
+                        </node>
+                        <node concept="liA8E" id="HnFYK1llip" role="2OqNvi">
+                          <ref role="37wK5l" node="HnFYK1iIz4" resolve="withoutMargin" />
+                        </node>
+                      </node>
                     </node>
                   </node>
                   <node concept="3cpWsd" id="2rPTijxCTiF" role="37wK5m">
@@ -16565,40 +16813,33 @@
                 <node concept="10Oyi0" id="1QtoRzJxKFQ" role="1tU5fm" />
               </node>
             </node>
-            <node concept="3clFbJ" id="1QtoRzJxKFR" role="3cqZAp">
-              <node concept="3clFbS" id="1QtoRzJxKFS" role="3clFbx">
-                <node concept="3clFbF" id="1QtoRzJxKFT" role="3cqZAp">
-                  <node concept="37vLTI" id="1QtoRzJxKFU" role="3clFbG">
-                    <node concept="3cpWs3" id="1QtoRzJxKFV" role="37vLTx">
-                      <node concept="3cpWs3" id="1QtoRzJxKFY" role="3uHU7B">
-                        <node concept="10M0yZ" id="1QtoRzJxKFZ" role="3uHU7B">
+            <node concept="3clFbJ" id="HnFYK1mXY$" role="3cqZAp">
+              <node concept="3clFbS" id="HnFYK1mXYA" role="3clFbx">
+                <node concept="3clFbF" id="HnFYK1ojli" role="3cqZAp">
+                  <node concept="37vLTI" id="HnFYK1ojlj" role="3clFbG">
+                    <node concept="3cpWs3" id="HnFYK1ojlk" role="37vLTx">
+                      <node concept="3cpWs3" id="HnFYK1ojll" role="3uHU7B">
+                        <node concept="10M0yZ" id="HnFYK1ojlm" role="3uHU7B">
                           <ref role="3cqZAo" node="1QtoRzH9jr6" resolve="BUTTON_SIZE" />
                           <ref role="1PxDUh" node="7GMtHW6rH5Q" resolve="Button" />
                         </node>
-                        <node concept="37vLTw" id="1QtoRzJxKKR" role="3uHU7w">
+                        <node concept="37vLTw" id="HnFYK1ojln" role="3uHU7w">
                           <ref role="3cqZAo" node="2vEHhzn1F4$" resolve="BUTTON_MARGIN" />
                         </node>
                       </node>
-                      <node concept="37vLTw" id="1QtoRzJxKG1" role="3uHU7w">
-                        <ref role="3cqZAo" node="1QtoRzJxKDn" resolve="overlapInsertButtonWithChildCell" />
+                      <node concept="10M0yZ" id="HnFYK1oKna" role="3uHU7w">
+                        <ref role="3cqZAo" node="1QtoRzH9jr6" resolve="BUTTON_SIZE" />
+                        <ref role="1PxDUh" node="7GMtHW6rH5Q" resolve="Button" />
                       </node>
                     </node>
-                    <node concept="37vLTw" id="1QtoRzJxKG2" role="37vLTJ">
+                    <node concept="37vLTw" id="HnFYK1ojlp" role="37vLTJ">
                       <ref role="3cqZAo" node="1QtoRzJxKFP" resolve="childMinWidth" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="22lmx$" id="1QtoRzJxKG3" role="3clFbw">
-                <node concept="37vLTw" id="1QtoRzJxKG4" role="3uHU7w">
-                  <ref role="3cqZAo" node="1QtoRzJxKFs" resolve="isLast" />
-                </node>
-                <node concept="37vLTw" id="1QtoRzJxKG5" role="3uHU7B">
-                  <ref role="3cqZAo" node="1QtoRzJxKFm" resolve="isFirst" />
-                </node>
-              </node>
-              <node concept="9aQIb" id="1QtoRzJxKG6" role="9aQIa">
-                <node concept="3clFbS" id="1QtoRzJxKG7" role="9aQI4">
+              <node concept="9aQIb" id="HnFYK1nVA7" role="9aQIa">
+                <node concept="3clFbS" id="HnFYK1nVA8" role="9aQI4">
                   <node concept="3clFbF" id="1QtoRzJxKG8" role="3cqZAp">
                     <node concept="37vLTI" id="1QtoRzJxKG9" role="3clFbG">
                       <node concept="37vLTw" id="1QtoRzJxKGa" role="37vLTJ">
@@ -16621,6 +16862,47 @@
                   </node>
                 </node>
               </node>
+              <node concept="1Wc70l" id="HnFYK1ndAo" role="3clFbw">
+                <node concept="37vLTw" id="HnFYK1ni7l" role="3uHU7w">
+                  <ref role="3cqZAo" node="1QtoRzJxKFs" resolve="isLast" />
+                </node>
+                <node concept="37vLTw" id="HnFYK1n5Fs" role="3uHU7B">
+                  <ref role="3cqZAo" node="1QtoRzJxKFm" resolve="isFirst" />
+                </node>
+              </node>
+              <node concept="3eNFk2" id="HnFYK1ns6p" role="3eNLev">
+                <node concept="22lmx$" id="HnFYK1nHiq" role="3eO9$A">
+                  <node concept="37vLTw" id="HnFYK1nOW1" role="3uHU7w">
+                    <ref role="3cqZAo" node="1QtoRzJxKFs" resolve="isLast" />
+                  </node>
+                  <node concept="37vLTw" id="HnFYK1n_ny" role="3uHU7B">
+                    <ref role="3cqZAo" node="1QtoRzJxKFm" resolve="isFirst" />
+                  </node>
+                </node>
+                <node concept="3clFbS" id="HnFYK1ns6r" role="3eOfB_">
+                  <node concept="3clFbF" id="1QtoRzJxKFT" role="3cqZAp">
+                    <node concept="37vLTI" id="1QtoRzJxKFU" role="3clFbG">
+                      <node concept="3cpWs3" id="1QtoRzJxKFV" role="37vLTx">
+                        <node concept="3cpWs3" id="1QtoRzJxKFY" role="3uHU7B">
+                          <node concept="10M0yZ" id="1QtoRzJxKFZ" role="3uHU7B">
+                            <ref role="3cqZAo" node="1QtoRzH9jr6" resolve="BUTTON_SIZE" />
+                            <ref role="1PxDUh" node="7GMtHW6rH5Q" resolve="Button" />
+                          </node>
+                          <node concept="37vLTw" id="1QtoRzJxKKR" role="3uHU7w">
+                            <ref role="3cqZAo" node="2vEHhzn1F4$" resolve="BUTTON_MARGIN" />
+                          </node>
+                        </node>
+                        <node concept="37vLTw" id="1QtoRzJxKG1" role="3uHU7w">
+                          <ref role="3cqZAo" node="1QtoRzJxKDn" resolve="overlapInsertButtonWithChildCell" />
+                        </node>
+                      </node>
+                      <node concept="37vLTw" id="1QtoRzJxKG2" role="37vLTJ">
+                        <ref role="3cqZAo" node="1QtoRzJxKFP" resolve="childMinWidth" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
             </node>
             <node concept="3clFbH" id="1QtoRzJxKGi" role="3cqZAp" />
             <node concept="3cpWs8" id="1QtoRzJxKGj" role="3cqZAp">
@@ -16642,152 +16924,292 @@
                 </node>
               </node>
             </node>
-            <node concept="3clFbJ" id="1QtoRzJxKGr" role="3cqZAp">
-              <node concept="3clFbS" id="1QtoRzJxKGs" role="3clFbx">
-                <node concept="3clFbJ" id="1QtoRzJxKGt" role="3cqZAp">
-                  <node concept="3clFbS" id="1QtoRzJxKGu" role="3clFbx">
-                    <node concept="3clFbF" id="1QtoRzJxKGv" role="3cqZAp">
-                      <node concept="37vLTI" id="1QtoRzJxKGw" role="3clFbG">
-                        <node concept="2ShNRf" id="1QtoRzJxKGx" role="37vLTx">
-                          <node concept="1pGfFk" id="1QtoRzJxKGy" role="2ShVmc">
-                            <property role="373rjd" value="true" />
-                            <ref role="37wK5l" node="1QtoRzIvQcK" resolve="BoundsWithMargin" />
-                            <node concept="37vLTw" id="1QtoRzJxKGz" role="37wK5m">
-                              <ref role="3cqZAo" node="1QtoRzJxKFg" resolve="childBounds" />
-                            </node>
-                            <node concept="3cmrfG" id="1QtoRzJxKG$" role="37wK5m">
-                              <property role="3cmrfH" value="0" />
+            <node concept="3clFbJ" id="HnFYK1qhaz" role="3cqZAp">
+              <node concept="3clFbS" id="HnFYK1qha$" role="3clFbx">
+                <node concept="3cpWs8" id="HnFYK1qha_" role="3cqZAp">
+                  <node concept="3cpWsn" id="HnFYK1qhaA" role="3cpWs9">
+                    <property role="TrG5h" value="leftMargin" />
+                    <node concept="10Oyi0" id="HnFYK1qhaB" role="1tU5fm" />
+                    <node concept="3cmrfG" id="HnFYK1qhaC" role="33vP2m">
+                      <property role="3cmrfH" value="0" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbJ" id="HnFYK1qhaD" role="3cqZAp">
+                  <node concept="3clFbS" id="HnFYK1qhaE" role="3clFbx">
+                    <node concept="3clFbF" id="HnFYK1qhaF" role="3cqZAp">
+                      <node concept="37vLTI" id="HnFYK1qhaG" role="3clFbG">
+                        <node concept="FJ1c_" id="HnFYK1qhaH" role="37vLTx">
+                          <node concept="3cmrfG" id="HnFYK1qhaI" role="3uHU7w">
+                            <property role="3cmrfH" value="2" />
+                          </node>
+                          <node concept="37vLTw" id="HnFYK1qhaJ" role="3uHU7B">
+                            <ref role="3cqZAo" node="1QtoRzJxKGk" resolve="margin" />
+                          </node>
+                        </node>
+                        <node concept="37vLTw" id="HnFYK1qhaK" role="37vLTJ">
+                          <ref role="3cqZAo" node="HnFYK1qhaA" resolve="leftMargin" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="9aQIb" id="HnFYK1qhbS" role="9aQIa">
+                    <node concept="3clFbS" id="HnFYK1qhbT" role="9aQI4">
+                      <node concept="3clFbF" id="HnFYK1qhbU" role="3cqZAp">
+                        <node concept="37vLTI" id="HnFYK1qhbV" role="3clFbG">
+                          <node concept="FJ1c_" id="HnFYK1qhbW" role="37vLTx">
+                            <node concept="3cmrfG" id="HnFYK1qhbX" role="3uHU7w">
+                              <property role="3cmrfH" value="2" />
                             </node>
-                            <node concept="37vLTw" id="1QtoRzJxKG_" role="37wK5m">
+                            <node concept="37vLTw" id="HnFYK1qhbY" role="3uHU7B">
                               <ref role="3cqZAo" node="1QtoRzJxKGk" resolve="margin" />
                             </node>
-                            <node concept="3cmrfG" id="1QtoRzJxKGA" role="37wK5m">
-                              <property role="3cmrfH" value="0" />
-                            </node>
-                            <node concept="3cmrfG" id="1QtoRzJxKGB" role="37wK5m">
-                              <property role="3cmrfH" value="0" />
-                            </node>
                           </node>
-                        </node>
-                        <node concept="1y4W85" id="1QtoRzJxKGC" role="37vLTJ">
-                          <node concept="37vLTw" id="1QtoRzJxKGD" role="1y58nS">
-                            <ref role="3cqZAo" node="1QtoRzJxKHl" resolve="i" />
-                          </node>
-                          <node concept="37vLTw" id="1QtoRzJxKGE" role="1y566C">
-                            <ref role="3cqZAo" node="1QtoRzJwQRf" resolve="childrenBounds" />
+                          <node concept="37vLTw" id="HnFYK1qhbZ" role="37vLTJ">
+                            <ref role="3cqZAo" node="HnFYK1qhaA" resolve="leftMargin" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="37vLTw" id="1QtoRzJxKGF" role="3clFbw">
-                    <ref role="3cqZAo" node="1QtoRzJxKFm" resolve="isFirst" />
-                  </node>
-                  <node concept="3eNFk2" id="1QtoRzJxKGG" role="3eNLev">
-                    <node concept="37vLTw" id="1QtoRzJxKGH" role="3eO9$A">
-                      <ref role="3cqZAo" node="1QtoRzJxKFs" resolve="isLast" />
+                  <node concept="3eNFk2" id="HnFYK1qhaO" role="3eNLev">
+                    <node concept="37vLTw" id="HnFYK1qhaP" role="3eO9$A">
+                      <ref role="3cqZAo" node="1QtoRzJxKFm" resolve="isFirst" />
                     </node>
-                    <node concept="3clFbS" id="1QtoRzJxKGI" role="3eOfB_">
-                      <node concept="3clFbF" id="1QtoRzJxKGJ" role="3cqZAp">
-                        <node concept="37vLTI" id="1QtoRzJxKGK" role="3clFbG">
-                          <node concept="2ShNRf" id="1QtoRzJxKGL" role="37vLTx">
-                            <node concept="1pGfFk" id="1QtoRzJxKGM" role="2ShVmc">
-                              <property role="373rjd" value="true" />
-                              <ref role="37wK5l" node="1QtoRzIvQcK" resolve="BoundsWithMargin" />
-                              <node concept="37vLTw" id="1QtoRzJxKGN" role="37wK5m">
-                                <ref role="3cqZAo" node="1QtoRzJxKFg" resolve="childBounds" />
-                              </node>
-                              <node concept="37vLTw" id="1QtoRzJxKGO" role="37wK5m">
-                                <ref role="3cqZAo" node="1QtoRzJxKGk" resolve="margin" />
+                    <node concept="3clFbS" id="HnFYK1qhaQ" role="3eOfB_">
+                      <node concept="3SKdUt" id="HnFYK1qhaR" role="3cqZAp">
+                        <node concept="1PaTwC" id="HnFYK1qhaS" role="1aUNEU">
+                          <node concept="3oM_SD" id="HnFYK1qhaT" role="1PaTwD">
+                            <property role="3oM_SC" value="align" />
+                          </node>
+                          <node concept="3oM_SD" id="HnFYK1qhaU" role="1PaTwD">
+                            <property role="3oM_SC" value="center" />
+                          </node>
+                          <node concept="3oM_SD" id="HnFYK1qr63" role="1PaTwD">
+                            <property role="3oM_SC" value="between" />
+                          </node>
+                          <node concept="3oM_SD" id="HnFYK1qr64" role="1PaTwD">
+                            <property role="3oM_SC" value="both" />
+                          </node>
+                          <node concept="3oM_SD" id="HnFYK1qra_" role="1PaTwD">
+                            <property role="3oM_SC" value="buttons" />
+                          </node>
+                          <node concept="3oM_SD" id="HnFYK1qhaZ" role="1PaTwD">
+                            <property role="3oM_SC" value="with" />
+                          </node>
+                          <node concept="3oM_SD" id="HnFYK1qhb0" role="1PaTwD">
+                            <property role="3oM_SC" value="the" />
+                          </node>
+                          <node concept="3oM_SD" id="HnFYK1qhb1" role="1PaTwD">
+                            <property role="3oM_SC" value="center" />
+                          </node>
+                          <node concept="3oM_SD" id="HnFYK1qhb2" role="1PaTwD">
+                            <property role="3oM_SC" value="of" />
+                          </node>
+                          <node concept="3oM_SD" id="HnFYK1qhb3" role="1PaTwD">
+                            <property role="3oM_SC" value="the" />
+                          </node>
+                          <node concept="3oM_SD" id="HnFYK1qhb4" role="1PaTwD">
+                            <property role="3oM_SC" value="child" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbF" id="HnFYK1qhb5" role="3cqZAp">
+                        <node concept="37vLTI" id="HnFYK1qhb6" role="3clFbG">
+                          <node concept="3cpWsd" id="HnFYK1qhb7" role="37vLTx">
+                            <node concept="FJ1c_" id="HnFYK1qhb8" role="3uHU7w">
+                              <node concept="3cmrfG" id="HnFYK1qhb9" role="3uHU7w">
+                                <property role="3cmrfH" value="2" />
                               </node>
-                              <node concept="3cmrfG" id="1QtoRzJxKGP" role="37wK5m">
-                                <property role="3cmrfH" value="0" />
+                              <node concept="2OqwBi" id="HnFYK1qhba" role="3uHU7B">
+                                <node concept="37vLTw" id="HnFYK1qhbb" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="1QtoRzJxKFg" resolve="childBounds" />
+                                </node>
+                                <node concept="liA8E" id="HnFYK1qhbc" role="2OqNvi">
+                                  <ref role="37wK5l" node="7uOgiTcFwM" resolve="getWidth" />
+                                </node>
                               </node>
-                              <node concept="3cmrfG" id="1QtoRzJxKGQ" role="37wK5m">
-                                <property role="3cmrfH" value="0" />
+                            </node>
+                            <node concept="3cpWs3" id="HnFYK1qhbe" role="3uHU7B">
+                              <node concept="10M0yZ" id="HnFYK1qhbf" role="3uHU7B">
+                                <ref role="3cqZAo" node="1QtoRzH9jr6" resolve="BUTTON_SIZE" />
+                                <ref role="1PxDUh" node="7GMtHW6rH5Q" resolve="Button" />
                               </node>
-                              <node concept="3cmrfG" id="1QtoRzJxKGR" role="37wK5m">
-                                <property role="3cmrfH" value="0" />
+                              <node concept="FJ1c_" id="HnFYK1qtIi" role="3uHU7w">
+                                <node concept="3cmrfG" id="HnFYK1qtYe" role="3uHU7w">
+                                  <property role="3cmrfH" value="2" />
+                                </node>
+                                <node concept="37vLTw" id="HnFYK1qhfl" role="3uHU7B">
+                                  <ref role="3cqZAo" node="2vEHhzn1F4$" resolve="BUTTON_MARGIN" />
+                                </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="1y4W85" id="1QtoRzJxKGS" role="37vLTJ">
-                            <node concept="37vLTw" id="1QtoRzJxKGT" role="1y58nS">
-                              <ref role="3cqZAo" node="1QtoRzJxKHl" resolve="i" />
+                          <node concept="37vLTw" id="HnFYK1qhbh" role="37vLTJ">
+                            <ref role="3cqZAo" node="HnFYK1qhaA" resolve="leftMargin" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbF" id="HnFYK1qhbi" role="3cqZAp">
+                        <node concept="37vLTI" id="HnFYK1qhbj" role="3clFbG">
+                          <node concept="2YIFZM" id="HnFYK1qhbk" role="37vLTx">
+                            <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
+                            <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
+                            <node concept="3cmrfG" id="HnFYK1qhbl" role="37wK5m">
+                              <property role="3cmrfH" value="0" />
                             </node>
-                            <node concept="37vLTw" id="1QtoRzJxKGU" role="1y566C">
-                              <ref role="3cqZAo" node="1QtoRzJwQRf" resolve="childrenBounds" />
+                            <node concept="2YIFZM" id="HnFYK1qhbm" role="37wK5m">
+                              <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
+                              <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
+                              <node concept="37vLTw" id="HnFYK1qhbn" role="37wK5m">
+                                <ref role="3cqZAo" node="1QtoRzJxKGk" resolve="margin" />
+                              </node>
+                              <node concept="37vLTw" id="HnFYK1qhbo" role="37wK5m">
+                                <ref role="3cqZAo" node="HnFYK1qhaA" resolve="leftMargin" />
+                              </node>
                             </node>
                           </node>
+                          <node concept="37vLTw" id="HnFYK1qhbp" role="37vLTJ">
+                            <ref role="3cqZAo" node="HnFYK1qhaA" resolve="leftMargin" />
+                          </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="9aQIb" id="1QtoRzJxKGV" role="9aQIa">
-                    <node concept="3clFbS" id="1QtoRzJxKGW" role="9aQI4">
-                      <node concept="3cpWs8" id="1QtoRzJxKGX" role="3cqZAp">
-                        <node concept="3cpWsn" id="1QtoRzJxKGY" role="3cpWs9">
-                          <property role="TrG5h" value="halfMargin" />
-                          <node concept="10Oyi0" id="1QtoRzJxKGZ" role="1tU5fm" />
-                          <node concept="FJ1c_" id="1QtoRzJxKH0" role="33vP2m">
-                            <node concept="3cmrfG" id="1QtoRzJxKH1" role="3uHU7w">
-                              <property role="3cmrfH" value="2" />
+                  <node concept="3eNFk2" id="HnFYK1qhbq" role="3eNLev">
+                    <node concept="37vLTw" id="HnFYK1qhbr" role="3eO9$A">
+                      <ref role="3cqZAo" node="1QtoRzJxKFs" resolve="isLast" />
+                    </node>
+                    <node concept="3clFbS" id="HnFYK1qhbs" role="3eOfB_">
+                      <node concept="3cpWs8" id="HnFYK1qhbt" role="3cqZAp">
+                        <node concept="3cpWsn" id="HnFYK1qhbu" role="3cpWs9">
+                          <property role="TrG5h" value="rightMargin" />
+                          <node concept="10Oyi0" id="HnFYK1qhbv" role="1tU5fm" />
+                          <node concept="3cpWsd" id="HnFYK1qTke" role="33vP2m">
+                            <node concept="FJ1c_" id="HnFYK1qTkf" role="3uHU7w">
+                              <node concept="3cmrfG" id="HnFYK1qTkg" role="3uHU7w">
+                                <property role="3cmrfH" value="2" />
+                              </node>
+                              <node concept="2OqwBi" id="HnFYK1qTkh" role="3uHU7B">
+                                <node concept="37vLTw" id="HnFYK1qTki" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="1QtoRzJxKFg" resolve="childBounds" />
+                                </node>
+                                <node concept="liA8E" id="HnFYK1qTkj" role="2OqNvi">
+                                  <ref role="37wK5l" node="7uOgiTcFwM" resolve="getWidth" />
+                                </node>
+                              </node>
                             </node>
-                            <node concept="1eOMI4" id="1QtoRzJxKH2" role="3uHU7B">
-                              <node concept="3cpWs3" id="1QtoRzJxKH3" role="1eOMHV">
-                                <node concept="3cmrfG" id="1QtoRzJxKH4" role="3uHU7w">
-                                  <property role="3cmrfH" value="1" />
+                            <node concept="3cpWs3" id="HnFYK1qTkk" role="3uHU7B">
+                              <node concept="10M0yZ" id="HnFYK1qTkl" role="3uHU7B">
+                                <ref role="3cqZAo" node="1QtoRzH9jr6" resolve="BUTTON_SIZE" />
+                                <ref role="1PxDUh" node="7GMtHW6rH5Q" resolve="Button" />
+                              </node>
+                              <node concept="FJ1c_" id="HnFYK1qTkm" role="3uHU7w">
+                                <node concept="3cmrfG" id="HnFYK1qTkn" role="3uHU7w">
+                                  <property role="3cmrfH" value="2" />
                                 </node>
-                                <node concept="37vLTw" id="1QtoRzJxKH5" role="3uHU7B">
-                                  <ref role="3cqZAo" node="1QtoRzJxKGk" resolve="margin" />
+                                <node concept="37vLTw" id="HnFYK1qTns" role="3uHU7B">
+                                  <ref role="3cqZAo" node="2vEHhzn1F4$" resolve="BUTTON_MARGIN" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="3clFbF" id="1QtoRzJxKH6" role="3cqZAp">
-                        <node concept="37vLTI" id="1QtoRzJxKH7" role="3clFbG">
-                          <node concept="2ShNRf" id="1QtoRzJxKH8" role="37vLTx">
-                            <node concept="1pGfFk" id="1QtoRzJxKH9" role="2ShVmc">
-                              <property role="373rjd" value="true" />
-                              <ref role="37wK5l" node="1QtoRzIvQcK" resolve="BoundsWithMargin" />
-                              <node concept="37vLTw" id="1QtoRzJxKHa" role="37wK5m">
-                                <ref role="3cqZAo" node="1QtoRzJxKFg" resolve="childBounds" />
-                              </node>
-                              <node concept="37vLTw" id="1QtoRzJxKHb" role="37wK5m">
-                                <ref role="3cqZAo" node="1QtoRzJxKGY" resolve="halfMargin" />
-                              </node>
-                              <node concept="37vLTw" id="1QtoRzJxKHc" role="37wK5m">
-                                <ref role="3cqZAo" node="1QtoRzJxKGY" resolve="halfMargin" />
-                              </node>
-                              <node concept="3cmrfG" id="1QtoRzJxKHd" role="37wK5m">
-                                <property role="3cmrfH" value="0" />
+                      <node concept="3clFbF" id="HnFYK1qhbE" role="3cqZAp">
+                        <node concept="37vLTI" id="HnFYK1qhbF" role="3clFbG">
+                          <node concept="37vLTw" id="HnFYK1qhbG" role="37vLTJ">
+                            <ref role="3cqZAo" node="HnFYK1qhbu" resolve="rightMargin" />
+                          </node>
+                          <node concept="2YIFZM" id="HnFYK1qhbH" role="37vLTx">
+                            <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
+                            <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
+                            <node concept="3cmrfG" id="HnFYK1qhbI" role="37wK5m">
+                              <property role="3cmrfH" value="0" />
+                            </node>
+                            <node concept="2YIFZM" id="HnFYK1qhbJ" role="37wK5m">
+                              <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
+                              <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
+                              <node concept="37vLTw" id="HnFYK1qhbK" role="37wK5m">
+                                <ref role="3cqZAo" node="1QtoRzJxKGk" resolve="margin" />
                               </node>
-                              <node concept="3cmrfG" id="1QtoRzJxKHe" role="37wK5m">
-                                <property role="3cmrfH" value="0" />
+                              <node concept="37vLTw" id="HnFYK1qhbL" role="37wK5m">
+                                <ref role="3cqZAo" node="HnFYK1qhbu" resolve="rightMargin" />
                               </node>
                             </node>
                           </node>
-                          <node concept="1y4W85" id="1QtoRzJxKHf" role="37vLTJ">
-                            <node concept="37vLTw" id="1QtoRzJxKHg" role="1y58nS">
-                              <ref role="3cqZAo" node="1QtoRzJxKHl" resolve="i" />
+                        </node>
+                      </node>
+                      <node concept="3clFbF" id="HnFYK1qhbM" role="3cqZAp">
+                        <node concept="37vLTI" id="HnFYK1qhbN" role="3clFbG">
+                          <node concept="3cpWsd" id="HnFYK1qhbO" role="37vLTx">
+                            <node concept="37vLTw" id="HnFYK1qhbP" role="3uHU7w">
+                              <ref role="3cqZAo" node="HnFYK1qhbu" resolve="rightMargin" />
                             </node>
-                            <node concept="37vLTw" id="1QtoRzJxKHh" role="1y566C">
-                              <ref role="3cqZAo" node="1QtoRzJwQRf" resolve="childrenBounds" />
+                            <node concept="37vLTw" id="HnFYK1qhbQ" role="3uHU7B">
+                              <ref role="3cqZAo" node="1QtoRzJxKGk" resolve="margin" />
                             </node>
                           </node>
+                          <node concept="37vLTw" id="HnFYK1qhbR" role="37vLTJ">
+                            <ref role="3cqZAo" node="HnFYK1qhaA" resolve="leftMargin" />
+                          </node>
                         </node>
                       </node>
                     </node>
                   </node>
+                  <node concept="1Wc70l" id="HnFYK1qhaL" role="3clFbw">
+                    <node concept="37vLTw" id="HnFYK1qhaM" role="3uHU7w">
+                      <ref role="3cqZAo" node="1QtoRzJxKFs" resolve="isLast" />
+                    </node>
+                    <node concept="37vLTw" id="HnFYK1qhaN" role="3uHU7B">
+                      <ref role="3cqZAo" node="1QtoRzJxKFm" resolve="isFirst" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="HnFYK1qhc0" role="3cqZAp">
+                  <node concept="37vLTI" id="HnFYK1qhc1" role="3clFbG">
+                    <node concept="2ShNRf" id="HnFYK1qhc2" role="37vLTx">
+                      <node concept="1pGfFk" id="HnFYK1qhc3" role="2ShVmc">
+                        <property role="373rjd" value="true" />
+                        <ref role="37wK5l" node="1QtoRzIvQcK" resolve="BoundsWithMargin" />
+                        <node concept="37vLTw" id="HnFYK1qhc4" role="37wK5m">
+                          <ref role="3cqZAo" node="1QtoRzJxKFg" resolve="childBounds" />
+                        </node>
+                        <node concept="37vLTw" id="HnFYK1qhc5" role="37wK5m">
+                          <ref role="3cqZAo" node="HnFYK1qhaA" resolve="leftMargin" />
+                        </node>
+                        <node concept="3cpWsd" id="HnFYK1qhc6" role="37wK5m">
+                          <node concept="37vLTw" id="HnFYK1qhc7" role="3uHU7w">
+                            <ref role="3cqZAo" node="HnFYK1qhaA" resolve="leftMargin" />
+                          </node>
+                          <node concept="37vLTw" id="HnFYK1qhc8" role="3uHU7B">
+                            <ref role="3cqZAo" node="1QtoRzJxKGk" resolve="margin" />
+                          </node>
+                        </node>
+                        <node concept="3cmrfG" id="HnFYK1qhc9" role="37wK5m">
+                          <property role="3cmrfH" value="0" />
+                        </node>
+                        <node concept="3cmrfG" id="HnFYK1qhca" role="37wK5m">
+                          <property role="3cmrfH" value="0" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="1y4W85" id="HnFYK1qhcb" role="37vLTJ">
+                      <node concept="37vLTw" id="HnFYK1qhcc" role="1y58nS">
+                        <ref role="3cqZAo" node="1QtoRzJxKHl" resolve="i" />
+                      </node>
+                      <node concept="37vLTw" id="HnFYK1qhcd" role="1y566C">
+                        <ref role="3cqZAo" node="1QtoRzJwQRf" resolve="childrenBounds" />
+                      </node>
+                    </node>
+                  </node>
                 </node>
               </node>
-              <node concept="3eOSWO" id="1QtoRzJxKHi" role="3clFbw">
-                <node concept="3cmrfG" id="1QtoRzJxKHj" role="3uHU7w">
+              <node concept="3eOSWO" id="HnFYK1qhce" role="3clFbw">
+                <node concept="3cmrfG" id="HnFYK1qhcf" role="3uHU7w">
                   <property role="3cmrfH" value="0" />
                 </node>
-                <node concept="37vLTw" id="1QtoRzJxKHk" role="3uHU7B">
+                <node concept="37vLTw" id="HnFYK1qhcg" role="3uHU7B">
                   <ref role="3cqZAo" node="1QtoRzJxKGk" resolve="margin" />
                 </node>
               </node>
@@ -17754,6 +18176,24 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
+    <node concept="2tJIrI" id="HnFYK1iMdn" role="jymVt" />
+    <node concept="3clFb_" id="HnFYK1iMC$" role="jymVt">
+      <property role="TrG5h" value="withoutMargin" />
+      <node concept="3Tm1VV" id="HnFYK1iMCA" role="1B3o_S" />
+      <node concept="3uibUv" id="HnFYK1iMCB" role="3clF45">
+        <ref role="3uigEE" node="7uOgiTcFuK" resolve="IBounds" />
+      </node>
+      <node concept="3clFbS" id="HnFYK1iMCC" role="3clF47">
+        <node concept="3clFbF" id="HnFYK1iP8$" role="3cqZAp">
+          <node concept="37vLTw" id="HnFYK1iP8z" role="3clFbG">
+            <ref role="3cqZAo" node="1QtoRzIu$nj" resolve="bounds" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="HnFYK1iMCD" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" />
+      </node>
+    </node>
   </node>
 </model>
 

From 69f80286c78cfc9fa71c4ca34871f5c86b23b0d7 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Sun, 15 Dec 2024 12:32:32 +0100
Subject: [PATCH 2/8] mpsutil.intentions: rewrite code to use the intention
 menu producer

---
 .../models/de.itemis.mps.extensions.build.mps |   20 +
 .../com.mbeddr.mpsutil.intentions.runtime.msd |    4 +
 .../com/mbeddr/mpsutil/intentions/runtime.mps | 5971 +++++++----------
 .../mpsutil/intentions/runtime/plugin.mps     |   28 +-
 4 files changed, 2365 insertions(+), 3658 deletions(-)

diff --git a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
index a5045fcb8a..585f5ccebf 100644
--- a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
+++ b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
@@ -14768,6 +14768,26 @@
             <ref role="3bR37D" to="ffeo:7Kfy9QB6L7y" resolve="jetbrains.mps.lang.intentions" />
           </node>
         </node>
+        <node concept="1SiIV0" id="2jDew6504Tc" role="3bR37C">
+          <node concept="3bR9La" id="2jDew6504Td" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="2jDew6504Te" role="3bR37C">
+          <node concept="3bR9La" id="2jDew6504Tf" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:44LXwdzyvTi" resolve="Annotations" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="2jDew6504Tg" role="3bR37C">
+          <node concept="3bR9La" id="2jDew6504Th" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1TaHNgiIbJb" resolve="MPS.Platform" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="2jDew6504Ti" role="3bR37C">
+          <node concept="3bR9La" id="2jDew6504Tj" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="m$_wf" id="hCVXosGNJH" role="3989C9">
diff --git a/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/com.mbeddr.mpsutil.intentions.runtime.msd b/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/com.mbeddr.mpsutil.intentions.runtime.msd
index 61495bda51..1e2ace2aef 100644
--- a/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/com.mbeddr.mpsutil.intentions.runtime.msd
+++ b/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/com.mbeddr.mpsutil.intentions.runtime.msd
@@ -17,6 +17,10 @@
     <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>
+    <dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
+    <dependency reexport="false">3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)</dependency>
+    <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
+    <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:654422bf-e75f-44dc-936d-188890a746ce:de.slisson.mps.reflection" version="0" />
diff --git a/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/models/com/mbeddr/mpsutil/intentions/runtime.mps b/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/models/com/mbeddr/mpsutil/intentions/runtime.mps
index f4d2004e0c..81e2692539 100644
--- a/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/models/com/mbeddr/mpsutil/intentions/runtime.mps
+++ b/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/models/com/mbeddr/mpsutil/intentions/runtime.mps
@@ -2,19 +2,16 @@
 <model ref="r:990d360b-3ac3-45fa-8ed3-0bbf017bba84(com.mbeddr.mpsutil.intentions.runtime)">
   <persistence version="9" />
   <languages>
-    <use id="654422bf-e75f-44dc-936d-188890a746ce" name="de.slisson.mps.reflection" version="-1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="654422bf-e75f-44dc-936d-188890a746ce" name="de.slisson.mps.reflection" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
-    <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
     <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
     <import index="3ahc" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.editor.runtime.cells(MPS.Editor/)" />
-    <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="91lp" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.intentions(MPS.Editor/)" />
     <import index="8b49" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.intentions.icons(MPS.Editor/)" />
@@ -25,36 +22,31 @@
     <import index="qq03" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.actions(MPS.Platform/)" />
     <import index="7bx7" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.workbench.action(MPS.Platform/)" />
     <import index="ddhc" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ide(MPS.IDEA/)" />
-    <import index="gspm" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.ui.popup(MPS.IDEA/)" />
-    <import index="vmdq" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui.awt(MPS.IDEA/)" />
     <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="f4zo" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.cells(MPS.Editor/)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
-    <import index="hyam" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.event(JDK/)" />
     <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
     <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
     <import index="nlpl" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.editor.runtime.commands(MPS.Editor/)" />
-    <import index="g51k" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.cells(MPS.Editor/)" />
-    <import index="zn9m" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.util(MPS.IDEA/)" />
-    <import index="5rcs" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui.popup(MPS.IDEA/)" />
-    <import index="65en" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui.speedSearch(MPS.IDEA/)" />
-    <import index="d2fk" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui.popup.list(MPS.IDEA/)" />
     <import index="nddn" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.intentions(MPS.Editor/)" />
     <import index="1ka" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.typechecking(MPS.Core/)" />
     <import index="cj4x" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor(MPS.Editor/)" />
     <import index="lwvz" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.selection(MPS.Editor/)" />
-    <import index="lzb2" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui(MPS.IDEA/)" />
     <import index="zddv" ref="r:1b71c6d7-41ff-44a2-a61c-39c2a9779c34(com.mbeddr.mpsutil.intentions.editor)" />
     <import index="hox0" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.style(MPS.Editor/)" />
     <import index="tegv" ref="r:b91d2412-f094-4e55-8db6-3c782d7edc40(com.mbeddr.mpsutil.intentions.structure)" />
     <import index="tp3j" ref="r:00000000-0000-4000-0000-011c89590353(jetbrains.mps.lang.intentions.structure)" />
+    <import index="uxaq" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.editor.intentions(MPS.Editor/)" />
+    <import index="hyam" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.event(JDK/)" />
+    <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
   </imports>
   <registry>
     <language id="654422bf-e75f-44dc-936d-188890a746ce" name="de.slisson.mps.reflection">
       <concept id="8473566765275063380" name="de.slisson.mps.reflection.structure.ReflectionFieldAccess" flags="ng" index="1PnCL0">
         <reference id="1197029500499" name="fieldDeclaration" index="2Oxat5" />
       </concept>
+      <concept id="8473566765277240526" name="de.slisson.mps.reflection.structure.ReflectionMethodCall" flags="ng" index="1PvZjq" />
     </language>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
       <concept id="6029276237631252951" name="jetbrains.mps.lang.editor.structure.StyleAttributeReferenceExpression" flags="ng" index="1Z6Ecs">
@@ -71,15 +63,8 @@
         <child id="1068498886295" name="lValue" index="37vLTJ" />
       </concept>
       <concept id="1153417849900" name="jetbrains.mps.baseLanguage.structure.GreaterThanOrEqualsExpression" flags="nn" index="2d3UOw" />
-      <concept id="1215695189714" name="jetbrains.mps.baseLanguage.structure.PlusAssignmentExpression" flags="nn" index="d57v9" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
-      <concept id="5279705229678483897" name="jetbrains.mps.baseLanguage.structure.FloatingPointFloatConstant" flags="nn" index="2$xPTn">
-        <property id="5279705229678483899" name="value" index="2$xPTl" />
-      </concept>
-      <concept id="1239714755177" name="jetbrains.mps.baseLanguage.structure.AbstractUnaryNumberOperation" flags="nn" index="2$Kvd9">
-        <child id="1239714902950" name="expression" index="2$L3a6" />
-      </concept>
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
@@ -96,10 +81,6 @@
       <concept id="1197029447546" name="jetbrains.mps.baseLanguage.structure.FieldReferenceOperation" flags="nn" index="2OwXpG">
         <reference id="1197029500499" name="fieldDeclaration" index="2Oxat6" />
       </concept>
-      <concept id="1083260308424" name="jetbrains.mps.baseLanguage.structure.EnumConstantReference" flags="nn" index="Rm8GO">
-        <reference id="1083260308426" name="enumConstantDeclaration" index="Rm8GQ" />
-        <reference id="1144432896254" name="enumClass" index="1Px2BO" />
-      </concept>
       <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
         <child id="1145553007750" name="creator" index="2ShVmc" />
       </concept>
@@ -161,9 +142,7 @@
         <child id="1068580123134" name="parameter" index="3clF46" />
         <child id="1068580123135" name="body" index="3clF47" />
       </concept>
-      <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_">
-        <property id="1178608670077" name="isAbstract" index="1EzhhJ" />
-      </concept>
+      <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_" />
       <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
@@ -204,6 +183,7 @@
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
+      <concept id="1073063089578" name="jetbrains.mps.baseLanguage.structure.SuperMethodCall" flags="nn" index="3nyPlj" />
       <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk">
         <child id="1212687122400" name="typeParameter" index="1pMfVU" />
       </concept>
@@ -230,9 +210,6 @@
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
         <child id="1144230900587" name="variable" index="1Duv9x" />
       </concept>
-      <concept id="1206629501431" name="jetbrains.mps.baseLanguage.structure.InstanceInitializer" flags="lg" index="3KIgzJ">
-        <child id="1206629521979" name="statementList" index="3KIlGz" />
-      </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
         <child id="8356039341262087992" name="line" index="1aUNEU" />
       </concept>
@@ -243,7 +220,6 @@
         <reference id="1170346070688" name="classifier" index="1Y3XeK" />
         <child id="1201186121363" name="typeParameter" index="2Ghqu4" />
       </concept>
-      <concept id="8064396509828172209" name="jetbrains.mps.baseLanguage.structure.UnaryMinus" flags="nn" index="1ZRNhn" />
     </language>
     <language id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots">
       <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
@@ -254,27 +230,6 @@
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
-    <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
-      <concept id="5858074156537516430" name="jetbrains.mps.baseLanguage.javadoc.structure.ReturnBlockDocTag" flags="ng" index="x79VA" />
-      <concept id="6832197706140518104" name="jetbrains.mps.baseLanguage.javadoc.structure.DocMethodParameterReference" flags="ng" index="zr_55" />
-      <concept id="6832197706140518103" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseParameterReference" flags="ng" index="zr_5a">
-        <reference id="6832197706140518108" name="param" index="zr_51" />
-      </concept>
-      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
-        <child id="8465538089690331502" name="body" index="TZ5H$" />
-        <child id="5383422241790532083" name="tags" index="3nqlJM" />
-      </concept>
-      <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
-      <concept id="8465538089690881930" name="jetbrains.mps.baseLanguage.javadoc.structure.ParameterBlockDocTag" flags="ng" index="TUZQ0">
-        <child id="6832197706140518123" name="parameter" index="zr_5Q" />
-      </concept>
-      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
-        <child id="8970989240999019149" name="part" index="1dT_Ay" />
-      </concept>
-      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
-        <property id="8970989240999019144" name="text" index="1dT_AB" />
-      </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" />
@@ -300,19 +255,9 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
-        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
-      </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
-      <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
-        <property id="709746936026609031" name="linkId" index="3V$3ak" />
-        <property id="709746936026609029" name="role_DebugInfo" index="3V$3am" />
-      </concept>
-      <concept id="4452961908202556907" name="jetbrains.mps.lang.core.structure.BaseCommentAttribute" flags="ng" index="1X3_iC">
-        <child id="3078666699043039389" name="commentedNode" index="8Wnug" />
-      </concept>
     </language>
     <language id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text">
       <concept id="155656958578482948" name="jetbrains.mps.lang.text.structure.Word" flags="nn" index="3oM_SD">
@@ -340,61 +285,240 @@
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
     </language>
   </registry>
-  <node concept="312cEu" id="3pwG8PSkQAz">
-    <property role="TrG5h" value="OriginalIntentionMenu" />
+  <node concept="312cEu" id="5qf1oe_zyw0">
+    <property role="TrG5h" value="StyleUtil" />
     <property role="2bfB8j" value="true" />
-    <property role="1sVAO0" value="false" />
-    <property role="1EXbeo" value="false" />
-    <node concept="3Tm1VV" id="3pwG8PSkQA_" role="1B3o_S" />
-    <node concept="312cEg" id="3pwG8PSkQAX" role="jymVt">
+    <node concept="3Tm1VV" id="5qf1oe_zyw1" role="1B3o_S" />
+    <node concept="Wx3nA" id="2iZPrFZnMN9" role="jymVt">
+      <property role="3TUv4t" value="true" />
+      <property role="TrG5h" value="INTENTIONS_IN_READONLY_CELL" />
+      <node concept="3Tm1VV" id="5qf1oe_$8ZN" role="1B3o_S" />
+      <node concept="3uibUv" id="2iZPrFZnMN6" role="1tU5fm">
+        <ref role="3uigEE" to="hox0:~StyleAttribute" resolve="StyleAttribute" />
+        <node concept="3uibUv" id="2iZPrFZnMN7" role="11_B2D">
+          <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+        </node>
+      </node>
+      <node concept="1Z6Ecs" id="2iZPrFZnMN8" role="33vP2m">
+        <ref role="1Z6EpT" to="zddv:5qf1oe_$9mw" resolve="intentions-in-read-only-cell" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5qf1oe_$8xF" role="jymVt" />
+    <node concept="2tJIrI" id="5qf1oe_$8Ay" role="jymVt" />
+    <node concept="2YIFZL" id="5qf1oe_zNws" role="jymVt">
+      <property role="TrG5h" value="allowIntentionsInReadOnlySelection" />
+      <node concept="37vLTG" id="5qf1oe_zNwt" role="3clF46">
+        <property role="TrG5h" value="editorComponent" />
+        <node concept="3uibUv" id="5qf1oe_zNwu" role="1tU5fm">
+          <ref role="3uigEE" to="cj4x:~EditorComponent" resolve="EditorComponent" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="5qf1oe_zNwv" role="3clF47">
+        <node concept="3cpWs8" id="5qf1oe_zNww" role="3cqZAp">
+          <node concept="3cpWsn" id="5qf1oe_zNwx" role="3cpWs9">
+            <property role="TrG5h" value="selection" />
+            <node concept="3uibUv" id="5qf1oe_zNwy" role="1tU5fm">
+              <ref role="3uigEE" to="lwvz:~Selection" resolve="Selection" />
+            </node>
+            <node concept="2OqwBi" id="5qf1oe_zNwz" role="33vP2m">
+              <node concept="2OqwBi" id="5qf1oe_zNw$" role="2Oq$k0">
+                <node concept="37vLTw" id="5qf1oe_zNw_" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5qf1oe_zNwt" resolve="editorComponent" />
+                </node>
+                <node concept="liA8E" id="5qf1oe_zNwA" role="2OqNvi">
+                  <ref role="37wK5l" to="cj4x:~EditorComponent.getSelectionManager()" resolve="getSelectionManager" />
+                </node>
+              </node>
+              <node concept="liA8E" id="5qf1oe_zNwB" role="2OqNvi">
+                <ref role="37wK5l" to="lwvz:~SelectionManager.getSelection()" resolve="getSelection" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="5qf1oe_zNwC" role="3cqZAp">
+          <node concept="22lmx$" id="5qf1oe_zNwD" role="3cqZAk">
+            <node concept="3clFbC" id="5qf1oe_zNwE" role="3uHU7B">
+              <node concept="37vLTw" id="5qf1oe_zNwF" role="3uHU7B">
+                <ref role="3cqZAo" node="5qf1oe_zNwx" resolve="selection" />
+              </node>
+              <node concept="10Nm6u" id="5qf1oe_zNwG" role="3uHU7w" />
+            </node>
+            <node concept="1rXfSq" id="5qf1oe_zZ7k" role="3uHU7w">
+              <ref role="37wK5l" node="5qf1oe_zXNE" resolve="allowIntentionsInReadOnlyCells" />
+              <node concept="37vLTw" id="5qf1oe_$h66" role="37wK5m">
+                <ref role="3cqZAo" node="5qf1oe_zNwt" resolve="editorComponent" />
+              </node>
+              <node concept="2OqwBi" id="5qf1oe_$mWQ" role="37wK5m">
+                <node concept="37vLTw" id="5qf1oe_$mJW" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5qf1oe_zNwx" resolve="selection" />
+                </node>
+                <node concept="liA8E" id="5qf1oe_$n5i" role="2OqNvi">
+                  <ref role="37wK5l" to="lwvz:~Selection.getSelectedCells()" resolve="getSelectedCells" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="5qf1oe_zNwM" role="1B3o_S" />
+      <node concept="10P_77" id="5qf1oe_zNwN" role="3clF45" />
+    </node>
+    <node concept="2tJIrI" id="5qf1oe_zXGa" role="jymVt" />
+    <node concept="2YIFZL" id="5qf1oe_zXNE" role="jymVt">
+      <property role="TrG5h" value="allowIntentionsInReadOnlyCells" />
+      <node concept="37vLTG" id="5qf1oe_zXNF" role="3clF46">
+        <property role="TrG5h" value="editorComponent" />
+        <node concept="3uibUv" id="5qf1oe_zXNG" role="1tU5fm">
+          <ref role="3uigEE" to="cj4x:~EditorComponent" resolve="EditorComponent" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="5qf1oe_zXNH" role="3clF46">
+        <property role="TrG5h" value="cells" />
+        <node concept="3uibUv" id="5qf1oe_zXNI" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
+          <node concept="3uibUv" id="5qf1oe_zXNJ" role="11_B2D">
+            <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
+          </node>
+        </node>
+      </node>
+      <node concept="3clFbS" id="5qf1oe_zXNK" role="3clF47">
+        <node concept="1DcWWT" id="5qf1oe_zXNS" role="3cqZAp">
+          <node concept="37vLTw" id="5qf1oe_zXNT" role="1DdaDG">
+            <ref role="3cqZAo" node="5qf1oe_zXNH" resolve="cells" />
+          </node>
+          <node concept="3cpWsn" id="5qf1oe_zXNU" role="1Duv9x">
+            <property role="TrG5h" value="cell" />
+            <node concept="3uibUv" id="5qf1oe_zXNV" role="1tU5fm">
+              <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
+            </node>
+          </node>
+          <node concept="3clFbS" id="5qf1oe_zXNW" role="2LFqv$">
+            <node concept="3clFbJ" id="5qf1oe_zXNX" role="3cqZAp">
+              <node concept="22lmx$" id="5qf1oe_zXNY" role="3clFbw">
+                <node concept="3clFbC" id="5qf1oe_zXNZ" role="3uHU7B">
+                  <node concept="37vLTw" id="5qf1oe_zXO0" role="3uHU7B">
+                    <ref role="3cqZAo" node="5qf1oe_zXNU" resolve="cell" />
+                  </node>
+                  <node concept="10Nm6u" id="5qf1oe_zXO1" role="3uHU7w" />
+                </node>
+                <node concept="1rXfSq" id="5qf1oe_zXO2" role="3uHU7w">
+                  <ref role="37wK5l" node="5qf1oe_zyw2" resolve="isAllowIntentionsInReadOnlyCell" />
+                  <node concept="37vLTw" id="5qf1oe_zXO3" role="37wK5m">
+                    <ref role="3cqZAo" node="5qf1oe_zXNU" resolve="cell" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbS" id="5qf1oe_zXO4" role="3clFbx">
+                <node concept="3cpWs6" id="5qf1oe_zXO5" role="3cqZAp">
+                  <node concept="3clFbT" id="5qf1oe_zXO6" role="3cqZAk">
+                    <property role="3clFbU" value="true" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="5qf1oe_zXO7" role="3cqZAp">
+          <node concept="3clFbT" id="5qf1oe_zXO8" role="3cqZAk" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="5qf1oe_zXO9" role="1B3o_S" />
+      <node concept="10P_77" id="5qf1oe_zXOa" role="3clF45" />
+    </node>
+    <node concept="2tJIrI" id="5qf1oe_zXJT" role="jymVt" />
+    <node concept="2tJIrI" id="5qf1oe_zMRh" role="jymVt" />
+    <node concept="2YIFZL" id="5qf1oe_zyw2" role="jymVt">
+      <property role="TrG5h" value="isAllowIntentionsInReadOnlyCell" />
+      <node concept="37vLTG" id="5qf1oe_zyw3" role="3clF46">
+        <property role="TrG5h" value="cell" />
+        <node concept="2AHcQZ" id="5qf1oe_zyw4" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
+        <node concept="3uibUv" id="5qf1oe_zyw5" role="1tU5fm">
+          <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="5qf1oe_zyw6" role="3clF47">
+        <node concept="3clFbF" id="5qf1oe_$3Wk" role="3cqZAp">
+          <node concept="2OqwBi" id="5qf1oe_$56t" role="3clFbG">
+            <node concept="2OqwBi" id="5qf1oe_$4nJ" role="2Oq$k0">
+              <node concept="37vLTw" id="5qf1oe_$3Wj" role="2Oq$k0">
+                <ref role="3cqZAo" node="5qf1oe_zyw3" resolve="cell" />
+              </node>
+              <node concept="liA8E" id="5qf1oe_$4Il" role="2OqNvi">
+                <ref role="37wK5l" to="f4zo:~EditorCell.getStyle()" resolve="getStyle" />
+              </node>
+            </node>
+            <node concept="liA8E" id="5qf1oe_$5uC" role="2OqNvi">
+              <ref role="37wK5l" to="hox0:~Style.get(jetbrains.mps.openapi.editor.style.StyleAttribute)" resolve="get" />
+              <node concept="37vLTw" id="5qf1oe_$nPc" role="37wK5m">
+                <ref role="3cqZAo" node="2iZPrFZnMN9" resolve="INTENTIONS_IN_READONLY_CELL" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="5qf1oe_zywb" role="1B3o_S" />
+      <node concept="10P_77" id="5qf1oe_zywc" role="3clF45" />
+    </node>
+  </node>
+  <node concept="312cEu" id="2jDew64JcPx">
+    <property role="TrG5h" value="MyIntentionMenuProducer" />
+    <node concept="2tJIrI" id="2jDew64KOaE" role="jymVt" />
+    <node concept="312cEg" id="2jDew64KOaH" role="jymVt">
       <property role="34CwA1" value="false" />
       <property role="eg7rD" value="false" />
-      <property role="TrG5h" value="myEditor" />
+      <property role="TrG5h" value="editor" />
       <property role="3TUv4t" value="false" />
-      <node concept="2AHcQZ" id="3pwG8PSkQAZ" role="2AJF6D">
+      <node concept="2AHcQZ" id="2jDew64KOaI" role="2AJF6D">
         <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
       </node>
-      <node concept="3uibUv" id="3pwG8PSkQB0" role="1tU5fm">
+      <node concept="3uibUv" id="2jDew64KOaJ" role="1tU5fm">
         <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
       </node>
-      <node concept="3Tmbuc" id="2xgTENkXoBm" role="1B3o_S" />
+      <node concept="3Tmbuc" id="2jDew64KOaK" role="1B3o_S" />
     </node>
-    <node concept="2tJIrI" id="3pwG8PSlHir" role="jymVt" />
-    <node concept="3clFbW" id="3pwG8PSkQB2" role="jymVt">
-      <property role="DiZV1" value="false" />
-      <property role="od$2w" value="false" />
-      <node concept="3cqZAl" id="3pwG8PSkQB3" role="3clF45" />
-      <node concept="37vLTG" id="3pwG8PSkQB4" role="3clF46">
+    <node concept="2tJIrI" id="2jDew64KOaG" role="jymVt" />
+    <node concept="3clFbW" id="2jDew64KaGG" role="jymVt">
+      <property role="TrG5h" value="IntentionMenuProducer" />
+      <node concept="3cqZAl" id="2jDew64KaGH" role="3clF45" />
+      <node concept="3Tm1VV" id="2jDew64KaGI" role="1B3o_S" />
+      <node concept="37vLTG" id="2jDew64KaGK" role="3clF46">
         <property role="TrG5h" value="editor" />
-        <property role="3TUv4t" value="false" />
-        <node concept="2AHcQZ" id="3pwG8PSkQB5" role="2AJF6D">
-          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
-        </node>
-        <node concept="3uibUv" id="3pwG8PSkQB6" role="1tU5fm">
+        <node concept="3uibUv" id="2jDew64KaGL" role="1tU5fm">
           <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
         </node>
       </node>
-      <node concept="3clFbS" id="3pwG8PSkQB7" role="3clF47">
-        <node concept="3clFbF" id="3pwG8PSkQB8" role="3cqZAp">
-          <node concept="37vLTI" id="3pwG8PSkQB9" role="3clFbG">
-            <node concept="37vLTw" id="3pwG8PSkQBa" role="37vLTJ">
-              <ref role="3cqZAo" node="3pwG8PSkQAX" resolve="myEditor" />
+      <node concept="3clFbS" id="2jDew64KaGM" role="3clF47">
+        <node concept="XkiVB" id="2jDew64KaGN" role="3cqZAp">
+          <ref role="37wK5l" to="uxaq:~IntentionMenuProducer.&lt;init&gt;(jetbrains.mps.openapi.editor.EditorComponent)" resolve="IntentionMenuProducer" />
+          <node concept="37vLTw" id="2jDew64KaGO" role="37wK5m">
+            <ref role="3cqZAo" node="2jDew64KaGK" resolve="editor" />
+          </node>
+        </node>
+        <node concept="3clFbF" id="2jDew64LOEb" role="3cqZAp">
+          <node concept="37vLTI" id="2jDew64LP9i" role="3clFbG">
+            <node concept="37vLTw" id="2jDew64LPj2" role="37vLTx">
+              <ref role="3cqZAo" node="2jDew64KaGK" resolve="editor" />
             </node>
-            <node concept="37vLTw" id="3pwG8PSkQBb" role="37vLTx">
-              <ref role="3cqZAo" node="3pwG8PSkQB4" resolve="editor" />
+            <node concept="2OqwBi" id="2jDew64LOPm" role="37vLTJ">
+              <node concept="Xjq3P" id="2jDew64LOE9" role="2Oq$k0" />
+              <node concept="2OwXpG" id="2jDew64LP0c" role="2OqNvi">
+                <ref role="2Oxat6" node="2jDew64KOaH" resolve="editor" />
+              </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="3pwG8PSnaoa" role="3cqZAp" />
         <node concept="3cpWs8" id="3pwG8PSnrNI" role="3cqZAp">
           <node concept="3cpWsn" id="3pwG8PSnrNJ" role="3cpWs9">
             <property role="TrG5h" value="intentionsSupport" />
+            <property role="3TUv4t" value="true" />
             <node concept="3uibUv" id="3pwG8PSnrNH" role="1tU5fm">
               <ref role="3uigEE" to="exr9:~IntentionsSupport" resolve="IntentionsSupport" />
             </node>
             <node concept="2OqwBi" id="3pwG8PSnrNK" role="33vP2m">
               <node concept="37vLTw" id="3pwG8PSnrNL" role="2Oq$k0">
-                <ref role="3cqZAo" node="3pwG8PSkQB4" resolve="editor" />
+                <ref role="3cqZAo" node="2jDew64KaGK" resolve="editor" />
               </node>
               <node concept="1PnCL0" id="3pwG8PSnrNM" role="2OqNvi">
                 <ref role="2Oxat5" to="exr9:~EditorComponent.myIntentionsSupport" resolve="myIntentionsSupport" />
@@ -458,6 +582,9 @@
                                           <node concept="3clFbF" id="3pwG8PSkQBx" role="3cqZAp">
                                             <node concept="1rXfSq" id="3pwG8PSkQBy" role="3clFbG">
                                               <ref role="37wK5l" node="3pwG8PSkQDq" resolve="checkAndShowMenu" />
+                                              <node concept="37vLTw" id="2jDew64YoyU" role="37wK5m">
+                                                <ref role="3cqZAo" node="3pwG8PSnrNJ" resolve="intentionsSupport" />
+                                              </node>
                                             </node>
                                           </node>
                                         </node>
@@ -540,6 +667,9 @@
                                           <node concept="3clFbF" id="3pwG8PSkQCf" role="3cqZAp">
                                             <node concept="1rXfSq" id="3pwG8PSkQCg" role="3clFbG">
                                               <ref role="37wK5l" node="3pwG8PSkQDq" resolve="checkAndShowMenu" />
+                                              <node concept="37vLTw" id="2jDew64YcOp" role="37wK5m">
+                                                <ref role="3cqZAo" node="3pwG8PSnrNJ" resolve="intentionsSupport" />
+                                              </node>
                                             </node>
                                           </node>
                                         </node>
@@ -561,35 +691,6 @@
                 </node>
               </node>
             </node>
-            <node concept="3clFbF" id="3pwG8PSkQCl" role="3cqZAp">
-              <node concept="2OqwBi" id="3pwG8PSkTH4" role="3clFbG">
-                <node concept="37vLTw" id="3pwG8PSkTH3" role="2Oq$k0">
-                  <ref role="3cqZAo" node="3pwG8PSkQAX" resolve="myEditor" />
-                </node>
-                <node concept="liA8E" id="3pwG8PSkTH5" role="2OqNvi">
-                  <ref role="37wK5l" to="dxuu:~JComponent.registerKeyboardAction(java.awt.event.ActionListener,javax.swing.KeyStroke,int)" resolve="registerKeyboardAction" />
-                  <node concept="2OqwBi" id="3pwG8PSo1pN" role="37wK5m">
-                    <node concept="37vLTw" id="3pwG8PSo1pO" role="2Oq$k0">
-                      <ref role="3cqZAo" node="3pwG8PSnrNJ" resolve="intentionsSupport" />
-                    </node>
-                    <node concept="1PnCL0" id="3pwG8PSo1pP" role="2OqNvi">
-                      <ref role="2Oxat5" to="exr9:~IntentionsSupport.myShowIntentionsAction" resolve="myShowIntentionsAction" />
-                    </node>
-                  </node>
-                  <node concept="2YIFZM" id="3pwG8PSkTH8" role="37wK5m">
-                    <ref role="1Pybhc" to="dxuu:~KeyStroke" resolve="KeyStroke" />
-                    <ref role="37wK5l" to="dxuu:~KeyStroke.getKeyStroke(java.lang.String)" resolve="getKeyStroke" />
-                    <node concept="Xl_RD" id="3pwG8PSkQCp" role="37wK5m">
-                      <property role="Xl_RC" value="alt ENTER" />
-                    </node>
-                  </node>
-                  <node concept="10M0yZ" id="3pwG8PSlb0p" role="37wK5m">
-                    <ref role="1PxDUh" to="dxuu:~JComponent" resolve="JComponent" />
-                    <ref role="3cqZAo" to="dxuu:~JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT" resolve="WHEN_ANCESTOR_OF_FOCUSED_COMPONENT" />
-                  </node>
-                </node>
-              </node>
-            </node>
           </node>
           <node concept="3y3z36" id="6JxzAvo_F3z" role="3clFbw">
             <node concept="10Nm6u" id="6JxzAvo_Fo0" role="3uHU7w" />
@@ -599,9 +700,8 @@
           </node>
         </node>
       </node>
-      <node concept="3Tm1VV" id="3pwG8PSkQDp" role="1B3o_S" />
     </node>
-    <node concept="2tJIrI" id="3pwG8PSlKnc" role="jymVt" />
+    <node concept="2tJIrI" id="2jDew64VROj" role="jymVt" />
     <node concept="3clFb_" id="3pwG8PSkQDq" role="jymVt">
       <property role="TrG5h" value="checkAndShowMenu" />
       <property role="DiZV1" value="false" />
@@ -622,7 +722,7 @@
                 <ref role="37wK5l" node="5qf1oe_zNws" resolve="allowIntentionsInReadOnlySelection" />
                 <ref role="1Pybhc" node="5qf1oe_zyw0" resolve="StyleUtil" />
                 <node concept="37vLTw" id="5qf1oe__0gn" role="37wK5m">
-                  <ref role="3cqZAo" node="3pwG8PSkQAX" resolve="myEditor" />
+                  <ref role="3cqZAo" node="2jDew64KOaH" resolve="editor" />
                 </node>
               </node>
             </node>
@@ -632,7 +732,7 @@
                   <ref role="1Pybhc" to="3ahc:~ReadOnlyUtil" resolve="ReadOnlyUtil" />
                   <ref role="37wK5l" to="3ahc:~ReadOnlyUtil.isSelectionReadOnlyInEditor(jetbrains.mps.openapi.editor.EditorComponent)" resolve="isSelectionReadOnlyInEditor" />
                   <node concept="37vLTw" id="3pwG8PSkQDz" role="37wK5m">
-                    <ref role="3cqZAo" node="3pwG8PSkQAX" resolve="myEditor" />
+                    <ref role="3cqZAo" node="2jDew64KOaH" resolve="editor" />
                   </node>
                 </node>
                 <node concept="2YIFZM" id="3pwG8PSkTS4" role="3uHU7w">
@@ -641,7 +741,7 @@
                   <node concept="2OqwBi" id="3pwG8PSkQD_" role="37wK5m">
                     <node concept="2OqwBi" id="3pwG8PSkTS8" role="2Oq$k0">
                       <node concept="37vLTw" id="3pwG8PSkTS7" role="2Oq$k0">
-                        <ref role="3cqZAo" node="3pwG8PSkQAX" resolve="myEditor" />
+                        <ref role="3cqZAo" node="2jDew64KOaH" resolve="editor" />
                       </node>
                       <node concept="liA8E" id="3pwG8PSkTS9" role="2OqNvi">
                         <ref role="37wK5l" to="exr9:~EditorComponent.getSelectedNode()" resolve="getSelectedNode" />
@@ -659,804 +759,249 @@
             <node concept="3cpWs6" id="3pwG8PSkQDC" role="3cqZAp" />
           </node>
         </node>
-        <node concept="3clFbF" id="3pwG8PSkQDE" role="3cqZAp">
-          <node concept="1rXfSq" id="3pwG8PSkQDF" role="3clFbG">
-            <ref role="37wK5l" node="3pwG8PSkQNZ" resolve="showIntentionsMenu" />
+        <node concept="3clFbF" id="2jDew64XO65" role="3cqZAp">
+          <node concept="2OqwBi" id="2jDew64XSbT" role="3clFbG">
+            <node concept="37vLTw" id="2jDew64XO63" role="2Oq$k0">
+              <ref role="3cqZAo" node="2jDew64XHAU" resolve="intentionsSupport" />
+            </node>
+            <node concept="1PvZjq" id="2jDew64XULy" role="2OqNvi">
+              <ref role="37wK5l" to="exr9:~IntentionsSupport.showIntentionsMenu()" resolve="showIntentionsMenu" />
+            </node>
           </node>
         </node>
       </node>
       <node concept="3Tmbuc" id="3pwG8PSojnf" role="1B3o_S" />
       <node concept="3cqZAl" id="3pwG8PSkQDH" role="3clF45" />
-    </node>
-    <node concept="2tJIrI" id="3pwG8PSlNtU" role="jymVt" />
-    <node concept="3clFb_" id="3pwG8PSkQGh" role="jymVt">
-      <property role="TrG5h" value="isInconsistentEditor" />
-      <property role="DiZV1" value="false" />
-      <property role="od$2w" value="false" />
-      <node concept="3clFbS" id="3pwG8PSkQGi" role="3clF47">
-        <node concept="3cpWs6" id="3pwG8PSkQGj" role="3cqZAp">
-          <node concept="22lmx$" id="3pwG8PSkQGk" role="3cqZAk">
-            <node concept="22lmx$" id="3pwG8PSkQGl" role="3uHU7B">
-              <node concept="2OqwBi" id="3pwG8PSkTXs" role="3uHU7B">
-                <node concept="37vLTw" id="3pwG8PSkTXr" role="2Oq$k0">
-                  <ref role="3cqZAo" node="3pwG8PSkQAX" resolve="myEditor" />
-                </node>
-                <node concept="liA8E" id="3pwG8PSkTXt" role="2OqNvi">
-                  <ref role="37wK5l" to="exr9:~EditorComponent.isDisposed()" resolve="isDisposed" />
-                </node>
-              </node>
-              <node concept="3clFbC" id="3pwG8PSkQGn" role="3uHU7w">
-                <node concept="2OqwBi" id="3pwG8PSkTXx" role="3uHU7B">
-                  <node concept="37vLTw" id="3pwG8PSkTXw" role="2Oq$k0">
-                    <ref role="3cqZAo" node="3pwG8PSkQAX" resolve="myEditor" />
-                  </node>
-                  <node concept="liA8E" id="3pwG8PSkTXy" role="2OqNvi">
-                    <ref role="37wK5l" to="exr9:~EditorComponent.getEditedNode()" resolve="getEditedNode" />
-                  </node>
-                </node>
-                <node concept="10Nm6u" id="3pwG8PSkQGp" role="3uHU7w" />
-              </node>
-            </node>
-            <node concept="3fqX7Q" id="3pwG8PSkQGq" role="3uHU7w">
-              <node concept="2OqwBi" id="3pwG8PSkTXA" role="3fr31v">
-                <node concept="37vLTw" id="3pwG8PSkTX_" role="2Oq$k0">
-                  <ref role="3cqZAo" node="3pwG8PSkQAX" resolve="myEditor" />
-                </node>
-                <node concept="liA8E" id="3pwG8PSkTXB" role="2OqNvi">
-                  <ref role="37wK5l" to="exr9:~EditorComponent.hasValidSelectedNode()" resolve="hasValidSelectedNode" />
-                </node>
-              </node>
-            </node>
-          </node>
+      <node concept="37vLTG" id="2jDew64XHAU" role="3clF46">
+        <property role="TrG5h" value="intentionsSupport" />
+        <node concept="3uibUv" id="2jDew64XHAT" role="1tU5fm">
+          <ref role="3uigEE" to="exr9:~IntentionsSupport" resolve="IntentionsSupport" />
         </node>
       </node>
-      <node concept="3Tmbuc" id="3pwG8PSokuW" role="1B3o_S" />
-      <node concept="10P_77" id="3pwG8PSkQGt" role="3clF45" />
     </node>
-    <node concept="2tJIrI" id="3pwG8PSm5_a" role="jymVt" />
-    <node concept="3clFb_" id="3pwG8PSkQIH" role="jymVt">
-      <property role="TrG5h" value="executeIntention" />
-      <property role="DiZV1" value="false" />
-      <property role="od$2w" value="false" />
-      <node concept="37vLTG" id="3pwG8PSkQII" role="3clF46">
-        <property role="TrG5h" value="intention" />
-        <property role="3TUv4t" value="true" />
-        <node concept="3uibUv" id="7me2y0SMJ_t" role="1tU5fm">
-          <ref role="3uigEE" to="nddn:~IntentionExecutable" resolve="IntentionExecutable" />
-        </node>
+    <node concept="2tJIrI" id="2jDew64VROk" role="jymVt" />
+    <node concept="2tJIrI" id="2jDew64KefB" role="jymVt" />
+    <node concept="3clFb_" id="2jDew64HgSb" role="jymVt">
+      <property role="TrG5h" value="getIntentionsGroup" />
+      <node concept="3Tm1VV" id="2jDew64HgSc" role="1B3o_S" />
+      <node concept="2AHcQZ" id="2jDew64HgSe" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
       </node>
-      <node concept="37vLTG" id="3pwG8PSkQIK" role="3clF46">
-        <property role="TrG5h" value="node" />
-        <property role="3TUv4t" value="true" />
-        <node concept="3uibUv" id="3pwG8PSkQIL" role="1tU5fm">
-          <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
+      <node concept="3uibUv" id="2jDew64HgSf" role="3clF45">
+        <ref role="3uigEE" to="qkt:~ActionGroup" resolve="ActionGroup" />
+      </node>
+      <node concept="37vLTG" id="2jDew64HgSg" role="3clF46">
+        <property role="TrG5h" value="dataContext" />
+        <node concept="3uibUv" id="2jDew64HgSh" role="1tU5fm">
+          <ref role="3uigEE" to="qkt:~DataContext" resolve="DataContext" />
+        </node>
+        <node concept="2AHcQZ" id="2jDew64HgSi" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
         </node>
       </node>
-      <node concept="3clFbS" id="3pwG8PSkQIM" role="3clF47">
-        <node concept="3cpWs8" id="43HEdiV$8c1" role="3cqZAp">
-          <node concept="3cpWsn" id="43HEdiV$8c2" role="3cpWs9">
-            <property role="TrG5h" value="dataContext" />
-            <node concept="3uibUv" id="43HEdiV$8c3" role="1tU5fm">
-              <ref role="3uigEE" to="qkt:~DataContext" resolve="DataContext" />
-            </node>
-            <node concept="2OqwBi" id="43HEdiV$8Nt" role="33vP2m">
-              <node concept="2YIFZM" id="43HEdiV$8IH" role="2Oq$k0">
-                <ref role="37wK5l" to="ddhc:~DataManager.getInstance()" resolve="getInstance" />
-                <ref role="1Pybhc" to="ddhc:~DataManager" resolve="DataManager" />
-              </node>
-              <node concept="liA8E" id="43HEdiV$8Ym" role="2OqNvi">
-                <ref role="37wK5l" to="ddhc:~DataManager.getDataContext(java.awt.Component)" resolve="getDataContext" />
-                <node concept="37vLTw" id="43HEdiV$94W" role="37wK5m">
-                  <ref role="3cqZAo" node="3pwG8PSkQAX" resolve="myEditor" />
-                </node>
-              </node>
+      <node concept="3clFbS" id="2jDew64HgSk" role="3clF47">
+        <node concept="3SKdUt" id="3pwG8PSkQRX" role="3cqZAp">
+          <node concept="1PaTwC" id="17qUVvSZlt8" role="1aUNEU">
+            <node concept="3oM_SD" id="17qUVvSZlt9" role="1PaTwD">
+              <property role="3oM_SC" value="intentions" />
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="3pwG8PSkQIO" role="3cqZAp">
-          <node concept="3cpWsn" id="3pwG8PSkQIN" role="3cpWs9">
+        <node concept="3cpWs8" id="3pwG8PSkQLa" role="3cqZAp">
+          <node concept="3cpWsn" id="3pwG8PSkQL9" role="3cpWs9">
             <property role="3TUv4t" value="false" />
-            <property role="TrG5h" value="project" />
-            <node concept="2OqwBi" id="6LzhH3u5Vt$" role="33vP2m">
-              <node concept="10M0yZ" id="6LzhH3u5Vt_" role="2Oq$k0">
-                <ref role="1PxDUh" to="qq03:~MPSCommonDataKeys" resolve="MPSCommonDataKeys" />
-                <ref role="3cqZAo" to="qq03:~MPSCommonDataKeys.MPS_PROJECT" resolve="MPS_PROJECT" />
-              </node>
-              <node concept="liA8E" id="6LzhH3u5VtA" role="2OqNvi">
-                <ref role="37wK5l" to="qkt:~DataKey.getData(com.intellij.openapi.actionSystem.DataContext)" resolve="getData" />
-                <node concept="37vLTw" id="43HEdiV$9qK" role="37wK5m">
-                  <ref role="3cqZAo" node="43HEdiV$8c2" resolve="dataContext" />
+            <property role="TrG5h" value="groupItems" />
+            <node concept="3uibUv" id="3pwG8PSkQLb" role="1tU5fm">
+              <ref role="3uigEE" to="33ny:~List" resolve="List" />
+              <node concept="3uibUv" id="3pwG8PSkQLc" role="11_B2D">
+                <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
+                <node concept="3uibUv" id="7me2y0SLnF1" role="11_B2D">
+                  <ref role="3uigEE" to="nddn:~IntentionExecutable" resolve="IntentionExecutable" />
+                </node>
+                <node concept="3uibUv" id="3pwG8PSkQLe" role="11_B2D">
+                  <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
                 </node>
               </node>
             </node>
-            <node concept="3uibUv" id="3pwG8PSkQIP" role="1tU5fm">
-              <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbJ" id="3pwG8PSkQIT" role="3cqZAp">
-          <node concept="3clFbC" id="3pwG8PSkQIU" role="3clFbw">
-            <node concept="37vLTw" id="3pwG8PSkQIV" role="3uHU7B">
-              <ref role="3cqZAo" node="3pwG8PSkQIN" resolve="project" />
-            </node>
-            <node concept="10Nm6u" id="3pwG8PSkQIW" role="3uHU7w" />
-          </node>
-          <node concept="3clFbS" id="3pwG8PSkQIY" role="3clFbx">
-            <node concept="3cpWs6" id="3pwG8PSkQIX" role="3cqZAp" />
-          </node>
-        </node>
-        <node concept="3clFbF" id="3pwG8PSkQIZ" role="3cqZAp">
-          <node concept="2OqwBi" id="3pwG8PSkQJ0" role="3clFbG">
-            <node concept="1rXfSq" id="3pwG8PSkQJ1" role="2Oq$k0">
-              <ref role="37wK5l" node="3pwG8PSkQQM" resolve="getModelAccess" />
-            </node>
-            <node concept="liA8E" id="3pwG8PSkQJ2" role="2OqNvi">
-              <ref role="37wK5l" to="lui2:~ModelAccess.executeCommandInEDT(java.lang.Runnable)" resolve="executeCommandInEDT" />
-              <node concept="2ShNRf" id="3pwG8PSkQJ3" role="37wK5m">
-                <node concept="YeOm9" id="3pwG8PSkQJ4" role="2ShVmc">
-                  <node concept="1Y3b0j" id="3pwG8PSkQJ5" role="YeSDq">
-                    <property role="2bfB8j" value="true" />
-                    <property role="1sVAO0" value="false" />
-                    <property role="1EXbeo" value="false" />
-                    <ref role="1Y3XeK" to="nlpl:~EditorCommand" resolve="EditorCommand" />
-                    <ref role="37wK5l" to="nlpl:~EditorCommand.&lt;init&gt;(jetbrains.mps.openapi.editor.EditorComponent)" resolve="EditorCommand" />
-                    <node concept="3Tm1VV" id="3pwG8PSkQJ6" role="1B3o_S" />
-                    <node concept="3clFb_" id="3pwG8PSkQJ7" role="jymVt">
-                      <property role="TrG5h" value="doExecute" />
-                      <property role="DiZV1" value="false" />
-                      <property role="od$2w" value="false" />
-                      <node concept="2AHcQZ" id="3pwG8PSkQJ8" role="2AJF6D">
-                        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-                      </node>
-                      <node concept="3clFbS" id="3pwG8PSkQJ9" role="3clF47">
-                        <node concept="3clFbF" id="3pwG8PSkQJa" role="3cqZAp">
-                          <node concept="2OqwBi" id="3pwG8PSkU27" role="3clFbG">
-                            <node concept="37vLTw" id="3pwG8PSkU26" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3pwG8PSkQII" resolve="intention" />
-                            </node>
-                            <node concept="liA8E" id="3pwG8PSkU28" role="2OqNvi">
-                              <ref role="37wK5l" to="nddn:~IntentionExecutable.execute(org.jetbrains.mps.openapi.model.SNode,jetbrains.mps.openapi.editor.EditorContext)" resolve="execute" />
-                              <node concept="37vLTw" id="3pwG8PSkQJc" role="37wK5m">
-                                <ref role="3cqZAo" node="3pwG8PSkQIK" resolve="node" />
-                              </node>
-                              <node concept="2OqwBi" id="3pwG8PSkU2e" role="37wK5m">
-                                <node concept="37vLTw" id="3pwG8PSkU2d" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3pwG8PSkQAX" resolve="myEditor" />
-                                </node>
-                                <node concept="liA8E" id="3pwG8PSkU2f" role="2OqNvi">
-                                  <ref role="37wK5l" to="exr9:~EditorComponent.getEditorContext()" resolve="getEditorContext" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3Tm1VV" id="3pwG8PSkQJe" role="1B3o_S" />
-                      <node concept="3cqZAl" id="3pwG8PSkQJf" role="3clF45" />
-                    </node>
-                    <node concept="37vLTw" id="3pwG8PSkQJg" role="37wK5m">
-                      <ref role="3cqZAo" node="3pwG8PSkQAX" resolve="myEditor" />
-                    </node>
+            <node concept="2ShNRf" id="3pwG8PSkU30" role="33vP2m">
+              <node concept="1pGfFk" id="3pwG8PSkU31" role="2ShVmc">
+                <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;()" resolve="ArrayList" />
+                <node concept="3uibUv" id="3pwG8PSkQLg" role="1pMfVU">
+                  <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
+                  <node concept="3uibUv" id="7me2y0SLqbn" role="11_B2D">
+                    <ref role="3uigEE" to="nddn:~IntentionExecutable" resolve="IntentionExecutable" />
+                  </node>
+                  <node concept="3uibUv" id="3pwG8PSkQLi" role="11_B2D">
+                    <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
                   </node>
                 </node>
               </node>
             </node>
           </node>
         </node>
-      </node>
-      <node concept="3Tmbuc" id="3pwG8PSolBb" role="1B3o_S" />
-      <node concept="3cqZAl" id="3pwG8PSkQJi" role="3clF45" />
-    </node>
-    <node concept="2tJIrI" id="3pwG8PSm8Er" role="jymVt" />
-    <node concept="3clFb_" id="3pwG8PSkQJj" role="jymVt">
-      <property role="TrG5h" value="getIntentionGroup" />
-      <property role="DiZV1" value="false" />
-      <property role="od$2w" value="false" />
-      <node concept="37vLTG" id="3pwG8PSkQJk" role="3clF46">
-        <property role="TrG5h" value="intention" />
-        <property role="3TUv4t" value="true" />
-        <node concept="3uibUv" id="7me2y0SLESH" role="1tU5fm">
-          <ref role="3uigEE" to="nddn:~IntentionExecutable" resolve="IntentionExecutable" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="3pwG8PSkQJm" role="3clF46">
-        <property role="TrG5h" value="node" />
-        <property role="3TUv4t" value="true" />
-        <node concept="3uibUv" id="3pwG8PSkQJn" role="1tU5fm">
-          <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="3pwG8PSkQJo" role="3clF47">
-        <node concept="3cpWs8" id="3pwG8PSkQJq" role="3cqZAp">
-          <node concept="3cpWsn" id="3pwG8PSkQJp" role="3cpWs9">
-            <property role="3TUv4t" value="false" />
-            <property role="TrG5h" value="icon" />
-            <node concept="2OqwBi" id="7me2y0SMyAM" role="33vP2m">
-              <node concept="2ShNRf" id="7me2y0SM63f" role="2Oq$k0">
-                <node concept="1pGfFk" id="7me2y0SMxVT" role="2ShVmc">
-                  <ref role="37wK5l" to="8b49:~IntentionIconProvider.&lt;init&gt;(jetbrains.mps.openapi.intentions.Kind)" resolve="IntentionIconProvider" />
-                  <node concept="2OqwBi" id="7me2y0SMyaH" role="37wK5m">
-                    <node concept="2OqwBi" id="7me2y0SMy0s" role="2Oq$k0">
-                      <node concept="37vLTw" id="7me2y0SMy0t" role="2Oq$k0">
-                        <ref role="3cqZAo" node="3pwG8PSkQJk" resolve="intention" />
-                      </node>
-                      <node concept="liA8E" id="7me2y0SMy0u" role="2OqNvi">
-                        <ref role="37wK5l" to="nddn:~IntentionExecutable.getDescriptor()" resolve="getDescriptor" />
-                      </node>
-                    </node>
-                    <node concept="liA8E" id="7me2y0SMys1" role="2OqNvi">
-                      <ref role="37wK5l" to="nddn:~IntentionDescriptor.getKind()" resolve="getKind" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="liA8E" id="7me2y0SM$LE" role="2OqNvi">
-                <ref role="37wK5l" to="8b49:~IntentionIconProvider.getIcon()" resolve="getIcon" />
-              </node>
+        <node concept="3clFbF" id="3pwG8PSkQLj" role="3cqZAp">
+          <node concept="2OqwBi" id="3pwG8PSkU35" role="3clFbG">
+            <node concept="37vLTw" id="3pwG8PSkU34" role="2Oq$k0">
+              <ref role="3cqZAo" node="3pwG8PSkQL9" resolve="groupItems" />
             </node>
-            <node concept="3uibUv" id="3pwG8PSkQJr" role="1tU5fm">
-              <ref role="3uigEE" to="dxuu:~Icon" resolve="Icon" />
+            <node concept="liA8E" id="3pwG8PSkU36" role="2OqNvi">
+              <ref role="37wK5l" to="33ny:~List.addAll(java.util.Collection)" resolve="addAll" />
+              <node concept="1rXfSq" id="3pwG8PSkQLl" role="37wK5m">
+                <ref role="37wK5l" node="2jDew64HgSp" resolve="getEnabledIntentions" />
+              </node>
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="3pwG8PSkQJy" role="3cqZAp">
-          <node concept="3cpWsn" id="3pwG8PSkQJx" role="3cpWs9">
-            <property role="3TUv4t" value="false" />
-            <property role="TrG5h" value="text" />
-            <node concept="17QB3L" id="4gYVSgE4$2b" role="1tU5fm" />
-            <node concept="2OqwBi" id="3pwG8PSkU2o" role="33vP2m">
-              <node concept="37vLTw" id="3pwG8PSkU2n" role="2Oq$k0">
-                <ref role="3cqZAo" node="3pwG8PSkQJk" resolve="intention" />
-              </node>
-              <node concept="liA8E" id="3pwG8PSkU2p" role="2OqNvi">
-                <ref role="37wK5l" to="nddn:~IntentionExecutable.getDescription(org.jetbrains.mps.openapi.model.SNode,jetbrains.mps.openapi.editor.EditorContext)" resolve="getDescription" />
-                <node concept="37vLTw" id="3pwG8PSkQJ_" role="37wK5m">
-                  <ref role="3cqZAo" node="3pwG8PSkQJm" resolve="node" />
-                </node>
-                <node concept="2OqwBi" id="3pwG8PSkU2t" role="37wK5m">
-                  <node concept="37vLTw" id="3pwG8PSkU2s" role="2Oq$k0">
-                    <ref role="3cqZAo" node="3pwG8PSkQAX" resolve="myEditor" />
-                  </node>
-                  <node concept="liA8E" id="3pwG8PSkU2u" role="2OqNvi">
-                    <ref role="37wK5l" to="exr9:~EditorComponent.getEditorContext()" resolve="getEditorContext" />
-                  </node>
-                </node>
-              </node>
+        <node concept="3SKdUt" id="3pwG8PSkQRZ" role="3cqZAp">
+          <node concept="1PaTwC" id="17qUVvSZlta" role="1aUNEU">
+            <node concept="3oM_SD" id="17qUVvSZltb" role="1PaTwD">
+              <property role="3oM_SC" value="actions" />
+            </node>
+            <node concept="3oM_SD" id="17qUVvSZltc" role="1PaTwD">
+              <property role="3oM_SC" value="as" />
+            </node>
+            <node concept="3oM_SD" id="17qUVvSZltd" role="1PaTwD">
+              <property role="3oM_SC" value="intentions" />
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="3pwG8PSkQJC" role="3cqZAp">
-          <node concept="3cpWsn" id="3pwG8PSkQJB" role="3cpWs9">
+        <node concept="3cpWs8" id="3pwG8PSkQLn" role="3cqZAp">
+          <node concept="3cpWsn" id="3pwG8PSkQLm" role="3cpWs9">
             <property role="3TUv4t" value="false" />
-            <property role="TrG5h" value="intentionActions" />
-            <node concept="3uibUv" id="3pwG8PSkQJD" role="1tU5fm">
+            <property role="TrG5h" value="actions" />
+            <node concept="3uibUv" id="3pwG8PSkQLo" role="1tU5fm">
               <ref role="3uigEE" to="33ny:~List" resolve="List" />
-              <node concept="3uibUv" id="3pwG8PSkQJE" role="11_B2D">
+              <node concept="3uibUv" id="3pwG8PSkQLp" role="11_B2D">
                 <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
               </node>
             </node>
-            <node concept="2ShNRf" id="3pwG8PSkU2v" role="33vP2m">
-              <node concept="1pGfFk" id="3pwG8PSkU2w" role="2ShVmc">
+            <node concept="2ShNRf" id="3pwG8PSkU37" role="33vP2m">
+              <node concept="1pGfFk" id="3pwG8PSkU38" role="2ShVmc">
                 <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;()" resolve="ArrayList" />
-                <node concept="3uibUv" id="3pwG8PSkQJG" role="1pMfVU">
+                <node concept="3uibUv" id="3pwG8PSkQLr" role="1pMfVU">
                   <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="1DcWWT" id="3pwG8PSkQJH" role="3cqZAp">
-          <node concept="2YIFZM" id="3pwG8PSkU2z" role="1DdaDG">
-            <ref role="1Pybhc" to="9ti4:~Extensions" resolve="Extensions" />
-            <ref role="37wK5l" to="9ti4:~Extensions.getExtensions(com.intellij.openapi.extensions.ExtensionPointName)" resolve="getExtensions" />
-            <node concept="10M0yZ" id="3pwG8PSlb0s" role="37wK5m">
-              <ref role="1PxDUh" to="exr9:~IntentionActionsProvider" resolve="IntentionActionsProvider" />
-              <ref role="3cqZAo" to="exr9:~IntentionActionsProvider.EP_NAME" resolve="EP_NAME" />
-            </node>
-          </node>
-          <node concept="3cpWsn" id="3pwG8PSkQJU" role="1Duv9x">
-            <property role="3TUv4t" value="false" />
-            <property role="TrG5h" value="provider" />
-            <node concept="3uibUv" id="3pwG8PSkQJW" role="1tU5fm">
-              <ref role="3uigEE" to="exr9:~IntentionActionsProvider" resolve="IntentionActionsProvider" />
-            </node>
-          </node>
-          <node concept="3clFbS" id="3pwG8PSkQJJ" role="2LFqv$">
-            <node concept="1DcWWT" id="3pwG8PSkQJK" role="3cqZAp">
-              <node concept="2OqwBi" id="3pwG8PSkU2E" role="1DdaDG">
-                <node concept="37vLTw" id="3pwG8PSkU2D" role="2Oq$k0">
-                  <ref role="3cqZAo" node="3pwG8PSkQJU" resolve="provider" />
-                </node>
-                <node concept="liA8E" id="3pwG8PSkU2F" role="2OqNvi">
-                  <ref role="37wK5l" to="exr9:~IntentionActionsProvider.getIntentionActions(jetbrains.mps.openapi.intentions.IntentionExecutable)" resolve="getIntentionActions" />
-                  <node concept="37vLTw" id="3pwG8PSkQJT" role="37wK5m">
-                    <ref role="3cqZAo" node="3pwG8PSkQJk" resolve="intention" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3cpWsn" id="3pwG8PSkQJP" role="1Duv9x">
-                <property role="3TUv4t" value="false" />
-                <property role="TrG5h" value="action" />
-                <node concept="3uibUv" id="3pwG8PSkQJR" role="1tU5fm">
-                  <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
-                </node>
+        <node concept="3clFbF" id="3pwG8PSkQLs" role="3cqZAp">
+          <node concept="1rXfSq" id="3pwG8PSkQLt" role="3clFbG">
+            <ref role="37wK5l" node="3pwG8PSkQMU" resolve="collectActionsAsIntentions" />
+            <node concept="2OqwBi" id="3pwG8PSkQLu" role="37wK5m">
+              <node concept="2YIFZM" id="3pwG8PSkU3b" role="2Oq$k0">
+                <ref role="1Pybhc" to="qkt:~ActionManager" resolve="ActionManager" />
+                <ref role="37wK5l" to="qkt:~ActionManager.getInstance()" resolve="getInstance" />
               </node>
-              <node concept="3clFbS" id="3pwG8PSkQJO" role="2LFqv$">
-                <node concept="3clFbF" id="3pwG8PSkQJL" role="3cqZAp">
-                  <node concept="2OqwBi" id="3pwG8PSkU2J" role="3clFbG">
-                    <node concept="37vLTw" id="3pwG8PSkU2I" role="2Oq$k0">
-                      <ref role="3cqZAo" node="3pwG8PSkQJB" resolve="intentionActions" />
-                    </node>
-                    <node concept="liA8E" id="3pwG8PSkU2K" role="2OqNvi">
-                      <ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
-                      <node concept="37vLTw" id="3pwG8PSkQJN" role="37wK5m">
-                        <ref role="3cqZAo" node="3pwG8PSkQJP" resolve="action" />
-                      </node>
-                    </node>
-                  </node>
+              <node concept="liA8E" id="3pwG8PSkQLw" role="2OqNvi">
+                <ref role="37wK5l" to="qkt:~ActionManager.getAction(java.lang.String)" resolve="getAction" />
+                <node concept="10M0yZ" id="3pwG8PSlb0t" role="37wK5m">
+                  <ref role="1PxDUh" to="qq03:~MPSActions" resolve="MPSActions" />
+                  <ref role="3cqZAo" to="qq03:~MPSActions.ACTIONS_AS_INTENTIONS_GROUP" resolve="ACTIONS_AS_INTENTIONS_GROUP" />
                 </node>
               </node>
             </node>
+            <node concept="37vLTw" id="3pwG8PSkQLy" role="37wK5m">
+              <ref role="3cqZAo" node="3pwG8PSkQLm" resolve="actions" />
+            </node>
+            <node concept="37vLTw" id="3pwG8PSkQLz" role="37wK5m">
+              <ref role="3cqZAo" node="2jDew64HgSg" resolve="dataContext" />
+            </node>
           </node>
         </node>
-        <node concept="3clFbJ" id="3pwG8PSkQJZ" role="3cqZAp">
-          <node concept="2OqwBi" id="3pwG8PSkU2O" role="3clFbw">
-            <node concept="37vLTw" id="3pwG8PSkU2N" role="2Oq$k0">
-              <ref role="3cqZAo" node="3pwG8PSkQJB" resolve="intentionActions" />
-            </node>
-            <node concept="liA8E" id="3pwG8PSkU2P" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
-            </node>
-          </node>
-          <node concept="9aQIb" id="3pwG8PSkQKq" role="9aQIa">
-            <node concept="3clFbS" id="3pwG8PSkQKr" role="9aQI4">
-              <node concept="3cpWs8" id="3pwG8PSkQKt" role="3cqZAp">
-                <node concept="3cpWsn" id="3pwG8PSkQKs" role="3cpWs9">
-                  <property role="3TUv4t" value="false" />
-                  <property role="TrG5h" value="intentionActionGroup" />
-                  <node concept="3uibUv" id="3pwG8PSkQKu" role="1tU5fm">
-                    <ref role="3uigEE" to="qkt:~DefaultActionGroup" resolve="DefaultActionGroup" />
-                  </node>
-                  <node concept="1rXfSq" id="2xgTENkWs2P" role="33vP2m">
-                    <ref role="37wK5l" node="2xgTENkWs2J" resolve="createIntentionActionGroup" />
-                    <node concept="37vLTw" id="2xgTENkWs2M" role="37wK5m">
-                      <ref role="3cqZAo" node="3pwG8PSkQJm" resolve="node" />
-                    </node>
-                    <node concept="37vLTw" id="2xgTENkWs2N" role="37wK5m">
-                      <ref role="3cqZAo" node="3pwG8PSkQJk" resolve="intention" />
-                    </node>
-                    <node concept="37vLTw" id="2xgTENkWs2O" role="37wK5m">
-                      <ref role="3cqZAo" node="3pwG8PSkQJx" resolve="text" />
-                    </node>
-                  </node>
-                </node>
+        <node concept="3clFbJ" id="3pwG8PSkQL$" role="3cqZAp">
+          <node concept="1Wc70l" id="3pwG8PSkQL_" role="3clFbw">
+            <node concept="2OqwBi" id="3pwG8PSkU6E" role="3uHU7B">
+              <node concept="37vLTw" id="3pwG8PSkU6D" role="2Oq$k0">
+                <ref role="3cqZAo" node="3pwG8PSkQL9" resolve="groupItems" />
               </node>
-              <node concept="3clFbF" id="3pwG8PSkQKT" role="3cqZAp">
-                <node concept="2OqwBi" id="3pwG8PSkU2T" role="3clFbG">
-                  <node concept="37vLTw" id="3pwG8PSkU2S" role="2Oq$k0">
-                    <ref role="3cqZAo" node="3pwG8PSkQKs" resolve="intentionActionGroup" />
-                  </node>
-                  <node concept="liA8E" id="3pwG8PSkU2U" role="2OqNvi">
-                    <ref role="37wK5l" to="qkt:~DefaultActionGroup.addAll(java.util.Collection)" resolve="addAll" />
-                    <node concept="37vLTw" id="3pwG8PSkQKV" role="37wK5m">
-                      <ref role="3cqZAo" node="3pwG8PSkQJB" resolve="intentionActions" />
-                    </node>
-                  </node>
-                </node>
+              <node concept="liA8E" id="3pwG8PSkU6F" role="2OqNvi">
+                <ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
               </node>
-              <node concept="3clFbF" id="3pwG8PSkQKW" role="3cqZAp">
-                <node concept="2OqwBi" id="3pwG8PSkQKX" role="3clFbG">
-                  <node concept="2OqwBi" id="3pwG8PSkU2Y" role="2Oq$k0">
-                    <node concept="37vLTw" id="3pwG8PSkU2X" role="2Oq$k0">
-                      <ref role="3cqZAo" node="3pwG8PSkQKs" resolve="intentionActionGroup" />
-                    </node>
-                    <node concept="liA8E" id="3pwG8PSkU2Z" role="2OqNvi">
-                      <ref role="37wK5l" to="qkt:~AnAction.getTemplatePresentation()" resolve="getTemplatePresentation" />
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="3pwG8PSkQKZ" role="2OqNvi">
-                    <ref role="37wK5l" to="qkt:~Presentation.setIcon(javax.swing.Icon)" resolve="setIcon" />
-                    <node concept="37vLTw" id="3pwG8PSkQL0" role="37wK5m">
-                      <ref role="3cqZAo" node="3pwG8PSkQJp" resolve="icon" />
-                    </node>
-                  </node>
-                </node>
+            </node>
+            <node concept="2OqwBi" id="3pwG8PSkU6J" role="3uHU7w">
+              <node concept="37vLTw" id="3pwG8PSkU6I" role="2Oq$k0">
+                <ref role="3cqZAo" node="3pwG8PSkQLm" resolve="actions" />
               </node>
-              <node concept="3cpWs6" id="3pwG8PSkQL1" role="3cqZAp">
-                <node concept="37vLTw" id="3pwG8PSkQL2" role="3cqZAk">
-                  <ref role="3cqZAo" node="3pwG8PSkQKs" resolve="intentionActionGroup" />
-                </node>
+              <node concept="liA8E" id="3pwG8PSkU6K" role="2OqNvi">
+                <ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
               </node>
             </node>
           </node>
-          <node concept="3clFbS" id="3pwG8PSkQK2" role="3clFbx">
-            <node concept="3cpWs6" id="3pwG8PSkQK3" role="3cqZAp">
-              <node concept="2ShNRf" id="3pwG8PSkQK4" role="3cqZAk">
-                <node concept="YeOm9" id="3pwG8PSkQK5" role="2ShVmc">
-                  <node concept="1Y3b0j" id="3pwG8PSkQK6" role="YeSDq">
-                    <property role="2bfB8j" value="true" />
-                    <property role="1sVAO0" value="false" />
-                    <property role="1EXbeo" value="false" />
-                    <ref role="1Y3XeK" to="7bx7:~BaseAction" resolve="BaseAction" />
-                    <ref role="37wK5l" to="7bx7:~BaseAction.&lt;init&gt;(java.lang.String,java.lang.String,javax.swing.Icon)" resolve="BaseAction" />
-                    <node concept="3Tm1VV" id="3pwG8PSkQK7" role="1B3o_S" />
-                    <node concept="3clFb_" id="3pwG8PSkQK8" role="jymVt">
-                      <property role="TrG5h" value="doExecute" />
-                      <property role="DiZV1" value="false" />
-                      <property role="od$2w" value="false" />
-                      <node concept="2AHcQZ" id="3pwG8PSkQK9" role="2AJF6D">
-                        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-                      </node>
-                      <node concept="37vLTG" id="3pwG8PSkQKa" role="3clF46">
-                        <property role="TrG5h" value="e" />
-                        <property role="3TUv4t" value="false" />
-                        <node concept="3uibUv" id="3pwG8PSkQKb" role="1tU5fm">
-                          <ref role="3uigEE" to="qkt:~AnActionEvent" resolve="AnActionEvent" />
-                        </node>
-                      </node>
-                      <node concept="37vLTG" id="3pwG8PSkQKc" role="3clF46">
-                        <property role="TrG5h" value="params" />
-                        <property role="3TUv4t" value="false" />
-                        <node concept="3uibUv" id="3pwG8PSkQKd" role="1tU5fm">
-                          <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
-                          <node concept="17QB3L" id="4gYVSgE4zVR" role="11_B2D" />
-                          <node concept="3uibUv" id="3pwG8PSkQKf" role="11_B2D">
-                            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbS" id="3pwG8PSkQKg" role="3clF47">
-                        <node concept="3clFbF" id="3pwG8PSkQKh" role="3cqZAp">
-                          <node concept="1rXfSq" id="3pwG8PSkQKi" role="3clFbG">
-                            <ref role="37wK5l" node="3pwG8PSkQIH" resolve="executeIntention" />
-                            <node concept="37vLTw" id="3pwG8PSkQKj" role="37wK5m">
-                              <ref role="3cqZAo" node="3pwG8PSkQJk" resolve="intention" />
-                            </node>
-                            <node concept="37vLTw" id="3pwG8PSkQKk" role="37wK5m">
-                              <ref role="3cqZAo" node="3pwG8PSkQJm" resolve="node" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3Tmbuc" id="3pwG8PSkQKl" role="1B3o_S" />
-                      <node concept="3cqZAl" id="3pwG8PSkQKm" role="3clF45" />
-                    </node>
-                    <node concept="37vLTw" id="3pwG8PSkQKn" role="37wK5m">
-                      <ref role="3cqZAo" node="3pwG8PSkQJx" resolve="text" />
-                    </node>
-                    <node concept="10Nm6u" id="3pwG8PSkQKo" role="37wK5m" />
-                    <node concept="37vLTw" id="3pwG8PSkQKp" role="37wK5m">
-                      <ref role="3cqZAo" node="3pwG8PSkQJp" resolve="icon" />
-                    </node>
-                  </node>
-                </node>
-              </node>
+          <node concept="3clFbS" id="3pwG8PSkQLD" role="3clFbx">
+            <node concept="3cpWs6" id="3pwG8PSkQLE" role="3cqZAp">
+              <node concept="10Nm6u" id="3pwG8PSkQLF" role="3cqZAk" />
             </node>
           </node>
         </node>
-      </node>
-      <node concept="3Tmbuc" id="3pwG8PSomJ5" role="1B3o_S" />
-      <node concept="3uibUv" id="3pwG8PSkQL4" role="3clF45">
-        <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="2xgTENkWvcD" role="jymVt" />
-    <node concept="3clFb_" id="2xgTENkWs2J" role="jymVt">
-      <property role="TrG5h" value="createIntentionActionGroup" />
-      <node concept="3Tmbuc" id="2xgTENkWs2K" role="1B3o_S" />
-      <node concept="3uibUv" id="2xgTENkWy9Z" role="3clF45">
-        <ref role="3uigEE" to="qkt:~DefaultActionGroup" resolve="DefaultActionGroup" />
-      </node>
-      <node concept="37vLTG" id="2xgTENkWs0j" role="3clF46">
-        <property role="TrG5h" value="node" />
-        <property role="3TUv4t" value="true" />
-        <node concept="3uibUv" id="2xgTENkWs0k" role="1tU5fm">
-          <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="2xgTENkWs0l" role="3clF46">
-        <property role="TrG5h" value="intention" />
-        <property role="3TUv4t" value="true" />
-        <node concept="3uibUv" id="7me2y0SMO4G" role="1tU5fm">
-          <ref role="3uigEE" to="nddn:~IntentionExecutable" resolve="IntentionExecutable" />
+        <node concept="3SKdUt" id="3pwG8PSkQS1" role="3cqZAp">
+          <node concept="1PaTwC" id="17qUVvSZlte" role="1aUNEU">
+            <node concept="3oM_SD" id="17qUVvSZltf" role="1PaTwD">
+              <property role="3oM_SC" value="TODO" />
+            </node>
+            <node concept="3oM_SD" id="17qUVvSZltg" role="1PaTwD">
+              <property role="3oM_SC" value="sort" />
+            </node>
+            <node concept="3oM_SD" id="17qUVvSZlth" role="1PaTwD">
+              <property role="3oM_SC" value="actions" />
+            </node>
+            <node concept="3oM_SD" id="17qUVvSZlti" role="1PaTwD">
+              <property role="3oM_SC" value="&amp;" />
+            </node>
+            <node concept="3oM_SD" id="17qUVvSZltj" role="1PaTwD">
+              <property role="3oM_SC" value="intentions" />
+            </node>
+            <node concept="3oM_SD" id="17qUVvSZltk" role="1PaTwD">
+              <property role="3oM_SC" value="together" />
+            </node>
+          </node>
         </node>
-      </node>
-      <node concept="37vLTG" id="2xgTENkWs0n" role="3clF46">
-        <property role="TrG5h" value="text" />
-        <node concept="17QB3L" id="2xgTENkWzuN" role="1tU5fm" />
-      </node>
-      <node concept="3clFbS" id="2xgTENkWrX_" role="3clF47">
-        <node concept="3cpWs6" id="2xgTENkWrZS" role="3cqZAp">
-          <node concept="2ShNRf" id="2xgTENkWrZT" role="3cqZAk">
-            <node concept="YeOm9" id="2xgTENkWrZU" role="2ShVmc">
-              <node concept="1Y3b0j" id="2xgTENkWrZV" role="YeSDq">
-                <property role="2bfB8j" value="true" />
-                <property role="1sVAO0" value="false" />
-                <property role="1EXbeo" value="false" />
-                <ref role="37wK5l" to="qkt:~DefaultActionGroup.&lt;init&gt;(java.lang.String,boolean)" resolve="DefaultActionGroup" />
-                <ref role="1Y3XeK" to="qkt:~DefaultActionGroup" resolve="DefaultActionGroup" />
-                <node concept="3clFb_" id="2xgTENkWrZW" role="jymVt">
-                  <property role="TrG5h" value="canBePerformed" />
-                  <property role="DiZV1" value="false" />
-                  <property role="od$2w" value="false" />
-                  <node concept="2AHcQZ" id="2xgTENkWrZX" role="2AJF6D">
-                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-                  </node>
-                  <node concept="37vLTG" id="2xgTENkWrZY" role="3clF46">
-                    <property role="TrG5h" value="c" />
-                    <property role="3TUv4t" value="false" />
-                    <node concept="3uibUv" id="2xgTENkWrZZ" role="1tU5fm">
-                      <ref role="3uigEE" to="qkt:~DataContext" resolve="DataContext" />
+        <node concept="3clFbF" id="3pwG8PSkQLG" role="3cqZAp">
+          <node concept="2YIFZM" id="3pwG8PSkU6N" role="3clFbG">
+            <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
+            <ref role="37wK5l" to="33ny:~Collections.sort(java.util.List,java.util.Comparator)" resolve="sort" />
+            <node concept="37vLTw" id="3pwG8PSkQLI" role="37wK5m">
+              <ref role="3cqZAo" node="3pwG8PSkQL9" resolve="groupItems" />
+            </node>
+            <node concept="2ShNRf" id="3pwG8PSkQLJ" role="37wK5m">
+              <node concept="YeOm9" id="3pwG8PSkQLK" role="2ShVmc">
+                <node concept="1Y3b0j" id="3pwG8PSkQLL" role="YeSDq">
+                  <property role="2bfB8j" value="true" />
+                  <property role="1sVAO0" value="false" />
+                  <property role="1EXbeo" value="false" />
+                  <ref role="1Y3XeK" to="33ny:~Comparator" resolve="Comparator" />
+                  <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                  <node concept="3Tm1VV" id="3pwG8PSkQLM" role="1B3o_S" />
+                  <node concept="3clFb_" id="3pwG8PSkQLN" role="jymVt">
+                    <property role="TrG5h" value="compare" />
+                    <property role="DiZV1" value="false" />
+                    <property role="od$2w" value="false" />
+                    <node concept="2AHcQZ" id="3pwG8PSkQLO" role="2AJF6D">
+                      <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                     </node>
-                  </node>
-                  <node concept="3clFbS" id="2xgTENkWs00" role="3clF47">
-                    <node concept="3cpWs6" id="2xgTENkWs01" role="3cqZAp">
-                      <node concept="3clFbT" id="2xgTENkWs02" role="3cqZAk">
-                        <property role="3clFbU" value="true" />
+                    <node concept="37vLTG" id="3pwG8PSkQLP" role="3clF46">
+                      <property role="TrG5h" value="o1" />
+                      <property role="3TUv4t" value="false" />
+                      <node concept="3uibUv" id="3pwG8PSkQLQ" role="1tU5fm">
+                        <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
+                        <node concept="3uibUv" id="7me2y0SLtv0" role="11_B2D">
+                          <ref role="3uigEE" to="nddn:~IntentionExecutable" resolve="IntentionExecutable" />
+                        </node>
+                        <node concept="3uibUv" id="3pwG8PSkQLS" role="11_B2D">
+                          <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
+                        </node>
                       </node>
                     </node>
-                  </node>
-                  <node concept="3Tm1VV" id="2xgTENkWs03" role="1B3o_S" />
-                  <node concept="10P_77" id="2xgTENkWs04" role="3clF45" />
-                </node>
-                <node concept="3clFb_" id="2xgTENkWs05" role="jymVt">
-                  <property role="TrG5h" value="actionPerformed" />
-                  <property role="DiZV1" value="false" />
-                  <property role="od$2w" value="false" />
-                  <node concept="2AHcQZ" id="2xgTENkWs06" role="2AJF6D">
-                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-                  </node>
-                  <node concept="37vLTG" id="2xgTENkWs07" role="3clF46">
-                    <property role="TrG5h" value="e" />
-                    <property role="3TUv4t" value="false" />
-                    <node concept="3uibUv" id="2xgTENkWs08" role="1tU5fm">
-                      <ref role="3uigEE" to="qkt:~AnActionEvent" resolve="AnActionEvent" />
-                    </node>
-                  </node>
-                  <node concept="3clFbS" id="2xgTENkWs09" role="3clF47">
-                    <node concept="3clFbF" id="2xgTENkWs0a" role="3cqZAp">
-                      <node concept="1rXfSq" id="2xgTENkWs0b" role="3clFbG">
-                        <ref role="37wK5l" node="3pwG8PSkQIH" resolve="executeIntention" />
-                        <node concept="37vLTw" id="2xgTENkWs0r" role="37wK5m">
-                          <ref role="3cqZAo" node="2xgTENkWs0l" resolve="intention" />
+                    <node concept="37vLTG" id="3pwG8PSkQLT" role="3clF46">
+                      <property role="TrG5h" value="o2" />
+                      <property role="3TUv4t" value="false" />
+                      <node concept="3uibUv" id="3pwG8PSkQLU" role="1tU5fm">
+                        <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
+                        <node concept="3uibUv" id="7me2y0SLu4M" role="11_B2D">
+                          <ref role="3uigEE" to="nddn:~IntentionExecutable" resolve="IntentionExecutable" />
                         </node>
-                        <node concept="37vLTw" id="2xgTENkWs0q" role="37wK5m">
-                          <ref role="3cqZAo" node="2xgTENkWs0j" resolve="node" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3Tm1VV" id="2xgTENkWs0e" role="1B3o_S" />
-                  <node concept="3cqZAl" id="2xgTENkWs0f" role="3clF45" />
-                </node>
-                <node concept="3Tm1VV" id="2xgTENkWs0g" role="1B3o_S" />
-                <node concept="37vLTw" id="2xgTENkWs0p" role="37wK5m">
-                  <ref role="3cqZAo" node="2xgTENkWs0n" resolve="text" />
-                </node>
-                <node concept="3clFbT" id="2xgTENkWs0i" role="37wK5m">
-                  <property role="3clFbU" value="true" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="2xgTENkW$V9" role="jymVt" />
-    <node concept="3clFb_" id="3pwG8PSkQL5" role="jymVt">
-      <property role="TrG5h" value="getIntentionsGroup" />
-      <property role="DiZV1" value="false" />
-      <property role="od$2w" value="false" />
-      <node concept="37vLTG" id="3pwG8PSkQL6" role="3clF46">
-        <property role="TrG5h" value="dataContext" />
-        <property role="3TUv4t" value="true" />
-        <node concept="3uibUv" id="3pwG8PSkQL7" role="1tU5fm">
-          <ref role="3uigEE" to="qkt:~DataContext" resolve="DataContext" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="3pwG8PSkQL8" role="3clF47">
-        <node concept="3SKdUt" id="3pwG8PSkQRX" role="3cqZAp">
-          <node concept="1PaTwC" id="17qUVvSZlt8" role="1aUNEU">
-            <node concept="3oM_SD" id="17qUVvSZlt9" role="1PaTwD">
-              <property role="3oM_SC" value="intentions" />
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="3pwG8PSkQLa" role="3cqZAp">
-          <node concept="3cpWsn" id="3pwG8PSkQL9" role="3cpWs9">
-            <property role="3TUv4t" value="false" />
-            <property role="TrG5h" value="groupItems" />
-            <node concept="3uibUv" id="3pwG8PSkQLb" role="1tU5fm">
-              <ref role="3uigEE" to="33ny:~List" resolve="List" />
-              <node concept="3uibUv" id="3pwG8PSkQLc" role="11_B2D">
-                <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-                <node concept="3uibUv" id="7me2y0SLnF1" role="11_B2D">
-                  <ref role="3uigEE" to="nddn:~IntentionExecutable" resolve="IntentionExecutable" />
-                </node>
-                <node concept="3uibUv" id="3pwG8PSkQLe" role="11_B2D">
-                  <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
-                </node>
-              </node>
-            </node>
-            <node concept="2ShNRf" id="3pwG8PSkU30" role="33vP2m">
-              <node concept="1pGfFk" id="3pwG8PSkU31" role="2ShVmc">
-                <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;()" resolve="ArrayList" />
-                <node concept="3uibUv" id="3pwG8PSkQLg" role="1pMfVU">
-                  <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-                  <node concept="3uibUv" id="7me2y0SLqbn" role="11_B2D">
-                    <ref role="3uigEE" to="nddn:~IntentionExecutable" resolve="IntentionExecutable" />
-                  </node>
-                  <node concept="3uibUv" id="3pwG8PSkQLi" role="11_B2D">
-                    <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="3pwG8PSkQLj" role="3cqZAp">
-          <node concept="2OqwBi" id="3pwG8PSkU35" role="3clFbG">
-            <node concept="37vLTw" id="3pwG8PSkU34" role="2Oq$k0">
-              <ref role="3cqZAo" node="3pwG8PSkQL9" resolve="groupItems" />
-            </node>
-            <node concept="liA8E" id="3pwG8PSkU36" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~List.addAll(java.util.Collection)" resolve="addAll" />
-              <node concept="1rXfSq" id="3pwG8PSkQLl" role="37wK5m">
-                <ref role="37wK5l" node="3pwG8PSkQPt" resolve="getEnabledIntentions" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3SKdUt" id="3pwG8PSkQRZ" role="3cqZAp">
-          <node concept="1PaTwC" id="17qUVvSZlta" role="1aUNEU">
-            <node concept="3oM_SD" id="17qUVvSZltb" role="1PaTwD">
-              <property role="3oM_SC" value="actions" />
-            </node>
-            <node concept="3oM_SD" id="17qUVvSZltc" role="1PaTwD">
-              <property role="3oM_SC" value="as" />
-            </node>
-            <node concept="3oM_SD" id="17qUVvSZltd" role="1PaTwD">
-              <property role="3oM_SC" value="intentions" />
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="3pwG8PSkQLn" role="3cqZAp">
-          <node concept="3cpWsn" id="3pwG8PSkQLm" role="3cpWs9">
-            <property role="3TUv4t" value="false" />
-            <property role="TrG5h" value="actions" />
-            <node concept="3uibUv" id="3pwG8PSkQLo" role="1tU5fm">
-              <ref role="3uigEE" to="33ny:~List" resolve="List" />
-              <node concept="3uibUv" id="3pwG8PSkQLp" role="11_B2D">
-                <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
-              </node>
-            </node>
-            <node concept="2ShNRf" id="3pwG8PSkU37" role="33vP2m">
-              <node concept="1pGfFk" id="3pwG8PSkU38" role="2ShVmc">
-                <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;()" resolve="ArrayList" />
-                <node concept="3uibUv" id="3pwG8PSkQLr" role="1pMfVU">
-                  <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="3pwG8PSkQLs" role="3cqZAp">
-          <node concept="1rXfSq" id="3pwG8PSkQLt" role="3clFbG">
-            <ref role="37wK5l" node="3pwG8PSkQMU" resolve="collectActionsAsIntentions" />
-            <node concept="2OqwBi" id="3pwG8PSkQLu" role="37wK5m">
-              <node concept="2YIFZM" id="3pwG8PSkU3b" role="2Oq$k0">
-                <ref role="1Pybhc" to="qkt:~ActionManager" resolve="ActionManager" />
-                <ref role="37wK5l" to="qkt:~ActionManager.getInstance()" resolve="getInstance" />
-              </node>
-              <node concept="liA8E" id="3pwG8PSkQLw" role="2OqNvi">
-                <ref role="37wK5l" to="qkt:~ActionManager.getAction(java.lang.String)" resolve="getAction" />
-                <node concept="10M0yZ" id="3pwG8PSlb0t" role="37wK5m">
-                  <ref role="1PxDUh" to="qq03:~MPSActions" resolve="MPSActions" />
-                  <ref role="3cqZAo" to="qq03:~MPSActions.ACTIONS_AS_INTENTIONS_GROUP" resolve="ACTIONS_AS_INTENTIONS_GROUP" />
-                </node>
-              </node>
-            </node>
-            <node concept="37vLTw" id="3pwG8PSkQLy" role="37wK5m">
-              <ref role="3cqZAo" node="3pwG8PSkQLm" resolve="actions" />
-            </node>
-            <node concept="37vLTw" id="3pwG8PSkQLz" role="37wK5m">
-              <ref role="3cqZAo" node="3pwG8PSkQL6" resolve="dataContext" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbJ" id="3pwG8PSkQL$" role="3cqZAp">
-          <node concept="1Wc70l" id="3pwG8PSkQL_" role="3clFbw">
-            <node concept="2OqwBi" id="3pwG8PSkU6E" role="3uHU7B">
-              <node concept="37vLTw" id="3pwG8PSkU6D" role="2Oq$k0">
-                <ref role="3cqZAo" node="3pwG8PSkQL9" resolve="groupItems" />
-              </node>
-              <node concept="liA8E" id="3pwG8PSkU6F" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
-              </node>
-            </node>
-            <node concept="2OqwBi" id="3pwG8PSkU6J" role="3uHU7w">
-              <node concept="37vLTw" id="3pwG8PSkU6I" role="2Oq$k0">
-                <ref role="3cqZAo" node="3pwG8PSkQLm" resolve="actions" />
-              </node>
-              <node concept="liA8E" id="3pwG8PSkU6K" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbS" id="3pwG8PSkQLD" role="3clFbx">
-            <node concept="3cpWs6" id="3pwG8PSkQLE" role="3cqZAp">
-              <node concept="10Nm6u" id="3pwG8PSkQLF" role="3cqZAk" />
-            </node>
-          </node>
-        </node>
-        <node concept="3SKdUt" id="3pwG8PSkQS1" role="3cqZAp">
-          <node concept="1PaTwC" id="17qUVvSZlte" role="1aUNEU">
-            <node concept="3oM_SD" id="17qUVvSZltf" role="1PaTwD">
-              <property role="3oM_SC" value="TODO" />
-            </node>
-            <node concept="3oM_SD" id="17qUVvSZltg" role="1PaTwD">
-              <property role="3oM_SC" value="sort" />
-            </node>
-            <node concept="3oM_SD" id="17qUVvSZlth" role="1PaTwD">
-              <property role="3oM_SC" value="actions" />
-            </node>
-            <node concept="3oM_SD" id="17qUVvSZlti" role="1PaTwD">
-              <property role="3oM_SC" value="&amp;" />
-            </node>
-            <node concept="3oM_SD" id="17qUVvSZltj" role="1PaTwD">
-              <property role="3oM_SC" value="intentions" />
-            </node>
-            <node concept="3oM_SD" id="17qUVvSZltk" role="1PaTwD">
-              <property role="3oM_SC" value="together" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="3pwG8PSkQLG" role="3cqZAp">
-          <node concept="2YIFZM" id="3pwG8PSkU6N" role="3clFbG">
-            <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
-            <ref role="37wK5l" to="33ny:~Collections.sort(java.util.List,java.util.Comparator)" resolve="sort" />
-            <node concept="37vLTw" id="3pwG8PSkQLI" role="37wK5m">
-              <ref role="3cqZAo" node="3pwG8PSkQL9" resolve="groupItems" />
-            </node>
-            <node concept="2ShNRf" id="3pwG8PSkQLJ" role="37wK5m">
-              <node concept="YeOm9" id="3pwG8PSkQLK" role="2ShVmc">
-                <node concept="1Y3b0j" id="3pwG8PSkQLL" role="YeSDq">
-                  <property role="2bfB8j" value="true" />
-                  <property role="1sVAO0" value="false" />
-                  <property role="1EXbeo" value="false" />
-                  <ref role="1Y3XeK" to="33ny:~Comparator" resolve="Comparator" />
-                  <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                  <node concept="3Tm1VV" id="3pwG8PSkQLM" role="1B3o_S" />
-                  <node concept="3clFb_" id="3pwG8PSkQLN" role="jymVt">
-                    <property role="TrG5h" value="compare" />
-                    <property role="DiZV1" value="false" />
-                    <property role="od$2w" value="false" />
-                    <node concept="2AHcQZ" id="3pwG8PSkQLO" role="2AJF6D">
-                      <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-                    </node>
-                    <node concept="37vLTG" id="3pwG8PSkQLP" role="3clF46">
-                      <property role="TrG5h" value="o1" />
-                      <property role="3TUv4t" value="false" />
-                      <node concept="3uibUv" id="3pwG8PSkQLQ" role="1tU5fm">
-                        <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-                        <node concept="3uibUv" id="7me2y0SLtv0" role="11_B2D">
-                          <ref role="3uigEE" to="nddn:~IntentionExecutable" resolve="IntentionExecutable" />
-                        </node>
-                        <node concept="3uibUv" id="3pwG8PSkQLS" role="11_B2D">
-                          <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="37vLTG" id="3pwG8PSkQLT" role="3clF46">
-                      <property role="TrG5h" value="o2" />
-                      <property role="3TUv4t" value="false" />
-                      <node concept="3uibUv" id="3pwG8PSkQLU" role="1tU5fm">
-                        <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-                        <node concept="3uibUv" id="7me2y0SLu4M" role="11_B2D">
-                          <ref role="3uigEE" to="nddn:~IntentionExecutable" resolve="IntentionExecutable" />
-                        </node>
-                        <node concept="3uibUv" id="3pwG8PSkQLW" role="11_B2D">
-                          <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
+                        <node concept="3uibUv" id="3pwG8PSkQLW" role="11_B2D">
+                          <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
                         </node>
                       </node>
                     </node>
@@ -1465,958 +1010,524 @@
                         <node concept="3cpWsn" id="3pwG8PSkQLY" role="3cpWs9">
                           <property role="3TUv4t" value="false" />
                           <property role="TrG5h" value="intention1" />
-                          <node concept="3uibUv" id="7me2y0SLuta" role="1tU5fm">
-                            <ref role="3uigEE" to="nddn:~IntentionExecutable" resolve="IntentionExecutable" />
-                          </node>
-                          <node concept="2OqwBi" id="3pwG8PSkU6Y" role="33vP2m">
-                            <node concept="37vLTw" id="3pwG8PSkU6X" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3pwG8PSkQLP" resolve="o1" />
-                            </node>
-                            <node concept="2OwXpG" id="3pwG8PSkU6Z" role="2OqNvi">
-                              <ref role="2Oxat6" to="18ew:~Pair.o1" resolve="o1" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3cpWs8" id="3pwG8PSkQM3" role="3cqZAp">
-                        <node concept="3cpWsn" id="3pwG8PSkQM2" role="3cpWs9">
-                          <property role="3TUv4t" value="false" />
-                          <property role="TrG5h" value="intention2" />
-                          <node concept="3uibUv" id="7me2y0SLuYi" role="1tU5fm">
-                            <ref role="3uigEE" to="nddn:~IntentionExecutable" resolve="IntentionExecutable" />
-                          </node>
-                          <node concept="2OqwBi" id="3pwG8PSkU7a" role="33vP2m">
-                            <node concept="37vLTw" id="3pwG8PSkU79" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3pwG8PSkQLT" resolve="o2" />
-                            </node>
-                            <node concept="2OwXpG" id="3pwG8PSkU7b" role="2OqNvi">
-                              <ref role="2Oxat6" to="18ew:~Pair.o1" resolve="o1" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3cpWs8" id="3pwG8PSkQM7" role="3cqZAp">
-                        <node concept="3cpWsn" id="3pwG8PSkQM6" role="3cpWs9">
-                          <property role="3TUv4t" value="false" />
-                          <property role="TrG5h" value="node1" />
-                          <node concept="3uibUv" id="3pwG8PSkQM8" role="1tU5fm">
-                            <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
-                          </node>
-                          <node concept="2OqwBi" id="3pwG8PSkU7m" role="33vP2m">
-                            <node concept="37vLTw" id="3pwG8PSkU7l" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3pwG8PSkQLP" resolve="o1" />
-                            </node>
-                            <node concept="2OwXpG" id="3pwG8PSkU7n" role="2OqNvi">
-                              <ref role="2Oxat6" to="18ew:~Pair.o2" resolve="o2" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3cpWs8" id="3pwG8PSkQMb" role="3cqZAp">
-                        <node concept="3cpWsn" id="3pwG8PSkQMa" role="3cpWs9">
-                          <property role="3TUv4t" value="false" />
-                          <property role="TrG5h" value="node2" />
-                          <node concept="3uibUv" id="3pwG8PSkQMc" role="1tU5fm">
-                            <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
-                          </node>
-                          <node concept="2OqwBi" id="3pwG8PSkU7y" role="33vP2m">
-                            <node concept="37vLTw" id="3pwG8PSkU7x" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3pwG8PSkQLT" resolve="o2" />
-                            </node>
-                            <node concept="2OwXpG" id="3pwG8PSkU7z" role="2OqNvi">
-                              <ref role="2Oxat6" to="18ew:~Pair.o2" resolve="o2" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3cpWs8" id="3pwG8PSkQMf" role="3cqZAp">
-                        <node concept="3cpWsn" id="3pwG8PSkQMe" role="3cpWs9">
-                          <property role="3TUv4t" value="false" />
-                          <property role="TrG5h" value="context" />
-                          <node concept="3uibUv" id="3pwG8PSkQMg" role="1tU5fm">
-                            <ref role="3uigEE" to="exr9:~EditorContext" resolve="EditorContext" />
-                          </node>
-                          <node concept="2OqwBi" id="3pwG8PSkU7I" role="33vP2m">
-                            <node concept="37vLTw" id="3pwG8PSkU7H" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3pwG8PSkQAX" resolve="myEditor" />
-                            </node>
-                            <node concept="liA8E" id="3pwG8PSkU7J" role="2OqNvi">
-                              <ref role="37wK5l" to="exr9:~EditorComponent.getEditorContext()" resolve="getEditorContext" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3cpWs6" id="3pwG8PSkQMi" role="3cqZAp">
-                        <node concept="2OqwBi" id="3pwG8PSkQMj" role="3cqZAk">
-                          <node concept="2OqwBi" id="3pwG8PSkU7U" role="2Oq$k0">
-                            <node concept="37vLTw" id="3pwG8PSkU7T" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3pwG8PSkQLY" resolve="intention1" />
-                            </node>
-                            <node concept="liA8E" id="3pwG8PSkU7V" role="2OqNvi">
-                              <ref role="37wK5l" to="nddn:~IntentionExecutable.getDescription(org.jetbrains.mps.openapi.model.SNode,jetbrains.mps.openapi.editor.EditorContext)" resolve="getDescription" />
-                              <node concept="37vLTw" id="3pwG8PSkQMl" role="37wK5m">
-                                <ref role="3cqZAo" node="3pwG8PSkQM6" resolve="node1" />
-                              </node>
-                              <node concept="37vLTw" id="3pwG8PSkQMm" role="37wK5m">
-                                <ref role="3cqZAo" node="3pwG8PSkQMe" resolve="context" />
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="liA8E" id="3pwG8PSkQMn" role="2OqNvi">
-                            <ref role="37wK5l" to="wyt6:~String.compareTo(java.lang.String)" resolve="compareTo" />
-                            <node concept="2OqwBi" id="3pwG8PSkU86" role="37wK5m">
-                              <node concept="37vLTw" id="3pwG8PSkU85" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3pwG8PSkQM2" resolve="intention2" />
-                              </node>
-                              <node concept="liA8E" id="3pwG8PSkU87" role="2OqNvi">
-                                <ref role="37wK5l" to="nddn:~IntentionExecutable.getDescription(org.jetbrains.mps.openapi.model.SNode,jetbrains.mps.openapi.editor.EditorContext)" resolve="getDescription" />
-                                <node concept="37vLTw" id="3pwG8PSkQMp" role="37wK5m">
-                                  <ref role="3cqZAo" node="3pwG8PSkQMa" resolve="node2" />
-                                </node>
-                                <node concept="37vLTw" id="3pwG8PSkQMq" role="37wK5m">
-                                  <ref role="3cqZAo" node="3pwG8PSkQMe" resolve="context" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3Tm1VV" id="3pwG8PSkQMr" role="1B3o_S" />
-                    <node concept="10Oyi0" id="3pwG8PSkQMs" role="3clF45" />
-                  </node>
-                  <node concept="3uibUv" id="3pwG8PSkQMt" role="2Ghqu4">
-                    <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-                    <node concept="3uibUv" id="7me2y0SLsOW" role="11_B2D">
-                      <ref role="3uigEE" to="nddn:~IntentionExecutable" resolve="IntentionExecutable" />
-                    </node>
-                    <node concept="3uibUv" id="3pwG8PSkQMv" role="11_B2D">
-                      <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="3pwG8PSkQMx" role="3cqZAp">
-          <node concept="3cpWsn" id="3pwG8PSkQMw" role="3cpWs9">
-            <property role="3TUv4t" value="false" />
-            <property role="TrG5h" value="group" />
-            <node concept="3uibUv" id="3pwG8PSkQMy" role="1tU5fm">
-              <ref role="3uigEE" to="7bx7:~BaseGroup" resolve="BaseGroup" />
-            </node>
-            <node concept="1rXfSq" id="3pwG8PSp_fd" role="33vP2m">
-              <ref role="37wK5l" node="3pwG8PSp_f8" resolve="getIntentionsGroup" />
-              <node concept="37vLTw" id="3pwG8PSp_fb" role="37wK5m">
-                <ref role="3cqZAo" node="3pwG8PSkQL9" resolve="groupItems" />
-              </node>
-              <node concept="37vLTw" id="3pwG8PSp_fc" role="37wK5m">
-                <ref role="3cqZAo" node="3pwG8PSkQLm" resolve="actions" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs6" id="3pwG8PSkQMQ" role="3cqZAp">
-          <node concept="37vLTw" id="3pwG8PSkQMR" role="3cqZAk">
-            <ref role="3cqZAo" node="3pwG8PSkQMw" resolve="group" />
-          </node>
-        </node>
-      </node>
-      <node concept="3Tmbuc" id="3pwG8PSonTB" role="1B3o_S" />
-      <node concept="3uibUv" id="3pwG8PSkQMT" role="3clF45">
-        <ref role="3uigEE" to="7bx7:~BaseGroup" resolve="BaseGroup" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="3pwG8PSpC9h" role="jymVt" />
-    <node concept="3clFb_" id="3pwG8PSp_f8" role="jymVt">
-      <property role="TrG5h" value="getIntentionsGroup" />
-      <node concept="3Tmbuc" id="3pwG8PSp_f9" role="1B3o_S" />
-      <node concept="3uibUv" id="3pwG8PSp_fa" role="3clF45">
-        <ref role="3uigEE" to="7bx7:~BaseGroup" resolve="BaseGroup" />
-      </node>
-      <node concept="37vLTG" id="3pwG8PSp_eW" role="3clF46">
-        <property role="TrG5h" value="groupItems" />
-        <node concept="3uibUv" id="3pwG8PSp_eX" role="1tU5fm">
-          <ref role="3uigEE" to="33ny:~List" resolve="List" />
-          <node concept="3uibUv" id="3pwG8PSp_eY" role="11_B2D">
-            <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-            <node concept="3uibUv" id="7me2y0SLBrW" role="11_B2D">
-              <ref role="3uigEE" to="nddn:~IntentionExecutable" resolve="IntentionExecutable" />
-            </node>
-            <node concept="3uibUv" id="3pwG8PSp_f0" role="11_B2D">
-              <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="3pwG8PSp_f1" role="3clF46">
-        <property role="TrG5h" value="actions" />
-        <node concept="3uibUv" id="3pwG8PSp_f2" role="1tU5fm">
-          <ref role="3uigEE" to="33ny:~List" resolve="List" />
-          <node concept="3uibUv" id="3pwG8PSp_f3" role="11_B2D">
-            <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
-          </node>
-        </node>
-      </node>
-      <node concept="3clFbS" id="3pwG8PSp_eq" role="3clF47">
-        <node concept="3cpWs8" id="3pwG8PSp_et" role="3cqZAp">
-          <node concept="3cpWsn" id="3pwG8PSp_eu" role="3cpWs9">
-            <property role="3TUv4t" value="false" />
-            <property role="TrG5h" value="group" />
-            <node concept="3uibUv" id="3pwG8PSp_ev" role="1tU5fm">
-              <ref role="3uigEE" to="7bx7:~BaseGroup" resolve="BaseGroup" />
-            </node>
-            <node concept="2ShNRf" id="3pwG8PSp_ew" role="33vP2m">
-              <node concept="1pGfFk" id="3pwG8PSp_ex" role="2ShVmc">
-                <ref role="37wK5l" to="7bx7:~BaseGroup.&lt;init&gt;(java.lang.String)" resolve="BaseGroup" />
-                <node concept="Xl_RD" id="3pwG8PSp_ey" role="37wK5m" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1DcWWT" id="3pwG8PSp_ez" role="3cqZAp">
-          <node concept="37vLTw" id="3pwG8PSp_f5" role="1DdaDG">
-            <ref role="3cqZAo" node="3pwG8PSp_eW" resolve="groupItems" />
-          </node>
-          <node concept="3cpWsn" id="3pwG8PSp_e_" role="1Duv9x">
-            <property role="3TUv4t" value="true" />
-            <property role="TrG5h" value="pair" />
-            <node concept="3uibUv" id="3pwG8PSp_eA" role="1tU5fm">
-              <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-              <node concept="3uibUv" id="7me2y0SLElI" role="11_B2D">
-                <ref role="3uigEE" to="nddn:~IntentionExecutable" resolve="IntentionExecutable" />
-              </node>
-              <node concept="3uibUv" id="3pwG8PSp_eC" role="11_B2D">
-                <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbS" id="3pwG8PSp_eD" role="2LFqv$">
-            <node concept="3clFbF" id="3pwG8PSp_eE" role="3cqZAp">
-              <node concept="2OqwBi" id="3pwG8PSp_eF" role="3clFbG">
-                <node concept="37vLTw" id="3pwG8PSp_eG" role="2Oq$k0">
-                  <ref role="3cqZAo" node="3pwG8PSp_eu" resolve="group" />
-                </node>
-                <node concept="liA8E" id="3pwG8PSp_eH" role="2OqNvi">
-                  <ref role="37wK5l" to="qkt:~DefaultActionGroup.add(com.intellij.openapi.actionSystem.AnAction)" resolve="add" />
-                  <node concept="1rXfSq" id="3pwG8PSp_eI" role="37wK5m">
-                    <ref role="37wK5l" node="3pwG8PSkQJj" resolve="getIntentionGroup" />
-                    <node concept="2OqwBi" id="3pwG8PSp_eJ" role="37wK5m">
-                      <node concept="37vLTw" id="3pwG8PSp_eK" role="2Oq$k0">
-                        <ref role="3cqZAo" node="3pwG8PSp_e_" resolve="pair" />
-                      </node>
-                      <node concept="2OwXpG" id="3pwG8PSp_eL" role="2OqNvi">
-                        <ref role="2Oxat6" to="18ew:~Pair.o1" resolve="o1" />
-                      </node>
-                    </node>
-                    <node concept="2OqwBi" id="3pwG8PSp_eM" role="37wK5m">
-                      <node concept="37vLTw" id="3pwG8PSp_eN" role="2Oq$k0">
-                        <ref role="3cqZAo" node="3pwG8PSp_e_" resolve="pair" />
-                      </node>
-                      <node concept="2OwXpG" id="3pwG8PSp_eO" role="2OqNvi">
-                        <ref role="2Oxat6" to="18ew:~Pair.o2" resolve="o2" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="3pwG8PSp_eP" role="3cqZAp">
-          <node concept="2OqwBi" id="3pwG8PSp_eQ" role="3clFbG">
-            <node concept="37vLTw" id="3pwG8PSp_eR" role="2Oq$k0">
-              <ref role="3cqZAo" node="3pwG8PSp_eu" resolve="group" />
-            </node>
-            <node concept="liA8E" id="3pwG8PSp_eS" role="2OqNvi">
-              <ref role="37wK5l" to="qkt:~DefaultActionGroup.addAll(java.util.Collection)" resolve="addAll" />
-              <node concept="37vLTw" id="3pwG8PSp_f4" role="37wK5m">
-                <ref role="3cqZAo" node="3pwG8PSp_f1" resolve="actions" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs6" id="3pwG8PSp_eU" role="3cqZAp">
-          <node concept="37vLTw" id="3pwG8PSp_eV" role="3cqZAk">
-            <ref role="3cqZAo" node="3pwG8PSp_eu" resolve="group" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="3pwG8PSmhXP" role="jymVt" />
-    <node concept="3clFb_" id="3pwG8PSkQMU" role="jymVt">
-      <property role="TrG5h" value="collectActionsAsIntentions" />
-      <property role="DiZV1" value="false" />
-      <property role="od$2w" value="false" />
-      <node concept="37vLTG" id="3pwG8PSkQMV" role="3clF46">
-        <property role="TrG5h" value="action" />
-        <property role="3TUv4t" value="false" />
-        <node concept="3uibUv" id="3pwG8PSkQMW" role="1tU5fm">
-          <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="3pwG8PSkQMX" role="3clF46">
-        <property role="TrG5h" value="actions" />
-        <property role="3TUv4t" value="false" />
-        <node concept="3uibUv" id="3pwG8PSkQMY" role="1tU5fm">
-          <ref role="3uigEE" to="33ny:~List" resolve="List" />
-          <node concept="3uibUv" id="3pwG8PSkQMZ" role="11_B2D">
-            <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="3pwG8PSkQN0" role="3clF46">
-        <property role="TrG5h" value="dataContext" />
-        <property role="3TUv4t" value="false" />
-        <node concept="3uibUv" id="3pwG8PSkQN1" role="1tU5fm">
-          <ref role="3uigEE" to="qkt:~DataContext" resolve="DataContext" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="3pwG8PSkQN2" role="3clF47">
-        <node concept="3clFbJ" id="3pwG8PSkQN3" role="3cqZAp">
-          <node concept="2ZW3vV" id="3pwG8PSkQN6" role="3clFbw">
-            <node concept="37vLTw" id="3pwG8PSkQN4" role="2ZW6bz">
-              <ref role="3cqZAo" node="3pwG8PSkQMV" resolve="action" />
-            </node>
-            <node concept="3uibUv" id="3pwG8PSkQN5" role="2ZW6by">
-              <ref role="3uigEE" to="qkt:~ActionGroup" resolve="ActionGroup" />
-            </node>
-          </node>
-          <node concept="3clFbJ" id="3pwG8PSkQNr" role="9aQIa">
-            <node concept="2ZW3vV" id="3pwG8PSkQNu" role="3clFbw">
-              <node concept="37vLTw" id="3pwG8PSkQNs" role="2ZW6bz">
-                <ref role="3cqZAo" node="3pwG8PSkQMV" resolve="action" />
-              </node>
-              <node concept="3uibUv" id="3pwG8PSkQNt" role="2ZW6by">
-                <ref role="3uigEE" to="7bx7:~BaseAction" resolve="BaseAction" />
-              </node>
-            </node>
-            <node concept="3clFbS" id="3pwG8PSkQNw" role="3clFbx">
-              <node concept="3cpWs8" id="3pwG8PSkQNy" role="3cqZAp">
-                <node concept="3cpWsn" id="3pwG8PSkQNx" role="3cpWs9">
-                  <property role="3TUv4t" value="false" />
-                  <property role="TrG5h" value="presentation" />
-                  <node concept="3uibUv" id="3pwG8PSkQNz" role="1tU5fm">
-                    <ref role="3uigEE" to="qkt:~Presentation" resolve="Presentation" />
-                  </node>
-                  <node concept="2OqwBi" id="3pwG8PSkU9U" role="33vP2m">
-                    <node concept="37vLTw" id="3pwG8PSkU9T" role="2Oq$k0">
-                      <ref role="3cqZAo" node="3pwG8PSkQMV" resolve="action" />
-                    </node>
-                    <node concept="liA8E" id="3pwG8PSkU9V" role="2OqNvi">
-                      <ref role="37wK5l" to="qkt:~AnAction.getTemplatePresentation()" resolve="getTemplatePresentation" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbJ" id="3pwG8PSkQN_" role="3cqZAp">
-                <node concept="3clFbC" id="3pwG8PSkQNA" role="3clFbw">
-                  <node concept="2OqwBi" id="3pwG8PSkU9Z" role="3uHU7B">
-                    <node concept="37vLTw" id="3pwG8PSkU9Y" role="2Oq$k0">
-                      <ref role="3cqZAo" node="3pwG8PSkQNx" resolve="presentation" />
-                    </node>
-                    <node concept="liA8E" id="3pwG8PSkUa0" role="2OqNvi">
-                      <ref role="37wK5l" to="qkt:~Presentation.getIcon()" resolve="getIcon" />
-                    </node>
-                  </node>
-                  <node concept="10Nm6u" id="3pwG8PSkQNC" role="3uHU7w" />
-                </node>
-                <node concept="3clFbS" id="3pwG8PSkQNG" role="3clFbx">
-                  <node concept="3clFbF" id="3pwG8PSkQND" role="3cqZAp">
-                    <node concept="2OqwBi" id="3pwG8PSkUa4" role="3clFbG">
-                      <node concept="37vLTw" id="3pwG8PSkUa3" role="2Oq$k0">
-                        <ref role="3cqZAo" node="3pwG8PSkQNx" resolve="presentation" />
-                      </node>
-                      <node concept="liA8E" id="3pwG8PSkUa5" role="2OqNvi">
-                        <ref role="37wK5l" to="qkt:~Presentation.setIcon(javax.swing.Icon)" resolve="setIcon" />
-                        <node concept="10M0yZ" id="3pwG8PSlb0u" role="37wK5m">
-                          <ref role="1PxDUh" to="8b49:~Icons" resolve="Icons" />
-                          <ref role="3cqZAo" to="8b49:~Icons.REAL_INTENTION" resolve="REAL_INTENTION" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="1DKEdPbwda0" role="3cqZAp">
-                <node concept="2OqwBi" id="1DKEdPbwfNR" role="3clFbG">
-                  <node concept="37vLTw" id="1DKEdPbwd9Y" role="2Oq$k0">
-                    <ref role="3cqZAo" node="3pwG8PSkQMV" resolve="action" />
-                  </node>
-                  <node concept="liA8E" id="1DKEdPbwhO4" role="2OqNvi">
-                    <ref role="37wK5l" to="qkt:~AnAction.update(com.intellij.openapi.actionSystem.AnActionEvent)" resolve="update" />
-                    <node concept="2YIFZM" id="1DKEdPbwnok" role="37wK5m">
-                      <ref role="37wK5l" to="qkt:~AnActionEvent.createFromAnAction(com.intellij.openapi.actionSystem.AnAction,java.awt.event.InputEvent,java.lang.String,com.intellij.openapi.actionSystem.DataContext)" resolve="createFromAnAction" />
-                      <ref role="1Pybhc" to="qkt:~AnActionEvent" resolve="AnActionEvent" />
-                      <node concept="37vLTw" id="1DKEdPbwqBy" role="37wK5m">
-                        <ref role="3cqZAo" node="3pwG8PSkQMV" resolve="action" />
-                      </node>
-                      <node concept="10Nm6u" id="1DKEdPbwwvS" role="37wK5m" />
-                      <node concept="Xl_RD" id="1DKEdPbw_0H" role="37wK5m">
-                        <property role="Xl_RC" value="" />
-                      </node>
-                      <node concept="37vLTw" id="1DKEdPbwGDJ" role="37wK5m">
-                        <ref role="3cqZAo" node="3pwG8PSkQN0" resolve="dataContext" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbJ" id="3pwG8PSkQNQ" role="3cqZAp">
-                <node concept="2OqwBi" id="3pwG8PSkUam" role="3clFbw">
-                  <node concept="37vLTw" id="3pwG8PSkUal" role="2Oq$k0">
-                    <ref role="3cqZAo" node="3pwG8PSkQNx" resolve="presentation" />
-                  </node>
-                  <node concept="liA8E" id="3pwG8PSkUan" role="2OqNvi">
-                    <ref role="37wK5l" to="qkt:~Presentation.isVisible()" resolve="isVisible" />
-                  </node>
-                </node>
-                <node concept="3clFbS" id="3pwG8PSkQNT" role="3clFbx">
-                  <node concept="3clFbF" id="3pwG8PSkQNU" role="3cqZAp">
-                    <node concept="2OqwBi" id="3pwG8PSkUar" role="3clFbG">
-                      <node concept="37vLTw" id="3pwG8PSkUaq" role="2Oq$k0">
-                        <ref role="3cqZAo" node="3pwG8PSkQMX" resolve="actions" />
-                      </node>
-                      <node concept="liA8E" id="3pwG8PSkUas" role="2OqNvi">
-                        <ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
-                        <node concept="37vLTw" id="3pwG8PSkQNW" role="37wK5m">
-                          <ref role="3cqZAo" node="3pwG8PSkQMV" resolve="action" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbS" id="3pwG8PSkQN8" role="3clFbx">
-            <node concept="1DcWWT" id="3pwG8PSkQN9" role="3cqZAp">
-              <node concept="2OqwBi" id="3pwG8PSkQNk" role="1DdaDG">
-                <node concept="1eOMI4" id="3pwG8PSkQNo" role="2Oq$k0">
-                  <node concept="10QFUN" id="3pwG8PSkQNl" role="1eOMHV">
-                    <node concept="37vLTw" id="3pwG8PSkQNm" role="10QFUP">
-                      <ref role="3cqZAo" node="3pwG8PSkQMV" resolve="action" />
-                    </node>
-                    <node concept="3uibUv" id="3pwG8PSkQNn" role="10QFUM">
-                      <ref role="3uigEE" to="qkt:~ActionGroup" resolve="ActionGroup" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="liA8E" id="3pwG8PSkQNp" role="2OqNvi">
-                  <ref role="37wK5l" to="qkt:~ActionGroup.getChildren(com.intellij.openapi.actionSystem.AnActionEvent)" resolve="getChildren" />
-                  <node concept="10Nm6u" id="3pwG8PSkQNq" role="37wK5m" />
-                </node>
-              </node>
-              <node concept="3cpWsn" id="3pwG8PSkQNh" role="1Duv9x">
-                <property role="3TUv4t" value="false" />
-                <property role="TrG5h" value="child" />
-                <node concept="3uibUv" id="3pwG8PSkQNj" role="1tU5fm">
-                  <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
-                </node>
-              </node>
-              <node concept="3clFbS" id="3pwG8PSkQNb" role="2LFqv$">
-                <node concept="3clFbF" id="29wDeGI8z3F" role="3cqZAp">
-                  <node concept="2OqwBi" id="29wDeGI8AU1" role="3clFbG">
-                    <node concept="37vLTw" id="29wDeGI8z3D" role="2Oq$k0">
-                      <ref role="3cqZAo" node="3pwG8PSkQMX" resolve="actions" />
-                    </node>
-                    <node concept="liA8E" id="29wDeGI8EAn" role="2OqNvi">
-                      <ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
-                      <node concept="37vLTw" id="29wDeGI8J3U" role="37wK5m">
-                        <ref role="3cqZAo" node="3pwG8PSkQNh" resolve="child" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tmbuc" id="3pwG8PSop7T" role="1B3o_S" />
-      <node concept="3cqZAl" id="3pwG8PSkQNY" role="3clF45" />
-    </node>
-    <node concept="2tJIrI" id="3pwG8PSml3m" role="jymVt" />
-    <node concept="3clFb_" id="3pwG8PSkQNZ" role="jymVt">
-      <property role="TrG5h" value="showIntentionsMenu" />
-      <property role="DiZV1" value="false" />
-      <property role="od$2w" value="false" />
-      <node concept="3clFbS" id="3pwG8PSkQO0" role="3clF47">
-        <node concept="3cpWs8" id="3pwG8PSkQO2" role="3cqZAp">
-          <node concept="3cpWsn" id="3pwG8PSkQO1" role="3cpWs9">
-            <property role="3TUv4t" value="true" />
-            <property role="TrG5h" value="editorContext" />
-            <node concept="3uibUv" id="3pwG8PSkQO3" role="1tU5fm">
-              <ref role="3uigEE" to="exr9:~EditorContext" resolve="EditorContext" />
-            </node>
-            <node concept="2OqwBi" id="3pwG8PSkUaw" role="33vP2m">
-              <node concept="37vLTw" id="3pwG8PSkUav" role="2Oq$k0">
-                <ref role="3cqZAo" node="3pwG8PSkQAX" resolve="myEditor" />
-              </node>
-              <node concept="liA8E" id="3pwG8PSkUax" role="2OqNvi">
-                <ref role="37wK5l" to="exr9:~EditorComponent.getEditorContext()" resolve="getEditorContext" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="3pwG8PSkQO6" role="3cqZAp">
-          <node concept="3cpWsn" id="3pwG8PSkQO5" role="3cpWs9">
-            <property role="3TUv4t" value="false" />
-            <property role="TrG5h" value="popup" />
-            <node concept="3uibUv" id="3pwG8PSkQO7" role="1tU5fm">
-              <ref role="3uigEE" to="gspm:~ListPopup" resolve="ListPopup" />
-            </node>
-            <node concept="2OqwBi" id="3pwG8PSkQO8" role="33vP2m">
-              <node concept="2ShNRf" id="3pwG8PSkUay" role="2Oq$k0">
-                <node concept="1pGfFk" id="3pwG8PSkUaz" role="2ShVmc">
-                  <ref role="37wK5l" to="w1kc:~ModelAccessHelper.&lt;init&gt;(org.jetbrains.mps.openapi.module.ModelAccess)" resolve="ModelAccessHelper" />
-                  <node concept="1rXfSq" id="3pwG8PSkQOa" role="37wK5m">
-                    <ref role="37wK5l" node="3pwG8PSkQQM" resolve="getModelAccess" />
-                  </node>
-                </node>
-              </node>
-              <node concept="liA8E" id="3pwG8PSkQOb" role="2OqNvi">
-                <ref role="37wK5l" to="w1kc:~ModelAccessHelper.runReadAction(jetbrains.mps.util.Computable)" resolve="runReadAction" />
-                <node concept="2ShNRf" id="3pwG8PSkQOc" role="37wK5m">
-                  <node concept="YeOm9" id="3pwG8PSkQOd" role="2ShVmc">
-                    <node concept="1Y3b0j" id="3pwG8PSkQOe" role="YeSDq">
-                      <property role="2bfB8j" value="true" />
-                      <property role="1sVAO0" value="false" />
-                      <property role="1EXbeo" value="false" />
-                      <ref role="1Y3XeK" to="18ew:~Computable" resolve="Computable" />
-                      <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                      <node concept="3Tm1VV" id="3pwG8PSkQOf" role="1B3o_S" />
-                      <node concept="3clFb_" id="3pwG8PSkQOg" role="jymVt">
-                        <property role="TrG5h" value="compute" />
-                        <property role="DiZV1" value="false" />
-                        <property role="od$2w" value="false" />
-                        <node concept="2AHcQZ" id="3pwG8PSkQOh" role="2AJF6D">
-                          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                          <node concept="3uibUv" id="7me2y0SLuta" role="1tU5fm">
+                            <ref role="3uigEE" to="nddn:~IntentionExecutable" resolve="IntentionExecutable" />
+                          </node>
+                          <node concept="2OqwBi" id="3pwG8PSkU6Y" role="33vP2m">
+                            <node concept="37vLTw" id="3pwG8PSkU6X" role="2Oq$k0">
+                              <ref role="3cqZAo" node="3pwG8PSkQLP" resolve="o1" />
+                            </node>
+                            <node concept="2OwXpG" id="3pwG8PSkU6Z" role="2OqNvi">
+                              <ref role="2Oxat6" to="18ew:~Pair.o1" resolve="o1" />
+                            </node>
+                          </node>
                         </node>
-                        <node concept="3clFbS" id="3pwG8PSkQOi" role="3clF47">
-                          <node concept="3cpWs8" id="3pwG8PSkQOk" role="3cqZAp">
-                            <node concept="3cpWsn" id="3pwG8PSkQOj" role="3cpWs9">
-                              <property role="3TUv4t" value="false" />
-                              <property role="TrG5h" value="dataContext" />
-                              <node concept="3uibUv" id="3pwG8PSkQOl" role="1tU5fm">
-                                <ref role="3uigEE" to="qkt:~DataContext" resolve="DataContext" />
-                              </node>
-                              <node concept="2OqwBi" id="3pwG8PSkQOm" role="33vP2m">
-                                <node concept="2YIFZM" id="3pwG8PSkWt8" role="2Oq$k0">
-                                  <ref role="1Pybhc" to="ddhc:~DataManager" resolve="DataManager" />
-                                  <ref role="37wK5l" to="ddhc:~DataManager.getInstance()" resolve="getInstance" />
-                                </node>
-                                <node concept="liA8E" id="3pwG8PSkQOo" role="2OqNvi">
-                                  <ref role="37wK5l" to="ddhc:~DataManager.getDataContext(java.awt.Component)" resolve="getDataContext" />
-                                  <node concept="2OqwBi" id="3pwG8PSkWtg" role="37wK5m">
-                                    <node concept="37vLTw" id="3pwG8PSkWtf" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="3pwG8PSkQO1" resolve="editorContext" />
-                                    </node>
-                                    <node concept="liA8E" id="3pwG8PSkWth" role="2OqNvi">
-                                      <ref role="37wK5l" to="exr9:~EditorContext.getNodeEditorComponent()" resolve="getNodeEditorComponent" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
+                      </node>
+                      <node concept="3cpWs8" id="3pwG8PSkQM3" role="3cqZAp">
+                        <node concept="3cpWsn" id="3pwG8PSkQM2" role="3cpWs9">
+                          <property role="3TUv4t" value="false" />
+                          <property role="TrG5h" value="intention2" />
+                          <node concept="3uibUv" id="7me2y0SLuYi" role="1tU5fm">
+                            <ref role="3uigEE" to="nddn:~IntentionExecutable" resolve="IntentionExecutable" />
+                          </node>
+                          <node concept="2OqwBi" id="3pwG8PSkU7a" role="33vP2m">
+                            <node concept="37vLTw" id="3pwG8PSkU79" role="2Oq$k0">
+                              <ref role="3cqZAo" node="3pwG8PSkQLT" resolve="o2" />
+                            </node>
+                            <node concept="2OwXpG" id="3pwG8PSkU7b" role="2OqNvi">
+                              <ref role="2Oxat6" to="18ew:~Pair.o1" resolve="o1" />
                             </node>
                           </node>
-                          <node concept="3cpWs8" id="3pwG8PSkQOr" role="3cqZAp">
-                            <node concept="3cpWsn" id="3pwG8PSkQOq" role="3cpWs9">
-                              <property role="3TUv4t" value="false" />
-                              <property role="TrG5h" value="group" />
-                              <node concept="3uibUv" id="3pwG8PSkQOs" role="1tU5fm">
-                                <ref role="3uigEE" to="7bx7:~BaseGroup" resolve="BaseGroup" />
-                              </node>
-                              <node concept="1rXfSq" id="3pwG8PSkQOt" role="33vP2m">
-                                <ref role="37wK5l" node="3pwG8PSkQL5" resolve="getIntentionsGroup" />
-                                <node concept="37vLTw" id="3pwG8PSkQOu" role="37wK5m">
-                                  <ref role="3cqZAo" node="3pwG8PSkQOj" resolve="dataContext" />
-                                </node>
-                              </node>
+                        </node>
+                      </node>
+                      <node concept="3cpWs8" id="3pwG8PSkQM7" role="3cqZAp">
+                        <node concept="3cpWsn" id="3pwG8PSkQM6" role="3cpWs9">
+                          <property role="3TUv4t" value="false" />
+                          <property role="TrG5h" value="node1" />
+                          <node concept="3uibUv" id="3pwG8PSkQM8" role="1tU5fm">
+                            <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
+                          </node>
+                          <node concept="2OqwBi" id="3pwG8PSkU7m" role="33vP2m">
+                            <node concept="37vLTw" id="3pwG8PSkU7l" role="2Oq$k0">
+                              <ref role="3cqZAo" node="3pwG8PSkQLP" resolve="o1" />
+                            </node>
+                            <node concept="2OwXpG" id="3pwG8PSkU7n" role="2OqNvi">
+                              <ref role="2Oxat6" to="18ew:~Pair.o2" resolve="o2" />
                             </node>
                           </node>
-                          <node concept="3clFbJ" id="3pwG8PSkQOv" role="3cqZAp">
-                            <node concept="3clFbC" id="3pwG8PSkQOw" role="3clFbw">
-                              <node concept="37vLTw" id="3pwG8PSkQOx" role="3uHU7B">
-                                <ref role="3cqZAo" node="3pwG8PSkQOq" resolve="group" />
-                              </node>
-                              <node concept="10Nm6u" id="3pwG8PSkQOy" role="3uHU7w" />
+                        </node>
+                      </node>
+                      <node concept="3cpWs8" id="3pwG8PSkQMb" role="3cqZAp">
+                        <node concept="3cpWsn" id="3pwG8PSkQMa" role="3cpWs9">
+                          <property role="3TUv4t" value="false" />
+                          <property role="TrG5h" value="node2" />
+                          <node concept="3uibUv" id="3pwG8PSkQMc" role="1tU5fm">
+                            <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
+                          </node>
+                          <node concept="2OqwBi" id="3pwG8PSkU7y" role="33vP2m">
+                            <node concept="37vLTw" id="3pwG8PSkU7x" role="2Oq$k0">
+                              <ref role="3cqZAo" node="3pwG8PSkQLT" resolve="o2" />
+                            </node>
+                            <node concept="2OwXpG" id="3pwG8PSkU7z" role="2OqNvi">
+                              <ref role="2Oxat6" to="18ew:~Pair.o2" resolve="o2" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3cpWs8" id="3pwG8PSkQMf" role="3cqZAp">
+                        <node concept="3cpWsn" id="3pwG8PSkQMe" role="3cpWs9">
+                          <property role="3TUv4t" value="false" />
+                          <property role="TrG5h" value="context" />
+                          <node concept="3uibUv" id="3pwG8PSkQMg" role="1tU5fm">
+                            <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
+                          </node>
+                          <node concept="2OqwBi" id="3pwG8PSkU7I" role="33vP2m">
+                            <node concept="37vLTw" id="3pwG8PSkU7H" role="2Oq$k0">
+                              <ref role="3cqZAo" node="2jDew64KOaH" resolve="editor" />
+                            </node>
+                            <node concept="liA8E" id="3pwG8PSkU7J" role="2OqNvi">
+                              <ref role="37wK5l" to="exr9:~EditorComponent.getEditorContext()" resolve="getEditorContext" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3cpWs6" id="3pwG8PSkQMi" role="3cqZAp">
+                        <node concept="2OqwBi" id="3pwG8PSkQMj" role="3cqZAk">
+                          <node concept="2OqwBi" id="3pwG8PSkU7U" role="2Oq$k0">
+                            <node concept="37vLTw" id="3pwG8PSkU7T" role="2Oq$k0">
+                              <ref role="3cqZAo" node="3pwG8PSkQLY" resolve="intention1" />
                             </node>
-                            <node concept="3clFbS" id="3pwG8PSkQO$" role="3clFbx">
-                              <node concept="3cpWs6" id="3pwG8PSkQO_" role="3cqZAp">
-                                <node concept="10Nm6u" id="3pwG8PSkQOA" role="3cqZAk" />
+                            <node concept="liA8E" id="3pwG8PSkU7V" role="2OqNvi">
+                              <ref role="37wK5l" to="nddn:~IntentionExecutable.getDescription(org.jetbrains.mps.openapi.model.SNode,jetbrains.mps.openapi.editor.EditorContext)" resolve="getDescription" />
+                              <node concept="37vLTw" id="3pwG8PSkQMl" role="37wK5m">
+                                <ref role="3cqZAo" node="3pwG8PSkQM6" resolve="node1" />
+                              </node>
+                              <node concept="37vLTw" id="3pwG8PSkQMm" role="37wK5m">
+                                <ref role="3cqZAo" node="3pwG8PSkQMe" resolve="context" />
                               </node>
                             </node>
                           </node>
-                          <node concept="3cpWs6" id="3pwG8PSkQOB" role="3cqZAp">
-                            <node concept="1rXfSq" id="2xgTENkQTUW" role="3cqZAk">
-                              <ref role="37wK5l" node="2xgTENkQTUR" resolve="createPopup" />
-                              <node concept="37vLTw" id="2xgTENkQTUU" role="37wK5m">
-                                <ref role="3cqZAo" node="3pwG8PSkQOq" resolve="group" />
+                          <node concept="liA8E" id="3pwG8PSkQMn" role="2OqNvi">
+                            <ref role="37wK5l" to="wyt6:~String.compareTo(java.lang.String)" resolve="compareTo" />
+                            <node concept="2OqwBi" id="3pwG8PSkU86" role="37wK5m">
+                              <node concept="37vLTw" id="3pwG8PSkU85" role="2Oq$k0">
+                                <ref role="3cqZAo" node="3pwG8PSkQM2" resolve="intention2" />
                               </node>
-                              <node concept="37vLTw" id="2xgTENkQTUV" role="37wK5m">
-                                <ref role="3cqZAo" node="3pwG8PSkQOj" resolve="dataContext" />
+                              <node concept="liA8E" id="3pwG8PSkU87" role="2OqNvi">
+                                <ref role="37wK5l" to="nddn:~IntentionExecutable.getDescription(org.jetbrains.mps.openapi.model.SNode,jetbrains.mps.openapi.editor.EditorContext)" resolve="getDescription" />
+                                <node concept="37vLTw" id="3pwG8PSkQMp" role="37wK5m">
+                                  <ref role="3cqZAo" node="3pwG8PSkQMa" resolve="node2" />
+                                </node>
+                                <node concept="37vLTw" id="3pwG8PSkQMq" role="37wK5m">
+                                  <ref role="3cqZAo" node="3pwG8PSkQMe" resolve="context" />
+                                </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="3Tm1VV" id="3pwG8PSkQOK" role="1B3o_S" />
-                        <node concept="3uibUv" id="3pwG8PSkQOL" role="3clF45">
-                          <ref role="3uigEE" to="gspm:~ListPopup" resolve="ListPopup" />
-                        </node>
-                      </node>
-                      <node concept="3uibUv" id="3pwG8PSkQOM" role="2Ghqu4">
-                        <ref role="3uigEE" to="gspm:~ListPopup" resolve="ListPopup" />
                       </node>
                     </node>
+                    <node concept="3Tm1VV" id="3pwG8PSkQMr" role="1B3o_S" />
+                    <node concept="10Oyi0" id="3pwG8PSkQMs" role="3clF45" />
+                  </node>
+                  <node concept="3uibUv" id="3pwG8PSkQMt" role="2Ghqu4">
+                    <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
+                    <node concept="3uibUv" id="7me2y0SLsOW" role="11_B2D">
+                      <ref role="3uigEE" to="nddn:~IntentionExecutable" resolve="IntentionExecutable" />
+                    </node>
+                    <node concept="3uibUv" id="3pwG8PSkQMv" role="11_B2D">
+                      <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
+                    </node>
                   </node>
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbJ" id="3pwG8PSkQON" role="3cqZAp">
-          <node concept="3clFbC" id="3pwG8PSkQOO" role="3clFbw">
-            <node concept="37vLTw" id="3pwG8PSkQOP" role="3uHU7B">
-              <ref role="3cqZAo" node="3pwG8PSkQO5" resolve="popup" />
+        <node concept="3cpWs8" id="3pwG8PSkQMx" role="3cqZAp">
+          <node concept="3cpWsn" id="3pwG8PSkQMw" role="3cpWs9">
+            <property role="3TUv4t" value="false" />
+            <property role="TrG5h" value="group" />
+            <node concept="3uibUv" id="3pwG8PSkQMy" role="1tU5fm">
+              <ref role="3uigEE" to="qkt:~ActionGroup" resolve="ActionGroup" />
+            </node>
+            <node concept="1rXfSq" id="3pwG8PSp_fd" role="33vP2m">
+              <ref role="37wK5l" node="3pwG8PSp_f8" resolve="getIntentionsGroup" />
+              <node concept="37vLTw" id="3pwG8PSp_fb" role="37wK5m">
+                <ref role="3cqZAo" node="3pwG8PSkQL9" resolve="groupItems" />
+              </node>
+              <node concept="37vLTw" id="3pwG8PSp_fc" role="37wK5m">
+                <ref role="3cqZAo" node="3pwG8PSkQLm" resolve="actions" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="3pwG8PSkQMQ" role="3cqZAp">
+          <node concept="37vLTw" id="3pwG8PSkQMR" role="3cqZAk">
+            <ref role="3cqZAo" node="3pwG8PSkQMw" resolve="group" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="2jDew64HgSl" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2jDew64MtYG" role="jymVt" />
+    <node concept="3clFb_" id="3pwG8PSp_f8" role="jymVt">
+      <property role="TrG5h" value="getIntentionsGroup" />
+      <node concept="3Tmbuc" id="3pwG8PSp_f9" role="1B3o_S" />
+      <node concept="3uibUv" id="3pwG8PSp_fa" role="3clF45">
+        <ref role="3uigEE" to="7bx7:~BaseGroup" resolve="BaseGroup" />
+      </node>
+      <node concept="37vLTG" id="3pwG8PSp_eW" role="3clF46">
+        <property role="TrG5h" value="groupItems" />
+        <node concept="3uibUv" id="3pwG8PSp_eX" role="1tU5fm">
+          <ref role="3uigEE" to="33ny:~List" resolve="List" />
+          <node concept="3uibUv" id="3pwG8PSp_eY" role="11_B2D">
+            <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
+            <node concept="3uibUv" id="7me2y0SLBrW" role="11_B2D">
+              <ref role="3uigEE" to="nddn:~IntentionExecutable" resolve="IntentionExecutable" />
+            </node>
+            <node concept="3uibUv" id="3pwG8PSp_f0" role="11_B2D">
+              <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
             </node>
-            <node concept="10Nm6u" id="3pwG8PSkQOQ" role="3uHU7w" />
           </node>
-          <node concept="3clFbS" id="3pwG8PSkQOS" role="3clFbx">
-            <node concept="3cpWs6" id="3pwG8PSkQOT" role="3cqZAp" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="3pwG8PSp_f1" role="3clF46">
+        <property role="TrG5h" value="actions" />
+        <node concept="3uibUv" id="3pwG8PSp_f2" role="1tU5fm">
+          <ref role="3uigEE" to="33ny:~List" resolve="List" />
+          <node concept="3uibUv" id="3pwG8PSp_f3" role="11_B2D">
+            <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
           </node>
         </node>
-        <node concept="3cpWs8" id="3pwG8PSkQOV" role="3cqZAp">
-          <node concept="3cpWsn" id="3pwG8PSkQOU" role="3cpWs9">
-            <property role="3TUv4t" value="true" />
-            <property role="TrG5h" value="selectedCell" />
-            <node concept="3uibUv" id="3pwG8PSkQOW" role="1tU5fm">
-              <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
+      </node>
+      <node concept="3clFbS" id="3pwG8PSp_eq" role="3clF47">
+        <node concept="3cpWs8" id="3pwG8PSpFW7" role="3cqZAp">
+          <node concept="3cpWsn" id="3pwG8PSpFW8" role="3cpWs9">
+            <property role="3TUv4t" value="false" />
+            <property role="TrG5h" value="mainGroup" />
+            <node concept="3uibUv" id="3pwG8PSpFW9" role="1tU5fm">
+              <ref role="3uigEE" to="7bx7:~BaseGroup" resolve="BaseGroup" />
             </node>
-            <node concept="2OqwBi" id="3pwG8PSkWtz" role="33vP2m">
-              <node concept="37vLTw" id="3pwG8PSkWty" role="2Oq$k0">
-                <ref role="3cqZAo" node="3pwG8PSkQO1" resolve="editorContext" />
-              </node>
-              <node concept="liA8E" id="3pwG8PSkWt$" role="2OqNvi">
-                <ref role="37wK5l" to="exr9:~EditorContext.getSelectedCell()" resolve="getSelectedCell" />
+            <node concept="2ShNRf" id="3pwG8PSpFWa" role="33vP2m">
+              <node concept="1pGfFk" id="3pwG8PSpFWb" role="2ShVmc">
+                <ref role="37wK5l" to="7bx7:~BaseGroup.&lt;init&gt;(java.lang.String)" resolve="BaseGroup" />
+                <node concept="Xl_RD" id="3pwG8PSpFWc" role="37wK5m" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="3pwG8PSkQOZ" role="3cqZAp">
-          <node concept="3cpWsn" id="3pwG8PSkQOY" role="3cpWs9">
-            <property role="3TUv4t" value="false" />
-            <property role="TrG5h" value="x" />
-            <node concept="10Oyi0" id="3pwG8PSkQP0" role="1tU5fm" />
-            <node concept="2OqwBi" id="3pwG8PSkWtC" role="33vP2m">
-              <node concept="37vLTw" id="3pwG8PSkWtB" role="2Oq$k0">
-                <ref role="3cqZAo" node="3pwG8PSkQOU" resolve="selectedCell" />
+        <node concept="3clFbH" id="3pwG8PSpKgb" role="3cqZAp" />
+        <node concept="3cpWs8" id="3pwG8PSpQVZ" role="3cqZAp">
+          <node concept="3cpWsn" id="3pwG8PSpQW0" role="3cpWs9">
+            <property role="TrG5h" value="groups" />
+            <node concept="3uibUv" id="3pwG8PSueRi" role="1tU5fm">
+              <ref role="3uigEE" to="33ny:~TreeMap" resolve="TreeMap" />
+              <node concept="17QB3L" id="3pwG8PSuibW" role="11_B2D" />
+              <node concept="3uibUv" id="6d0zIQxcMCE" role="11_B2D">
+                <ref role="3uigEE" to="33ny:~List" resolve="List" />
+                <node concept="3uibUv" id="6d0zIQxcOR$" role="11_B2D">
+                  <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
+                </node>
               </node>
-              <node concept="liA8E" id="3pwG8PSkWtD" role="2OqNvi">
-                <ref role="37wK5l" to="f4zo:~EditorCell.getX()" resolve="getX" />
+            </node>
+            <node concept="2ShNRf" id="6d0zIQxcRgB" role="33vP2m">
+              <node concept="1pGfFk" id="6d0zIQxd7Zw" role="2ShVmc">
+                <ref role="37wK5l" to="33ny:~TreeMap.&lt;init&gt;()" resolve="TreeMap" />
+                <node concept="17QB3L" id="6d0zIQxd9rp" role="1pMfVU" />
+                <node concept="3uibUv" id="6d0zIQxdaha" role="1pMfVU">
+                  <ref role="3uigEE" to="33ny:~List" resolve="List" />
+                  <node concept="3uibUv" id="6d0zIQxdbU3" role="11_B2D">
+                    <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
+                  </node>
+                </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="3pwG8PSkQP3" role="3cqZAp">
-          <node concept="3cpWsn" id="3pwG8PSkQP2" role="3cpWs9">
-            <property role="3TUv4t" value="false" />
-            <property role="TrG5h" value="y" />
-            <node concept="10Oyi0" id="3pwG8PSkQP4" role="1tU5fm" />
-            <node concept="2OqwBi" id="3pwG8PSkWtH" role="33vP2m">
-              <node concept="37vLTw" id="3pwG8PSkWtG" role="2Oq$k0">
-                <ref role="3cqZAo" node="3pwG8PSkQOU" resolve="selectedCell" />
+        <node concept="1DcWWT" id="3pwG8PSpFWd" role="3cqZAp">
+          <node concept="37vLTw" id="3pwG8PSpFWe" role="1DdaDG">
+            <ref role="3cqZAo" node="3pwG8PSp_eW" resolve="groupItems" />
+          </node>
+          <node concept="3cpWsn" id="3pwG8PSpFWf" role="1Duv9x">
+            <property role="3TUv4t" value="true" />
+            <property role="TrG5h" value="pair" />
+            <node concept="3uibUv" id="3pwG8PSpFWg" role="1tU5fm">
+              <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
+              <node concept="3uibUv" id="7me2y0SMVTY" role="11_B2D">
+                <ref role="3uigEE" to="nddn:~IntentionExecutable" resolve="IntentionExecutable" />
+              </node>
+              <node concept="3uibUv" id="3pwG8PSpFWi" role="11_B2D">
+                <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
               </node>
-              <node concept="liA8E" id="3pwG8PSkWtI" role="2OqNvi">
-                <ref role="37wK5l" to="f4zo:~EditorCell.getY()" resolve="getY" />
+            </node>
+          </node>
+          <node concept="3clFbS" id="3pwG8PSpFWj" role="2LFqv$">
+            <node concept="3cpWs8" id="3pwG8PSq660" role="3cqZAp">
+              <node concept="3cpWsn" id="3pwG8PSq661" role="3cpWs9">
+                <property role="TrG5h" value="intentionEntry" />
+                <node concept="3uibUv" id="3pwG8PSq65Z" role="1tU5fm">
+                  <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
+                </node>
+                <node concept="1rXfSq" id="3pwG8PSq662" role="33vP2m">
+                  <ref role="37wK5l" node="3pwG8PSkQJj" resolve="getIntentionGroup" />
+                  <node concept="2OqwBi" id="3pwG8PSq663" role="37wK5m">
+                    <node concept="37vLTw" id="3pwG8PSq664" role="2Oq$k0">
+                      <ref role="3cqZAo" node="3pwG8PSpFWf" resolve="pair" />
+                    </node>
+                    <node concept="2OwXpG" id="3pwG8PSq665" role="2OqNvi">
+                      <ref role="2Oxat6" to="18ew:~Pair.o1" resolve="o1" />
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="3pwG8PSq666" role="37wK5m">
+                    <node concept="37vLTw" id="3pwG8PSq667" role="2Oq$k0">
+                      <ref role="3cqZAo" node="3pwG8PSpFWf" resolve="pair" />
+                    </node>
+                    <node concept="2OwXpG" id="3pwG8PSq668" role="2OqNvi">
+                      <ref role="2Oxat6" to="18ew:~Pair.o2" resolve="o2" />
+                    </node>
+                  </node>
+                </node>
               </node>
             </node>
-          </node>
-        </node>
-        <node concept="3clFbJ" id="3pwG8PSkQP6" role="3cqZAp">
-          <node concept="2ZW3vV" id="3pwG8PSkQP9" role="3clFbw">
-            <node concept="37vLTw" id="3pwG8PSkQP7" role="2ZW6bz">
-              <ref role="3cqZAo" node="3pwG8PSkQOU" resolve="selectedCell" />
-            </node>
-            <node concept="3uibUv" id="3pwG8PSkQP8" role="2ZW6by">
-              <ref role="3uigEE" to="g51k:~EditorCell_Label" resolve="EditorCell_Label" />
-            </node>
-          </node>
-          <node concept="3clFbS" id="3pwG8PSkQPb" role="3clFbx">
-            <node concept="3clFbF" id="3pwG8PSkQPc" role="3cqZAp">
-              <node concept="d57v9" id="3pwG8PSkQPd" role="3clFbG">
-                <node concept="37vLTw" id="3pwG8PSkQPe" role="37vLTJ">
-                  <ref role="3cqZAo" node="3pwG8PSkQP2" resolve="y" />
-                </node>
-                <node concept="2OqwBi" id="3pwG8PSkWtM" role="37vLTx">
-                  <node concept="37vLTw" id="3pwG8PSkWtL" role="2Oq$k0">
-                    <ref role="3cqZAo" node="3pwG8PSkQOU" resolve="selectedCell" />
-                  </node>
-                  <node concept="liA8E" id="3pwG8PSkWtN" role="2OqNvi">
-                    <ref role="37wK5l" to="f4zo:~EditorCell.getHeight()" resolve="getHeight" />
+            <node concept="3cpWs8" id="3pwG8PSq6Q2" role="3cqZAp">
+              <node concept="3cpWsn" id="3pwG8PSq6Q3" role="3cpWs9">
+                <property role="TrG5h" value="groupName" />
+                <node concept="17QB3L" id="3pwG8PSq6PK" role="1tU5fm" />
+                <node concept="1rXfSq" id="3pwG8PSq6Q4" role="33vP2m">
+                  <ref role="37wK5l" node="3pwG8PSpGSr" resolve="getGroupName" />
+                  <node concept="37vLTw" id="3pwG8PSq6Q5" role="37wK5m">
+                    <ref role="3cqZAo" node="3pwG8PSq661" resolve="intentionEntry" />
                   </node>
                 </node>
               </node>
             </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="3pwG8PSkQPh" role="3cqZAp">
-          <node concept="3cpWsn" id="3pwG8PSkQPg" role="3cpWs9">
-            <property role="3TUv4t" value="false" />
-            <property role="TrG5h" value="relativePoint" />
-            <node concept="3uibUv" id="3pwG8PSkQPi" role="1tU5fm">
-              <ref role="3uigEE" to="vmdq:~RelativePoint" resolve="RelativePoint" />
-            </node>
-            <node concept="2ShNRf" id="3pwG8PSl47u" role="33vP2m">
-              <node concept="1pGfFk" id="3pwG8PSl47v" role="2ShVmc">
-                <ref role="37wK5l" to="vmdq:~RelativePoint.&lt;init&gt;(java.awt.Component,java.awt.Point)" resolve="RelativePoint" />
-                <node concept="2OqwBi" id="3pwG8PSl47z" role="37wK5m">
-                  <node concept="37vLTw" id="3pwG8PSl47y" role="2Oq$k0">
-                    <ref role="3cqZAo" node="3pwG8PSkQO1" resolve="editorContext" />
-                  </node>
-                  <node concept="liA8E" id="3pwG8PSl47$" role="2OqNvi">
-                    <ref role="37wK5l" to="exr9:~EditorContext.getNodeEditorComponent()" resolve="getNodeEditorComponent" />
-                  </node>
+            <node concept="3SKdUt" id="3pZvzolt2Zu" role="3cqZAp">
+              <node concept="1PaTwC" id="3pZvzolt2Zv" role="1aUNEU">
+                <node concept="3oM_SD" id="3pZvzolt7BI" role="1PaTwD">
+                  <property role="3oM_SC" value="cut" />
                 </node>
-                <node concept="2ShNRf" id="3pwG8PSl47_" role="37wK5m">
-                  <node concept="1pGfFk" id="3pwG8PSl47A" role="2ShVmc">
-                    <ref role="37wK5l" to="z60i:~Point.&lt;init&gt;(int,int)" resolve="Point" />
-                    <node concept="37vLTw" id="3pwG8PSkQPm" role="37wK5m">
-                      <ref role="3cqZAo" node="3pwG8PSkQOY" resolve="x" />
-                    </node>
-                    <node concept="37vLTw" id="3pwG8PSkQPn" role="37wK5m">
-                      <ref role="3cqZAo" node="3pwG8PSkQP2" resolve="y" />
-                    </node>
-                  </node>
+                <node concept="3oM_SD" id="3pZvzolt7BK" role="1PaTwD">
+                  <property role="3oM_SC" value="off" />
+                </node>
+                <node concept="3oM_SD" id="3pZvzolt7BN" role="1PaTwD">
+                  <property role="3oM_SC" value="the" />
+                </node>
+                <node concept="3oM_SD" id="3pZvzolt7BR" role="1PaTwD">
+                  <property role="3oM_SC" value="groupName" />
+                </node>
+                <node concept="3oM_SD" id="3pZvzolt7BW" role="1PaTwD">
+                  <property role="3oM_SC" value="from" />
+                </node>
+                <node concept="3oM_SD" id="3pZvzolt7C2" role="1PaTwD">
+                  <property role="3oM_SC" value="the" />
+                </node>
+                <node concept="3oM_SD" id="3pZvzolt7C9" role="1PaTwD">
+                  <property role="3oM_SC" value="action," />
+                </node>
+                <node concept="3oM_SD" id="3pZvzolt7Ch" role="1PaTwD">
+                  <property role="3oM_SC" value="if" />
+                </node>
+                <node concept="3oM_SD" id="3pZvzolt7Cq" role="1PaTwD">
+                  <property role="3oM_SC" value="action" />
+                </node>
+                <node concept="3oM_SD" id="3pZvzolt7C$" role="1PaTwD">
+                  <property role="3oM_SC" value="is" />
+                </node>
+                <node concept="3oM_SD" id="3pZvzolt7CJ" role="1PaTwD">
+                  <property role="3oM_SC" value="not" />
+                </node>
+                <node concept="3oM_SD" id="3pZvzolt7CV" role="1PaTwD">
+                  <property role="3oM_SC" value="a" />
+                </node>
+                <node concept="3oM_SD" id="3pZvzolt7D8" role="1PaTwD">
+                  <property role="3oM_SC" value="group," />
+                </node>
+                <node concept="3oM_SD" id="3pZvzolt7Dm" role="1PaTwD">
+                  <property role="3oM_SC" value="i.e." />
+                </node>
+                <node concept="3oM_SD" id="3pZvzolt7D_" role="1PaTwD">
+                  <property role="3oM_SC" value="has" />
+                </node>
+                <node concept="3oM_SD" id="3pZvzolt7DP" role="1PaTwD">
+                  <property role="3oM_SC" value="no" />
+                </node>
+                <node concept="3oM_SD" id="3pZvzolt7E6" role="1PaTwD">
+                  <property role="3oM_SC" value="submenu," />
+                </node>
+                <node concept="3oM_SD" id="3pZvzolt8Rv" role="1PaTwD">
+                  <property role="3oM_SC" value="" />
                 </node>
               </node>
             </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="3pwG8PSkQPo" role="3cqZAp">
-          <node concept="2OqwBi" id="3pwG8PSl47E" role="3clFbG">
-            <node concept="37vLTw" id="3pwG8PSl47D" role="2Oq$k0">
-              <ref role="3cqZAo" node="3pwG8PSkQO5" resolve="popup" />
-            </node>
-            <node concept="liA8E" id="3pwG8PSl47F" role="2OqNvi">
-              <ref role="37wK5l" to="gspm:~JBPopup.show(com.intellij.ui.awt.RelativePoint)" resolve="show" />
-              <node concept="37vLTw" id="3pwG8PSkQPq" role="37wK5m">
-                <ref role="3cqZAo" node="3pwG8PSkQPg" resolve="relativePoint" />
+            <node concept="3SKdUt" id="3pZvzoltfB5" role="3cqZAp">
+              <node concept="1PaTwC" id="3pZvzoltfAI" role="1aUNEU">
+                <node concept="3oM_SD" id="3pZvzoltfAH" role="1PaTwD">
+                  <property role="3oM_SC" value="and" />
+                </node>
+                <node concept="3oM_SD" id="3pZvzolt8RM" role="1PaTwD">
+                  <property role="3oM_SC" value="the" />
+                </node>
+                <node concept="3oM_SD" id="3pZvzolt8S6" role="1PaTwD">
+                  <property role="3oM_SC" value="intention" />
+                </node>
+                <node concept="3oM_SD" id="3pZvzolt8Sr" role="1PaTwD">
+                  <property role="3oM_SC" value="annotation" />
+                </node>
+                <node concept="3oM_SD" id="3pZvzoltipc" role="1PaTwD">
+                  <property role="3oM_SC" value="was" />
+                </node>
+                <node concept="3oM_SD" id="3pZvzoltipq" role="1PaTwD">
+                  <property role="3oM_SC" value="not" />
+                </node>
+                <node concept="3oM_SD" id="3pZvzoltipx" role="1PaTwD">
+                  <property role="3oM_SC" value="used." />
+                </node>
               </node>
             </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tmbuc" id="3pwG8PSoqkB" role="1B3o_S" />
-      <node concept="3cqZAl" id="3pwG8PSkQPs" role="3clF45" />
-    </node>
-    <node concept="2tJIrI" id="2xgTENkR0B8" role="jymVt" />
-    <node concept="3clFb_" id="2xgTENkQTUR" role="jymVt">
-      <property role="TrG5h" value="createPopup" />
-      <node concept="3Tmbuc" id="2xgTENkQTUS" role="1B3o_S" />
-      <node concept="3uibUv" id="2xgTENkQTUT" role="3clF45">
-        <ref role="3uigEE" to="gspm:~ListPopup" resolve="ListPopup" />
-      </node>
-      <node concept="37vLTG" id="2xgTENkQTRc" role="3clF46">
-        <property role="TrG5h" value="group" />
-        <node concept="3uibUv" id="2xgTENkQTRd" role="1tU5fm">
-          <ref role="3uigEE" to="7bx7:~BaseGroup" resolve="BaseGroup" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="2xgTENkQTRe" role="3clF46">
-        <property role="TrG5h" value="dataContext" />
-        <node concept="3uibUv" id="2xgTENkQTRf" role="1tU5fm">
-          <ref role="3uigEE" to="qkt:~DataContext" resolve="DataContext" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="2xgTENkQTNu" role="3clF47">
-        <node concept="3cpWs6" id="2xgTENkQTR3" role="3cqZAp">
-          <node concept="2OqwBi" id="2xgTENkQTR4" role="3cqZAk">
-            <node concept="2YIFZM" id="2xgTENkQTR5" role="2Oq$k0">
-              <ref role="1Pybhc" to="gspm:~JBPopupFactory" resolve="JBPopupFactory" />
-              <ref role="37wK5l" to="gspm:~JBPopupFactory.getInstance()" resolve="getInstance" />
-            </node>
-            <node concept="liA8E" id="2xgTENkQTR6" role="2OqNvi">
-              <ref role="37wK5l" to="gspm:~JBPopupFactory.createActionGroupPopup(java.lang.String,com.intellij.openapi.actionSystem.ActionGroup,com.intellij.openapi.actionSystem.DataContext,com.intellij.openapi.ui.popup.JBPopupFactory$ActionSelectionAid,boolean)" resolve="createActionGroupPopup" />
-              <node concept="Xl_RD" id="2xgTENkQTR7" role="37wK5m">
-                <property role="Xl_RC" value="Intentions" />
-              </node>
-              <node concept="37vLTw" id="2xgTENkQTRh" role="37wK5m">
-                <ref role="3cqZAo" node="2xgTENkQTRc" resolve="group" />
-              </node>
-              <node concept="37vLTw" id="2xgTENkQTRg" role="37wK5m">
-                <ref role="3cqZAo" node="2xgTENkQTRe" resolve="dataContext" />
-              </node>
-              <node concept="Rm8GO" id="2xgTENkQTRa" role="37wK5m">
-                <ref role="Rm8GQ" to="gspm:~JBPopupFactory$ActionSelectionAid.SPEEDSEARCH" resolve="SPEEDSEARCH" />
-                <ref role="1Px2BO" to="gspm:~JBPopupFactory$ActionSelectionAid" resolve="JBPopupFactory.ActionSelectionAid" />
+            <node concept="3clFbF" id="3pZvzols0Bn" role="3cqZAp">
+              <node concept="1rXfSq" id="3pZvzols0Bl" role="3clFbG">
+                <ref role="37wK5l" node="3pZvzolpwf_" resolve="trimGroupNameFromActionText" />
+                <node concept="37vLTw" id="3pZvzols489" role="37wK5m">
+                  <ref role="3cqZAo" node="3pwG8PSq661" resolve="intentionEntry" />
+                </node>
+                <node concept="37vLTw" id="3pZvzolsaBu" role="37wK5m">
+                  <ref role="3cqZAo" node="3pwG8PSq6Q3" resolve="groupName" />
+                </node>
               </node>
-              <node concept="3clFbT" id="2xgTENkQTRb" role="37wK5m" />
             </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="3pwG8PSmo8V" role="jymVt" />
-    <node concept="3clFb_" id="3pwG8PSkQPt" role="jymVt">
-      <property role="TrG5h" value="getEnabledIntentions" />
-      <property role="DiZV1" value="false" />
-      <property role="od$2w" value="false" />
-      <node concept="3clFbS" id="3pwG8PSkQPu" role="3clF47">
-        <node concept="3cpWs8" id="3pwG8PSkQPw" role="3cqZAp">
-          <node concept="3cpWsn" id="3pwG8PSkQPv" role="3cpWs9">
-            <property role="3TUv4t" value="true" />
-            <property role="TrG5h" value="result" />
-            <node concept="2ShNRf" id="3pwG8PSl47G" role="33vP2m">
-              <node concept="1pGfFk" id="3pwG8PSl47H" role="2ShVmc">
-                <ref role="37wK5l" to="33ny:~LinkedHashSet.&lt;init&gt;()" resolve="LinkedHashSet" />
-                <node concept="3uibUv" id="3pwG8PSkQPA" role="1pMfVU">
-                  <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-                  <node concept="3uibUv" id="7me2y0SLc1M" role="11_B2D">
-                    <ref role="3uigEE" to="nddn:~IntentionExecutable" resolve="IntentionExecutable" />
+            <node concept="3cpWs8" id="6d0zIQxdhDi" role="3cqZAp">
+              <node concept="3cpWsn" id="6d0zIQxdhDj" role="3cpWs9">
+                <property role="TrG5h" value="c" />
+                <node concept="3uibUv" id="6d0zIQxdhkN" role="1tU5fm">
+                  <ref role="3uigEE" to="33ny:~List" resolve="List" />
+                  <node concept="3uibUv" id="6d0zIQxdhkQ" role="11_B2D">
+                    <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
                   </node>
-                  <node concept="3uibUv" id="3pwG8PSkQPC" role="11_B2D">
-                    <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
+                </node>
+                <node concept="2OqwBi" id="6d0zIQxdhDk" role="33vP2m">
+                  <node concept="37vLTw" id="6d0zIQxdhDl" role="2Oq$k0">
+                    <ref role="3cqZAo" node="3pwG8PSpQW0" resolve="groups" />
+                  </node>
+                  <node concept="liA8E" id="6d0zIQxdhDm" role="2OqNvi">
+                    <ref role="37wK5l" to="33ny:~TreeMap.get(java.lang.Object)" resolve="get" />
+                    <node concept="37vLTw" id="6d0zIQxdhDn" role="37wK5m">
+                      <ref role="3cqZAo" node="3pwG8PSq6Q3" resolve="groupName" />
+                    </node>
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="2hMVRd" id="frLjuvQHTD" role="1tU5fm">
-              <node concept="3uibUv" id="frLjuvQLMc" role="2hN53Y">
-                <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-                <node concept="3uibUv" id="frLjuvQLMd" role="11_B2D">
-                  <ref role="3uigEE" to="nddn:~IntentionExecutable" resolve="IntentionExecutable" />
+            <node concept="3clFbJ" id="6d0zIQxdjdR" role="3cqZAp">
+              <node concept="3clFbS" id="6d0zIQxdjdT" role="3clFbx">
+                <node concept="3clFbF" id="6d0zIQxdGGv" role="3cqZAp">
+                  <node concept="37vLTI" id="6d0zIQxdHHc" role="3clFbG">
+                    <node concept="37vLTw" id="6d0zIQxdGGt" role="37vLTJ">
+                      <ref role="3cqZAo" node="6d0zIQxdhDj" resolve="c" />
+                    </node>
+                    <node concept="2ShNRf" id="6d0zIQxdp7Z" role="37vLTx">
+                      <node concept="1pGfFk" id="6d0zIQxdqy8" role="2ShVmc">
+                        <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;(int)" resolve="ArrayList" />
+                        <node concept="3uibUv" id="6d0zIQxdr8q" role="1pMfVU">
+                          <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
+                        </node>
+                        <node concept="3cmrfG" id="6d0zIQxdrYn" role="37wK5m">
+                          <property role="3cmrfH" value="4" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
                 </node>
-                <node concept="3uibUv" id="frLjuvQLMe" role="11_B2D">
-                  <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
+                <node concept="3clFbF" id="3pwG8PSq77f" role="3cqZAp">
+                  <node concept="2OqwBi" id="3pwG8PSq7d5" role="3clFbG">
+                    <node concept="37vLTw" id="3pwG8PSq77d" role="2Oq$k0">
+                      <ref role="3cqZAo" node="3pwG8PSpQW0" resolve="groups" />
+                    </node>
+                    <node concept="liA8E" id="3pwG8PSq8w0" role="2OqNvi">
+                      <ref role="37wK5l" to="33ny:~TreeMap.put(java.lang.Object,java.lang.Object)" resolve="put" />
+                      <node concept="37vLTw" id="3pwG8PSq8zq" role="37wK5m">
+                        <ref role="3cqZAo" node="3pwG8PSq6Q3" resolve="groupName" />
+                      </node>
+                      <node concept="37vLTw" id="6d0zIQxdJRj" role="37wK5m">
+                        <ref role="3cqZAo" node="6d0zIQxdhDj" resolve="c" />
+                      </node>
+                    </node>
+                  </node>
                 </node>
               </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="3pwG8PSkQPE" role="3cqZAp">
-          <node concept="3cpWsn" id="3pwG8PSkQPD" role="3cpWs9">
-            <property role="3TUv4t" value="true" />
-            <property role="TrG5h" value="node" />
-            <node concept="3uibUv" id="3pwG8PSkQPF" role="1tU5fm">
-              <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
-            </node>
-            <node concept="2OqwBi" id="3pwG8PSl47L" role="33vP2m">
-              <node concept="37vLTw" id="3pwG8PSl47K" role="2Oq$k0">
-                <ref role="3cqZAo" node="3pwG8PSkQAX" resolve="myEditor" />
-              </node>
-              <node concept="liA8E" id="3pwG8PSl47M" role="2OqNvi">
-                <ref role="37wK5l" to="exr9:~EditorComponent.getSelectedNode()" resolve="getSelectedNode" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="3pwG8PSkQPI" role="3cqZAp">
-          <node concept="3cpWsn" id="3pwG8PSkQPH" role="3cpWs9">
-            <property role="3TUv4t" value="true" />
-            <property role="TrG5h" value="editorContext" />
-            <node concept="3uibUv" id="3pwG8PSkQPJ" role="1tU5fm">
-              <ref role="3uigEE" to="exr9:~EditorContext" resolve="EditorContext" />
-            </node>
-            <node concept="2OqwBi" id="3pwG8PSl47Q" role="33vP2m">
-              <node concept="37vLTw" id="3pwG8PSl47P" role="2Oq$k0">
-                <ref role="3cqZAo" node="3pwG8PSkQAX" resolve="myEditor" />
-              </node>
-              <node concept="liA8E" id="3pwG8PSl47R" role="2OqNvi">
-                <ref role="37wK5l" to="exr9:~EditorComponent.getEditorContext()" resolve="getEditorContext" />
+              <node concept="3clFbC" id="6d0zIQxdk8o" role="3clFbw">
+                <node concept="10Nm6u" id="6d0zIQxdkel" role="3uHU7w" />
+                <node concept="37vLTw" id="6d0zIQxdjoW" role="3uHU7B">
+                  <ref role="3cqZAo" node="6d0zIQxdhDj" resolve="c" />
+                </node>
               </node>
             </node>
-          </node>
-        </node>
-        <node concept="3clFbJ" id="3pwG8PSkQPL" role="3cqZAp">
-          <node concept="3y3z36" id="3pwG8PSkQPM" role="3clFbw">
-            <node concept="37vLTw" id="3pwG8PSkQPN" role="3uHU7B">
-              <ref role="3cqZAo" node="3pwG8PSkQPD" resolve="node" />
-            </node>
-            <node concept="10Nm6u" id="3pwG8PSkQPO" role="3uHU7w" />
-          </node>
-          <node concept="3clFbS" id="3pwG8PSkQPQ" role="3clFbx">
-            <node concept="3cpWs8" id="3pwG8PSkQPS" role="3cqZAp">
-              <node concept="3cpWsn" id="3pwG8PSkQPR" role="3cpWs9">
-                <property role="3TUv4t" value="true" />
-                <property role="TrG5h" value="query" />
-                <node concept="3uibUv" id="3pwG8PSkQPT" role="1tU5fm">
-                  <ref role="3uigEE" to="91lp:~IntentionsManager$QueryDescriptor" resolve="IntentionsManager.QueryDescriptor" />
+            <node concept="3clFbF" id="6d0zIQxdlsG" role="3cqZAp">
+              <node concept="2OqwBi" id="6d0zIQxdmm7" role="3clFbG">
+                <node concept="37vLTw" id="6d0zIQxdlsE" role="2Oq$k0">
+                  <ref role="3cqZAo" node="6d0zIQxdhDj" resolve="c" />
                 </node>
-                <node concept="2ShNRf" id="3pwG8PSl47S" role="33vP2m">
-                  <node concept="1pGfFk" id="3pwG8PSl47T" role="2ShVmc">
-                    <ref role="37wK5l" to="91lp:~IntentionsManager$QueryDescriptor.&lt;init&gt;()" resolve="IntentionsManager.QueryDescriptor" />
+                <node concept="liA8E" id="6d0zIQxdnn7" role="2OqNvi">
+                  <ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
+                  <node concept="37vLTw" id="6d0zIQxdnDK" role="37wK5m">
+                    <ref role="3cqZAo" node="3pwG8PSq661" resolve="intentionEntry" />
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3clFbF" id="3pwG8PSkQPV" role="3cqZAp">
-              <node concept="2OqwBi" id="3pwG8PSl47X" role="3clFbG">
-                <node concept="37vLTw" id="3pwG8PSl47W" role="2Oq$k0">
-                  <ref role="3cqZAo" node="3pwG8PSkQPR" resolve="query" />
-                </node>
-                <node concept="liA8E" id="3pwG8PSl47Y" role="2OqNvi">
-                  <ref role="37wK5l" to="91lp:~IntentionsManager$QueryDescriptor.setEnabledOnly(boolean)" resolve="setEnabledOnly" />
-                  <node concept="3clFbT" id="3pwG8PSkQPX" role="37wK5m">
-                    <property role="3clFbU" value="true" />
+          </node>
+        </node>
+        <node concept="2Gpval" id="3pwG8PSq979" role="3cqZAp">
+          <node concept="2GrKxI" id="3pwG8PSq97b" role="2Gsz3X">
+            <property role="TrG5h" value="entry" />
+          </node>
+          <node concept="3clFbS" id="3pwG8PSq97d" role="2LFqv$">
+            <node concept="3cpWs8" id="3pwG8PSsP9T" role="3cqZAp">
+              <node concept="3cpWsn" id="3pwG8PSsP9U" role="3cpWs9">
+                <property role="TrG5h" value="groupName" />
+                <node concept="17QB3L" id="3pwG8PSsP89" role="1tU5fm" />
+                <node concept="2OqwBi" id="3pwG8PSsP9V" role="33vP2m">
+                  <node concept="2GrUjf" id="3pwG8PSsP9W" role="2Oq$k0">
+                    <ref role="2Gs0qQ" node="3pwG8PSq97b" resolve="entry" />
+                  </node>
+                  <node concept="liA8E" id="3pwG8PSsP9X" role="2OqNvi">
+                    <ref role="37wK5l" to="33ny:~Map$Entry.getKey()" resolve="getKey" />
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3cpWs8" id="3pwG8PSkQPZ" role="3cqZAp">
-              <node concept="3cpWsn" id="3pwG8PSkQPY" role="3cpWs9">
-                <property role="3TUv4t" value="true" />
-                <property role="TrG5h" value="availableIntentions" />
-                <node concept="3uibUv" id="3pwG8PSkQQ0" role="1tU5fm">
-                  <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
-                  <node concept="3uibUv" id="3pwG8PSkQQ1" role="11_B2D">
-                    <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-                    <node concept="3uibUv" id="7me2y0SLeF$" role="11_B2D">
-                      <ref role="3uigEE" to="nddn:~IntentionExecutable" resolve="IntentionExecutable" />
+            <node concept="3clFbJ" id="3pwG8PSsQSU" role="3cqZAp">
+              <node concept="3clFbS" id="3pwG8PSsQSW" role="3clFbx">
+                <node concept="3clFbF" id="3pwG8PSsRk6" role="3cqZAp">
+                  <node concept="2OqwBi" id="3pwG8PSsRso" role="3clFbG">
+                    <node concept="37vLTw" id="3pwG8PSsRk4" role="2Oq$k0">
+                      <ref role="3cqZAo" node="3pwG8PSpFW8" resolve="mainGroup" />
                     </node>
-                    <node concept="3uibUv" id="3pwG8PSkQQ3" role="11_B2D">
-                      <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
+                    <node concept="liA8E" id="3pwG8PSsS$s" role="2OqNvi">
+                      <ref role="37wK5l" to="qkt:~DefaultActionGroup.addSeparator()" resolve="addSeparator" />
                     </node>
                   </node>
                 </node>
-                <node concept="2OqwBi" id="4wDwLRRJJwC" role="33vP2m">
-                  <node concept="2YIFZM" id="4wDwLRRJJhX" role="2Oq$k0">
-                    <ref role="1Pybhc" to="1ka:~TypecheckingFacade" resolve="TypecheckingFacade" />
-                    <ref role="37wK5l" to="1ka:~TypecheckingFacade.getFromContext()" resolve="getFromContext" />
-                  </node>
-                  <node concept="liA8E" id="4wDwLRRJJLm" role="2OqNvi">
-                    <ref role="37wK5l" to="1ka:~TypecheckingComputations.computeWithSession(jetbrains.mps.typechecking.TypecheckingSession,java.util.function.Supplier)" resolve="computeWithSession" />
-                    <node concept="2OqwBi" id="4wDwLRRJL5z" role="37wK5m">
-                      <node concept="37vLTw" id="4wDwLRRJJYe" role="2Oq$k0">
-                        <ref role="3cqZAo" node="3pwG8PSkQAX" resolve="myEditor" />
-                      </node>
-                      <node concept="liA8E" id="4wDwLRRJMjt" role="2OqNvi">
-                        <ref role="37wK5l" to="exr9:~EditorComponent.getTypecheckingSession()" resolve="getTypecheckingSession" />
+              </node>
+              <node concept="3clFbC" id="3pwG8PSsRi_" role="3clFbw">
+                <node concept="10Nm6u" id="3pwG8PSsRjm" role="3uHU7w" />
+                <node concept="37vLTw" id="3pwG8PSsRag" role="3uHU7B">
+                  <ref role="3cqZAo" node="3pwG8PSsP9U" resolve="groupName" />
+                </node>
+              </node>
+              <node concept="9aQIb" id="3pwG8PSsSOD" role="9aQIa">
+                <node concept="3clFbS" id="3pwG8PSsSOE" role="9aQI4">
+                  <node concept="3clFbF" id="3pwG8PSrWaY" role="3cqZAp">
+                    <node concept="2OqwBi" id="3pwG8PSrW$C" role="3clFbG">
+                      <node concept="37vLTw" id="3pwG8PSrWaW" role="2Oq$k0">
+                        <ref role="3cqZAo" node="3pwG8PSpFW8" resolve="mainGroup" />
                       </node>
-                    </node>
-                    <node concept="1bVj0M" id="4wDwLRRJN7j" role="37wK5m">
-                      <property role="3yWfEV" value="true" />
-                      <node concept="3clFbS" id="4wDwLRRJN7l" role="1bW5cS">
-                        <node concept="3clFbF" id="4wDwLRRJNpa" role="3cqZAp">
-                          <node concept="2OqwBi" id="3pwG8PSkQQj" role="3clFbG">
-                            <node concept="2YIFZM" id="3pwG8PSl48m" role="2Oq$k0">
-                              <ref role="37wK5l" to="91lp:~IntentionsManager.getInstance()" resolve="getInstance" />
-                              <ref role="1Pybhc" to="91lp:~IntentionsManager" resolve="IntentionsManager" />
-                            </node>
-                            <node concept="liA8E" id="3pwG8PSkQQl" role="2OqNvi">
-                              <ref role="37wK5l" to="91lp:~IntentionsManager.getAvailableIntentions(jetbrains.mps.intentions.IntentionsManager$QueryDescriptor,org.jetbrains.mps.openapi.model.SNode,jetbrains.mps.openapi.editor.EditorContext)" resolve="getAvailableIntentions" />
-                              <node concept="37vLTw" id="3pwG8PSkQQm" role="37wK5m">
-                                <ref role="3cqZAo" node="3pwG8PSkQPR" resolve="query" />
-                              </node>
-                              <node concept="37vLTw" id="3pwG8PSkQQn" role="37wK5m">
-                                <ref role="3cqZAo" node="3pwG8PSkQPD" resolve="node" />
-                              </node>
-                              <node concept="37vLTw" id="3pwG8PSkQQo" role="37wK5m">
-                                <ref role="3cqZAo" node="3pwG8PSkQPH" resolve="editorContext" />
-                              </node>
-                            </node>
-                          </node>
+                      <node concept="liA8E" id="3pwG8PSrYWm" role="2OqNvi">
+                        <ref role="37wK5l" to="qkt:~DefaultActionGroup.addSeparator(java.lang.String)" resolve="addSeparator" />
+                        <node concept="37vLTw" id="3pwG8PSsP9Y" role="37wK5m">
+                          <ref role="3cqZAo" node="3pwG8PSsP9U" resolve="groupName" />
                         </node>
                       </node>
                     </node>
@@ -2424,1005 +1535,970 @@
                 </node>
               </node>
             </node>
-            <node concept="2Gpval" id="frLjuvY9Rz" role="3cqZAp">
-              <node concept="3clFbS" id="frLjuvY9RC" role="2LFqv$">
-                <node concept="3cpWs8" id="frLjuvY9RD" role="3cqZAp">
-                  <node concept="3cpWsn" id="frLjuvY9RE" role="3cpWs9">
-                    <property role="TrG5h" value="intentionDeclaration" />
-                    <node concept="3Tqbb2" id="frLjuvY9RF" role="1tU5fm">
-                      <ref role="ehGHo" to="tp3j:2c3oNEsfcpP" resolve="BaseIntentionDeclaration" />
-                    </node>
-                    <node concept="1PxgMI" id="frLjuvY9RG" role="33vP2m">
-                      <property role="1BlNFB" value="true" />
-                      <node concept="chp4Y" id="frLjuvY9RH" role="3oSUPX">
-                        <ref role="cht4Q" to="tp3j:2c3oNEsfcpP" resolve="BaseIntentionDeclaration" />
-                      </node>
-                      <node concept="2EnYce" id="frLjuvYBZ2" role="1m5AlR">
-                        <node concept="2EnYce" id="frLjuvYuOE" role="2Oq$k0">
-                          <node concept="2EnYce" id="frLjuvYpL0" role="2Oq$k0">
-                            <node concept="2EnYce" id="frLjuvYl7X" role="2Oq$k0">
-                              <node concept="2GrUjf" id="frLjuvY9Sf" role="2Oq$k0">
-                                <ref role="2Gs0qQ" node="frLjuvY9Se" resolve="availableIntention" />
-                              </node>
-                              <node concept="2OwXpG" id="frLjuvY9RN" role="2OqNvi">
-                                <ref role="2Oxat6" to="18ew:~Pair.o1" resolve="o1" />
-                              </node>
-                            </node>
-                            <node concept="liA8E" id="frLjuvY9RO" role="2OqNvi">
-                              <ref role="37wK5l" to="nddn:~IntentionExecutable.getDescriptor()" resolve="getDescriptor" />
-                            </node>
-                          </node>
-                          <node concept="liA8E" id="frLjuvY9RP" role="2OqNvi">
-                            <ref role="37wK5l" to="nddn:~IntentionDescriptor.getIntentionNodeReference()" resolve="getIntentionNodeReference" />
-                          </node>
-                        </node>
-                        <node concept="liA8E" id="frLjuvY9RQ" role="2OqNvi">
-                          <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
-                          <node concept="2OqwBi" id="frLjuvYGGo" role="37wK5m">
-                            <node concept="37vLTw" id="frLjuvY9RS" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3pwG8PSkQPH" resolve="editorContext" />
-                            </node>
-                            <node concept="liA8E" id="frLjuvY9RT" role="2OqNvi">
-                              <ref role="37wK5l" to="exr9:~EditorContext.getRepository()" resolve="getRepository" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
+            <node concept="3cpWs8" id="6d0zIQxdw_7" role="3cqZAp">
+              <node concept="3cpWsn" id="6d0zIQxdw_d" role="3cpWs9">
+                <property role="TrG5h" value="toSortCopy" />
+                <node concept="3uibUv" id="6d0zIQxdw_f" role="1tU5fm">
+                  <ref role="3uigEE" to="33ny:~ArrayList" resolve="ArrayList" />
+                  <node concept="3uibUv" id="6d0zIQxdwSN" role="11_B2D">
+                    <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
                   </node>
                 </node>
-                <node concept="3clFbJ" id="frLjuvZcBR" role="3cqZAp">
-                  <node concept="3clFbS" id="frLjuvZcBT" role="3clFbx">
-                    <node concept="3clFbF" id="frLjuvY9RW" role="3cqZAp">
-                      <node concept="2OqwBi" id="frLjuvY9RX" role="3clFbG">
-                        <node concept="37vLTw" id="frLjuvY9RY" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3pwG8PSkQPv" resolve="result" />
-                        </node>
-                        <node concept="TSZUe" id="frLjuvY9RZ" role="2OqNvi">
-                          <node concept="2GrUjf" id="frLjuvY9Sg" role="25WWJ7">
-                            <ref role="2Gs0qQ" node="frLjuvY9Se" resolve="availableIntention" />
-                          </node>
-                        </node>
+                <node concept="2ShNRf" id="6d0zIQxdxzC" role="33vP2m">
+                  <node concept="1pGfFk" id="6d0zIQxdyLJ" role="2ShVmc">
+                    <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;(java.util.Collection)" resolve="ArrayList" />
+                    <node concept="2OqwBi" id="3pwG8PSsUXK" role="37wK5m">
+                      <node concept="2GrUjf" id="3pwG8PSsUO1" role="2Oq$k0">
+                        <ref role="2Gs0qQ" node="3pwG8PSq97b" resolve="entry" />
                       </node>
-                    </node>
-                  </node>
-                  <node concept="22lmx$" id="frLjuvZFR9" role="3clFbw">
-                    <node concept="3fqX7Q" id="frLjuvZBA8" role="3uHU7B">
-                      <node concept="2YIFZM" id="frLjuvZBAa" role="3fr31v">
-                        <ref role="37wK5l" to="3ahc:~ReadOnlyUtil.isSelectionReadOnlyInEditor(jetbrains.mps.openapi.editor.EditorComponent)" resolve="isSelectionReadOnlyInEditor" />
-                        <ref role="1Pybhc" to="3ahc:~ReadOnlyUtil" resolve="ReadOnlyUtil" />
-                        <node concept="37vLTw" id="frLjuvZBAb" role="37wK5m">
-                          <ref role="3cqZAo" node="3pwG8PSkQAX" resolve="myEditor" />
-                        </node>
+                      <node concept="liA8E" id="3pwG8PSsZrb" role="2OqNvi">
+                        <ref role="37wK5l" to="33ny:~Map$Entry.getValue()" resolve="getValue" />
                       </node>
                     </node>
-                    <node concept="2OqwBi" id="frLjuvY9S8" role="3uHU7w">
-                      <node concept="2OqwBi" id="frLjuvY9S9" role="2Oq$k0">
-                        <node concept="37vLTw" id="frLjuvY9Sa" role="2Oq$k0">
-                          <ref role="3cqZAo" node="frLjuvY9RE" resolve="intentionDeclaration" />
-                        </node>
-                        <node concept="3CFZ6_" id="frLjuvY9Sb" role="2OqNvi">
-                          <node concept="3CFYIy" id="frLjuvY9Sc" role="3CFYIz">
-                            <ref role="3CFYIx" to="tegv:frLjuvP$7P" resolve="ShowIntentionInReadyOnlyCell" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3TrcHB" id="frLjuvY9Sd" role="2OqNvi">
-                        <ref role="3TsBF5" to="tegv:frLjuvPGIB" resolve="flag" />
-                      </node>
+                    <node concept="3uibUv" id="6d0zIQxdyZ8" role="1pMfVU">
+                      <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="37vLTw" id="frLjuvY9RB" role="2GsD0m">
-                <ref role="3cqZAo" node="3pwG8PSkQPY" resolve="availableIntentions" />
-              </node>
-              <node concept="2GrKxI" id="frLjuvY9Se" role="2Gsz3X">
-                <property role="TrG5h" value="availableIntention" />
+            </node>
+            <node concept="3clFbF" id="6d0zIQxdB5n" role="3cqZAp">
+              <node concept="2OqwBi" id="6d0zIQxdCWf" role="3clFbG">
+                <node concept="37vLTw" id="6d0zIQxdB5l" role="2Oq$k0">
+                  <ref role="3cqZAo" node="6d0zIQxdw_d" resolve="toSortCopy" />
+                </node>
+                <node concept="liA8E" id="6d0zIQxdEwl" role="2OqNvi">
+                  <ref role="37wK5l" to="33ny:~ArrayList.sort(java.util.Comparator)" resolve="sort" />
+                  <node concept="2ShNRf" id="6d0zIQxdERJ" role="37wK5m">
+                    <node concept="1pGfFk" id="6d0zIQxdGfd" role="2ShVmc">
+                      <ref role="37wK5l" to="18ew:~ToStringComparator.&lt;init&gt;()" resolve="ToStringComparator" />
+                    </node>
+                  </node>
+                </node>
               </node>
             </node>
-          </node>
-        </node>
-        <node concept="3cpWs6" id="3pwG8PSkQQ_" role="3cqZAp">
-          <node concept="37vLTw" id="frLjuvY24D" role="3cqZAk">
-            <ref role="3cqZAo" node="3pwG8PSkQPv" resolve="result" />
-          </node>
-        </node>
-      </node>
-      <node concept="3Tmbuc" id="3pwG8PSorsL" role="1B3o_S" />
-      <node concept="3uibUv" id="3pwG8PSkQQC" role="3clF45">
-        <ref role="3uigEE" to="33ny:~Set" resolve="Set" />
-        <node concept="3uibUv" id="3pwG8PSkQQD" role="11_B2D">
-          <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-          <node concept="3uibUv" id="7me2y0SL6NQ" role="11_B2D">
-            <ref role="3uigEE" to="nddn:~IntentionExecutable" resolve="IntentionExecutable" />
-          </node>
-          <node concept="3uibUv" id="3pwG8PSkQQF" role="11_B2D">
-            <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="3pwG8PSmre$" role="jymVt" />
-    <node concept="3clFb_" id="3pwG8PSkQQM" role="jymVt">
-      <property role="TrG5h" value="getModelAccess" />
-      <property role="DiZV1" value="false" />
-      <property role="od$2w" value="false" />
-      <node concept="3clFbS" id="3pwG8PSkQQN" role="3clF47">
-        <node concept="3cpWs6" id="3pwG8PSkQQO" role="3cqZAp">
-          <node concept="2OqwBi" id="6LzhH3u5xk8" role="3cqZAk">
-            <node concept="2OqwBi" id="6LzhH3u5sNy" role="2Oq$k0">
-              <node concept="2OqwBi" id="6LzhH3u5nhR" role="2Oq$k0">
-                <node concept="37vLTw" id="3pwG8PSl48z" role="2Oq$k0">
-                  <ref role="3cqZAo" node="3pwG8PSkQAX" resolve="myEditor" />
+            <node concept="3clFbF" id="3pwG8PSsT8s" role="3cqZAp">
+              <node concept="2OqwBi" id="3pwG8PSsTyo" role="3clFbG">
+                <node concept="37vLTw" id="3pwG8PSsT8q" role="2Oq$k0">
+                  <ref role="3cqZAo" node="3pwG8PSpFW8" resolve="mainGroup" />
                 </node>
-                <node concept="liA8E" id="6LzhH3u5qRS" role="2OqNvi">
-                  <ref role="37wK5l" to="exr9:~EditorComponent.getEditorContext()" resolve="getEditorContext" />
+                <node concept="liA8E" id="3pwG8PSsUEs" role="2OqNvi">
+                  <ref role="37wK5l" to="qkt:~DefaultActionGroup.addAll(java.util.Collection)" resolve="addAll" />
+                  <node concept="37vLTw" id="6d0zIQxd$x4" role="37wK5m">
+                    <ref role="3cqZAo" node="6d0zIQxdw_d" resolve="toSortCopy" />
+                  </node>
                 </node>
               </node>
-              <node concept="liA8E" id="6LzhH3u5uX8" role="2OqNvi">
-                <ref role="37wK5l" to="exr9:~EditorContext.getRepository()" resolve="getRepository" />
-              </node>
-            </node>
-            <node concept="liA8E" id="6LzhH3u5zzP" role="2OqNvi">
-              <ref role="37wK5l" to="lui2:~SRepository.getModelAccess()" resolve="getModelAccess" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tmbuc" id="3pwG8PSouID" role="1B3o_S" />
-      <node concept="3uibUv" id="3pwG8PSkQQT" role="3clF45">
-        <ref role="3uigEE" to="lui2:~ModelAccess" resolve="ModelAccess" />
-      </node>
-    </node>
-  </node>
-  <node concept="312cEu" id="3pwG8PSoBZq">
-    <property role="TrG5h" value="IntentionsMenuWithGroups" />
-    <node concept="3Tm1VV" id="3pwG8PSoBZr" role="1B3o_S" />
-    <node concept="3uibUv" id="3pwG8PSoC2P" role="1zkMxy">
-      <ref role="3uigEE" node="3pwG8PSkQAz" resolve="OriginalIntentionMenu" />
-    </node>
-    <node concept="3clFbW" id="3pwG8PSoC4u" role="jymVt">
-      <node concept="3cqZAl" id="3pwG8PSoC4v" role="3clF45" />
-      <node concept="3Tm1VV" id="3pwG8PSoC4w" role="1B3o_S" />
-      <node concept="3clFbS" id="3pwG8PSoC4y" role="3clF47">
-        <node concept="XkiVB" id="3pwG8PSoC4$" role="3cqZAp">
-          <ref role="37wK5l" node="3pwG8PSkQB2" resolve="OriginalIntentionMenu" />
-          <node concept="37vLTw" id="3pwG8PSoC4D" role="37wK5m">
-            <ref role="3cqZAo" node="3pwG8PSoC4_" resolve="editor" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="3pwG8PSoC4_" role="3clF46">
-        <property role="TrG5h" value="editor" />
-        <node concept="3uibUv" id="3pwG8PSoC4B" role="1tU5fm">
-          <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
-        </node>
-        <node concept="2AHcQZ" id="3pwG8PSoC4C" role="2AJF6D">
-          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="3pwG8PSpFRO" role="jymVt" />
-    <node concept="3clFb_" id="3pwG8PSpFVV" role="jymVt">
-      <property role="TrG5h" value="getIntentionsGroup" />
-      <node concept="3Tmbuc" id="3pwG8PSpFVW" role="1B3o_S" />
-      <node concept="3uibUv" id="3pwG8PSpFVX" role="3clF45">
-        <ref role="3uigEE" to="7bx7:~BaseGroup" resolve="BaseGroup" />
-      </node>
-      <node concept="37vLTG" id="3pwG8PSpFVY" role="3clF46">
-        <property role="TrG5h" value="groupItems" />
-        <node concept="3uibUv" id="3pwG8PSpFVZ" role="1tU5fm">
-          <ref role="3uigEE" to="33ny:~List" resolve="List" />
-          <node concept="3uibUv" id="3pwG8PSpFW0" role="11_B2D">
-            <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-            <node concept="3uibUv" id="7me2y0SMVg2" role="11_B2D">
-              <ref role="3uigEE" to="nddn:~IntentionExecutable" resolve="IntentionExecutable" />
-            </node>
-            <node concept="3uibUv" id="3pwG8PSpFW2" role="11_B2D">
-              <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
             </node>
           </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="3pwG8PSpFW3" role="3clF46">
-        <property role="TrG5h" value="actions" />
-        <node concept="3uibUv" id="3pwG8PSpFW4" role="1tU5fm">
-          <ref role="3uigEE" to="33ny:~List" resolve="List" />
-          <node concept="3uibUv" id="3pwG8PSpFW5" role="11_B2D">
-            <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
-          </node>
-        </node>
-      </node>
-      <node concept="3clFbS" id="3pwG8PSpFW6" role="3clF47">
-        <node concept="3cpWs8" id="3pwG8PSpFW7" role="3cqZAp">
-          <node concept="3cpWsn" id="3pwG8PSpFW8" role="3cpWs9">
-            <property role="3TUv4t" value="false" />
-            <property role="TrG5h" value="mainGroup" />
-            <node concept="3uibUv" id="3pwG8PSpFW9" role="1tU5fm">
-              <ref role="3uigEE" to="7bx7:~BaseGroup" resolve="BaseGroup" />
+          <node concept="2OqwBi" id="3pwG8PSvpFb" role="2GsD0m">
+            <node concept="liA8E" id="3pwG8PSvsrw" role="2OqNvi">
+              <ref role="37wK5l" to="33ny:~TreeMap.entrySet()" resolve="entrySet" />
             </node>
-            <node concept="2ShNRf" id="3pwG8PSpFWa" role="33vP2m">
-              <node concept="1pGfFk" id="3pwG8PSpFWb" role="2ShVmc">
-                <ref role="37wK5l" to="7bx7:~BaseGroup.&lt;init&gt;(java.lang.String)" resolve="BaseGroup" />
-                <node concept="Xl_RD" id="3pwG8PSpFWc" role="37wK5m" />
-              </node>
+            <node concept="37vLTw" id="3pwG8PSq9Cg" role="2Oq$k0">
+              <ref role="3cqZAo" node="3pwG8PSpQW0" resolve="groups" />
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="3pwG8PSpKgb" role="3cqZAp" />
-        <node concept="3cpWs8" id="3pwG8PSpQVZ" role="3cqZAp">
-          <node concept="3cpWsn" id="3pwG8PSpQW0" role="3cpWs9">
-            <property role="TrG5h" value="groups" />
-            <node concept="3uibUv" id="3pwG8PSueRi" role="1tU5fm">
-              <ref role="3uigEE" to="33ny:~TreeMap" resolve="TreeMap" />
-              <node concept="17QB3L" id="3pwG8PSuibW" role="11_B2D" />
-              <node concept="3uibUv" id="6d0zIQxcMCE" role="11_B2D">
-                <ref role="3uigEE" to="33ny:~List" resolve="List" />
-                <node concept="3uibUv" id="6d0zIQxcOR$" role="11_B2D">
-                  <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
+        <node concept="3clFbH" id="3pwG8PSq9nF" role="3cqZAp" />
+        <node concept="3clFbJ" id="3pwG8PSte48" role="3cqZAp">
+          <node concept="3clFbS" id="3pwG8PSte4a" role="3clFbx">
+            <node concept="3clFbF" id="3pwG8PSthDL" role="3cqZAp">
+              <node concept="2OqwBi" id="3pwG8PSthO2" role="3clFbG">
+                <node concept="37vLTw" id="3pwG8PSthDJ" role="2Oq$k0">
+                  <ref role="3cqZAo" node="3pwG8PSpFW8" resolve="mainGroup" />
+                </node>
+                <node concept="liA8E" id="3pwG8PStiW6" role="2OqNvi">
+                  <ref role="37wK5l" to="qkt:~DefaultActionGroup.addSeparator()" resolve="addSeparator" />
                 </node>
               </node>
             </node>
-            <node concept="2ShNRf" id="6d0zIQxcRgB" role="33vP2m">
-              <node concept="1pGfFk" id="6d0zIQxd7Zw" role="2ShVmc">
-                <ref role="37wK5l" to="33ny:~TreeMap.&lt;init&gt;()" resolve="TreeMap" />
-                <node concept="17QB3L" id="6d0zIQxd9rp" role="1pMfVU" />
-                <node concept="3uibUv" id="6d0zIQxdaha" role="1pMfVU">
-                  <ref role="3uigEE" to="33ny:~List" resolve="List" />
-                  <node concept="3uibUv" id="6d0zIQxdbU3" role="11_B2D">
-                    <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
+            <node concept="3clFbF" id="3pwG8PSpFWv" role="3cqZAp">
+              <node concept="2OqwBi" id="3pwG8PSpFWw" role="3clFbG">
+                <node concept="37vLTw" id="3pwG8PSpFWx" role="2Oq$k0">
+                  <ref role="3cqZAo" node="3pwG8PSpFW8" resolve="mainGroup" />
+                </node>
+                <node concept="liA8E" id="3pwG8PSpFWy" role="2OqNvi">
+                  <ref role="37wK5l" to="qkt:~DefaultActionGroup.addAll(java.util.Collection)" resolve="addAll" />
+                  <node concept="37vLTw" id="3pwG8PSpFWz" role="37wK5m">
+                    <ref role="3cqZAo" node="3pwG8PSp_f1" resolve="actions" />
                   </node>
                 </node>
               </node>
             </node>
           </node>
+          <node concept="3fqX7Q" id="3pwG8PStgRO" role="3clFbw">
+            <node concept="2OqwBi" id="3pwG8PStgRQ" role="3fr31v">
+              <node concept="37vLTw" id="3pwG8PStgRR" role="2Oq$k0">
+                <ref role="3cqZAo" node="3pwG8PSp_f1" resolve="actions" />
+              </node>
+              <node concept="liA8E" id="3pwG8PStgRS" role="2OqNvi">
+                <ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
+              </node>
+            </node>
+          </node>
         </node>
-        <node concept="1DcWWT" id="3pwG8PSpFWd" role="3cqZAp">
-          <node concept="37vLTw" id="3pwG8PSpFWe" role="1DdaDG">
-            <ref role="3cqZAo" node="3pwG8PSpFVY" resolve="groupItems" />
+        <node concept="3cpWs6" id="3pwG8PSpFW$" role="3cqZAp">
+          <node concept="37vLTw" id="3pwG8PSpFW_" role="3cqZAk">
+            <ref role="3cqZAo" node="3pwG8PSpFW8" resolve="mainGroup" />
           </node>
-          <node concept="3cpWsn" id="3pwG8PSpFWf" role="1Duv9x">
-            <property role="3TUv4t" value="true" />
-            <property role="TrG5h" value="pair" />
-            <node concept="3uibUv" id="3pwG8PSpFWg" role="1tU5fm">
-              <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
-              <node concept="3uibUv" id="7me2y0SMVTY" role="11_B2D">
-                <ref role="3uigEE" to="nddn:~IntentionExecutable" resolve="IntentionExecutable" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2jDew64Qmgc" role="jymVt" />
+    <node concept="3clFb_" id="3pZvzolpwf_" role="jymVt">
+      <property role="TrG5h" value="trimGroupNameFromActionText" />
+      <node concept="3clFbS" id="3pZvzolpwfC" role="3clF47">
+        <node concept="3clFbJ" id="3pZvzolpEqJ" role="3cqZAp">
+          <node concept="3fqX7Q" id="3pZvzolpP1r" role="3clFbw">
+            <node concept="2ZW3vV" id="3pZvzolpP1t" role="3fr31v">
+              <node concept="3uibUv" id="3pZvzolpP1u" role="2ZW6by">
+                <ref role="3uigEE" node="2jDew64QLb0" resolve="IntentionActionGroup" />
               </node>
-              <node concept="3uibUv" id="3pwG8PSpFWi" role="11_B2D">
-                <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
+              <node concept="37vLTw" id="3pZvzolpP1v" role="2ZW6bz">
+                <ref role="3cqZAo" node="3pZvzolpzLz" resolve="action" />
               </node>
             </node>
           </node>
-          <node concept="3clFbS" id="3pwG8PSpFWj" role="2LFqv$">
-            <node concept="3cpWs8" id="3pwG8PSq660" role="3cqZAp">
-              <node concept="3cpWsn" id="3pwG8PSq661" role="3cpWs9">
-                <property role="TrG5h" value="intentionEntry" />
-                <node concept="3uibUv" id="3pwG8PSq65Z" role="1tU5fm">
-                  <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
+          <node concept="3clFbS" id="3pZvzolpEqL" role="3clFbx">
+            <node concept="3cpWs8" id="3pZvzolqck1" role="3cqZAp">
+              <node concept="3cpWsn" id="3pZvzolqck2" role="3cpWs9">
+                <property role="TrG5h" value="text" />
+                <node concept="17QB3L" id="3pZvzolqck3" role="1tU5fm" />
+                <node concept="2OqwBi" id="3pZvzolqck4" role="33vP2m">
+                  <node concept="2OqwBi" id="3pZvzolqck5" role="2Oq$k0">
+                    <node concept="37vLTw" id="3pZvzolqck6" role="2Oq$k0">
+                      <ref role="3cqZAo" node="3pZvzolpzLz" resolve="action" />
+                    </node>
+                    <node concept="liA8E" id="3pZvzolqck7" role="2OqNvi">
+                      <ref role="37wK5l" to="qkt:~AnAction.getTemplatePresentation()" resolve="getTemplatePresentation" />
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="3pZvzolqck8" role="2OqNvi">
+                    <ref role="37wK5l" to="qkt:~Presentation.getText()" resolve="getText" />
+                  </node>
                 </node>
-                <node concept="1rXfSq" id="3pwG8PSq662" role="33vP2m">
-                  <ref role="37wK5l" node="3pwG8PSkQJj" resolve="getIntentionGroup" />
-                  <node concept="2OqwBi" id="3pwG8PSq663" role="37wK5m">
-                    <node concept="37vLTw" id="3pwG8PSq664" role="2Oq$k0">
-                      <ref role="3cqZAo" node="3pwG8PSpFWf" resolve="pair" />
+              </node>
+            </node>
+            <node concept="3clFbJ" id="3pZvzolq8Yp" role="3cqZAp">
+              <node concept="3clFbS" id="3pZvzolq8Yr" role="3clFbx">
+                <node concept="3SKdUt" id="3pZvzolsS9j" role="3cqZAp">
+                  <node concept="1PaTwC" id="3pZvzolsS9k" role="1aUNEU">
+                    <node concept="3oM_SD" id="3pZvzolsV8k" role="1PaTwD">
+                      <property role="3oM_SC" value="add" />
                     </node>
-                    <node concept="2OwXpG" id="3pwG8PSq665" role="2OqNvi">
-                      <ref role="2Oxat6" to="18ew:~Pair.o1" resolve="o1" />
+                    <node concept="3oM_SD" id="3pZvzolsV8m" role="1PaTwD">
+                      <property role="3oM_SC" value="+1" />
+                    </node>
+                    <node concept="3oM_SD" id="3pZvzolsV8p" role="1PaTwD">
+                      <property role="3oM_SC" value="in" />
+                    </node>
+                    <node concept="3oM_SD" id="3pZvzolsV8C" role="1PaTwD">
+                      <property role="3oM_SC" value="substring" />
+                    </node>
+                    <node concept="3oM_SD" id="3pZvzolsV8H" role="1PaTwD">
+                      <property role="3oM_SC" value="to" />
+                    </node>
+                    <node concept="3oM_SD" id="3pZvzolsV8N" role="1PaTwD">
+                      <property role="3oM_SC" value="cut" />
+                    </node>
+                    <node concept="3oM_SD" id="3pZvzolsV8U" role="1PaTwD">
+                      <property role="3oM_SC" value="off" />
+                    </node>
+                    <node concept="3oM_SD" id="3pZvzolsV92" role="1PaTwD">
+                      <property role="3oM_SC" value="the" />
+                    </node>
+                    <node concept="3oM_SD" id="3pZvzolsV9b" role="1PaTwD">
+                      <property role="3oM_SC" value="colon" />
+                    </node>
+                    <node concept="3oM_SD" id="3pZvzolsV9l" role="1PaTwD">
+                      <property role="3oM_SC" value="after" />
+                    </node>
+                    <node concept="3oM_SD" id="3pZvzolsV9w" role="1PaTwD">
+                      <property role="3oM_SC" value="the" />
+                    </node>
+                    <node concept="3oM_SD" id="3pZvzolsV9G" role="1PaTwD">
+                      <property role="3oM_SC" value="groupName" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="3pZvzolm1oQ" role="3cqZAp">
+                  <node concept="2OqwBi" id="3pZvzolmb07" role="3clFbG">
+                    <node concept="2OqwBi" id="3pZvzolm59K" role="2Oq$k0">
+                      <node concept="37vLTw" id="3pZvzolm1oO" role="2Oq$k0">
+                        <ref role="3cqZAo" node="3pZvzolpzLz" resolve="action" />
+                      </node>
+                      <node concept="liA8E" id="3pZvzolm8FW" role="2OqNvi">
+                        <ref role="37wK5l" to="qkt:~AnAction.getTemplatePresentation()" resolve="getTemplatePresentation" />
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="3pZvzolmeOD" role="2OqNvi">
+                      <ref role="37wK5l" to="qkt:~Presentation.setText(java.lang.String)" resolve="setText" />
+                      <node concept="2OqwBi" id="3pZvzolmzk3" role="37wK5m">
+                        <node concept="2OqwBi" id="3pZvzolmjWV" role="2Oq$k0">
+                          <node concept="37vLTw" id="3pZvzolmhSV" role="2Oq$k0">
+                            <ref role="3cqZAo" node="3pZvzolqck2" resolve="text" />
+                          </node>
+                          <node concept="liA8E" id="3pZvzolmnyg" role="2OqNvi">
+                            <ref role="37wK5l" to="wyt6:~String.substring(int)" resolve="substring" />
+                            <node concept="3cpWs3" id="3pZvzolsEDU" role="37wK5m">
+                              <node concept="3cmrfG" id="3pZvzolsEJo" role="3uHU7w">
+                                <property role="3cmrfH" value="1" />
+                              </node>
+                              <node concept="2OqwBi" id="3pZvzolreqn" role="3uHU7B">
+                                <node concept="37vLTw" id="3pZvzolraE$" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="3pZvzolpBeb" resolve="groupName" />
+                                </node>
+                                <node concept="liA8E" id="3pZvzolrhFo" role="2OqNvi">
+                                  <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="17S1cR" id="3pZvzolmHIg" role="2OqNvi" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="1Wc70l" id="3pZvzolqK4g" role="3clFbw">
+                <node concept="2OqwBi" id="3pZvzolqQ0G" role="3uHU7w">
+                  <node concept="37vLTw" id="3pZvzolqMhi" role="2Oq$k0">
+                    <ref role="3cqZAo" node="3pZvzolqck2" resolve="text" />
+                  </node>
+                  <node concept="liA8E" id="3pZvzolqSjV" role="2OqNvi">
+                    <ref role="37wK5l" to="wyt6:~String.startsWith(java.lang.String)" resolve="startsWith" />
+                    <node concept="37vLTw" id="3pZvzolqVNv" role="37wK5m">
+                      <ref role="3cqZAo" node="3pZvzolpBeb" resolve="groupName" />
                     </node>
                   </node>
-                  <node concept="2OqwBi" id="3pwG8PSq666" role="37wK5m">
-                    <node concept="37vLTw" id="3pwG8PSq667" role="2Oq$k0">
-                      <ref role="3cqZAo" node="3pwG8PSpFWf" resolve="pair" />
+                </node>
+                <node concept="1Wc70l" id="3pZvzolqyGY" role="3uHU7B">
+                  <node concept="3y3z36" id="3pZvzolqs4n" role="3uHU7B">
+                    <node concept="37vLTw" id="3pZvzolqidM" role="3uHU7B">
+                      <ref role="3cqZAo" node="3pZvzolqck2" resolve="text" />
                     </node>
-                    <node concept="2OwXpG" id="3pwG8PSq668" role="2OqNvi">
-                      <ref role="2Oxat6" to="18ew:~Pair.o2" resolve="o2" />
+                    <node concept="10Nm6u" id="3pZvzolqvEd" role="3uHU7w" />
+                  </node>
+                  <node concept="2OqwBi" id="5KWvuz1uFuy" role="3uHU7w">
+                    <node concept="37vLTw" id="3pZvzolq_lp" role="2Oq$k0">
+                      <ref role="3cqZAo" node="3pZvzolpBeb" resolve="groupName" />
                     </node>
+                    <node concept="17RvpY" id="5KWvuz1w10D" role="2OqNvi" />
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3cpWs8" id="3pwG8PSq6Q2" role="3cqZAp">
-              <node concept="3cpWsn" id="3pwG8PSq6Q3" role="3cpWs9">
-                <property role="TrG5h" value="groupName" />
-                <node concept="17QB3L" id="3pwG8PSq6PK" role="1tU5fm" />
-                <node concept="1rXfSq" id="3pwG8PSq6Q4" role="33vP2m">
-                  <ref role="37wK5l" node="3pwG8PSpGSr" resolve="getGroupName" />
-                  <node concept="37vLTw" id="3pwG8PSq6Q5" role="37wK5m">
-                    <ref role="3cqZAo" node="3pwG8PSq661" resolve="intentionEntry" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tmbuc" id="3pZvzolps_O" role="1B3o_S" />
+      <node concept="37vLTG" id="3pZvzolpzLz" role="3clF46">
+        <property role="TrG5h" value="action" />
+        <node concept="3uibUv" id="3pZvzolpzLy" role="1tU5fm">
+          <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="3pZvzolpBeb" role="3clF46">
+        <property role="TrG5h" value="groupName" />
+        <node concept="17QB3L" id="3pZvzolpE5e" role="1tU5fm" />
+      </node>
+      <node concept="3cqZAl" id="3pZvzolpUMR" role="3clF45" />
+    </node>
+    <node concept="2tJIrI" id="2jDew64Pxne" role="jymVt" />
+    <node concept="3clFb_" id="3pwG8PSpGSr" role="jymVt">
+      <property role="TrG5h" value="getGroupName" />
+      <node concept="37vLTG" id="3pwG8PSpHHh" role="3clF46">
+        <property role="TrG5h" value="action" />
+        <node concept="3uibUv" id="3pwG8PSpHTA" role="1tU5fm">
+          <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
+        </node>
+      </node>
+      <node concept="17QB3L" id="3pwG8PSpHC0" role="3clF45" />
+      <node concept="3Tmbuc" id="3pwG8PSqo2G" role="1B3o_S" />
+      <node concept="3clFbS" id="3pwG8PSpGSv" role="3clF47">
+        <node concept="3clFbJ" id="2xgTENkV5Ei" role="3cqZAp">
+          <node concept="3clFbS" id="2xgTENkV5Ek" role="3clFbx">
+            <node concept="3cpWs6" id="2xgTENkV7jA" role="3cqZAp">
+              <node concept="2OqwBi" id="2xgTENkV8gI" role="3cqZAk">
+                <node concept="1eOMI4" id="2xgTENkV7DH" role="2Oq$k0">
+                  <node concept="10QFUN" id="2xgTENkV7DE" role="1eOMHV">
+                    <node concept="3uibUv" id="2xgTENkV7DJ" role="10QFUM">
+                      <ref role="3uigEE" node="2jDew64QLb0" resolve="IntentionActionGroup" />
+                    </node>
+                    <node concept="37vLTw" id="2xgTENkV7DK" role="10QFUP">
+                      <ref role="3cqZAo" node="3pwG8PSpHHh" resolve="action" />
+                    </node>
                   </node>
                 </node>
-              </node>
-            </node>
-            <node concept="3SKdUt" id="3pZvzolt2Zu" role="3cqZAp">
-              <node concept="1PaTwC" id="3pZvzolt2Zv" role="1aUNEU">
-                <node concept="3oM_SD" id="3pZvzolt7BI" role="1PaTwD">
-                  <property role="3oM_SC" value="cut" />
-                </node>
-                <node concept="3oM_SD" id="3pZvzolt7BK" role="1PaTwD">
-                  <property role="3oM_SC" value="off" />
-                </node>
-                <node concept="3oM_SD" id="3pZvzolt7BN" role="1PaTwD">
-                  <property role="3oM_SC" value="the" />
-                </node>
-                <node concept="3oM_SD" id="3pZvzolt7BR" role="1PaTwD">
-                  <property role="3oM_SC" value="groupName" />
-                </node>
-                <node concept="3oM_SD" id="3pZvzolt7BW" role="1PaTwD">
-                  <property role="3oM_SC" value="from" />
-                </node>
-                <node concept="3oM_SD" id="3pZvzolt7C2" role="1PaTwD">
-                  <property role="3oM_SC" value="the" />
-                </node>
-                <node concept="3oM_SD" id="3pZvzolt7C9" role="1PaTwD">
-                  <property role="3oM_SC" value="action," />
-                </node>
-                <node concept="3oM_SD" id="3pZvzolt7Ch" role="1PaTwD">
-                  <property role="3oM_SC" value="if" />
-                </node>
-                <node concept="3oM_SD" id="3pZvzolt7Cq" role="1PaTwD">
-                  <property role="3oM_SC" value="action" />
-                </node>
-                <node concept="3oM_SD" id="3pZvzolt7C$" role="1PaTwD">
-                  <property role="3oM_SC" value="is" />
-                </node>
-                <node concept="3oM_SD" id="3pZvzolt7CJ" role="1PaTwD">
-                  <property role="3oM_SC" value="not" />
-                </node>
-                <node concept="3oM_SD" id="3pZvzolt7CV" role="1PaTwD">
-                  <property role="3oM_SC" value="a" />
-                </node>
-                <node concept="3oM_SD" id="3pZvzolt7D8" role="1PaTwD">
-                  <property role="3oM_SC" value="group," />
-                </node>
-                <node concept="3oM_SD" id="3pZvzolt7Dm" role="1PaTwD">
-                  <property role="3oM_SC" value="i.e." />
-                </node>
-                <node concept="3oM_SD" id="3pZvzolt7D_" role="1PaTwD">
-                  <property role="3oM_SC" value="has" />
-                </node>
-                <node concept="3oM_SD" id="3pZvzolt7DP" role="1PaTwD">
-                  <property role="3oM_SC" value="no" />
-                </node>
-                <node concept="3oM_SD" id="3pZvzolt7E6" role="1PaTwD">
-                  <property role="3oM_SC" value="submenu," />
-                </node>
-                <node concept="3oM_SD" id="3pZvzolt8Rv" role="1PaTwD">
-                  <property role="3oM_SC" value="" />
+                <node concept="liA8E" id="2xgTENkV9CR" role="2OqNvi">
+                  <ref role="37wK5l" node="2jDew64QLcf" resolve="getGroupName" />
                 </node>
               </node>
             </node>
-            <node concept="3SKdUt" id="3pZvzoltfB5" role="3cqZAp">
-              <node concept="1PaTwC" id="3pZvzoltfAI" role="1aUNEU">
-                <node concept="3oM_SD" id="3pZvzoltfAH" role="1PaTwD">
-                  <property role="3oM_SC" value="and" />
-                </node>
-                <node concept="3oM_SD" id="3pZvzolt8RM" role="1PaTwD">
-                  <property role="3oM_SC" value="the" />
-                </node>
-                <node concept="3oM_SD" id="3pZvzolt8S6" role="1PaTwD">
-                  <property role="3oM_SC" value="intention" />
-                </node>
-                <node concept="3oM_SD" id="3pZvzolt8Sr" role="1PaTwD">
-                  <property role="3oM_SC" value="annotation" />
-                </node>
-                <node concept="3oM_SD" id="3pZvzoltipc" role="1PaTwD">
-                  <property role="3oM_SC" value="was" />
-                </node>
-                <node concept="3oM_SD" id="3pZvzoltipq" role="1PaTwD">
-                  <property role="3oM_SC" value="not" />
-                </node>
-                <node concept="3oM_SD" id="3pZvzoltipx" role="1PaTwD">
-                  <property role="3oM_SC" value="used." />
-                </node>
-              </node>
+          </node>
+          <node concept="2ZW3vV" id="2xgTENkV6Ko" role="3clFbw">
+            <node concept="3uibUv" id="2xgTENkV7fT" role="2ZW6by">
+              <ref role="3uigEE" node="2jDew64QLb0" resolve="IntentionActionGroup" />
             </node>
-            <node concept="3clFbF" id="3pZvzols0Bn" role="3cqZAp">
-              <node concept="1rXfSq" id="3pZvzols0Bl" role="3clFbG">
-                <ref role="37wK5l" node="3pZvzolpwf_" resolve="trimGroupNameFromActionText" />
-                <node concept="37vLTw" id="3pZvzols489" role="37wK5m">
-                  <ref role="3cqZAo" node="3pwG8PSq661" resolve="intentionEntry" />
+            <node concept="37vLTw" id="2xgTENkV6ay" role="2ZW6bz">
+              <ref role="3cqZAo" node="3pwG8PSpHHh" resolve="action" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="2xgTENkV5at" role="3cqZAp" />
+        <node concept="3cpWs8" id="3pwG8PSsoLy" role="3cqZAp">
+          <node concept="3cpWsn" id="3pwG8PSsoLz" role="3cpWs9">
+            <property role="TrG5h" value="text" />
+            <node concept="17QB3L" id="3pwG8PSspYn" role="1tU5fm" />
+            <node concept="2OqwBi" id="3pwG8PSsoL$" role="33vP2m">
+              <node concept="2OqwBi" id="3pwG8PSsoL_" role="2Oq$k0">
+                <node concept="37vLTw" id="3pwG8PSsoLA" role="2Oq$k0">
+                  <ref role="3cqZAo" node="3pwG8PSpHHh" resolve="action" />
                 </node>
-                <node concept="37vLTw" id="3pZvzolsaBu" role="37wK5m">
-                  <ref role="3cqZAo" node="3pwG8PSq6Q3" resolve="groupName" />
+                <node concept="liA8E" id="3pwG8PSsoLB" role="2OqNvi">
+                  <ref role="37wK5l" to="qkt:~AnAction.getTemplatePresentation()" resolve="getTemplatePresentation" />
                 </node>
               </node>
+              <node concept="liA8E" id="3pwG8PSsoLC" role="2OqNvi">
+                <ref role="37wK5l" to="qkt:~Presentation.getText()" resolve="getText" />
+              </node>
             </node>
-            <node concept="3cpWs8" id="6d0zIQxdhDi" role="3cqZAp">
-              <node concept="3cpWsn" id="6d0zIQxdhDj" role="3cpWs9">
-                <property role="TrG5h" value="c" />
-                <node concept="3uibUv" id="6d0zIQxdhkN" role="1tU5fm">
-                  <ref role="3uigEE" to="33ny:~List" resolve="List" />
-                  <node concept="3uibUv" id="6d0zIQxdhkQ" role="11_B2D">
-                    <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
-                  </node>
-                </node>
-                <node concept="2OqwBi" id="6d0zIQxdhDk" role="33vP2m">
-                  <node concept="37vLTw" id="6d0zIQxdhDl" role="2Oq$k0">
-                    <ref role="3cqZAo" node="3pwG8PSpQW0" resolve="groups" />
-                  </node>
-                  <node concept="liA8E" id="6d0zIQxdhDm" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~TreeMap.get(java.lang.Object)" resolve="get" />
-                    <node concept="37vLTw" id="6d0zIQxdhDn" role="37wK5m">
-                      <ref role="3cqZAo" node="3pwG8PSq6Q3" resolve="groupName" />
-                    </node>
-                  </node>
-                </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="3pwG8PSsrmI" role="3cqZAp">
+          <node concept="3clFbS" id="3pwG8PSsrmK" role="3clFbx">
+            <node concept="3cpWs6" id="3pwG8PSsrWM" role="3cqZAp">
+              <node concept="Xl_RD" id="3pwG8PSssf3" role="3cqZAk">
+                <property role="Xl_RC" value="" />
               </node>
             </node>
-            <node concept="3clFbJ" id="6d0zIQxdjdR" role="3cqZAp">
-              <node concept="3clFbS" id="6d0zIQxdjdT" role="3clFbx">
-                <node concept="3clFbF" id="6d0zIQxdGGv" role="3cqZAp">
-                  <node concept="37vLTI" id="6d0zIQxdHHc" role="3clFbG">
-                    <node concept="37vLTw" id="6d0zIQxdGGt" role="37vLTJ">
-                      <ref role="3cqZAo" node="6d0zIQxdhDj" resolve="c" />
-                    </node>
-                    <node concept="2ShNRf" id="6d0zIQxdp7Z" role="37vLTx">
-                      <node concept="1pGfFk" id="6d0zIQxdqy8" role="2ShVmc">
-                        <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;(int)" resolve="ArrayList" />
-                        <node concept="3uibUv" id="6d0zIQxdr8q" role="1pMfVU">
-                          <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
-                        </node>
-                        <node concept="3cmrfG" id="6d0zIQxdrYn" role="37wK5m">
-                          <property role="3cmrfH" value="4" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="3pwG8PSq77f" role="3cqZAp">
-                  <node concept="2OqwBi" id="3pwG8PSq7d5" role="3clFbG">
-                    <node concept="37vLTw" id="3pwG8PSq77d" role="2Oq$k0">
-                      <ref role="3cqZAo" node="3pwG8PSpQW0" resolve="groups" />
-                    </node>
-                    <node concept="liA8E" id="3pwG8PSq8w0" role="2OqNvi">
-                      <ref role="37wK5l" to="33ny:~TreeMap.put(java.lang.Object,java.lang.Object)" resolve="put" />
-                      <node concept="37vLTw" id="3pwG8PSq8zq" role="37wK5m">
-                        <ref role="3cqZAo" node="3pwG8PSq6Q3" resolve="groupName" />
-                      </node>
-                      <node concept="37vLTw" id="6d0zIQxdJRj" role="37wK5m">
-                        <ref role="3cqZAo" node="6d0zIQxdhDj" resolve="c" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
+          </node>
+          <node concept="3clFbC" id="3pwG8PSsrTY" role="3clFbw">
+            <node concept="10Nm6u" id="3pwG8PSsrWc" role="3uHU7w" />
+            <node concept="37vLTw" id="3pwG8PSsrGf" role="3uHU7B">
+              <ref role="3cqZAo" node="3pwG8PSsoLz" resolve="text" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="3pwG8PSsqXD" role="3cqZAp" />
+        <node concept="3cpWs8" id="3pwG8PSsv5W" role="3cqZAp">
+          <node concept="3cpWsn" id="3pwG8PSsv5X" role="3cpWs9">
+            <property role="TrG5h" value="separatorPosition" />
+            <node concept="10Oyi0" id="3pwG8PSsv5O" role="1tU5fm" />
+            <node concept="2OqwBi" id="3pwG8PSsv5Y" role="33vP2m">
+              <node concept="37vLTw" id="3pwG8PSsv5Z" role="2Oq$k0">
+                <ref role="3cqZAo" node="3pwG8PSsoLz" resolve="text" />
               </node>
-              <node concept="3clFbC" id="6d0zIQxdk8o" role="3clFbw">
-                <node concept="10Nm6u" id="6d0zIQxdkel" role="3uHU7w" />
-                <node concept="37vLTw" id="6d0zIQxdjoW" role="3uHU7B">
-                  <ref role="3cqZAo" node="6d0zIQxdhDj" resolve="c" />
+              <node concept="liA8E" id="3pwG8PSsv60" role="2OqNvi">
+                <ref role="37wK5l" to="wyt6:~String.indexOf(java.lang.String)" resolve="indexOf" />
+                <node concept="Xl_RD" id="3pwG8PSsv61" role="37wK5m">
+                  <property role="Xl_RC" value=":" />
                 </node>
               </node>
             </node>
-            <node concept="3clFbF" id="6d0zIQxdlsG" role="3cqZAp">
-              <node concept="2OqwBi" id="6d0zIQxdmm7" role="3clFbG">
-                <node concept="37vLTw" id="6d0zIQxdlsE" role="2Oq$k0">
-                  <ref role="3cqZAo" node="6d0zIQxdhDj" resolve="c" />
+          </node>
+        </node>
+        <node concept="3clFbJ" id="3pwG8PSsw$H" role="3cqZAp">
+          <node concept="3clFbS" id="3pwG8PSsw$J" role="3clFbx">
+            <node concept="3cpWs6" id="3pwG8PSsxQ$" role="3cqZAp">
+              <node concept="Xl_RD" id="3pwG8PSsybc" role="3cqZAk" />
+            </node>
+          </node>
+          <node concept="3eOVzh" id="3pwG8PSsxLI" role="3clFbw">
+            <node concept="3cmrfG" id="3pwG8PSsxLV" role="3uHU7w">
+              <property role="3cmrfH" value="0" />
+            </node>
+            <node concept="37vLTw" id="3pwG8PSsx1b" role="3uHU7B">
+              <ref role="3cqZAo" node="3pwG8PSsv5X" resolve="separatorPosition" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="3pwG8PSsw8P" role="3cqZAp" />
+        <node concept="3cpWs8" id="3pwG8PSsz1H" role="3cqZAp">
+          <node concept="3cpWsn" id="3pwG8PSsz1K" role="3cpWs9">
+            <property role="TrG5h" value="groupName" />
+            <node concept="17QB3L" id="3pwG8PSsz1F" role="1tU5fm" />
+            <node concept="2OqwBi" id="3pwG8PSszBn" role="33vP2m">
+              <node concept="37vLTw" id="3pwG8PSszxq" role="2Oq$k0">
+                <ref role="3cqZAo" node="3pwG8PSsoLz" resolve="text" />
+              </node>
+              <node concept="liA8E" id="3pwG8PSs$mC" role="2OqNvi">
+                <ref role="37wK5l" to="wyt6:~String.substring(int,int)" resolve="substring" />
+                <node concept="3cmrfG" id="3pwG8PSs$nV" role="37wK5m">
+                  <property role="3cmrfH" value="0" />
                 </node>
-                <node concept="liA8E" id="6d0zIQxdnn7" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
-                  <node concept="37vLTw" id="6d0zIQxdnDK" role="37wK5m">
-                    <ref role="3cqZAo" node="3pwG8PSq661" resolve="intentionEntry" />
-                  </node>
+                <node concept="37vLTw" id="3pwG8PSs$Ep" role="37wK5m">
+                  <ref role="3cqZAo" node="3pwG8PSsv5X" resolve="separatorPosition" />
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="2Gpval" id="3pwG8PSq979" role="3cqZAp">
-          <node concept="2GrKxI" id="3pwG8PSq97b" role="2Gsz3X">
-            <property role="TrG5h" value="entry" />
+        <node concept="3cpWs6" id="3pwG8PSs_F8" role="3cqZAp">
+          <node concept="37vLTw" id="3pwG8PSsAzu" role="3cqZAk">
+            <ref role="3cqZAo" node="3pwG8PSsz1K" resolve="groupName" />
           </node>
-          <node concept="3clFbS" id="3pwG8PSq97d" role="2LFqv$">
-            <node concept="3cpWs8" id="3pwG8PSsP9T" role="3cqZAp">
-              <node concept="3cpWsn" id="3pwG8PSsP9U" role="3cpWs9">
-                <property role="TrG5h" value="groupName" />
-                <node concept="17QB3L" id="3pwG8PSsP89" role="1tU5fm" />
-                <node concept="2OqwBi" id="3pwG8PSsP9V" role="33vP2m">
-                  <node concept="2GrUjf" id="3pwG8PSsP9W" role="2Oq$k0">
-                    <ref role="2Gs0qQ" node="3pwG8PSq97b" resolve="entry" />
-                  </node>
-                  <node concept="liA8E" id="3pwG8PSsP9X" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~Map$Entry.getKey()" resolve="getKey" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbJ" id="3pwG8PSsQSU" role="3cqZAp">
-              <node concept="3clFbS" id="3pwG8PSsQSW" role="3clFbx">
-                <node concept="3clFbF" id="3pwG8PSsRk6" role="3cqZAp">
-                  <node concept="2OqwBi" id="3pwG8PSsRso" role="3clFbG">
-                    <node concept="37vLTw" id="3pwG8PSsRk4" role="2Oq$k0">
-                      <ref role="3cqZAo" node="3pwG8PSpFW8" resolve="mainGroup" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="3pwG8PSsKNl" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2jDew64Pxng" role="jymVt" />
+    <node concept="2tJIrI" id="2jDew64PJHF" role="jymVt" />
+    <node concept="2tJIrI" id="2jDew64MtYH" role="jymVt" />
+    <node concept="3clFb_" id="3pwG8PSkQJj" role="jymVt">
+      <property role="TrG5h" value="getIntentionGroup" />
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <node concept="37vLTG" id="3pwG8PSkQJk" role="3clF46">
+        <property role="TrG5h" value="intention" />
+        <property role="3TUv4t" value="true" />
+        <node concept="3uibUv" id="7me2y0SLESH" role="1tU5fm">
+          <ref role="3uigEE" to="nddn:~IntentionExecutable" resolve="IntentionExecutable" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="3pwG8PSkQJm" role="3clF46">
+        <property role="TrG5h" value="node" />
+        <property role="3TUv4t" value="true" />
+        <node concept="3uibUv" id="3pwG8PSkQJn" role="1tU5fm">
+          <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="3pwG8PSkQJo" role="3clF47">
+        <node concept="3cpWs8" id="3pwG8PSkQJq" role="3cqZAp">
+          <node concept="3cpWsn" id="3pwG8PSkQJp" role="3cpWs9">
+            <property role="3TUv4t" value="false" />
+            <property role="TrG5h" value="icon" />
+            <node concept="2OqwBi" id="7me2y0SMyAM" role="33vP2m">
+              <node concept="2ShNRf" id="7me2y0SM63f" role="2Oq$k0">
+                <node concept="1pGfFk" id="7me2y0SMxVT" role="2ShVmc">
+                  <ref role="37wK5l" to="8b49:~IntentionIconProvider.&lt;init&gt;(jetbrains.mps.openapi.intentions.Kind)" resolve="IntentionIconProvider" />
+                  <node concept="2OqwBi" id="7me2y0SMyaH" role="37wK5m">
+                    <node concept="2OqwBi" id="7me2y0SMy0s" role="2Oq$k0">
+                      <node concept="37vLTw" id="7me2y0SMy0t" role="2Oq$k0">
+                        <ref role="3cqZAo" node="3pwG8PSkQJk" resolve="intention" />
+                      </node>
+                      <node concept="liA8E" id="7me2y0SMy0u" role="2OqNvi">
+                        <ref role="37wK5l" to="nddn:~IntentionExecutable.getDescriptor()" resolve="getDescriptor" />
+                      </node>
                     </node>
-                    <node concept="liA8E" id="3pwG8PSsS$s" role="2OqNvi">
-                      <ref role="37wK5l" to="qkt:~DefaultActionGroup.addSeparator()" resolve="addSeparator" />
+                    <node concept="liA8E" id="7me2y0SMys1" role="2OqNvi">
+                      <ref role="37wK5l" to="nddn:~IntentionDescriptor.getKind()" resolve="getKind" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="3clFbC" id="3pwG8PSsRi_" role="3clFbw">
-                <node concept="10Nm6u" id="3pwG8PSsRjm" role="3uHU7w" />
-                <node concept="37vLTw" id="3pwG8PSsRag" role="3uHU7B">
-                  <ref role="3cqZAo" node="3pwG8PSsP9U" resolve="groupName" />
-                </node>
+              <node concept="liA8E" id="7me2y0SM$LE" role="2OqNvi">
+                <ref role="37wK5l" to="8b49:~IntentionIconProvider.getIcon()" resolve="getIcon" />
               </node>
-              <node concept="9aQIb" id="3pwG8PSsSOD" role="9aQIa">
-                <node concept="3clFbS" id="3pwG8PSsSOE" role="9aQI4">
-                  <node concept="3clFbF" id="3pwG8PSrWaY" role="3cqZAp">
-                    <node concept="2OqwBi" id="3pwG8PSrW$C" role="3clFbG">
-                      <node concept="37vLTw" id="3pwG8PSrWaW" role="2Oq$k0">
-                        <ref role="3cqZAo" node="3pwG8PSpFW8" resolve="mainGroup" />
-                      </node>
-                      <node concept="liA8E" id="3pwG8PSrYWm" role="2OqNvi">
-                        <ref role="37wK5l" to="qkt:~DefaultActionGroup.addSeparator(java.lang.String)" resolve="addSeparator" />
-                        <node concept="37vLTw" id="3pwG8PSsP9Y" role="37wK5m">
-                          <ref role="3cqZAo" node="3pwG8PSsP9U" resolve="groupName" />
-                        </node>
-                      </node>
-                    </node>
+            </node>
+            <node concept="3uibUv" id="3pwG8PSkQJr" role="1tU5fm">
+              <ref role="3uigEE" to="dxuu:~Icon" resolve="Icon" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="3pwG8PSkQJy" role="3cqZAp">
+          <node concept="3cpWsn" id="3pwG8PSkQJx" role="3cpWs9">
+            <property role="3TUv4t" value="false" />
+            <property role="TrG5h" value="text" />
+            <node concept="17QB3L" id="4gYVSgE4$2b" role="1tU5fm" />
+            <node concept="2OqwBi" id="3pwG8PSkU2o" role="33vP2m">
+              <node concept="37vLTw" id="3pwG8PSkU2n" role="2Oq$k0">
+                <ref role="3cqZAo" node="3pwG8PSkQJk" resolve="intention" />
+              </node>
+              <node concept="liA8E" id="3pwG8PSkU2p" role="2OqNvi">
+                <ref role="37wK5l" to="nddn:~IntentionExecutable.getDescription(org.jetbrains.mps.openapi.model.SNode,jetbrains.mps.openapi.editor.EditorContext)" resolve="getDescription" />
+                <node concept="37vLTw" id="3pwG8PSkQJ_" role="37wK5m">
+                  <ref role="3cqZAo" node="3pwG8PSkQJm" resolve="node" />
+                </node>
+                <node concept="2OqwBi" id="3pwG8PSkU2t" role="37wK5m">
+                  <node concept="37vLTw" id="3pwG8PSkU2s" role="2Oq$k0">
+                    <ref role="3cqZAo" node="2jDew64KOaH" resolve="editor" />
+                  </node>
+                  <node concept="liA8E" id="3pwG8PSkU2u" role="2OqNvi">
+                    <ref role="37wK5l" to="exr9:~EditorComponent.getEditorContext()" resolve="getEditorContext" />
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3cpWs8" id="6d0zIQxdw_7" role="3cqZAp">
-              <node concept="3cpWsn" id="6d0zIQxdw_d" role="3cpWs9">
-                <property role="TrG5h" value="toSortCopy" />
-                <node concept="3uibUv" id="6d0zIQxdw_f" role="1tU5fm">
-                  <ref role="3uigEE" to="33ny:~ArrayList" resolve="ArrayList" />
-                  <node concept="3uibUv" id="6d0zIQxdwSN" role="11_B2D">
-                    <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
-                  </node>
-                </node>
-                <node concept="2ShNRf" id="6d0zIQxdxzC" role="33vP2m">
-                  <node concept="1pGfFk" id="6d0zIQxdyLJ" role="2ShVmc">
-                    <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;(java.util.Collection)" resolve="ArrayList" />
-                    <node concept="2OqwBi" id="3pwG8PSsUXK" role="37wK5m">
-                      <node concept="2GrUjf" id="3pwG8PSsUO1" role="2Oq$k0">
-                        <ref role="2Gs0qQ" node="3pwG8PSq97b" resolve="entry" />
-                      </node>
-                      <node concept="liA8E" id="3pwG8PSsZrb" role="2OqNvi">
-                        <ref role="37wK5l" to="33ny:~Map$Entry.getValue()" resolve="getValue" />
-                      </node>
-                    </node>
-                    <node concept="3uibUv" id="6d0zIQxdyZ8" role="1pMfVU">
-                      <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
-                    </node>
-                  </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="3pwG8PSkQJC" role="3cqZAp">
+          <node concept="3cpWsn" id="3pwG8PSkQJB" role="3cpWs9">
+            <property role="3TUv4t" value="false" />
+            <property role="TrG5h" value="intentionActions" />
+            <node concept="3uibUv" id="3pwG8PSkQJD" role="1tU5fm">
+              <ref role="3uigEE" to="33ny:~List" resolve="List" />
+              <node concept="3uibUv" id="3pwG8PSkQJE" role="11_B2D">
+                <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
+              </node>
+            </node>
+            <node concept="2ShNRf" id="3pwG8PSkU2v" role="33vP2m">
+              <node concept="1pGfFk" id="3pwG8PSkU2w" role="2ShVmc">
+                <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;()" resolve="ArrayList" />
+                <node concept="3uibUv" id="3pwG8PSkQJG" role="1pMfVU">
+                  <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
                 </node>
               </node>
             </node>
-            <node concept="3clFbF" id="6d0zIQxdB5n" role="3cqZAp">
-              <node concept="2OqwBi" id="6d0zIQxdCWf" role="3clFbG">
-                <node concept="37vLTw" id="6d0zIQxdB5l" role="2Oq$k0">
-                  <ref role="3cqZAo" node="6d0zIQxdw_d" resolve="toSortCopy" />
+          </node>
+        </node>
+        <node concept="3clFbH" id="2jDew64Olos" role="3cqZAp" />
+        <node concept="1DcWWT" id="3pwG8PSkQJH" role="3cqZAp">
+          <node concept="3cpWsn" id="3pwG8PSkQJU" role="1Duv9x">
+            <property role="3TUv4t" value="false" />
+            <property role="TrG5h" value="provider" />
+            <node concept="3uibUv" id="3pwG8PSkQJW" role="1tU5fm">
+              <ref role="3uigEE" to="exr9:~IntentionActionsProvider" resolve="IntentionActionsProvider" />
+            </node>
+          </node>
+          <node concept="3clFbS" id="3pwG8PSkQJJ" role="2LFqv$">
+            <node concept="1DcWWT" id="3pwG8PSkQJK" role="3cqZAp">
+              <node concept="2OqwBi" id="3pwG8PSkU2E" role="1DdaDG">
+                <node concept="37vLTw" id="3pwG8PSkU2D" role="2Oq$k0">
+                  <ref role="3cqZAo" node="3pwG8PSkQJU" resolve="provider" />
                 </node>
-                <node concept="liA8E" id="6d0zIQxdEwl" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~ArrayList.sort(java.util.Comparator)" resolve="sort" />
-                  <node concept="2ShNRf" id="6d0zIQxdERJ" role="37wK5m">
-                    <node concept="1pGfFk" id="6d0zIQxdGfd" role="2ShVmc">
-                      <ref role="37wK5l" to="18ew:~ToStringComparator.&lt;init&gt;()" resolve="ToStringComparator" />
-                    </node>
+                <node concept="liA8E" id="3pwG8PSkU2F" role="2OqNvi">
+                  <ref role="37wK5l" to="exr9:~IntentionActionsProvider.getIntentionActions(jetbrains.mps.openapi.intentions.IntentionExecutable)" resolve="getIntentionActions" />
+                  <node concept="37vLTw" id="3pwG8PSkQJT" role="37wK5m">
+                    <ref role="3cqZAo" node="3pwG8PSkQJk" resolve="intention" />
                   </node>
                 </node>
               </node>
-            </node>
-            <node concept="3clFbF" id="3pwG8PSsT8s" role="3cqZAp">
-              <node concept="2OqwBi" id="3pwG8PSsTyo" role="3clFbG">
-                <node concept="37vLTw" id="3pwG8PSsT8q" role="2Oq$k0">
-                  <ref role="3cqZAo" node="3pwG8PSpFW8" resolve="mainGroup" />
+              <node concept="3cpWsn" id="3pwG8PSkQJP" role="1Duv9x">
+                <property role="3TUv4t" value="false" />
+                <property role="TrG5h" value="action" />
+                <node concept="3uibUv" id="3pwG8PSkQJR" role="1tU5fm">
+                  <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
                 </node>
-                <node concept="liA8E" id="3pwG8PSsUEs" role="2OqNvi">
-                  <ref role="37wK5l" to="qkt:~DefaultActionGroup.addAll(java.util.Collection)" resolve="addAll" />
-                  <node concept="37vLTw" id="6d0zIQxd$x4" role="37wK5m">
-                    <ref role="3cqZAo" node="6d0zIQxdw_d" resolve="toSortCopy" />
+              </node>
+              <node concept="3clFbS" id="3pwG8PSkQJO" role="2LFqv$">
+                <node concept="3clFbF" id="3pwG8PSkQJL" role="3cqZAp">
+                  <node concept="2OqwBi" id="3pwG8PSkU2J" role="3clFbG">
+                    <node concept="37vLTw" id="3pwG8PSkU2I" role="2Oq$k0">
+                      <ref role="3cqZAo" node="3pwG8PSkQJB" resolve="intentionActions" />
+                    </node>
+                    <node concept="liA8E" id="3pwG8PSkU2K" role="2OqNvi">
+                      <ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
+                      <node concept="37vLTw" id="3pwG8PSkQJN" role="37wK5m">
+                        <ref role="3cqZAo" node="3pwG8PSkQJP" resolve="action" />
+                      </node>
+                    </node>
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3clFbH" id="3pwG8PSsQnD" role="3cqZAp" />
-            <node concept="1X3_iC" id="29L9c1qbY70" role="lGtFl">
-              <property role="3V$3am" value="statement" />
-              <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-              <node concept="3cpWs8" id="3pwG8PSqaXY" role="8Wnug">
-                <node concept="3cpWsn" id="3pwG8PSqaXZ" role="3cpWs9">
-                  <property role="TrG5h" value="group" />
-                  <node concept="3uibUv" id="3pwG8PSr17O" role="1tU5fm">
+          </node>
+          <node concept="2OqwBi" id="2jDew64Oo0h" role="1DdaDG">
+            <node concept="10M0yZ" id="2jDew64Olov" role="2Oq$k0">
+              <ref role="1PxDUh" to="exr9:~IntentionActionsProvider" resolve="IntentionActionsProvider" />
+              <ref role="3cqZAo" to="exr9:~IntentionActionsProvider.EP_NAME" resolve="EP_NAME" />
+            </node>
+            <node concept="liA8E" id="2jDew64OqE7" role="2OqNvi">
+              <ref role="37wK5l" to="9ti4:~ExtensionPointName.getExtensions()" resolve="getExtensions" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="3pwG8PSkQJZ" role="3cqZAp">
+          <node concept="2OqwBi" id="3pwG8PSkU2O" role="3clFbw">
+            <node concept="37vLTw" id="3pwG8PSkU2N" role="2Oq$k0">
+              <ref role="3cqZAo" node="3pwG8PSkQJB" resolve="intentionActions" />
+            </node>
+            <node concept="liA8E" id="3pwG8PSkU2P" role="2OqNvi">
+              <ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
+            </node>
+          </node>
+          <node concept="9aQIb" id="3pwG8PSkQKq" role="9aQIa">
+            <node concept="3clFbS" id="3pwG8PSkQKr" role="9aQI4">
+              <node concept="3cpWs8" id="3pwG8PSkQKt" role="3cqZAp">
+                <node concept="3cpWsn" id="3pwG8PSkQKs" role="3cpWs9">
+                  <property role="3TUv4t" value="false" />
+                  <property role="TrG5h" value="intentionActionGroup" />
+                  <node concept="3uibUv" id="3pwG8PSkQKu" role="1tU5fm">
                     <ref role="3uigEE" to="qkt:~DefaultActionGroup" resolve="DefaultActionGroup" />
                   </node>
-                  <node concept="2ShNRf" id="3pwG8PSqb2H" role="33vP2m">
-                    <node concept="1pGfFk" id="3pwG8PSrV5j" role="2ShVmc">
-                      <ref role="37wK5l" to="qkt:~DefaultActionGroup.&lt;init&gt;(java.lang.String,boolean)" resolve="DefaultActionGroup" />
-                      <node concept="37vLTw" id="3pwG8PSsP9Z" role="37wK5m">
-                        <ref role="3cqZAo" node="3pwG8PSsP9U" resolve="groupName" />
-                      </node>
-                      <node concept="3clFbT" id="3pwG8PSqUa9" role="37wK5m">
-                        <property role="3clFbU" value="true" />
-                      </node>
+                  <node concept="1rXfSq" id="2xgTENkWs2P" role="33vP2m">
+                    <ref role="37wK5l" node="2xgTENkWs2J" resolve="createIntentionActionGroup" />
+                    <node concept="37vLTw" id="2xgTENkWs2M" role="37wK5m">
+                      <ref role="3cqZAo" node="3pwG8PSkQJm" resolve="node" />
+                    </node>
+                    <node concept="37vLTw" id="2xgTENkWs2N" role="37wK5m">
+                      <ref role="3cqZAo" node="3pwG8PSkQJk" resolve="intention" />
+                    </node>
+                    <node concept="37vLTw" id="2xgTENkWs2O" role="37wK5m">
+                      <ref role="3cqZAo" node="3pwG8PSkQJx" resolve="text" />
                     </node>
                   </node>
                 </node>
               </node>
-            </node>
-            <node concept="1X3_iC" id="29L9c1qbY71" role="lGtFl">
-              <property role="3V$3am" value="statement" />
-              <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-              <node concept="3clFbF" id="3pwG8PSqklM" role="8Wnug">
-                <node concept="2OqwBi" id="3pwG8PSqkt_" role="3clFbG">
-                  <node concept="37vLTw" id="3pwG8PSqklL" role="2Oq$k0">
-                    <ref role="3cqZAo" node="3pwG8PSqaXZ" resolve="group" />
+              <node concept="3clFbF" id="3pwG8PSkQKT" role="3cqZAp">
+                <node concept="2OqwBi" id="3pwG8PSkU2T" role="3clFbG">
+                  <node concept="37vLTw" id="3pwG8PSkU2S" role="2Oq$k0">
+                    <ref role="3cqZAo" node="3pwG8PSkQKs" resolve="intentionActionGroup" />
                   </node>
-                  <node concept="liA8E" id="3pwG8PSqlAD" role="2OqNvi">
+                  <node concept="liA8E" id="3pwG8PSkU2U" role="2OqNvi">
                     <ref role="37wK5l" to="qkt:~DefaultActionGroup.addAll(java.util.Collection)" resolve="addAll" />
-                    <node concept="2OqwBi" id="3pwG8PSt32j" role="37wK5m">
-                      <node concept="2GrUjf" id="3pwG8PSt32k" role="2Oq$k0">
-                        <ref role="2Gs0qQ" node="3pwG8PSq97b" resolve="entry" />
-                      </node>
-                      <node concept="liA8E" id="3pwG8PSt32l" role="2OqNvi">
-                        <ref role="37wK5l" to="33ny:~Map$Entry.getValue()" resolve="getValue" />
-                      </node>
+                    <node concept="37vLTw" id="3pwG8PSkQKV" role="37wK5m">
+                      <ref role="3cqZAo" node="3pwG8PSkQJB" resolve="intentionActions" />
                     </node>
                   </node>
                 </node>
               </node>
-            </node>
-            <node concept="1X3_iC" id="29L9c1qbY72" role="lGtFl">
-              <property role="3V$3am" value="statement" />
-              <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-              <node concept="3clFbF" id="3pwG8PSqlWN" role="8Wnug">
-                <node concept="2OqwBi" id="3pwG8PSqmly" role="3clFbG">
-                  <node concept="37vLTw" id="3pwG8PSqlWL" role="2Oq$k0">
-                    <ref role="3cqZAo" node="3pwG8PSpFW8" resolve="mainGroup" />
+              <node concept="3clFbF" id="3pwG8PSkQKW" role="3cqZAp">
+                <node concept="2OqwBi" id="3pwG8PSkQKX" role="3clFbG">
+                  <node concept="2OqwBi" id="3pwG8PSkU2Y" role="2Oq$k0">
+                    <node concept="37vLTw" id="3pwG8PSkU2X" role="2Oq$k0">
+                      <ref role="3cqZAo" node="3pwG8PSkQKs" resolve="intentionActionGroup" />
+                    </node>
+                    <node concept="liA8E" id="3pwG8PSkU2Z" role="2OqNvi">
+                      <ref role="37wK5l" to="qkt:~AnAction.getTemplatePresentation()" resolve="getTemplatePresentation" />
+                    </node>
                   </node>
-                  <node concept="liA8E" id="3pwG8PSqntt" role="2OqNvi">
-                    <ref role="37wK5l" to="qkt:~DefaultActionGroup.add(com.intellij.openapi.actionSystem.AnAction)" resolve="add" />
-                    <node concept="37vLTw" id="3pwG8PSqnxR" role="37wK5m">
-                      <ref role="3cqZAo" node="3pwG8PSqaXZ" resolve="group" />
+                  <node concept="liA8E" id="3pwG8PSkQKZ" role="2OqNvi">
+                    <ref role="37wK5l" to="qkt:~Presentation.setIcon(javax.swing.Icon)" resolve="setIcon" />
+                    <node concept="37vLTw" id="3pwG8PSkQL0" role="37wK5m">
+                      <ref role="3cqZAo" node="3pwG8PSkQJp" resolve="icon" />
                     </node>
                   </node>
                 </node>
               </node>
-            </node>
-          </node>
-          <node concept="2OqwBi" id="3pwG8PSvpFb" role="2GsD0m">
-            <node concept="liA8E" id="3pwG8PSvsrw" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~TreeMap.entrySet()" resolve="entrySet" />
-            </node>
-            <node concept="37vLTw" id="3pwG8PSq9Cg" role="2Oq$k0">
-              <ref role="3cqZAo" node="3pwG8PSpQW0" resolve="groups" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="3pwG8PSq9nF" role="3cqZAp" />
-        <node concept="3clFbJ" id="3pwG8PSte48" role="3cqZAp">
-          <node concept="3clFbS" id="3pwG8PSte4a" role="3clFbx">
-            <node concept="3clFbF" id="3pwG8PSthDL" role="3cqZAp">
-              <node concept="2OqwBi" id="3pwG8PSthO2" role="3clFbG">
-                <node concept="37vLTw" id="3pwG8PSthDJ" role="2Oq$k0">
-                  <ref role="3cqZAo" node="3pwG8PSpFW8" resolve="mainGroup" />
-                </node>
-                <node concept="liA8E" id="3pwG8PStiW6" role="2OqNvi">
-                  <ref role="37wK5l" to="qkt:~DefaultActionGroup.addSeparator()" resolve="addSeparator" />
+              <node concept="3cpWs6" id="3pwG8PSkQL1" role="3cqZAp">
+                <node concept="37vLTw" id="3pwG8PSkQL2" role="3cqZAk">
+                  <ref role="3cqZAo" node="3pwG8PSkQKs" resolve="intentionActionGroup" />
                 </node>
               </node>
             </node>
-            <node concept="3clFbF" id="3pwG8PSpFWv" role="3cqZAp">
-              <node concept="2OqwBi" id="3pwG8PSpFWw" role="3clFbG">
-                <node concept="37vLTw" id="3pwG8PSpFWx" role="2Oq$k0">
-                  <ref role="3cqZAo" node="3pwG8PSpFW8" resolve="mainGroup" />
-                </node>
-                <node concept="liA8E" id="3pwG8PSpFWy" role="2OqNvi">
-                  <ref role="37wK5l" to="qkt:~DefaultActionGroup.addAll(java.util.Collection)" resolve="addAll" />
-                  <node concept="37vLTw" id="3pwG8PSpFWz" role="37wK5m">
-                    <ref role="3cqZAo" node="3pwG8PSpFW3" resolve="actions" />
+          </node>
+          <node concept="3clFbS" id="3pwG8PSkQK2" role="3clFbx">
+            <node concept="3cpWs6" id="3pwG8PSkQK3" role="3cqZAp">
+              <node concept="2ShNRf" id="3pwG8PSkQK4" role="3cqZAk">
+                <node concept="YeOm9" id="3pwG8PSkQK5" role="2ShVmc">
+                  <node concept="1Y3b0j" id="3pwG8PSkQK6" role="YeSDq">
+                    <property role="2bfB8j" value="true" />
+                    <property role="1sVAO0" value="false" />
+                    <property role="1EXbeo" value="false" />
+                    <ref role="1Y3XeK" to="7bx7:~BaseAction" resolve="BaseAction" />
+                    <ref role="37wK5l" to="7bx7:~BaseAction.&lt;init&gt;(java.lang.String,java.lang.String,javax.swing.Icon)" resolve="BaseAction" />
+                    <node concept="3Tm1VV" id="3pwG8PSkQK7" role="1B3o_S" />
+                    <node concept="3clFb_" id="3pwG8PSkQK8" role="jymVt">
+                      <property role="TrG5h" value="doExecute" />
+                      <property role="DiZV1" value="false" />
+                      <property role="od$2w" value="false" />
+                      <node concept="2AHcQZ" id="3pwG8PSkQK9" role="2AJF6D">
+                        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                      </node>
+                      <node concept="37vLTG" id="3pwG8PSkQKa" role="3clF46">
+                        <property role="TrG5h" value="e" />
+                        <property role="3TUv4t" value="false" />
+                        <node concept="3uibUv" id="3pwG8PSkQKb" role="1tU5fm">
+                          <ref role="3uigEE" to="qkt:~AnActionEvent" resolve="AnActionEvent" />
+                        </node>
+                      </node>
+                      <node concept="37vLTG" id="3pwG8PSkQKc" role="3clF46">
+                        <property role="TrG5h" value="params" />
+                        <property role="3TUv4t" value="false" />
+                        <node concept="3uibUv" id="3pwG8PSkQKd" role="1tU5fm">
+                          <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
+                          <node concept="17QB3L" id="4gYVSgE4zVR" role="11_B2D" />
+                          <node concept="3uibUv" id="3pwG8PSkQKf" role="11_B2D">
+                            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbS" id="3pwG8PSkQKg" role="3clF47">
+                        <node concept="3clFbF" id="3pwG8PSkQKh" role="3cqZAp">
+                          <node concept="1rXfSq" id="3pwG8PSkQKi" role="3clFbG">
+                            <ref role="37wK5l" node="2jDew64RVuQ" resolve="executeIntention" />
+                            <node concept="37vLTw" id="3pwG8PSkQKj" role="37wK5m">
+                              <ref role="3cqZAo" node="3pwG8PSkQJk" resolve="intention" />
+                            </node>
+                            <node concept="37vLTw" id="3pwG8PSkQKk" role="37wK5m">
+                              <ref role="3cqZAo" node="3pwG8PSkQJm" resolve="node" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3Tmbuc" id="3pwG8PSkQKl" role="1B3o_S" />
+                      <node concept="3cqZAl" id="3pwG8PSkQKm" role="3clF45" />
+                    </node>
+                    <node concept="37vLTw" id="3pwG8PSkQKn" role="37wK5m">
+                      <ref role="3cqZAo" node="3pwG8PSkQJx" resolve="text" />
+                    </node>
+                    <node concept="10Nm6u" id="3pwG8PSkQKo" role="37wK5m" />
+                    <node concept="37vLTw" id="3pwG8PSkQKp" role="37wK5m">
+                      <ref role="3cqZAo" node="3pwG8PSkQJp" resolve="icon" />
+                    </node>
                   </node>
                 </node>
               </node>
             </node>
           </node>
-          <node concept="3fqX7Q" id="3pwG8PStgRO" role="3clFbw">
-            <node concept="2OqwBi" id="3pwG8PStgRQ" role="3fr31v">
-              <node concept="37vLTw" id="3pwG8PStgRR" role="2Oq$k0">
-                <ref role="3cqZAo" node="3pwG8PSpFW3" resolve="actions" />
-              </node>
-              <node concept="liA8E" id="3pwG8PStgRS" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs6" id="3pwG8PSpFW$" role="3cqZAp">
-          <node concept="37vLTw" id="3pwG8PSpFW_" role="3cqZAk">
-            <ref role="3cqZAo" node="3pwG8PSpFW8" resolve="mainGroup" />
-          </node>
         </node>
       </node>
-      <node concept="2AHcQZ" id="3pwG8PSpGoa" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      <node concept="3Tmbuc" id="3pwG8PSomJ5" role="1B3o_S" />
+      <node concept="3uibUv" id="3pwG8PSkQL4" role="3clF45">
+        <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
       </node>
     </node>
-    <node concept="2tJIrI" id="3pwG8PSpFSO" role="jymVt" />
-    <node concept="3clFb_" id="3pwG8PSpGSr" role="jymVt">
-      <property role="TrG5h" value="getGroupName" />
-      <node concept="37vLTG" id="3pwG8PSpHHh" role="3clF46">
-        <property role="TrG5h" value="action" />
-        <node concept="3uibUv" id="3pwG8PSpHTA" role="1tU5fm">
-          <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
-        </node>
+    <node concept="2tJIrI" id="2jDew64O_lP" role="jymVt" />
+    <node concept="3clFb_" id="2xgTENkWs2J" role="jymVt">
+      <property role="TrG5h" value="createIntentionActionGroup" />
+      <node concept="3Tmbuc" id="2xgTENkWs2K" role="1B3o_S" />
+      <node concept="3uibUv" id="2xgTENkWy9Z" role="3clF45">
+        <ref role="3uigEE" to="qkt:~DefaultActionGroup" resolve="DefaultActionGroup" />
       </node>
-      <node concept="17QB3L" id="3pwG8PSpHC0" role="3clF45" />
-      <node concept="3Tmbuc" id="3pwG8PSqo2G" role="1B3o_S" />
-      <node concept="3clFbS" id="3pwG8PSpGSv" role="3clF47">
-        <node concept="3clFbJ" id="2xgTENkV5Ei" role="3cqZAp">
-          <node concept="3clFbS" id="2xgTENkV5Ek" role="3clFbx">
-            <node concept="3cpWs6" id="2xgTENkV7jA" role="3cqZAp">
-              <node concept="2OqwBi" id="2xgTENkV8gI" role="3cqZAk">
-                <node concept="1eOMI4" id="2xgTENkV7DH" role="2Oq$k0">
-                  <node concept="10QFUN" id="2xgTENkV7DE" role="1eOMHV">
-                    <node concept="3uibUv" id="2xgTENkV7DJ" role="10QFUM">
-                      <ref role="3uigEE" node="2xgTENkSGPx" resolve="IntentionsMenuWithGroups.IntentionActionGroup" />
-                    </node>
-                    <node concept="37vLTw" id="2xgTENkV7DK" role="10QFUP">
-                      <ref role="3cqZAo" node="3pwG8PSpHHh" resolve="action" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="liA8E" id="2xgTENkV9CR" role="2OqNvi">
-                  <ref role="37wK5l" node="2xgTENkUI_8" resolve="getGroupName" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2ZW3vV" id="2xgTENkV6Ko" role="3clFbw">
-            <node concept="3uibUv" id="2xgTENkV7fT" role="2ZW6by">
-              <ref role="3uigEE" node="2xgTENkSGPx" resolve="IntentionsMenuWithGroups.IntentionActionGroup" />
-            </node>
-            <node concept="37vLTw" id="2xgTENkV6ay" role="2ZW6bz">
-              <ref role="3cqZAo" node="3pwG8PSpHHh" resolve="action" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="2xgTENkV5at" role="3cqZAp" />
-        <node concept="3cpWs8" id="3pwG8PSsoLy" role="3cqZAp">
-          <node concept="3cpWsn" id="3pwG8PSsoLz" role="3cpWs9">
-            <property role="TrG5h" value="text" />
-            <node concept="17QB3L" id="3pwG8PSspYn" role="1tU5fm" />
-            <node concept="2OqwBi" id="3pwG8PSsoL$" role="33vP2m">
-              <node concept="2OqwBi" id="3pwG8PSsoL_" role="2Oq$k0">
-                <node concept="37vLTw" id="3pwG8PSsoLA" role="2Oq$k0">
-                  <ref role="3cqZAo" node="3pwG8PSpHHh" resolve="action" />
-                </node>
-                <node concept="liA8E" id="3pwG8PSsoLB" role="2OqNvi">
-                  <ref role="37wK5l" to="qkt:~AnAction.getTemplatePresentation()" resolve="getTemplatePresentation" />
-                </node>
-              </node>
-              <node concept="liA8E" id="3pwG8PSsoLC" role="2OqNvi">
-                <ref role="37wK5l" to="qkt:~Presentation.getText()" resolve="getText" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbJ" id="3pwG8PSsrmI" role="3cqZAp">
-          <node concept="3clFbS" id="3pwG8PSsrmK" role="3clFbx">
-            <node concept="3cpWs6" id="3pwG8PSsrWM" role="3cqZAp">
-              <node concept="Xl_RD" id="3pwG8PSssf3" role="3cqZAk">
-                <property role="Xl_RC" value="" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbC" id="3pwG8PSsrTY" role="3clFbw">
-            <node concept="10Nm6u" id="3pwG8PSsrWc" role="3uHU7w" />
-            <node concept="37vLTw" id="3pwG8PSsrGf" role="3uHU7B">
-              <ref role="3cqZAo" node="3pwG8PSsoLz" resolve="text" />
+      <node concept="37vLTG" id="2xgTENkWs0j" role="3clF46">
+        <property role="TrG5h" value="node" />
+        <property role="3TUv4t" value="true" />
+        <node concept="3uibUv" id="2xgTENkWs0k" role="1tU5fm">
+          <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="2xgTENkWs0l" role="3clF46">
+        <property role="TrG5h" value="intention" />
+        <property role="3TUv4t" value="true" />
+        <node concept="3uibUv" id="7me2y0SMO4G" role="1tU5fm">
+          <ref role="3uigEE" to="nddn:~IntentionExecutable" resolve="IntentionExecutable" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="2xgTENkWs0n" role="3clF46">
+        <property role="TrG5h" value="text" />
+        <node concept="17QB3L" id="2xgTENkWzuN" role="1tU5fm" />
+      </node>
+      <node concept="3clFbS" id="2xgTENkWrX_" role="3clF47">
+        <node concept="3cpWs8" id="2xgTENkX278" role="3cqZAp">
+          <node concept="3cpWsn" id="2xgTENkX279" role="3cpWs9">
+            <property role="TrG5h" value="groupText" />
+            <node concept="17QB3L" id="2xgTENkX27a" role="1tU5fm" />
+            <node concept="Xl_RD" id="2xgTENkX27b" role="33vP2m">
+              <property role="Xl_RC" value="" />
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="3pwG8PSsqXD" role="3cqZAp" />
-        <node concept="3cpWs8" id="3pwG8PSsv5W" role="3cqZAp">
-          <node concept="3cpWsn" id="3pwG8PSsv5X" role="3cpWs9">
-            <property role="TrG5h" value="separatorPosition" />
-            <node concept="10Oyi0" id="3pwG8PSsv5O" role="1tU5fm" />
-            <node concept="2OqwBi" id="3pwG8PSsv5Y" role="33vP2m">
-              <node concept="37vLTw" id="3pwG8PSsv5Z" role="2Oq$k0">
-                <ref role="3cqZAo" node="3pwG8PSsoLz" resolve="text" />
+        <node concept="3cpWs8" id="2xgTENkX27c" role="3cqZAp">
+          <node concept="3cpWsn" id="2xgTENkX27d" role="3cpWs9">
+            <property role="TrG5h" value="separatorPos" />
+            <node concept="10Oyi0" id="2xgTENkX27e" role="1tU5fm" />
+            <node concept="2OqwBi" id="2xgTENkX27f" role="33vP2m">
+              <node concept="37vLTw" id="2xgTENkX27g" role="2Oq$k0">
+                <ref role="3cqZAo" node="2xgTENkWs0n" resolve="text" />
               </node>
-              <node concept="liA8E" id="3pwG8PSsv60" role="2OqNvi">
+              <node concept="liA8E" id="2xgTENkX27h" role="2OqNvi">
                 <ref role="37wK5l" to="wyt6:~String.indexOf(java.lang.String)" resolve="indexOf" />
-                <node concept="Xl_RD" id="3pwG8PSsv61" role="37wK5m">
+                <node concept="Xl_RD" id="2xgTENkX27i" role="37wK5m">
                   <property role="Xl_RC" value=":" />
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbJ" id="3pwG8PSsw$H" role="3cqZAp">
-          <node concept="3clFbS" id="3pwG8PSsw$J" role="3clFbx">
-            <node concept="3cpWs6" id="3pwG8PSsxQ$" role="3cqZAp">
-              <node concept="Xl_RD" id="3pwG8PSsybc" role="3cqZAk" />
+        <node concept="3clFbJ" id="2xgTENkX27j" role="3cqZAp">
+          <node concept="3clFbS" id="2xgTENkX27k" role="3clFbx">
+            <node concept="3clFbF" id="2xgTENkX27l" role="3cqZAp">
+              <node concept="37vLTI" id="2xgTENkX27m" role="3clFbG">
+                <node concept="2OqwBi" id="2xgTENkX27n" role="37vLTx">
+                  <node concept="37vLTw" id="2xgTENkX27o" role="2Oq$k0">
+                    <ref role="3cqZAo" node="2xgTENkWs0n" resolve="text" />
+                  </node>
+                  <node concept="liA8E" id="2xgTENkX27p" role="2OqNvi">
+                    <ref role="37wK5l" to="wyt6:~String.substring(int,int)" resolve="substring" />
+                    <node concept="3cmrfG" id="2xgTENkX27q" role="37wK5m">
+                      <property role="3cmrfH" value="0" />
+                    </node>
+                    <node concept="37vLTw" id="2xgTENkX27r" role="37wK5m">
+                      <ref role="3cqZAo" node="2xgTENkX27d" resolve="separatorPos" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="37vLTw" id="2xgTENkX27s" role="37vLTJ">
+                  <ref role="3cqZAo" node="2xgTENkX279" resolve="groupText" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="2xgTENkX27t" role="3cqZAp">
+              <node concept="37vLTI" id="2xgTENkX27u" role="3clFbG">
+                <node concept="2OqwBi" id="2xgTENkX27v" role="37vLTx">
+                  <node concept="2OqwBi" id="2xgTENkX27w" role="2Oq$k0">
+                    <node concept="37vLTw" id="2xgTENkX27x" role="2Oq$k0">
+                      <ref role="3cqZAo" node="2xgTENkWs0n" resolve="text" />
+                    </node>
+                    <node concept="liA8E" id="2xgTENkX27y" role="2OqNvi">
+                      <ref role="37wK5l" to="wyt6:~String.substring(int)" resolve="substring" />
+                      <node concept="3cpWs3" id="2xgTENkX27z" role="37wK5m">
+                        <node concept="3cmrfG" id="2xgTENkX27$" role="3uHU7w">
+                          <property role="3cmrfH" value="1" />
+                        </node>
+                        <node concept="37vLTw" id="2xgTENkX27_" role="3uHU7B">
+                          <ref role="3cqZAo" node="2xgTENkX27d" resolve="separatorPos" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="17S1cR" id="2xgTENkX27A" role="2OqNvi" />
+                </node>
+                <node concept="37vLTw" id="2xgTENkX27B" role="37vLTJ">
+                  <ref role="3cqZAo" node="2xgTENkWs0n" resolve="text" />
+                </node>
+              </node>
             </node>
           </node>
-          <node concept="3eOVzh" id="3pwG8PSsxLI" role="3clFbw">
-            <node concept="3cmrfG" id="3pwG8PSsxLV" role="3uHU7w">
+          <node concept="2d3UOw" id="2xgTENkX27C" role="3clFbw">
+            <node concept="3cmrfG" id="2xgTENkX27D" role="3uHU7w">
               <property role="3cmrfH" value="0" />
             </node>
-            <node concept="37vLTw" id="3pwG8PSsx1b" role="3uHU7B">
-              <ref role="3cqZAo" node="3pwG8PSsv5X" resolve="separatorPosition" />
+            <node concept="37vLTw" id="2xgTENkX27E" role="3uHU7B">
+              <ref role="3cqZAo" node="2xgTENkX27d" resolve="separatorPos" />
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="3pwG8PSsw8P" role="3cqZAp" />
-        <node concept="3cpWs8" id="3pwG8PSsz1H" role="3cqZAp">
-          <node concept="3cpWsn" id="3pwG8PSsz1K" role="3cpWs9">
-            <property role="TrG5h" value="groupName" />
-            <node concept="17QB3L" id="3pwG8PSsz1F" role="1tU5fm" />
-            <node concept="2OqwBi" id="3pwG8PSszBn" role="33vP2m">
-              <node concept="37vLTw" id="3pwG8PSszxq" role="2Oq$k0">
-                <ref role="3cqZAo" node="3pwG8PSsoLz" resolve="text" />
-              </node>
-              <node concept="liA8E" id="3pwG8PSs$mC" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~String.substring(int,int)" resolve="substring" />
-                <node concept="3cmrfG" id="3pwG8PSs$nV" role="37wK5m">
-                  <property role="3cmrfH" value="0" />
+        <node concept="3cpWs8" id="2xgTENkWQDG" role="3cqZAp">
+          <node concept="3cpWsn" id="2xgTENkWQDH" role="3cpWs9">
+            <property role="3TUv4t" value="false" />
+            <property role="TrG5h" value="intentionActionGroup" />
+            <node concept="3uibUv" id="2xgTENkWQDI" role="1tU5fm">
+              <ref role="3uigEE" node="2jDew64QLb0" resolve="IntentionActionGroup" />
+            </node>
+            <node concept="2ShNRf" id="2xgTENkWQDJ" role="33vP2m">
+              <node concept="1pGfFk" id="2xgTENkXaSH" role="2ShVmc">
+                <ref role="37wK5l" node="2jDew64QLbd" resolve="IntentionActionGroup" />
+                <node concept="Xjq3P" id="2jDew64Sk5w" role="37wK5m" />
+                <node concept="37vLTw" id="2xgTENkWQDN" role="37wK5m">
+                  <ref role="3cqZAo" node="2xgTENkWs0n" resolve="text" />
                 </node>
-                <node concept="37vLTw" id="3pwG8PSs$Ep" role="37wK5m">
-                  <ref role="3cqZAo" node="3pwG8PSsv5X" resolve="separatorPosition" />
+                <node concept="37vLTw" id="2xgTENkWQDO" role="37wK5m">
+                  <ref role="3cqZAo" node="2xgTENkX279" resolve="groupText" />
+                </node>
+                <node concept="3clFbT" id="2xgTENkWQDP" role="37wK5m">
+                  <property role="3clFbU" value="true" />
+                </node>
+                <node concept="37vLTw" id="2xgTENkWQDQ" role="37wK5m">
+                  <ref role="3cqZAo" node="2xgTENkWs0l" resolve="intention" />
+                </node>
+                <node concept="37vLTw" id="2xgTENkWQDR" role="37wK5m">
+                  <ref role="3cqZAo" node="2xgTENkWs0j" resolve="node" />
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3cpWs6" id="3pwG8PSs_F8" role="3cqZAp">
-          <node concept="37vLTw" id="3pwG8PSsAzu" role="3cqZAk">
-            <ref role="3cqZAo" node="3pwG8PSsz1K" resolve="groupName" />
+        <node concept="3cpWs6" id="2xgTENkX96C" role="3cqZAp">
+          <node concept="37vLTw" id="2xgTENkX9Yi" role="3cqZAk">
+            <ref role="3cqZAo" node="2xgTENkWQDH" resolve="intentionActionGroup" />
           </node>
         </node>
       </node>
-      <node concept="2AHcQZ" id="3pwG8PSsKNl" role="2AJF6D">
-        <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
-      </node>
     </node>
-    <node concept="2tJIrI" id="2xgTENkRhXD" role="jymVt" />
-    <node concept="3clFb_" id="3pZvzolpwf_" role="jymVt">
-      <property role="TrG5h" value="trimGroupNameFromActionText" />
-      <node concept="3clFbS" id="3pZvzolpwfC" role="3clF47">
-        <node concept="3clFbJ" id="3pZvzolpEqJ" role="3cqZAp">
-          <node concept="3fqX7Q" id="3pZvzolpP1r" role="3clFbw">
-            <node concept="2ZW3vV" id="3pZvzolpP1t" role="3fr31v">
-              <node concept="3uibUv" id="3pZvzolpP1u" role="2ZW6by">
-                <ref role="3uigEE" node="2xgTENkSGPx" resolve="IntentionsMenuWithGroups.IntentionActionGroup" />
+    <node concept="2tJIrI" id="2jDew64MFfM" role="jymVt" />
+    <node concept="3clFb_" id="2jDew64RVuQ" role="jymVt">
+      <property role="TrG5h" value="executeIntention" />
+      <node concept="3clFbS" id="2jDew64RVuS" role="3clF47">
+        <node concept="3cpWs8" id="2jDew64RVuT" role="3cqZAp">
+          <node concept="3cpWsn" id="2jDew64RVuU" role="3cpWs9">
+            <property role="TrG5h" value="dataContext" />
+            <node concept="3uibUv" id="2jDew64RVuV" role="1tU5fm">
+              <ref role="3uigEE" to="qkt:~DataContext" resolve="DataContext" />
+            </node>
+            <node concept="2OqwBi" id="2jDew64RVuW" role="33vP2m">
+              <node concept="2YIFZM" id="2jDew64RVuX" role="2Oq$k0">
+                <ref role="37wK5l" to="ddhc:~DataManager.getInstance()" resolve="getInstance" />
+                <ref role="1Pybhc" to="ddhc:~DataManager" resolve="DataManager" />
               </node>
-              <node concept="37vLTw" id="3pZvzolpP1v" role="2ZW6bz">
-                <ref role="3cqZAo" node="3pZvzolpzLz" resolve="action" />
+              <node concept="liA8E" id="2jDew64RVuY" role="2OqNvi">
+                <ref role="37wK5l" to="ddhc:~DataManager.getDataContext(java.awt.Component)" resolve="getDataContext" />
+                <node concept="37vLTw" id="2jDew64RVuZ" role="37wK5m">
+                  <ref role="3cqZAo" node="2jDew64KOaH" resolve="editor" />
+                </node>
               </node>
             </node>
           </node>
-          <node concept="3clFbS" id="3pZvzolpEqL" role="3clFbx">
-            <node concept="3cpWs8" id="3pZvzolqck1" role="3cqZAp">
-              <node concept="3cpWsn" id="3pZvzolqck2" role="3cpWs9">
-                <property role="TrG5h" value="text" />
-                <node concept="17QB3L" id="3pZvzolqck3" role="1tU5fm" />
-                <node concept="2OqwBi" id="3pZvzolqck4" role="33vP2m">
-                  <node concept="2OqwBi" id="3pZvzolqck5" role="2Oq$k0">
-                    <node concept="37vLTw" id="3pZvzolqck6" role="2Oq$k0">
-                      <ref role="3cqZAo" node="3pZvzolpzLz" resolve="action" />
-                    </node>
-                    <node concept="liA8E" id="3pZvzolqck7" role="2OqNvi">
-                      <ref role="37wK5l" to="qkt:~AnAction.getTemplatePresentation()" resolve="getTemplatePresentation" />
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="3pZvzolqck8" role="2OqNvi">
-                    <ref role="37wK5l" to="qkt:~Presentation.getText()" resolve="getText" />
-                  </node>
+        </node>
+        <node concept="3cpWs8" id="2jDew64RVv0" role="3cqZAp">
+          <node concept="3cpWsn" id="2jDew64RVv1" role="3cpWs9">
+            <property role="3TUv4t" value="false" />
+            <property role="TrG5h" value="project" />
+            <node concept="2OqwBi" id="2jDew64RVv2" role="33vP2m">
+              <node concept="10M0yZ" id="2jDew64RVv3" role="2Oq$k0">
+                <ref role="1PxDUh" to="qq03:~MPSCommonDataKeys" resolve="MPSCommonDataKeys" />
+                <ref role="3cqZAo" to="qq03:~MPSCommonDataKeys.MPS_PROJECT" resolve="MPS_PROJECT" />
+              </node>
+              <node concept="liA8E" id="2jDew64RVv4" role="2OqNvi">
+                <ref role="37wK5l" to="qkt:~DataKey.getData(com.intellij.openapi.actionSystem.DataContext)" resolve="getData" />
+                <node concept="37vLTw" id="2jDew64RVv5" role="37wK5m">
+                  <ref role="3cqZAo" node="2jDew64RVuU" resolve="dataContext" />
                 </node>
               </node>
             </node>
-            <node concept="3clFbJ" id="3pZvzolq8Yp" role="3cqZAp">
-              <node concept="3clFbS" id="3pZvzolq8Yr" role="3clFbx">
-                <node concept="3SKdUt" id="3pZvzolsS9j" role="3cqZAp">
-                  <node concept="1PaTwC" id="3pZvzolsS9k" role="1aUNEU">
-                    <node concept="3oM_SD" id="3pZvzolsV8k" role="1PaTwD">
-                      <property role="3oM_SC" value="add" />
-                    </node>
-                    <node concept="3oM_SD" id="3pZvzolsV8m" role="1PaTwD">
-                      <property role="3oM_SC" value="+1" />
-                    </node>
-                    <node concept="3oM_SD" id="3pZvzolsV8p" role="1PaTwD">
-                      <property role="3oM_SC" value="in" />
-                    </node>
-                    <node concept="3oM_SD" id="3pZvzolsV8C" role="1PaTwD">
-                      <property role="3oM_SC" value="substring" />
-                    </node>
-                    <node concept="3oM_SD" id="3pZvzolsV8H" role="1PaTwD">
-                      <property role="3oM_SC" value="to" />
-                    </node>
-                    <node concept="3oM_SD" id="3pZvzolsV8N" role="1PaTwD">
-                      <property role="3oM_SC" value="cut" />
-                    </node>
-                    <node concept="3oM_SD" id="3pZvzolsV8U" role="1PaTwD">
-                      <property role="3oM_SC" value="off" />
-                    </node>
-                    <node concept="3oM_SD" id="3pZvzolsV92" role="1PaTwD">
-                      <property role="3oM_SC" value="the" />
-                    </node>
-                    <node concept="3oM_SD" id="3pZvzolsV9b" role="1PaTwD">
-                      <property role="3oM_SC" value="colon" />
-                    </node>
-                    <node concept="3oM_SD" id="3pZvzolsV9l" role="1PaTwD">
-                      <property role="3oM_SC" value="after" />
-                    </node>
-                    <node concept="3oM_SD" id="3pZvzolsV9w" role="1PaTwD">
-                      <property role="3oM_SC" value="the" />
-                    </node>
-                    <node concept="3oM_SD" id="3pZvzolsV9G" role="1PaTwD">
-                      <property role="3oM_SC" value="groupName" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="3pZvzolm1oQ" role="3cqZAp">
-                  <node concept="2OqwBi" id="3pZvzolmb07" role="3clFbG">
-                    <node concept="2OqwBi" id="3pZvzolm59K" role="2Oq$k0">
-                      <node concept="37vLTw" id="3pZvzolm1oO" role="2Oq$k0">
-                        <ref role="3cqZAo" node="3pZvzolpzLz" resolve="action" />
-                      </node>
-                      <node concept="liA8E" id="3pZvzolm8FW" role="2OqNvi">
-                        <ref role="37wK5l" to="qkt:~AnAction.getTemplatePresentation()" resolve="getTemplatePresentation" />
-                      </node>
-                    </node>
-                    <node concept="liA8E" id="3pZvzolmeOD" role="2OqNvi">
-                      <ref role="37wK5l" to="qkt:~Presentation.setText(java.lang.String)" resolve="setText" />
-                      <node concept="2OqwBi" id="3pZvzolmzk3" role="37wK5m">
-                        <node concept="2OqwBi" id="3pZvzolmjWV" role="2Oq$k0">
-                          <node concept="37vLTw" id="3pZvzolmhSV" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3pZvzolqck2" resolve="text" />
-                          </node>
-                          <node concept="liA8E" id="3pZvzolmnyg" role="2OqNvi">
-                            <ref role="37wK5l" to="wyt6:~String.substring(int)" resolve="substring" />
-                            <node concept="3cpWs3" id="3pZvzolsEDU" role="37wK5m">
-                              <node concept="3cmrfG" id="3pZvzolsEJo" role="3uHU7w">
-                                <property role="3cmrfH" value="1" />
+            <node concept="3uibUv" id="2jDew64RVv6" role="1tU5fm">
+              <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="2jDew64RVv7" role="3cqZAp">
+          <node concept="3clFbC" id="2jDew64RVv8" role="3clFbw">
+            <node concept="37vLTw" id="2jDew64RVv9" role="3uHU7B">
+              <ref role="3cqZAo" node="2jDew64RVv1" resolve="project" />
+            </node>
+            <node concept="10Nm6u" id="2jDew64RVva" role="3uHU7w" />
+          </node>
+          <node concept="3clFbS" id="2jDew64RVvb" role="3clFbx">
+            <node concept="3cpWs6" id="2jDew64RVvc" role="3cqZAp" />
+          </node>
+        </node>
+        <node concept="3clFbF" id="2jDew64RVvd" role="3cqZAp">
+          <node concept="2OqwBi" id="2jDew64RVve" role="3clFbG">
+            <node concept="1rXfSq" id="2jDew64RVvf" role="2Oq$k0">
+              <ref role="37wK5l" node="3pwG8PSkQQM" resolve="getModelAccess" />
+            </node>
+            <node concept="liA8E" id="2jDew64RVvg" role="2OqNvi">
+              <ref role="37wK5l" to="lui2:~ModelAccess.executeCommandInEDT(java.lang.Runnable)" resolve="executeCommandInEDT" />
+              <node concept="2ShNRf" id="2jDew64RVvh" role="37wK5m">
+                <node concept="YeOm9" id="2jDew64RVvi" role="2ShVmc">
+                  <node concept="1Y3b0j" id="2jDew64RVvj" role="YeSDq">
+                    <property role="2bfB8j" value="true" />
+                    <property role="1sVAO0" value="false" />
+                    <property role="1EXbeo" value="false" />
+                    <ref role="1Y3XeK" to="nlpl:~EditorCommand" resolve="EditorCommand" />
+                    <ref role="37wK5l" to="nlpl:~EditorCommand.&lt;init&gt;(jetbrains.mps.openapi.editor.EditorComponent)" resolve="EditorCommand" />
+                    <node concept="3Tm1VV" id="2jDew64RVvk" role="1B3o_S" />
+                    <node concept="3clFb_" id="2jDew64RVvl" role="jymVt">
+                      <property role="TrG5h" value="doExecute" />
+                      <property role="DiZV1" value="false" />
+                      <property role="od$2w" value="false" />
+                      <node concept="2AHcQZ" id="2jDew64RVvm" role="2AJF6D">
+                        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                      </node>
+                      <node concept="3clFbS" id="2jDew64RVvn" role="3clF47">
+                        <node concept="3clFbF" id="2jDew64RVvo" role="3cqZAp">
+                          <node concept="2OqwBi" id="2jDew64RVvp" role="3clFbG">
+                            <node concept="37vLTw" id="2jDew64RVvq" role="2Oq$k0">
+                              <ref role="3cqZAo" node="2jDew64RVv$" resolve="intention" />
+                            </node>
+                            <node concept="liA8E" id="2jDew64RVvr" role="2OqNvi">
+                              <ref role="37wK5l" to="nddn:~IntentionExecutable.execute(org.jetbrains.mps.openapi.model.SNode,jetbrains.mps.openapi.editor.EditorContext)" resolve="execute" />
+                              <node concept="37vLTw" id="2jDew64RVvs" role="37wK5m">
+                                <ref role="3cqZAo" node="2jDew64RVvA" resolve="node" />
                               </node>
-                              <node concept="2OqwBi" id="3pZvzolreqn" role="3uHU7B">
-                                <node concept="37vLTw" id="3pZvzolraE$" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3pZvzolpBeb" resolve="groupName" />
+                              <node concept="2OqwBi" id="2jDew64RVvt" role="37wK5m">
+                                <node concept="37vLTw" id="2jDew64RVvu" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="2jDew64KOaH" resolve="editor" />
                                 </node>
-                                <node concept="liA8E" id="3pZvzolrhFo" role="2OqNvi">
-                                  <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
+                                <node concept="liA8E" id="2jDew64RVvv" role="2OqNvi">
+                                  <ref role="37wK5l" to="exr9:~EditorComponent.getEditorContext()" resolve="getEditorContext" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="17S1cR" id="3pZvzolmHIg" role="2OqNvi" />
                       </node>
+                      <node concept="3Tm1VV" id="2jDew64RVvw" role="1B3o_S" />
+                      <node concept="3cqZAl" id="2jDew64RVvx" role="3clF45" />
                     </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="1Wc70l" id="3pZvzolqK4g" role="3clFbw">
-                <node concept="2OqwBi" id="3pZvzolqQ0G" role="3uHU7w">
-                  <node concept="37vLTw" id="3pZvzolqMhi" role="2Oq$k0">
-                    <ref role="3cqZAo" node="3pZvzolqck2" resolve="text" />
-                  </node>
-                  <node concept="liA8E" id="3pZvzolqSjV" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~String.startsWith(java.lang.String)" resolve="startsWith" />
-                    <node concept="37vLTw" id="3pZvzolqVNv" role="37wK5m">
-                      <ref role="3cqZAo" node="3pZvzolpBeb" resolve="groupName" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="1Wc70l" id="3pZvzolqyGY" role="3uHU7B">
-                  <node concept="3y3z36" id="3pZvzolqs4n" role="3uHU7B">
-                    <node concept="37vLTw" id="3pZvzolqidM" role="3uHU7B">
-                      <ref role="3cqZAo" node="3pZvzolqck2" resolve="text" />
-                    </node>
-                    <node concept="10Nm6u" id="3pZvzolqvEd" role="3uHU7w" />
-                  </node>
-                  <node concept="2OqwBi" id="5KWvuz1uFuy" role="3uHU7w">
-                    <node concept="37vLTw" id="3pZvzolq_lp" role="2Oq$k0">
-                      <ref role="3cqZAo" node="3pZvzolpBeb" resolve="groupName" />
+                    <node concept="37vLTw" id="2jDew64RVvy" role="37wK5m">
+                      <ref role="3cqZAo" node="2jDew64KOaH" resolve="editor" />
                     </node>
-                    <node concept="17RvpY" id="5KWvuz1w10D" role="2OqNvi" />
                   </node>
                 </node>
               </node>
@@ -3430,1238 +2506,837 @@
           </node>
         </node>
       </node>
-      <node concept="3Tmbuc" id="3pZvzolps_O" role="1B3o_S" />
-      <node concept="37vLTG" id="3pZvzolpzLz" role="3clF46">
-        <property role="TrG5h" value="action" />
-        <node concept="3uibUv" id="3pZvzolpzLy" role="1tU5fm">
-          <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
+      <node concept="3cqZAl" id="2jDew64RVvz" role="3clF45" />
+      <node concept="37vLTG" id="2jDew64RVv$" role="3clF46">
+        <property role="TrG5h" value="intention" />
+        <property role="3TUv4t" value="true" />
+        <node concept="3uibUv" id="2jDew64RVv_" role="1tU5fm">
+          <ref role="3uigEE" to="nddn:~IntentionExecutable" resolve="IntentionExecutable" />
         </node>
       </node>
-      <node concept="37vLTG" id="3pZvzolpBeb" role="3clF46">
-        <property role="TrG5h" value="groupName" />
-        <node concept="17QB3L" id="3pZvzolpE5e" role="1tU5fm" />
-      </node>
-      <node concept="3cqZAl" id="3pZvzolpUMR" role="3clF45" />
-    </node>
-    <node concept="2tJIrI" id="3pZvzolpp4b" role="jymVt" />
-    <node concept="3clFb_" id="2xgTENkWOsD" role="jymVt">
-      <property role="TrG5h" value="createIntentionActionGroup" />
-      <property role="1EzhhJ" value="false" />
-      <node concept="3Tmbuc" id="2xgTENkWOsE" role="1B3o_S" />
-      <node concept="3uibUv" id="2xgTENkWOsF" role="3clF45">
-        <ref role="3uigEE" to="qkt:~DefaultActionGroup" resolve="DefaultActionGroup" />
-      </node>
-      <node concept="37vLTG" id="2xgTENkWOsG" role="3clF46">
+      <node concept="37vLTG" id="2jDew64RVvA" role="3clF46">
         <property role="TrG5h" value="node" />
         <property role="3TUv4t" value="true" />
-        <node concept="3uibUv" id="2xgTENkWOsH" role="1tU5fm">
+        <node concept="3uibUv" id="2jDew64RVvB" role="1tU5fm">
           <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
         </node>
       </node>
-      <node concept="37vLTG" id="2xgTENkWOsI" role="3clF46">
-        <property role="TrG5h" value="intention" />
-        <property role="3TUv4t" value="true" />
-        <node concept="3uibUv" id="7me2y0SMWzd" role="1tU5fm">
-          <ref role="3uigEE" to="nddn:~IntentionExecutable" resolve="IntentionExecutable" />
+      <node concept="3Tm1VV" id="2jDew64RVvC" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="2jDew64JPLD" role="jymVt" />
+    <node concept="2tJIrI" id="2jDew64MVr6" role="jymVt" />
+    <node concept="3clFb_" id="2jDew64HgSp" role="jymVt">
+      <property role="TrG5h" value="getEnabledIntentions" />
+      <node concept="3Tmbuc" id="2jDew64HgSq" role="1B3o_S" />
+      <node concept="3uibUv" id="2jDew64HgSs" role="3clF45">
+        <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
+        <node concept="3uibUv" id="2jDew64HgSt" role="11_B2D">
+          <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
+          <node concept="3uibUv" id="2jDew64HgSu" role="11_B2D">
+            <ref role="3uigEE" to="nddn:~IntentionExecutable" resolve="IntentionExecutable" />
+          </node>
+          <node concept="3uibUv" id="2jDew64HgSv" role="11_B2D">
+            <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
+          </node>
         </node>
       </node>
-      <node concept="37vLTG" id="2xgTENkWOsK" role="3clF46">
-        <property role="TrG5h" value="text" />
-        <node concept="17QB3L" id="2xgTENkWOsL" role="1tU5fm" />
-      </node>
-      <node concept="3clFbS" id="2xgTENkWOte" role="3clF47">
-        <node concept="3cpWs8" id="2xgTENkX278" role="3cqZAp">
-          <node concept="3cpWsn" id="2xgTENkX279" role="3cpWs9">
-            <property role="TrG5h" value="groupText" />
-            <node concept="17QB3L" id="2xgTENkX27a" role="1tU5fm" />
-            <node concept="Xl_RD" id="2xgTENkX27b" role="33vP2m">
-              <property role="Xl_RC" value="" />
+      <node concept="3clFbS" id="2jDew64HgSx" role="3clF47">
+        <node concept="3cpWs8" id="3pwG8PSkQPw" role="3cqZAp">
+          <node concept="3cpWsn" id="3pwG8PSkQPv" role="3cpWs9">
+            <property role="3TUv4t" value="true" />
+            <property role="TrG5h" value="result" />
+            <node concept="2ShNRf" id="3pwG8PSl47G" role="33vP2m">
+              <node concept="1pGfFk" id="3pwG8PSl47H" role="2ShVmc">
+                <ref role="37wK5l" to="33ny:~LinkedHashSet.&lt;init&gt;()" resolve="LinkedHashSet" />
+                <node concept="3uibUv" id="3pwG8PSkQPA" role="1pMfVU">
+                  <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
+                  <node concept="3uibUv" id="7me2y0SLc1M" role="11_B2D">
+                    <ref role="3uigEE" to="nddn:~IntentionExecutable" resolve="IntentionExecutable" />
+                  </node>
+                  <node concept="3uibUv" id="3pwG8PSkQPC" role="11_B2D">
+                    <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="2hMVRd" id="frLjuvQHTD" role="1tU5fm">
+              <node concept="3uibUv" id="frLjuvQLMc" role="2hN53Y">
+                <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
+                <node concept="3uibUv" id="frLjuvQLMd" role="11_B2D">
+                  <ref role="3uigEE" to="nddn:~IntentionExecutable" resolve="IntentionExecutable" />
+                </node>
+                <node concept="3uibUv" id="frLjuvQLMe" role="11_B2D">
+                  <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
+                </node>
+              </node>
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="2xgTENkX27c" role="3cqZAp">
-          <node concept="3cpWsn" id="2xgTENkX27d" role="3cpWs9">
-            <property role="TrG5h" value="separatorPos" />
-            <node concept="10Oyi0" id="2xgTENkX27e" role="1tU5fm" />
-            <node concept="2OqwBi" id="2xgTENkX27f" role="33vP2m">
-              <node concept="37vLTw" id="2xgTENkX27g" role="2Oq$k0">
-                <ref role="3cqZAo" node="2xgTENkWOsK" resolve="text" />
+        <node concept="3cpWs8" id="3pwG8PSkQPE" role="3cqZAp">
+          <node concept="3cpWsn" id="3pwG8PSkQPD" role="3cpWs9">
+            <property role="3TUv4t" value="true" />
+            <property role="TrG5h" value="node" />
+            <node concept="3uibUv" id="3pwG8PSkQPF" role="1tU5fm">
+              <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
+            </node>
+            <node concept="2OqwBi" id="3pwG8PSl47L" role="33vP2m">
+              <node concept="37vLTw" id="3pwG8PSl47K" role="2Oq$k0">
+                <ref role="3cqZAo" node="2jDew64KOaH" resolve="editor" />
               </node>
-              <node concept="liA8E" id="2xgTENkX27h" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~String.indexOf(java.lang.String)" resolve="indexOf" />
-                <node concept="Xl_RD" id="2xgTENkX27i" role="37wK5m">
-                  <property role="Xl_RC" value=":" />
-                </node>
+              <node concept="liA8E" id="3pwG8PSl47M" role="2OqNvi">
+                <ref role="37wK5l" to="exr9:~EditorComponent.getSelectedNode()" resolve="getSelectedNode" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbJ" id="2xgTENkX27j" role="3cqZAp">
-          <node concept="3clFbS" id="2xgTENkX27k" role="3clFbx">
-            <node concept="3clFbF" id="2xgTENkX27l" role="3cqZAp">
-              <node concept="37vLTI" id="2xgTENkX27m" role="3clFbG">
-                <node concept="2OqwBi" id="2xgTENkX27n" role="37vLTx">
-                  <node concept="37vLTw" id="2xgTENkX27o" role="2Oq$k0">
-                    <ref role="3cqZAo" node="2xgTENkWOsK" resolve="text" />
+        <node concept="3cpWs8" id="3pwG8PSkQPI" role="3cqZAp">
+          <node concept="3cpWsn" id="3pwG8PSkQPH" role="3cpWs9">
+            <property role="3TUv4t" value="true" />
+            <property role="TrG5h" value="editorContext" />
+            <node concept="3uibUv" id="3pwG8PSkQPJ" role="1tU5fm">
+              <ref role="3uigEE" to="exr9:~EditorContext" resolve="EditorContext" />
+            </node>
+            <node concept="2OqwBi" id="3pwG8PSl47Q" role="33vP2m">
+              <node concept="37vLTw" id="3pwG8PSl47P" role="2Oq$k0">
+                <ref role="3cqZAo" node="2jDew64KOaH" resolve="editor" />
+              </node>
+              <node concept="liA8E" id="3pwG8PSl47R" role="2OqNvi">
+                <ref role="37wK5l" to="exr9:~EditorComponent.getEditorContext()" resolve="getEditorContext" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="3pwG8PSkQPL" role="3cqZAp">
+          <node concept="3y3z36" id="3pwG8PSkQPM" role="3clFbw">
+            <node concept="37vLTw" id="3pwG8PSkQPN" role="3uHU7B">
+              <ref role="3cqZAo" node="3pwG8PSkQPD" resolve="node" />
+            </node>
+            <node concept="10Nm6u" id="3pwG8PSkQPO" role="3uHU7w" />
+          </node>
+          <node concept="3clFbS" id="3pwG8PSkQPQ" role="3clFbx">
+            <node concept="3cpWs8" id="3pwG8PSkQPS" role="3cqZAp">
+              <node concept="3cpWsn" id="3pwG8PSkQPR" role="3cpWs9">
+                <property role="3TUv4t" value="true" />
+                <property role="TrG5h" value="query" />
+                <node concept="3uibUv" id="3pwG8PSkQPT" role="1tU5fm">
+                  <ref role="3uigEE" to="91lp:~IntentionsManager$QueryDescriptor" resolve="IntentionsManager.QueryDescriptor" />
+                </node>
+                <node concept="2ShNRf" id="3pwG8PSl47S" role="33vP2m">
+                  <node concept="1pGfFk" id="3pwG8PSl47T" role="2ShVmc">
+                    <ref role="37wK5l" to="91lp:~IntentionsManager$QueryDescriptor.&lt;init&gt;()" resolve="IntentionsManager.QueryDescriptor" />
                   </node>
-                  <node concept="liA8E" id="2xgTENkX27p" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~String.substring(int,int)" resolve="substring" />
-                    <node concept="3cmrfG" id="2xgTENkX27q" role="37wK5m">
-                      <property role="3cmrfH" value="0" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="3pwG8PSkQPV" role="3cqZAp">
+              <node concept="2OqwBi" id="3pwG8PSl47X" role="3clFbG">
+                <node concept="37vLTw" id="3pwG8PSl47W" role="2Oq$k0">
+                  <ref role="3cqZAo" node="3pwG8PSkQPR" resolve="query" />
+                </node>
+                <node concept="liA8E" id="3pwG8PSl47Y" role="2OqNvi">
+                  <ref role="37wK5l" to="91lp:~IntentionsManager$QueryDescriptor.setEnabledOnly(boolean)" resolve="setEnabledOnly" />
+                  <node concept="3clFbT" id="3pwG8PSkQPX" role="37wK5m">
+                    <property role="3clFbU" value="true" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs8" id="3pwG8PSkQPZ" role="3cqZAp">
+              <node concept="3cpWsn" id="3pwG8PSkQPY" role="3cpWs9">
+                <property role="3TUv4t" value="true" />
+                <property role="TrG5h" value="availableIntentions" />
+                <node concept="3uibUv" id="3pwG8PSkQQ0" role="1tU5fm">
+                  <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
+                  <node concept="3uibUv" id="3pwG8PSkQQ1" role="11_B2D">
+                    <ref role="3uigEE" to="18ew:~Pair" resolve="Pair" />
+                    <node concept="3uibUv" id="7me2y0SLeF$" role="11_B2D">
+                      <ref role="3uigEE" to="nddn:~IntentionExecutable" resolve="IntentionExecutable" />
                     </node>
-                    <node concept="37vLTw" id="2xgTENkX27r" role="37wK5m">
-                      <ref role="3cqZAo" node="2xgTENkX27d" resolve="separatorPos" />
+                    <node concept="3uibUv" id="3pwG8PSkQQ3" role="11_B2D">
+                      <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="2OqwBi" id="4wDwLRRJJwC" role="33vP2m">
+                  <node concept="2YIFZM" id="4wDwLRRJJhX" role="2Oq$k0">
+                    <ref role="1Pybhc" to="1ka:~TypecheckingFacade" resolve="TypecheckingFacade" />
+                    <ref role="37wK5l" to="1ka:~TypecheckingFacade.getFromContext()" resolve="getFromContext" />
+                  </node>
+                  <node concept="liA8E" id="4wDwLRRJJLm" role="2OqNvi">
+                    <ref role="37wK5l" to="1ka:~TypecheckingComputations.computeWithSession(jetbrains.mps.typechecking.TypecheckingSession,java.util.function.Supplier)" resolve="computeWithSession" />
+                    <node concept="2OqwBi" id="4wDwLRRJL5z" role="37wK5m">
+                      <node concept="37vLTw" id="4wDwLRRJJYe" role="2Oq$k0">
+                        <ref role="3cqZAo" node="2jDew64KOaH" resolve="editor" />
+                      </node>
+                      <node concept="liA8E" id="4wDwLRRJMjt" role="2OqNvi">
+                        <ref role="37wK5l" to="exr9:~EditorComponent.getTypecheckingSession()" resolve="getTypecheckingSession" />
+                      </node>
+                    </node>
+                    <node concept="1bVj0M" id="4wDwLRRJN7j" role="37wK5m">
+                      <property role="3yWfEV" value="true" />
+                      <node concept="3clFbS" id="4wDwLRRJN7l" role="1bW5cS">
+                        <node concept="3clFbF" id="4wDwLRRJNpa" role="3cqZAp">
+                          <node concept="2OqwBi" id="3pwG8PSkQQj" role="3clFbG">
+                            <node concept="2YIFZM" id="3pwG8PSl48m" role="2Oq$k0">
+                              <ref role="37wK5l" to="91lp:~IntentionsManager.getInstance()" resolve="getInstance" />
+                              <ref role="1Pybhc" to="91lp:~IntentionsManager" resolve="IntentionsManager" />
+                            </node>
+                            <node concept="liA8E" id="3pwG8PSkQQl" role="2OqNvi">
+                              <ref role="37wK5l" to="91lp:~IntentionsManager.getAvailableIntentions(jetbrains.mps.intentions.IntentionsManager$QueryDescriptor,org.jetbrains.mps.openapi.model.SNode,jetbrains.mps.openapi.editor.EditorContext)" resolve="getAvailableIntentions" />
+                              <node concept="37vLTw" id="3pwG8PSkQQm" role="37wK5m">
+                                <ref role="3cqZAo" node="3pwG8PSkQPR" resolve="query" />
+                              </node>
+                              <node concept="37vLTw" id="3pwG8PSkQQn" role="37wK5m">
+                                <ref role="3cqZAo" node="3pwG8PSkQPD" resolve="node" />
+                              </node>
+                              <node concept="37vLTw" id="3pwG8PSkQQo" role="37wK5m">
+                                <ref role="3cqZAo" node="3pwG8PSkQPH" resolve="editorContext" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="2Gpval" id="frLjuvY9Rz" role="3cqZAp">
+              <node concept="3clFbS" id="frLjuvY9RC" role="2LFqv$">
+                <node concept="3cpWs8" id="frLjuvY9RD" role="3cqZAp">
+                  <node concept="3cpWsn" id="frLjuvY9RE" role="3cpWs9">
+                    <property role="TrG5h" value="intentionDeclaration" />
+                    <node concept="3Tqbb2" id="frLjuvY9RF" role="1tU5fm">
+                      <ref role="ehGHo" to="tp3j:2c3oNEsfcpP" resolve="BaseIntentionDeclaration" />
+                    </node>
+                    <node concept="1PxgMI" id="frLjuvY9RG" role="33vP2m">
+                      <property role="1BlNFB" value="true" />
+                      <node concept="chp4Y" id="frLjuvY9RH" role="3oSUPX">
+                        <ref role="cht4Q" to="tp3j:2c3oNEsfcpP" resolve="BaseIntentionDeclaration" />
+                      </node>
+                      <node concept="2EnYce" id="frLjuvYBZ2" role="1m5AlR">
+                        <node concept="2EnYce" id="frLjuvYuOE" role="2Oq$k0">
+                          <node concept="2EnYce" id="frLjuvYpL0" role="2Oq$k0">
+                            <node concept="2EnYce" id="frLjuvYl7X" role="2Oq$k0">
+                              <node concept="2GrUjf" id="frLjuvY9Sf" role="2Oq$k0">
+                                <ref role="2Gs0qQ" node="frLjuvY9Se" resolve="availableIntention" />
+                              </node>
+                              <node concept="2OwXpG" id="frLjuvY9RN" role="2OqNvi">
+                                <ref role="2Oxat6" to="18ew:~Pair.o1" resolve="o1" />
+                              </node>
+                            </node>
+                            <node concept="liA8E" id="frLjuvY9RO" role="2OqNvi">
+                              <ref role="37wK5l" to="nddn:~IntentionExecutable.getDescriptor()" resolve="getDescriptor" />
+                            </node>
+                          </node>
+                          <node concept="liA8E" id="frLjuvY9RP" role="2OqNvi">
+                            <ref role="37wK5l" to="nddn:~IntentionDescriptor.getIntentionNodeReference()" resolve="getIntentionNodeReference" />
+                          </node>
+                        </node>
+                        <node concept="liA8E" id="frLjuvY9RQ" role="2OqNvi">
+                          <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
+                          <node concept="2OqwBi" id="frLjuvYGGo" role="37wK5m">
+                            <node concept="37vLTw" id="frLjuvY9RS" role="2Oq$k0">
+                              <ref role="3cqZAo" node="3pwG8PSkQPH" resolve="editorContext" />
+                            </node>
+                            <node concept="liA8E" id="frLjuvY9RT" role="2OqNvi">
+                              <ref role="37wK5l" to="exr9:~EditorContext.getRepository()" resolve="getRepository" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
                     </node>
                   </node>
                 </node>
-                <node concept="37vLTw" id="2xgTENkX27s" role="37vLTJ">
-                  <ref role="3cqZAo" node="2xgTENkX279" resolve="groupText" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="2xgTENkX27t" role="3cqZAp">
-              <node concept="37vLTI" id="2xgTENkX27u" role="3clFbG">
-                <node concept="2OqwBi" id="2xgTENkX27v" role="37vLTx">
-                  <node concept="2OqwBi" id="2xgTENkX27w" role="2Oq$k0">
-                    <node concept="37vLTw" id="2xgTENkX27x" role="2Oq$k0">
-                      <ref role="3cqZAo" node="2xgTENkWOsK" resolve="text" />
+                <node concept="3clFbJ" id="frLjuvZcBR" role="3cqZAp">
+                  <node concept="3clFbS" id="frLjuvZcBT" role="3clFbx">
+                    <node concept="3clFbF" id="frLjuvY9RW" role="3cqZAp">
+                      <node concept="2OqwBi" id="frLjuvY9RX" role="3clFbG">
+                        <node concept="37vLTw" id="frLjuvY9RY" role="2Oq$k0">
+                          <ref role="3cqZAo" node="3pwG8PSkQPv" resolve="result" />
+                        </node>
+                        <node concept="TSZUe" id="frLjuvY9RZ" role="2OqNvi">
+                          <node concept="2GrUjf" id="frLjuvY9Sg" role="25WWJ7">
+                            <ref role="2Gs0qQ" node="frLjuvY9Se" resolve="availableIntention" />
+                          </node>
+                        </node>
+                      </node>
                     </node>
-                    <node concept="liA8E" id="2xgTENkX27y" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~String.substring(int)" resolve="substring" />
-                      <node concept="3cpWs3" id="2xgTENkX27z" role="37wK5m">
-                        <node concept="3cmrfG" id="2xgTENkX27$" role="3uHU7w">
-                          <property role="3cmrfH" value="1" />
+                  </node>
+                  <node concept="22lmx$" id="frLjuvZFR9" role="3clFbw">
+                    <node concept="3fqX7Q" id="frLjuvZBA8" role="3uHU7B">
+                      <node concept="2YIFZM" id="frLjuvZBAa" role="3fr31v">
+                        <ref role="37wK5l" to="3ahc:~ReadOnlyUtil.isSelectionReadOnlyInEditor(jetbrains.mps.openapi.editor.EditorComponent)" resolve="isSelectionReadOnlyInEditor" />
+                        <ref role="1Pybhc" to="3ahc:~ReadOnlyUtil" resolve="ReadOnlyUtil" />
+                        <node concept="37vLTw" id="frLjuvZBAb" role="37wK5m">
+                          <ref role="3cqZAo" node="2jDew64KOaH" resolve="editor" />
                         </node>
-                        <node concept="37vLTw" id="2xgTENkX27_" role="3uHU7B">
-                          <ref role="3cqZAo" node="2xgTENkX27d" resolve="separatorPos" />
+                      </node>
+                    </node>
+                    <node concept="2OqwBi" id="frLjuvY9S8" role="3uHU7w">
+                      <node concept="2OqwBi" id="frLjuvY9S9" role="2Oq$k0">
+                        <node concept="37vLTw" id="frLjuvY9Sa" role="2Oq$k0">
+                          <ref role="3cqZAo" node="frLjuvY9RE" resolve="intentionDeclaration" />
                         </node>
+                        <node concept="3CFZ6_" id="frLjuvY9Sb" role="2OqNvi">
+                          <node concept="3CFYIy" id="frLjuvY9Sc" role="3CFYIz">
+                            <ref role="3CFYIx" to="tegv:frLjuvP$7P" resolve="ShowIntentionInReadyOnlyCell" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3TrcHB" id="frLjuvY9Sd" role="2OqNvi">
+                        <ref role="3TsBF5" to="tegv:frLjuvPGIB" resolve="flag" />
                       </node>
                     </node>
                   </node>
-                  <node concept="17S1cR" id="2xgTENkX27A" role="2OqNvi" />
-                </node>
-                <node concept="37vLTw" id="2xgTENkX27B" role="37vLTJ">
-                  <ref role="3cqZAo" node="2xgTENkWOsK" resolve="text" />
                 </node>
               </node>
-            </node>
-          </node>
-          <node concept="2d3UOw" id="2xgTENkX27C" role="3clFbw">
-            <node concept="3cmrfG" id="2xgTENkX27D" role="3uHU7w">
-              <property role="3cmrfH" value="0" />
-            </node>
-            <node concept="37vLTw" id="2xgTENkX27E" role="3uHU7B">
-              <ref role="3cqZAo" node="2xgTENkX27d" resolve="separatorPos" />
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="2xgTENkWQDG" role="3cqZAp">
-          <node concept="3cpWsn" id="2xgTENkWQDH" role="3cpWs9">
-            <property role="3TUv4t" value="false" />
-            <property role="TrG5h" value="intentionActionGroup" />
-            <node concept="3uibUv" id="2xgTENkWQDI" role="1tU5fm">
-              <ref role="3uigEE" node="2xgTENkSGPx" resolve="IntentionsMenuWithGroups.IntentionActionGroup" />
-            </node>
-            <node concept="2ShNRf" id="2xgTENkWQDJ" role="33vP2m">
-              <node concept="1pGfFk" id="2xgTENkXaSH" role="2ShVmc">
-                <ref role="37wK5l" node="2xgTENkSP2C" resolve="IntentionsMenuWithGroups.IntentionActionGroup" />
-                <node concept="37vLTw" id="2xgTENkWQDN" role="37wK5m">
-                  <ref role="3cqZAo" node="2xgTENkWOsK" resolve="text" />
-                </node>
-                <node concept="37vLTw" id="2xgTENkWQDO" role="37wK5m">
-                  <ref role="3cqZAo" node="2xgTENkX279" resolve="groupText" />
-                </node>
-                <node concept="3clFbT" id="2xgTENkWQDP" role="37wK5m">
-                  <property role="3clFbU" value="true" />
-                </node>
-                <node concept="37vLTw" id="2xgTENkWQDQ" role="37wK5m">
-                  <ref role="3cqZAo" node="2xgTENkWOsI" resolve="intention" />
-                </node>
-                <node concept="37vLTw" id="2xgTENkWQDR" role="37wK5m">
-                  <ref role="3cqZAo" node="2xgTENkWOsG" resolve="node" />
-                </node>
+              <node concept="37vLTw" id="frLjuvY9RB" role="2GsD0m">
+                <ref role="3cqZAo" node="3pwG8PSkQPY" resolve="availableIntentions" />
+              </node>
+              <node concept="2GrKxI" id="frLjuvY9Se" role="2Gsz3X">
+                <property role="TrG5h" value="availableIntention" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3cpWs6" id="2xgTENkX96C" role="3cqZAp">
-          <node concept="37vLTw" id="2xgTENkX9Yi" role="3cqZAk">
-            <ref role="3cqZAo" node="2xgTENkWQDH" resolve="intentionActionGroup" />
+        <node concept="3cpWs6" id="3pwG8PSkQQ_" role="3cqZAp">
+          <node concept="37vLTw" id="frLjuvY24D" role="3cqZAk">
+            <ref role="3cqZAo" node="3pwG8PSkQPv" resolve="result" />
           </node>
         </node>
       </node>
-      <node concept="2AHcQZ" id="2xgTENkWOtf" role="2AJF6D">
+      <node concept="2AHcQZ" id="2jDew64HgSy" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
-    <node concept="2tJIrI" id="2xgTENkXbWc" role="jymVt" />
-    <node concept="3clFb_" id="2xgTENkRhks" role="jymVt">
-      <property role="TrG5h" value="createPopup" />
-      <property role="1EzhhJ" value="false" />
-      <node concept="3Tmbuc" id="2xgTENkRhkt" role="1B3o_S" />
-      <node concept="3uibUv" id="2xgTENkRhku" role="3clF45">
-        <ref role="3uigEE" to="gspm:~ListPopup" resolve="ListPopup" />
+    <node concept="2tJIrI" id="2jDew64JPLE" role="jymVt" />
+    <node concept="3clFb_" id="2jDew64HgS_" role="jymVt">
+      <property role="TrG5h" value="getIntentionActionOrGroup" />
+      <node concept="3Tmbuc" id="2jDew64HgSA" role="1B3o_S" />
+      <node concept="3uibUv" id="2jDew64HgSC" role="3clF45">
+        <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
       </node>
-      <node concept="37vLTG" id="2xgTENkRhkv" role="3clF46">
-        <property role="TrG5h" value="group" />
-        <node concept="3uibUv" id="2xgTENkRhkw" role="1tU5fm">
-          <ref role="3uigEE" to="7bx7:~BaseGroup" resolve="BaseGroup" />
+      <node concept="37vLTG" id="2jDew64HgSD" role="3clF46">
+        <property role="TrG5h" value="intention" />
+        <node concept="3uibUv" id="2jDew64HgSE" role="1tU5fm">
+          <ref role="3uigEE" to="nddn:~IntentionExecutable" resolve="IntentionExecutable" />
         </node>
       </node>
-      <node concept="37vLTG" id="2xgTENkRhkx" role="3clF46">
-        <property role="TrG5h" value="dataContext" />
-        <node concept="3uibUv" id="2xgTENkRhky" role="1tU5fm">
-          <ref role="3uigEE" to="qkt:~DataContext" resolve="DataContext" />
+      <node concept="37vLTG" id="2jDew64HgSF" role="3clF46">
+        <property role="TrG5h" value="node" />
+        <node concept="3uibUv" id="2jDew64HgSG" role="1tU5fm">
+          <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
         </node>
       </node>
-      <node concept="3clFbS" id="2xgTENkRhkH" role="3clF47">
-        <node concept="3cpWs6" id="2xgTENkRrbU" role="3cqZAp">
-          <node concept="1rXfSq" id="2xgTENkRVuu" role="3cqZAk">
-            <ref role="37wK5l" node="2xgTENkRszE" resolve="createActionGroupPopup" />
-            <node concept="Xl_RD" id="2xgTENkRrbY" role="37wK5m">
-              <property role="Xl_RC" value="Intentions" />
+      <node concept="3clFbS" id="2jDew64HgSI" role="3clF47">
+        <node concept="3clFbF" id="2jDew64HgSN" role="3cqZAp">
+          <node concept="3nyPlj" id="2jDew64HgSM" role="3clFbG">
+            <ref role="37wK5l" to="uxaq:~IntentionMenuProducer.getIntentionActionOrGroup(jetbrains.mps.openapi.intentions.IntentionExecutable,org.jetbrains.mps.openapi.model.SNode)" resolve="getIntentionActionOrGroup" />
+            <node concept="37vLTw" id="2jDew64HgSK" role="37wK5m">
+              <ref role="3cqZAo" node="2jDew64HgSD" resolve="intention" />
             </node>
-            <node concept="37vLTw" id="2xgTENkRrbZ" role="37wK5m">
-              <ref role="3cqZAo" node="2xgTENkRhkv" resolve="group" />
+            <node concept="37vLTw" id="2jDew64HgSL" role="37wK5m">
+              <ref role="3cqZAo" node="2jDew64HgSF" resolve="node" />
             </node>
-            <node concept="37vLTw" id="2xgTENkRrc0" role="37wK5m">
-              <ref role="3cqZAo" node="2xgTENkRhkx" resolve="dataContext" />
-            </node>
-            <node concept="Rm8GO" id="2xgTENkRrc1" role="37wK5m">
-              <ref role="1Px2BO" to="gspm:~JBPopupFactory$ActionSelectionAid" resolve="JBPopupFactory.ActionSelectionAid" />
-              <ref role="Rm8GQ" to="gspm:~JBPopupFactory$ActionSelectionAid.SPEEDSEARCH" resolve="SPEEDSEARCH" />
-            </node>
-            <node concept="3clFbT" id="2xgTENkRrc2" role="37wK5m" />
           </node>
         </node>
       </node>
-      <node concept="2AHcQZ" id="2xgTENkRhkI" role="2AJF6D">
+      <node concept="2AHcQZ" id="2jDew64HgSJ" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
-      <node concept="P$JXv" id="29wDeGI9MK5" role="lGtFl">
-        <node concept="TZ5HA" id="29wDeGI9MK6" role="TZ5H$">
-          <node concept="1dT_AC" id="29wDeGI9MK7" role="1dT_Ay">
-            <property role="1dT_AB" value="colorz colory coloa colorg colorb colorn" />
-          </node>
-        </node>
-        <node concept="TUZQ0" id="29wDeGI9MK8" role="3nqlJM">
-          <node concept="zr_55" id="29wDeGI9MKa" role="zr_5Q">
-            <ref role="zr_51" node="2xgTENkRhkv" resolve="group" />
-          </node>
-        </node>
-        <node concept="TUZQ0" id="29wDeGI9MKb" role="3nqlJM">
-          <node concept="zr_55" id="29wDeGI9MKd" role="zr_5Q">
-            <ref role="zr_51" node="2xgTENkRhkx" resolve="dataContext" />
-          </node>
-        </node>
-        <node concept="x79VA" id="29wDeGI9MKe" role="3nqlJM" />
-      </node>
     </node>
-    <node concept="2tJIrI" id="2xgTENkRlmN" role="jymVt" />
-    <node concept="3clFb_" id="2xgTENkRszE" role="jymVt">
-      <property role="TrG5h" value="createActionGroupPopup" />
+    <node concept="2tJIrI" id="2jDew64Ldo_" role="jymVt" />
+    <node concept="3clFb_" id="3pwG8PSkQGh" role="jymVt">
+      <property role="TrG5h" value="isInconsistentEditor" />
       <property role="DiZV1" value="false" />
       <property role="od$2w" value="false" />
-      <node concept="2AHcQZ" id="2xgTENkRszF" role="2AJF6D">
-        <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
-      </node>
-      <node concept="37vLTG" id="2xgTENkRszH" role="3clF46">
-        <property role="TrG5h" value="title" />
-        <property role="3TUv4t" value="false" />
-        <node concept="17QB3L" id="2xgTENkRHg8" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="2xgTENkRszJ" role="3clF46">
-        <property role="TrG5h" value="actionGroup" />
-        <property role="3TUv4t" value="false" />
-        <node concept="2AHcQZ" id="2xgTENkRszK" role="2AJF6D">
-          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
-        </node>
-        <node concept="3uibUv" id="2xgTENkRszL" role="1tU5fm">
-          <ref role="3uigEE" to="qkt:~ActionGroup" resolve="ActionGroup" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="2xgTENkRszM" role="3clF46">
-        <property role="TrG5h" value="dataContext" />
-        <property role="3TUv4t" value="false" />
-        <node concept="2AHcQZ" id="2xgTENkRszN" role="2AJF6D">
-          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
-        </node>
-        <node concept="3uibUv" id="2xgTENkRszO" role="1tU5fm">
-          <ref role="3uigEE" to="qkt:~DataContext" resolve="DataContext" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="2xgTENkRszP" role="3clF46">
-        <property role="TrG5h" value="selectionAidMethod" />
-        <property role="3TUv4t" value="false" />
-        <node concept="3uibUv" id="2xgTENkRxyB" role="1tU5fm">
-          <ref role="3uigEE" to="gspm:~JBPopupFactory$ActionSelectionAid" resolve="JBPopupFactory.ActionSelectionAid" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="2xgTENkRszR" role="3clF46">
-        <property role="TrG5h" value="showDisabledActions" />
-        <property role="3TUv4t" value="false" />
-        <node concept="10P_77" id="2xgTENkRszS" role="1tU5fm" />
-      </node>
-      <node concept="3clFbS" id="2xgTENkRszT" role="3clF47">
-        <node concept="3cpWs6" id="2xgTENkRszU" role="3cqZAp">
-          <node concept="1rXfSq" id="2xgTENkRszV" role="3cqZAk">
-            <ref role="37wK5l" node="2xgTENkRKl9" resolve="createActionGroupPopup" />
-            <node concept="37vLTw" id="2xgTENkRszW" role="37wK5m">
-              <ref role="3cqZAo" node="2xgTENkRszH" resolve="title" />
-            </node>
-            <node concept="37vLTw" id="2xgTENkRszX" role="37wK5m">
-              <ref role="3cqZAo" node="2xgTENkRszJ" resolve="actionGroup" />
-            </node>
-            <node concept="37vLTw" id="2xgTENkRszY" role="37wK5m">
-              <ref role="3cqZAo" node="2xgTENkRszM" resolve="dataContext" />
-            </node>
-            <node concept="22lmx$" id="2xgTENkRszZ" role="37wK5m">
-              <node concept="3clFbC" id="2xgTENkRs$0" role="3uHU7B">
-                <node concept="37vLTw" id="2xgTENkRs$1" role="3uHU7B">
-                  <ref role="3cqZAo" node="2xgTENkRszP" resolve="selectionAidMethod" />
+      <node concept="3clFbS" id="3pwG8PSkQGi" role="3clF47">
+        <node concept="3cpWs6" id="3pwG8PSkQGj" role="3cqZAp">
+          <node concept="22lmx$" id="3pwG8PSkQGk" role="3cqZAk">
+            <node concept="22lmx$" id="3pwG8PSkQGl" role="3uHU7B">
+              <node concept="2OqwBi" id="3pwG8PSkTXs" role="3uHU7B">
+                <node concept="37vLTw" id="3pwG8PSkTXr" role="2Oq$k0">
+                  <ref role="3cqZAo" node="2jDew64KOaH" resolve="editor" />
                 </node>
-                <node concept="Rm8GO" id="2xgTENkRw0e" role="3uHU7w">
-                  <ref role="Rm8GQ" to="gspm:~JBPopupFactory$ActionSelectionAid.NUMBERING" resolve="NUMBERING" />
-                  <ref role="1Px2BO" to="gspm:~JBPopupFactory$ActionSelectionAid" resolve="JBPopupFactory.ActionSelectionAid" />
+                <node concept="liA8E" id="3pwG8PSkTXt" role="2OqNvi">
+                  <ref role="37wK5l" to="exr9:~EditorComponent.isDisposed()" resolve="isDisposed" />
                 </node>
               </node>
-              <node concept="3clFbC" id="2xgTENkRs$3" role="3uHU7w">
-                <node concept="37vLTw" id="2xgTENkRs$4" role="3uHU7B">
-                  <ref role="3cqZAo" node="2xgTENkRszP" resolve="selectionAidMethod" />
-                </node>
-                <node concept="Rm8GO" id="2xgTENkRwsu" role="3uHU7w">
-                  <ref role="Rm8GQ" to="gspm:~JBPopupFactory$ActionSelectionAid.ALPHA_NUMBERING" resolve="ALPHA_NUMBERING" />
-                  <ref role="1Px2BO" to="gspm:~JBPopupFactory$ActionSelectionAid" resolve="JBPopupFactory.ActionSelectionAid" />
+              <node concept="3clFbC" id="3pwG8PSkQGn" role="3uHU7w">
+                <node concept="2OqwBi" id="3pwG8PSkTXx" role="3uHU7B">
+                  <node concept="37vLTw" id="3pwG8PSkTXw" role="2Oq$k0">
+                    <ref role="3cqZAo" node="2jDew64KOaH" resolve="editor" />
+                  </node>
+                  <node concept="liA8E" id="3pwG8PSkTXy" role="2OqNvi">
+                    <ref role="37wK5l" to="exr9:~EditorComponent.getEditedNode()" resolve="getEditedNode" />
+                  </node>
                 </node>
+                <node concept="10Nm6u" id="3pwG8PSkQGp" role="3uHU7w" />
               </node>
             </node>
-            <node concept="3clFbC" id="2xgTENkRs$6" role="37wK5m">
-              <node concept="37vLTw" id="2xgTENkRs$7" role="3uHU7B">
-                <ref role="3cqZAo" node="2xgTENkRszP" resolve="selectionAidMethod" />
-              </node>
-              <node concept="Rm8GO" id="2xgTENkRwSD" role="3uHU7w">
-                <ref role="Rm8GQ" to="gspm:~JBPopupFactory$ActionSelectionAid.ALPHA_NUMBERING" resolve="ALPHA_NUMBERING" />
-                <ref role="1Px2BO" to="gspm:~JBPopupFactory$ActionSelectionAid" resolve="JBPopupFactory.ActionSelectionAid" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="2xgTENkRs$9" role="37wK5m">
-              <ref role="3cqZAo" node="2xgTENkRszR" resolve="showDisabledActions" />
-            </node>
-            <node concept="3clFbC" id="2xgTENkRs$a" role="37wK5m">
-              <node concept="37vLTw" id="2xgTENkRs$b" role="3uHU7B">
-                <ref role="3cqZAo" node="2xgTENkRszP" resolve="selectionAidMethod" />
-              </node>
-              <node concept="Rm8GO" id="2xgTENkRxkE" role="3uHU7w">
-                <ref role="Rm8GQ" to="gspm:~JBPopupFactory$ActionSelectionAid.MNEMONICS" resolve="MNEMONICS" />
-                <ref role="1Px2BO" to="gspm:~JBPopupFactory$ActionSelectionAid" resolve="JBPopupFactory.ActionSelectionAid" />
-              </node>
-            </node>
-            <node concept="10Nm6u" id="2xgTENkRs$d" role="37wK5m" />
-            <node concept="1ZRNhn" id="2xgTENkRs$e" role="37wK5m">
-              <node concept="3cmrfG" id="2xgTENkRs$f" role="2$L3a6">
-                <property role="3cmrfH" value="1" />
+            <node concept="3fqX7Q" id="3pwG8PSkQGq" role="3uHU7w">
+              <node concept="2OqwBi" id="3pwG8PSkTXA" role="3fr31v">
+                <node concept="37vLTw" id="3pwG8PSkTX_" role="2Oq$k0">
+                  <ref role="3cqZAo" node="2jDew64KOaH" resolve="editor" />
+                </node>
+                <node concept="liA8E" id="3pwG8PSkTXB" role="2OqNvi">
+                  <ref role="37wK5l" to="exr9:~EditorComponent.hasValidSelectedNode()" resolve="hasValidSelectedNode" />
+                </node>
               </node>
             </node>
           </node>
         </node>
       </node>
-      <node concept="3Tmbuc" id="2xgTENkRK6w" role="1B3o_S" />
-      <node concept="3uibUv" id="2xgTENkRs$h" role="3clF45">
-        <ref role="3uigEE" to="gspm:~ListPopup" resolve="ListPopup" />
-      </node>
+      <node concept="3Tmbuc" id="3pwG8PSokuW" role="1B3o_S" />
+      <node concept="10P_77" id="3pwG8PSkQGt" role="3clF45" />
     </node>
-    <node concept="2tJIrI" id="2xgTENkRHRu" role="jymVt" />
-    <node concept="3clFb_" id="2xgTENkRKl9" role="jymVt">
-      <property role="TrG5h" value="createActionGroupPopup" />
+    <node concept="2tJIrI" id="2jDew64KoHm" role="jymVt" />
+    <node concept="3clFb_" id="3pwG8PSkQMU" role="jymVt">
+      <property role="TrG5h" value="collectActionsAsIntentions" />
       <property role="DiZV1" value="false" />
       <property role="od$2w" value="false" />
-      <node concept="3clFbS" id="2xgTENkRtF$" role="3clF47">
-        <node concept="3cpWs6" id="2xgTENkRtF_" role="3cqZAp">
-          <node concept="1rXfSq" id="2xgTENkRtFA" role="3cqZAk">
-            <ref role="37wK5l" node="2xgTENkRLtu" resolve="createActionGroupPopup" />
-            <node concept="37vLTw" id="2xgTENkRtFB" role="37wK5m">
-              <ref role="3cqZAo" node="2xgTENkRtFg" resolve="title" />
-            </node>
-            <node concept="37vLTw" id="2xgTENkRtFC" role="37wK5m">
-              <ref role="3cqZAo" node="2xgTENkRtFi" resolve="actionGroup" />
-            </node>
-            <node concept="37vLTw" id="2xgTENkRtFD" role="37wK5m">
-              <ref role="3cqZAo" node="2xgTENkRtFl" resolve="dataContext" />
-            </node>
-            <node concept="37vLTw" id="2xgTENkRtFE" role="37wK5m">
-              <ref role="3cqZAo" node="2xgTENkRtFo" resolve="showNumbers" />
-            </node>
-            <node concept="37vLTw" id="2xgTENkRtFF" role="37wK5m">
-              <ref role="3cqZAo" node="2xgTENkRtFq" resolve="useAlphaAsNumbers" />
-            </node>
-            <node concept="37vLTw" id="2xgTENkRtFG" role="37wK5m">
-              <ref role="3cqZAo" node="2xgTENkRtFs" resolve="showDisabledActions" />
-            </node>
-            <node concept="37vLTw" id="2xgTENkRtFH" role="37wK5m">
-              <ref role="3cqZAo" node="2xgTENkRtFu" resolve="honorActionMnemonics" />
-            </node>
-            <node concept="37vLTw" id="2xgTENkRtFI" role="37wK5m">
-              <ref role="3cqZAo" node="2xgTENkRtFw" resolve="disposeCallback" />
-            </node>
-            <node concept="37vLTw" id="2xgTENkRtFJ" role="37wK5m">
-              <ref role="3cqZAo" node="2xgTENkRtFy" resolve="maxRowCount" />
-            </node>
-            <node concept="10Nm6u" id="2xgTENkRtFK" role="37wK5m" />
-            <node concept="10Nm6u" id="2xgTENkRtFL" role="37wK5m" />
-          </node>
+      <node concept="37vLTG" id="3pwG8PSkQMV" role="3clF46">
+        <property role="TrG5h" value="action" />
+        <property role="3TUv4t" value="false" />
+        <node concept="3uibUv" id="3pwG8PSkQMW" role="1tU5fm">
+          <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
         </node>
       </node>
-      <node concept="37vLTG" id="2xgTENkRtFg" role="3clF46">
-        <property role="TrG5h" value="title" />
-        <property role="3TUv4t" value="true" />
-        <node concept="17QB3L" id="2xgTENkRJN1" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="2xgTENkRtFi" role="3clF46">
-        <property role="TrG5h" value="actionGroup" />
+      <node concept="37vLTG" id="3pwG8PSkQMX" role="3clF46">
+        <property role="TrG5h" value="actions" />
         <property role="3TUv4t" value="false" />
-        <node concept="2AHcQZ" id="2xgTENkRtFj" role="2AJF6D">
-          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
-        </node>
-        <node concept="3uibUv" id="2xgTENkRtFk" role="1tU5fm">
-          <ref role="3uigEE" to="qkt:~ActionGroup" resolve="ActionGroup" />
+        <node concept="3uibUv" id="3pwG8PSkQMY" role="1tU5fm">
+          <ref role="3uigEE" to="33ny:~List" resolve="List" />
+          <node concept="3uibUv" id="3pwG8PSkQMZ" role="11_B2D">
+            <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
+          </node>
         </node>
       </node>
-      <node concept="37vLTG" id="2xgTENkRtFl" role="3clF46">
+      <node concept="37vLTG" id="3pwG8PSkQN0" role="3clF46">
         <property role="TrG5h" value="dataContext" />
         <property role="3TUv4t" value="false" />
-        <node concept="2AHcQZ" id="2xgTENkRtFm" role="2AJF6D">
-          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
-        </node>
-        <node concept="3uibUv" id="2xgTENkRtFn" role="1tU5fm">
+        <node concept="3uibUv" id="3pwG8PSkQN1" role="1tU5fm">
           <ref role="3uigEE" to="qkt:~DataContext" resolve="DataContext" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="2xgTENkRtFo" role="3clF46">
-        <property role="TrG5h" value="showNumbers" />
-        <property role="3TUv4t" value="false" />
-        <node concept="10P_77" id="2xgTENkRtFp" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="2xgTENkRtFq" role="3clF46">
-        <property role="TrG5h" value="useAlphaAsNumbers" />
-        <property role="3TUv4t" value="false" />
-        <node concept="10P_77" id="2xgTENkRtFr" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="2xgTENkRtFs" role="3clF46">
-        <property role="TrG5h" value="showDisabledActions" />
-        <property role="3TUv4t" value="false" />
-        <node concept="10P_77" id="2xgTENkRtFt" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="2xgTENkRtFu" role="3clF46">
-        <property role="TrG5h" value="honorActionMnemonics" />
-        <property role="3TUv4t" value="false" />
-        <node concept="10P_77" id="2xgTENkRtFv" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="2xgTENkRtFw" role="3clF46">
-        <property role="TrG5h" value="disposeCallback" />
-        <property role="3TUv4t" value="true" />
-        <node concept="3uibUv" id="2xgTENkRtFx" role="1tU5fm">
-          <ref role="3uigEE" to="wyt6:~Runnable" resolve="Runnable" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="2xgTENkRtFy" role="3clF46">
-        <property role="TrG5h" value="maxRowCount" />
-        <property role="3TUv4t" value="true" />
-        <node concept="10Oyi0" id="2xgTENkRtFz" role="1tU5fm" />
-      </node>
-      <node concept="3uibUv" id="2xgTENkRtFN" role="3clF45">
-        <ref role="3uigEE" to="gspm:~ListPopup" resolve="ListPopup" />
+        </node>
       </node>
-      <node concept="3Tmbuc" id="2xgTENkRLff" role="1B3o_S" />
-    </node>
-    <node concept="2tJIrI" id="2xgTENkRrUk" role="jymVt" />
-    <node concept="3clFb_" id="2xgTENkRLtu" role="jymVt">
-      <property role="TrG5h" value="createActionGroupPopup" />
-      <property role="DiZV1" value="false" />
-      <property role="od$2w" value="false" />
-      <node concept="3clFbS" id="2xgTENkRmpy" role="3clF47">
-        <node concept="3cpWs6" id="2xgTENkRmpz" role="3cqZAp">
-          <node concept="2ShNRf" id="2xgTENkRGQA" role="3cqZAk">
-            <node concept="YeOm9" id="2xgTENkRPul" role="2ShVmc">
-              <node concept="1Y3b0j" id="2xgTENkRPuo" role="YeSDq">
-                <property role="2bfB8j" value="true" />
-                <ref role="1Y3XeK" to="5rcs:~PopupFactoryImpl$ActionGroupPopup" resolve="PopupFactoryImpl.ActionGroupPopup" />
-                <ref role="37wK5l" to="5rcs:~PopupFactoryImpl$ActionGroupPopup.&lt;init&gt;(java.lang.String,com.intellij.openapi.actionSystem.ActionGroup,com.intellij.openapi.actionSystem.DataContext,boolean,boolean,boolean,boolean,java.lang.Runnable,int,com.intellij.openapi.util.Condition,java.lang.String)" resolve="PopupFactoryImpl.ActionGroupPopup" />
-                <node concept="3Tm1VV" id="2xgTENkRPup" role="1B3o_S" />
-                <node concept="37vLTw" id="2xgTENkRmp_" role="37wK5m">
-                  <ref role="3cqZAo" node="2xgTENkRmp8" resolve="title" />
-                </node>
-                <node concept="37vLTw" id="2xgTENkRmpA" role="37wK5m">
-                  <ref role="3cqZAo" node="2xgTENkRmpa" resolve="actionGroup" />
-                </node>
-                <node concept="37vLTw" id="2xgTENkRmpB" role="37wK5m">
-                  <ref role="3cqZAo" node="2xgTENkRmpd" resolve="dataContext" />
-                </node>
-                <node concept="37vLTw" id="2xgTENkRmpC" role="37wK5m">
-                  <ref role="3cqZAo" node="2xgTENkRmpg" resolve="showNumbers" />
-                </node>
-                <node concept="37vLTw" id="2xgTENkRmpD" role="37wK5m">
-                  <ref role="3cqZAo" node="2xgTENkRmpi" resolve="useAlphaAsNumbers" />
-                </node>
-                <node concept="37vLTw" id="2xgTENkRmpE" role="37wK5m">
-                  <ref role="3cqZAo" node="2xgTENkRmpk" resolve="showDisabledActions" />
-                </node>
-                <node concept="37vLTw" id="2xgTENkRmpF" role="37wK5m">
-                  <ref role="3cqZAo" node="2xgTENkRmpm" resolve="honorActionMnemonics" />
-                </node>
-                <node concept="37vLTw" id="2xgTENkRmpG" role="37wK5m">
-                  <ref role="3cqZAo" node="2xgTENkRmpo" resolve="disposeCallback" />
-                </node>
-                <node concept="37vLTw" id="2xgTENkRmpH" role="37wK5m">
-                  <ref role="3cqZAo" node="2xgTENkRmpq" resolve="maxRowCount" />
-                </node>
-                <node concept="37vLTw" id="2xgTENkRmpI" role="37wK5m">
-                  <ref role="3cqZAo" node="2xgTENkRmps" resolve="preselectActionCondition" />
-                </node>
-                <node concept="37vLTw" id="2xgTENkRmpJ" role="37wK5m">
-                  <ref role="3cqZAo" node="2xgTENkRmpv" resolve="actionPlace" />
-                </node>
-                <node concept="3clFb_" id="2xgTENkRPVK" role="jymVt">
-                  <property role="1EzhhJ" value="false" />
-                  <property role="TrG5h" value="shouldBeShowing" />
-                  <property role="DiZV1" value="false" />
-                  <node concept="3Tm1VV" id="2xgTENkRPVL" role="1B3o_S" />
-                  <node concept="10P_77" id="2xgTENkRPVN" role="3clF45" />
-                  <node concept="37vLTG" id="2xgTENkRPVO" role="3clF46">
-                    <property role="TrG5h" value="value" />
-                    <node concept="3uibUv" id="2xgTENkRPVP" role="1tU5fm">
-                      <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                    </node>
+      <node concept="3clFbS" id="3pwG8PSkQN2" role="3clF47">
+        <node concept="3clFbJ" id="3pwG8PSkQN3" role="3cqZAp">
+          <node concept="2ZW3vV" id="3pwG8PSkQN6" role="3clFbw">
+            <node concept="37vLTw" id="3pwG8PSkQN4" role="2ZW6bz">
+              <ref role="3cqZAo" node="3pwG8PSkQMV" resolve="action" />
+            </node>
+            <node concept="3uibUv" id="3pwG8PSkQN5" role="2ZW6by">
+              <ref role="3uigEE" to="qkt:~ActionGroup" resolve="ActionGroup" />
+            </node>
+          </node>
+          <node concept="3clFbJ" id="3pwG8PSkQNr" role="9aQIa">
+            <node concept="2ZW3vV" id="3pwG8PSkQNu" role="3clFbw">
+              <node concept="37vLTw" id="3pwG8PSkQNs" role="2ZW6bz">
+                <ref role="3cqZAo" node="3pwG8PSkQMV" resolve="action" />
+              </node>
+              <node concept="3uibUv" id="3pwG8PSkQNt" role="2ZW6by">
+                <ref role="3uigEE" to="7bx7:~BaseAction" resolve="BaseAction" />
+              </node>
+            </node>
+            <node concept="3clFbS" id="3pwG8PSkQNw" role="3clFbx">
+              <node concept="3cpWs8" id="3pwG8PSkQNy" role="3cqZAp">
+                <node concept="3cpWsn" id="3pwG8PSkQNx" role="3cpWs9">
+                  <property role="3TUv4t" value="false" />
+                  <property role="TrG5h" value="presentation" />
+                  <node concept="3uibUv" id="3pwG8PSkQNz" role="1tU5fm">
+                    <ref role="3uigEE" to="qkt:~Presentation" resolve="Presentation" />
                   </node>
-                  <node concept="3clFbS" id="2xgTENkRPVU" role="3clF47">
-                    <node concept="3clFbJ" id="2xgTENkRQAV" role="3cqZAp">
-                      <node concept="3fqX7Q" id="2xgTENkRQAW" role="3clFbw">
-                        <node concept="2OqwBi" id="2xgTENkRQBv" role="3fr31v">
-                          <node concept="37vLTw" id="2xgTENkRQBu" role="2Oq$k0">
-                            <ref role="3cqZAo" to="5rcs:~WizardPopup.myStep" resolve="myStep" />
-                          </node>
-                          <node concept="liA8E" id="2xgTENkRQBw" role="2OqNvi">
-                            <ref role="37wK5l" to="gspm:~PopupStep.isSpeedSearchEnabled()" resolve="isSpeedSearchEnabled" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbS" id="2xgTENkRQB0" role="3clFbx">
-                        <node concept="3cpWs6" id="2xgTENkRQAY" role="3cqZAp">
-                          <node concept="3clFbT" id="2xgTENkRQAZ" role="3cqZAk">
-                            <property role="3clFbU" value="true" />
-                          </node>
-                        </node>
-                      </node>
+                  <node concept="2OqwBi" id="3pwG8PSkU9U" role="33vP2m">
+                    <node concept="37vLTw" id="3pwG8PSkU9T" role="2Oq$k0">
+                      <ref role="3cqZAo" node="3pwG8PSkQMV" resolve="action" />
                     </node>
-                    <node concept="3cpWs8" id="2xgTENkRQB2" role="3cqZAp">
-                      <node concept="3cpWsn" id="2xgTENkRQB1" role="3cpWs9">
-                        <property role="3TUv4t" value="false" />
-                        <property role="TrG5h" value="filter" />
-                        <node concept="3uibUv" id="2xgTENkRQB3" role="1tU5fm">
-                          <ref role="3uigEE" to="gspm:~SpeedSearchFilter" resolve="SpeedSearchFilter" />
-                          <node concept="3uibUv" id="2xgTENkRQB4" role="11_B2D">
-                            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                          </node>
-                        </node>
-                        <node concept="2OqwBi" id="2xgTENkRQBF" role="33vP2m">
-                          <node concept="37vLTw" id="2xgTENkRQBE" role="2Oq$k0">
-                            <ref role="3cqZAo" to="5rcs:~WizardPopup.myStep" resolve="myStep" />
-                          </node>
-                          <node concept="liA8E" id="2xgTENkRQBG" role="2OqNvi">
-                            <ref role="37wK5l" to="gspm:~PopupStep.getSpeedSearchFilter()" resolve="getSpeedSearchFilter" />
-                          </node>
-                        </node>
-                      </node>
+                    <node concept="liA8E" id="3pwG8PSkU9V" role="2OqNvi">
+                      <ref role="37wK5l" to="qkt:~AnAction.getTemplatePresentation()" resolve="getTemplatePresentation" />
                     </node>
-                    <node concept="3clFbJ" id="2xgTENkRQB6" role="3cqZAp">
-                      <node concept="1Wc70l" id="4gYVSgE4ABx" role="3clFbw">
-                        <node concept="3y3z36" id="4gYVSgE4KKI" role="3uHU7B">
-                          <node concept="10Nm6u" id="4gYVSgE4Lfj" role="3uHU7w" />
-                          <node concept="37vLTw" id="4gYVSgE4Khv" role="3uHU7B">
-                            <ref role="3cqZAo" node="2xgTENkRQB1" resolve="filter" />
-                          </node>
-                        </node>
-                        <node concept="3fqX7Q" id="2xgTENkRQB7" role="3uHU7w">
-                          <node concept="2OqwBi" id="2xgTENkRQBR" role="3fr31v">
-                            <node concept="37vLTw" id="2xgTENkRQBQ" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2xgTENkRQB1" resolve="filter" />
-                            </node>
-                            <node concept="liA8E" id="2xgTENkRQBS" role="2OqNvi">
-                              <ref role="37wK5l" to="gspm:~SpeedSearchFilter.canBeHidden(java.lang.Object)" resolve="canBeHidden" />
-                              <node concept="37vLTw" id="2xgTENkRQB9" role="37wK5m">
-                                <ref role="3cqZAo" node="2xgTENkRPVO" resolve="value" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbS" id="2xgTENkRQBc" role="3clFbx">
-                        <node concept="3cpWs6" id="2xgTENkRQBa" role="3cqZAp">
-                          <node concept="3clFbT" id="2xgTENkRQBb" role="3cqZAk">
-                            <property role="3clFbU" value="true" />
-                          </node>
-                        </node>
-                      </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbJ" id="3pwG8PSkQN_" role="3cqZAp">
+                <node concept="3clFbC" id="3pwG8PSkQNA" role="3clFbw">
+                  <node concept="2OqwBi" id="3pwG8PSkU9Z" role="3uHU7B">
+                    <node concept="37vLTw" id="3pwG8PSkU9Y" role="2Oq$k0">
+                      <ref role="3cqZAo" node="3pwG8PSkQNx" resolve="presentation" />
                     </node>
-                    <node concept="3clFbH" id="2xgTENkSgld" role="3cqZAp" />
-                    <node concept="3SKdUt" id="2xgTENkVr05" role="3cqZAp">
-                      <node concept="1PaTwC" id="17qUVvSZltl" role="1aUNEU">
-                        <node concept="3oM_SD" id="17qUVvSZltm" role="1PaTwD">
-                          <property role="3oM_SC" value="allow" />
-                        </node>
-                        <node concept="3oM_SD" id="17qUVvSZltn" role="1PaTwD">
-                          <property role="3oM_SC" value="to" />
-                        </node>
-                        <node concept="3oM_SD" id="17qUVvSZlto" role="1PaTwD">
-                          <property role="3oM_SC" value="search" />
-                        </node>
-                        <node concept="3oM_SD" id="17qUVvSZltp" role="1PaTwD">
-                          <property role="3oM_SC" value="by" />
-                        </node>
-                        <node concept="3oM_SD" id="17qUVvSZltq" role="1PaTwD">
-                          <property role="3oM_SC" value="group" />
-                        </node>
-                        <node concept="3oM_SD" id="17qUVvSZltr" role="1PaTwD">
-                          <property role="3oM_SC" value="name" />
-                        </node>
-                      </node>
+                    <node concept="liA8E" id="3pwG8PSkUa0" role="2OqNvi">
+                      <ref role="37wK5l" to="qkt:~Presentation.getIcon()" resolve="getIcon" />
                     </node>
-                    <node concept="3cpWs8" id="2xgTENkShUN" role="3cqZAp">
-                      <node concept="3cpWsn" id="2xgTENkShUO" role="3cpWs9">
-                        <property role="TrG5h" value="item" />
-                        <node concept="3uibUv" id="2xgTENkShUP" role="1tU5fm">
-                          <ref role="3uigEE" to="5rcs:~PopupFactoryImpl$ActionItem" resolve="PopupFactoryImpl.ActionItem" />
-                        </node>
-                        <node concept="1eOMI4" id="2xgTENkSir1" role="33vP2m">
-                          <node concept="10QFUN" id="2xgTENkSir2" role="1eOMHV">
-                            <node concept="37vLTw" id="2xgTENkSir0" role="10QFUP">
-                              <ref role="3cqZAo" node="2xgTENkRPVO" resolve="value" />
-                            </node>
-                            <node concept="3uibUv" id="2xgTENkSiqZ" role="10QFUM">
-                              <ref role="3uigEE" to="5rcs:~PopupFactoryImpl$ActionItem" resolve="PopupFactoryImpl.ActionItem" />
-                            </node>
-                          </node>
-                        </node>
+                  </node>
+                  <node concept="10Nm6u" id="3pwG8PSkQNC" role="3uHU7w" />
+                </node>
+                <node concept="3clFbS" id="3pwG8PSkQNG" role="3clFbx">
+                  <node concept="3clFbF" id="3pwG8PSkQND" role="3cqZAp">
+                    <node concept="2OqwBi" id="3pwG8PSkUa4" role="3clFbG">
+                      <node concept="37vLTw" id="3pwG8PSkUa3" role="2Oq$k0">
+                        <ref role="3cqZAo" node="3pwG8PSkQNx" resolve="presentation" />
                       </node>
-                    </node>
-                    <node concept="3cpWs8" id="2xgTENkSj86" role="3cqZAp">
-                      <node concept="3cpWsn" id="2xgTENkSj87" role="3cpWs9">
-                        <property role="TrG5h" value="action" />
-                        <node concept="3uibUv" id="2xgTENkSj84" role="1tU5fm">
-                          <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
-                        </node>
-                        <node concept="2OqwBi" id="2xgTENkSj88" role="33vP2m">
-                          <node concept="37vLTw" id="2xgTENkSj89" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2xgTENkShUO" resolve="item" />
-                          </node>
-                          <node concept="liA8E" id="2xgTENkSj8a" role="2OqNvi">
-                            <ref role="37wK5l" to="5rcs:~PopupFactoryImpl$ActionItem.getAction()" resolve="getAction" />
-                          </node>
+                      <node concept="liA8E" id="3pwG8PSkUa5" role="2OqNvi">
+                        <ref role="37wK5l" to="qkt:~Presentation.setIcon(javax.swing.Icon)" resolve="setIcon" />
+                        <node concept="10M0yZ" id="3pwG8PSlb0u" role="37wK5m">
+                          <ref role="1PxDUh" to="8b49:~Icons" resolve="Icons" />
+                          <ref role="3cqZAo" to="8b49:~Icons.REAL_INTENTION" resolve="REAL_INTENTION" />
                         </node>
                       </node>
                     </node>
-                    <node concept="3clFbJ" id="2xgTENkTNL$" role="3cqZAp">
-                      <node concept="3clFbS" id="2xgTENkTNLA" role="3clFbx">
-                        <node concept="3cpWs8" id="2xgTENkVnvB" role="3cqZAp">
-                          <node concept="3cpWsn" id="2xgTENkVnvC" role="3cpWs9">
-                            <property role="TrG5h" value="actionGroup" />
-                            <node concept="3uibUv" id="2xgTENkVnvr" role="1tU5fm">
-                              <ref role="3uigEE" node="2xgTENkSGPx" resolve="IntentionsMenuWithGroups.IntentionActionGroup" />
-                            </node>
-                            <node concept="1eOMI4" id="2xgTENkVnvD" role="33vP2m">
-                              <node concept="10QFUN" id="2xgTENkVnvE" role="1eOMHV">
-                                <node concept="3uibUv" id="2xgTENkVnvF" role="10QFUM">
-                                  <ref role="3uigEE" node="2xgTENkSGPx" resolve="IntentionsMenuWithGroups.IntentionActionGroup" />
-                                </node>
-                                <node concept="37vLTw" id="2xgTENkVnvG" role="10QFUP">
-                                  <ref role="3cqZAo" node="2xgTENkSj87" resolve="action" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3clFbJ" id="2xgTENkVnL0" role="3cqZAp">
-                          <node concept="3clFbS" id="2xgTENkVnL2" role="3clFbx">
-                            <node concept="3cpWs6" id="2xgTENkVpGp" role="3cqZAp">
-                              <node concept="3clFbT" id="2xgTENkVq2_" role="3cqZAk">
-                                <property role="3clFbU" value="true" />
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="2OqwBi" id="2xgTENkVnX$" role="3clFbw">
-                            <node concept="37vLTw" id="2xgTENkVnTe" role="2Oq$k0">
-                              <ref role="3cqZAo" to="5rcs:~AbstractPopup.mySpeedSearch" resolve="mySpeedSearch" />
-                            </node>
-                            <node concept="liA8E" id="2xgTENkVoeb" role="2OqNvi">
-                              <ref role="37wK5l" to="65en:~SpeedSearch.shouldBeShowing(java.lang.String)" resolve="shouldBeShowing" />
-                              <node concept="2OqwBi" id="2xgTENkVoxV" role="37wK5m">
-                                <node concept="37vLTw" id="2xgTENkVom2" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2xgTENkVnvC" resolve="actionGroup" />
-                                </node>
-                                <node concept="liA8E" id="2xgTENkVpBq" role="2OqNvi">
-                                  <ref role="37wK5l" node="2xgTENkUI_8" resolve="getGroupName" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3clFbH" id="2xgTENkVnCd" role="3cqZAp" />
-                      </node>
-                      <node concept="2ZW3vV" id="2xgTENkTOyL" role="3clFbw">
-                        <node concept="3uibUv" id="2xgTENkTOFN" role="2ZW6by">
-                          <ref role="3uigEE" node="2xgTENkSGPx" resolve="IntentionsMenuWithGroups.IntentionActionGroup" />
-                        </node>
-                        <node concept="37vLTw" id="2xgTENkTOjT" role="2ZW6bz">
-                          <ref role="3cqZAo" node="2xgTENkSj87" resolve="action" />
-                        </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="1DKEdPbwda0" role="3cqZAp">
+                <node concept="2OqwBi" id="1DKEdPbwfNR" role="3clFbG">
+                  <node concept="37vLTw" id="1DKEdPbwd9Y" role="2Oq$k0">
+                    <ref role="3cqZAo" node="3pwG8PSkQMV" resolve="action" />
+                  </node>
+                  <node concept="liA8E" id="1DKEdPbwhO4" role="2OqNvi">
+                    <ref role="37wK5l" to="qkt:~AnAction.update(com.intellij.openapi.actionSystem.AnActionEvent)" resolve="update" />
+                    <node concept="2YIFZM" id="1DKEdPbwnok" role="37wK5m">
+                      <ref role="37wK5l" to="qkt:~AnActionEvent.createFromAnAction(com.intellij.openapi.actionSystem.AnAction,java.awt.event.InputEvent,java.lang.String,com.intellij.openapi.actionSystem.DataContext)" resolve="createFromAnAction" />
+                      <ref role="1Pybhc" to="qkt:~AnActionEvent" resolve="AnActionEvent" />
+                      <node concept="37vLTw" id="1DKEdPbwqBy" role="37wK5m">
+                        <ref role="3cqZAo" node="3pwG8PSkQMV" resolve="action" />
                       </node>
-                    </node>
-                    <node concept="3clFbH" id="2xgTENkSoOo" role="3cqZAp" />
-                    <node concept="3cpWs8" id="2xgTENkRQBe" role="3cqZAp">
-                      <node concept="3cpWsn" id="2xgTENkRQBd" role="3cpWs9">
-                        <property role="3TUv4t" value="false" />
-                        <property role="TrG5h" value="text" />
-                        <node concept="17QB3L" id="2xgTENkScVW" role="1tU5fm" />
-                        <node concept="2OqwBi" id="2xgTENkRQC3" role="33vP2m">
-                          <node concept="37vLTw" id="2xgTENkRQC2" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2xgTENkRQB1" resolve="filter" />
-                          </node>
-                          <node concept="liA8E" id="2xgTENkRQC4" role="2OqNvi">
-                            <ref role="37wK5l" to="gspm:~SpeedSearchFilter.getIndexedString(java.lang.Object)" resolve="getIndexedString" />
-                            <node concept="37vLTw" id="2xgTENkRQBh" role="37wK5m">
-                              <ref role="3cqZAo" node="2xgTENkRPVO" resolve="value" />
-                            </node>
-                          </node>
-                        </node>
+                      <node concept="10Nm6u" id="1DKEdPbwwvS" role="37wK5m" />
+                      <node concept="Xl_RD" id="1DKEdPbw_0H" role="37wK5m">
+                        <property role="Xl_RC" value="" />
                       </node>
-                    </node>
-                    <node concept="3cpWs6" id="2xgTENkRQBi" role="3cqZAp">
-                      <node concept="2OqwBi" id="2xgTENkRQCf" role="3cqZAk">
-                        <node concept="37vLTw" id="2xgTENkRQCe" role="2Oq$k0">
-                          <ref role="3cqZAo" to="5rcs:~AbstractPopup.mySpeedSearch" resolve="mySpeedSearch" />
-                        </node>
-                        <node concept="liA8E" id="2xgTENkRQCg" role="2OqNvi">
-                          <ref role="37wK5l" to="65en:~SpeedSearch.shouldBeShowing(java.lang.String)" resolve="shouldBeShowing" />
-                          <node concept="37vLTw" id="2xgTENkRQBk" role="37wK5m">
-                            <ref role="3cqZAo" node="2xgTENkRQBd" resolve="text" />
-                          </node>
-                        </node>
+                      <node concept="37vLTw" id="1DKEdPbwGDJ" role="37wK5m">
+                        <ref role="3cqZAo" node="3pwG8PSkQN0" resolve="dataContext" />
                       </node>
                     </node>
                   </node>
-                  <node concept="2AHcQZ" id="2xgTENkRPVV" role="2AJF6D">
-                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-                  </node>
                 </node>
-                <node concept="2tJIrI" id="3N2QCt80Z2T" role="jymVt" />
-                <node concept="3clFb_" id="3N2QCt80XSe" role="jymVt">
-                  <property role="1EzhhJ" value="false" />
-                  <property role="TrG5h" value="getListElementRenderer" />
-                  <property role="DiZV1" value="false" />
-                  <node concept="3Tmbuc" id="3N2QCt80XSf" role="1B3o_S" />
-                  <node concept="3uibUv" id="3N2QCt80XSh" role="3clF45">
-                    <ref role="3uigEE" to="dxuu:~ListCellRenderer" resolve="ListCellRenderer" />
+              </node>
+              <node concept="3clFbJ" id="3pwG8PSkQNQ" role="3cqZAp">
+                <node concept="2OqwBi" id="3pwG8PSkUam" role="3clFbw">
+                  <node concept="37vLTw" id="3pwG8PSkUal" role="2Oq$k0">
+                    <ref role="3cqZAo" node="3pwG8PSkQNx" resolve="presentation" />
                   </node>
-                  <node concept="3clFbS" id="3N2QCt80XSk" role="3clF47">
-                    <node concept="3clFbF" id="3N2QCt8159c" role="3cqZAp">
-                      <node concept="2ShNRf" id="3N2QCt8159a" role="3clFbG">
-                        <node concept="YeOm9" id="3N2QCt82vCI" role="2ShVmc">
-                          <node concept="1Y3b0j" id="3N2QCt82vCL" role="YeSDq">
-                            <property role="2bfB8j" value="true" />
-                            <ref role="1Y3XeK" to="d2fk:~PopupListElementRenderer" resolve="PopupListElementRenderer" />
-                            <ref role="37wK5l" to="d2fk:~PopupListElementRenderer.&lt;init&gt;(com.intellij.ui.popup.list.ListPopupImpl)" resolve="PopupListElementRenderer" />
-                            <node concept="3Tm1VV" id="3N2QCt82vCM" role="1B3o_S" />
-                            <node concept="Xjq3P" id="3N2QCt82qB2" role="37wK5m" />
-                            <node concept="3KIgzJ" id="3N2QCt82vJ9" role="jymVt">
-                              <node concept="3clFbS" id="3N2QCt82vJa" role="3KIlGz">
-                                <node concept="3clFbF" id="3N2QCt82vMJ" role="3cqZAp">
-                                  <node concept="2OqwBi" id="3N2QCt82w2K" role="3clFbG">
-                                    <node concept="37vLTw" id="3N2QCt82vMI" role="2Oq$k0">
-                                      <ref role="3cqZAo" to="lzb2:~GroupedElementsRenderer.mySeparatorComponent" resolve="mySeparatorComponent" />
-                                    </node>
-                                    <node concept="liA8E" id="3N2QCt82zVZ" role="2OqNvi">
-                                      <ref role="37wK5l" to="dxuu:~JComponent.setFont(java.awt.Font)" resolve="setFont" />
-                                      <node concept="2OqwBi" id="3N2QCt82Cw_" role="37wK5m">
-                                        <node concept="2OqwBi" id="3N2QCt82$cW" role="2Oq$k0">
-                                          <node concept="37vLTw" id="3N2QCt82$0l" role="2Oq$k0">
-                                            <ref role="3cqZAo" to="lzb2:~GroupedElementsRenderer.mySeparatorComponent" resolve="mySeparatorComponent" />
-                                          </node>
-                                          <node concept="liA8E" id="3N2QCt82C75" role="2OqNvi">
-                                            <ref role="37wK5l" to="z60i:~Component.getFont()" resolve="getFont" />
-                                          </node>
-                                        </node>
-                                        <node concept="liA8E" id="3N2QCt82Ha3" role="2OqNvi">
-                                          <ref role="37wK5l" to="z60i:~Font.deriveFont(float)" resolve="deriveFont" />
-                                          <node concept="2$xPTn" id="3N2QCt83eFx" role="37wK5m">
-                                            <property role="2$xPTl" value="10.0f" />
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
+                  <node concept="liA8E" id="3pwG8PSkUan" role="2OqNvi">
+                    <ref role="37wK5l" to="qkt:~Presentation.isVisible()" resolve="isVisible" />
+                  </node>
+                </node>
+                <node concept="3clFbS" id="3pwG8PSkQNT" role="3clFbx">
+                  <node concept="3clFbF" id="3pwG8PSkQNU" role="3cqZAp">
+                    <node concept="2OqwBi" id="3pwG8PSkUar" role="3clFbG">
+                      <node concept="37vLTw" id="3pwG8PSkUaq" role="2Oq$k0">
+                        <ref role="3cqZAo" node="3pwG8PSkQMX" resolve="actions" />
+                      </node>
+                      <node concept="liA8E" id="3pwG8PSkUas" role="2OqNvi">
+                        <ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
+                        <node concept="37vLTw" id="3pwG8PSkQNW" role="37wK5m">
+                          <ref role="3cqZAo" node="3pwG8PSkQMV" resolve="action" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="2AHcQZ" id="3N2QCt80XSl" role="2AJF6D">
-                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-                  </node>
                 </node>
               </node>
             </node>
           </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="2xgTENkRmp8" role="3clF46">
-        <property role="TrG5h" value="title" />
-        <property role="3TUv4t" value="true" />
-        <node concept="17QB3L" id="2xgTENkRHzy" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="2xgTENkRmpa" role="3clF46">
-        <property role="TrG5h" value="actionGroup" />
-        <property role="3TUv4t" value="false" />
-        <node concept="2AHcQZ" id="2xgTENkRmpb" role="2AJF6D">
-          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
-        </node>
-        <node concept="3uibUv" id="2xgTENkRmpc" role="1tU5fm">
-          <ref role="3uigEE" to="qkt:~ActionGroup" resolve="ActionGroup" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="2xgTENkRmpd" role="3clF46">
-        <property role="TrG5h" value="dataContext" />
-        <property role="3TUv4t" value="false" />
-        <node concept="2AHcQZ" id="2xgTENkRmpe" role="2AJF6D">
-          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
-        </node>
-        <node concept="3uibUv" id="2xgTENkRmpf" role="1tU5fm">
-          <ref role="3uigEE" to="qkt:~DataContext" resolve="DataContext" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="2xgTENkRmpg" role="3clF46">
-        <property role="TrG5h" value="showNumbers" />
-        <property role="3TUv4t" value="false" />
-        <node concept="10P_77" id="2xgTENkRmph" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="2xgTENkRmpi" role="3clF46">
-        <property role="TrG5h" value="useAlphaAsNumbers" />
-        <property role="3TUv4t" value="false" />
-        <node concept="10P_77" id="2xgTENkRmpj" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="2xgTENkRmpk" role="3clF46">
-        <property role="TrG5h" value="showDisabledActions" />
-        <property role="3TUv4t" value="false" />
-        <node concept="10P_77" id="2xgTENkRmpl" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="2xgTENkRmpm" role="3clF46">
-        <property role="TrG5h" value="honorActionMnemonics" />
-        <property role="3TUv4t" value="false" />
-        <node concept="10P_77" id="2xgTENkRmpn" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="2xgTENkRmpo" role="3clF46">
-        <property role="TrG5h" value="disposeCallback" />
-        <property role="3TUv4t" value="true" />
-        <node concept="3uibUv" id="2xgTENkRmpp" role="1tU5fm">
-          <ref role="3uigEE" to="wyt6:~Runnable" resolve="Runnable" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="2xgTENkRmpq" role="3clF46">
-        <property role="TrG5h" value="maxRowCount" />
-        <property role="3TUv4t" value="true" />
-        <node concept="10Oyi0" id="2xgTENkRmpr" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="2xgTENkRmps" role="3clF46">
-        <property role="TrG5h" value="preselectActionCondition" />
-        <property role="3TUv4t" value="true" />
-        <node concept="3uibUv" id="2xgTENkRmpt" role="1tU5fm">
-          <ref role="3uigEE" to="zn9m:~Condition" resolve="Condition" />
-          <node concept="3uibUv" id="2xgTENkRmpu" role="11_B2D">
-            <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
+          <node concept="3clFbS" id="3pwG8PSkQN8" role="3clFbx">
+            <node concept="1DcWWT" id="3pwG8PSkQN9" role="3cqZAp">
+              <node concept="2OqwBi" id="3pwG8PSkQNk" role="1DdaDG">
+                <node concept="1eOMI4" id="3pwG8PSkQNo" role="2Oq$k0">
+                  <node concept="10QFUN" id="3pwG8PSkQNl" role="1eOMHV">
+                    <node concept="37vLTw" id="3pwG8PSkQNm" role="10QFUP">
+                      <ref role="3cqZAo" node="3pwG8PSkQMV" resolve="action" />
+                    </node>
+                    <node concept="3uibUv" id="3pwG8PSkQNn" role="10QFUM">
+                      <ref role="3uigEE" to="qkt:~ActionGroup" resolve="ActionGroup" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="liA8E" id="3pwG8PSkQNp" role="2OqNvi">
+                  <ref role="37wK5l" to="qkt:~ActionGroup.getChildren(com.intellij.openapi.actionSystem.AnActionEvent)" resolve="getChildren" />
+                  <node concept="10Nm6u" id="3pwG8PSkQNq" role="37wK5m" />
+                </node>
+              </node>
+              <node concept="3cpWsn" id="3pwG8PSkQNh" role="1Duv9x">
+                <property role="3TUv4t" value="false" />
+                <property role="TrG5h" value="child" />
+                <node concept="3uibUv" id="3pwG8PSkQNj" role="1tU5fm">
+                  <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
+                </node>
+              </node>
+              <node concept="3clFbS" id="3pwG8PSkQNb" role="2LFqv$">
+                <node concept="3clFbF" id="29wDeGI8z3F" role="3cqZAp">
+                  <node concept="2OqwBi" id="29wDeGI8AU1" role="3clFbG">
+                    <node concept="37vLTw" id="29wDeGI8z3D" role="2Oq$k0">
+                      <ref role="3cqZAo" node="3pwG8PSkQMX" resolve="actions" />
+                    </node>
+                    <node concept="liA8E" id="29wDeGI8EAn" role="2OqNvi">
+                      <ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
+                      <node concept="37vLTw" id="29wDeGI8J3U" role="37wK5m">
+                        <ref role="3cqZAo" node="3pwG8PSkQNh" resolve="child" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
           </node>
         </node>
       </node>
-      <node concept="37vLTG" id="2xgTENkRmpv" role="3clF46">
-        <property role="TrG5h" value="actionPlace" />
-        <property role="3TUv4t" value="true" />
-        <node concept="2AHcQZ" id="2xgTENkRmpw" role="2AJF6D">
-          <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
-        </node>
-        <node concept="17QB3L" id="2xgTENkRON8" role="1tU5fm" />
-      </node>
-      <node concept="3uibUv" id="2xgTENkRmpL" role="3clF45">
-        <ref role="3uigEE" to="gspm:~ListPopup" resolve="ListPopup" />
-      </node>
-      <node concept="3Tmbuc" id="2xgTENkRMnt" role="1B3o_S" />
+      <node concept="3Tmbuc" id="3pwG8PSop7T" role="1B3o_S" />
+      <node concept="3cqZAl" id="3pwG8PSkQNY" role="3clF45" />
     </node>
-    <node concept="2tJIrI" id="2xgTENkWhiQ" role="jymVt" />
-    <node concept="312cEu" id="2xgTENkSGPx" role="jymVt">
-      <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="IntentionActionGroup" />
-      <node concept="312cEg" id="2xgTENkSUWY" role="jymVt">
-        <property role="TrG5h" value="myIntention" />
-        <node concept="3uibUv" id="7me2y0SMXZ7" role="1tU5fm">
-          <ref role="3uigEE" to="nddn:~IntentionExecutable" resolve="IntentionExecutable" />
+    <node concept="2tJIrI" id="2jDew64NilU" role="jymVt" />
+    <node concept="3clFb_" id="3pwG8PSkQQM" role="jymVt">
+      <property role="TrG5h" value="getModelAccess" />
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <node concept="3clFbS" id="3pwG8PSkQQN" role="3clF47">
+        <node concept="3cpWs6" id="3pwG8PSkQQO" role="3cqZAp">
+          <node concept="2OqwBi" id="6LzhH3u5xk8" role="3cqZAk">
+            <node concept="2OqwBi" id="6LzhH3u5sNy" role="2Oq$k0">
+              <node concept="2OqwBi" id="6LzhH3u5nhR" role="2Oq$k0">
+                <node concept="37vLTw" id="3pwG8PSl48z" role="2Oq$k0">
+                  <ref role="3cqZAo" node="2jDew64KOaH" resolve="editor" />
+                </node>
+                <node concept="liA8E" id="6LzhH3u5qRS" role="2OqNvi">
+                  <ref role="37wK5l" to="exr9:~EditorComponent.getEditorContext()" resolve="getEditorContext" />
+                </node>
+              </node>
+              <node concept="liA8E" id="6LzhH3u5uX8" role="2OqNvi">
+                <ref role="37wK5l" to="exr9:~EditorContext.getRepository()" resolve="getRepository" />
+              </node>
+            </node>
+            <node concept="liA8E" id="6LzhH3u5zzP" role="2OqNvi">
+              <ref role="37wK5l" to="lui2:~SRepository.getModelAccess()" resolve="getModelAccess" />
+            </node>
+          </node>
         </node>
-        <node concept="3Tmbuc" id="2xgTENkTfuA" role="1B3o_S" />
       </node>
-      <node concept="312cEg" id="2xgTENkTgHn" role="jymVt">
-        <property role="TrG5h" value="myNode" />
-        <node concept="3Tmbuc" id="2xgTENkUHl5" role="1B3o_S" />
-        <node concept="3Tqbb2" id="2xgTENkThUC" role="1tU5fm" />
+      <node concept="3Tmbuc" id="3pwG8PSouID" role="1B3o_S" />
+      <node concept="3uibUv" id="3pwG8PSkQQT" role="3clF45">
+        <ref role="3uigEE" to="lui2:~ModelAccess" resolve="ModelAccess" />
       </node>
-      <node concept="312cEg" id="2xgTENkUFZO" role="jymVt">
-        <property role="TrG5h" value="myGroupName" />
-        <node concept="3Tmbuc" id="2xgTENkUHn9" role="1B3o_S" />
-        <node concept="17QB3L" id="2xgTENkUHo9" role="1tU5fm" />
+    </node>
+    <node concept="3Tm1VV" id="2jDew64JcPy" role="1B3o_S" />
+    <node concept="3uibUv" id="2jDew64JeQ$" role="1zkMxy">
+      <ref role="3uigEE" to="uxaq:~IntentionMenuProducer" resolve="IntentionMenuProducer" />
+    </node>
+  </node>
+  <node concept="312cEu" id="2jDew64QLb0">
+    <property role="2bfB8j" value="true" />
+    <property role="TrG5h" value="IntentionActionGroup" />
+    <node concept="312cEg" id="2jDew64S3xv" role="jymVt">
+      <property role="TrG5h" value="myProducer" />
+      <node concept="3Tmbuc" id="2jDew64S3eZ" role="1B3o_S" />
+      <node concept="3uibUv" id="2jDew64S3rJ" role="1tU5fm">
+        <ref role="3uigEE" node="2jDew64JcPx" resolve="MyIntentionMenuProducer" />
       </node>
-      <node concept="2tJIrI" id="2xgTENkSTLV" role="jymVt" />
-      <node concept="3Tm1VV" id="2xgTENkSGPy" role="1B3o_S" />
-      <node concept="3uibUv" id="2xgTENkSJxo" role="1zkMxy">
-        <ref role="3uigEE" to="qkt:~DefaultActionGroup" resolve="DefaultActionGroup" />
+    </node>
+    <node concept="312cEg" id="2jDew64QLb1" role="jymVt">
+      <property role="TrG5h" value="myIntention" />
+      <node concept="3uibUv" id="2jDew64QLb2" role="1tU5fm">
+        <ref role="3uigEE" to="nddn:~IntentionExecutable" resolve="IntentionExecutable" />
       </node>
-      <node concept="3clFbW" id="2xgTENkSP2C" role="jymVt">
-        <node concept="3cqZAl" id="2xgTENkSP2D" role="3clF45" />
-        <node concept="3Tm1VV" id="2xgTENkSP2E" role="1B3o_S" />
-        <node concept="3clFbS" id="2xgTENkSP2G" role="3clF47">
-          <node concept="XkiVB" id="2xgTENkSP2I" role="3cqZAp">
-            <ref role="37wK5l" to="qkt:~DefaultActionGroup.&lt;init&gt;(java.lang.String,boolean)" resolve="DefaultActionGroup" />
-            <node concept="37vLTw" id="2xgTENkSP2M" role="37wK5m">
-              <ref role="3cqZAo" node="2xgTENkSP2J" resolve="shortName" />
-            </node>
-            <node concept="37vLTw" id="2xgTENkSP2Q" role="37wK5m">
-              <ref role="3cqZAo" node="2xgTENkSP2N" resolve="popup" />
-            </node>
+      <node concept="3Tmbuc" id="2jDew64QLb3" role="1B3o_S" />
+    </node>
+    <node concept="312cEg" id="2jDew64QLb4" role="jymVt">
+      <property role="TrG5h" value="myNode" />
+      <node concept="3Tmbuc" id="2jDew64QLb5" role="1B3o_S" />
+      <node concept="3Tqbb2" id="2jDew64QLb6" role="1tU5fm" />
+    </node>
+    <node concept="312cEg" id="2jDew64QLb7" role="jymVt">
+      <property role="TrG5h" value="myGroupName" />
+      <node concept="3Tmbuc" id="2jDew64QLb8" role="1B3o_S" />
+      <node concept="17QB3L" id="2jDew64QLb9" role="1tU5fm" />
+    </node>
+    <node concept="2tJIrI" id="2jDew64QLba" role="jymVt" />
+    <node concept="3Tm1VV" id="2jDew64QLbb" role="1B3o_S" />
+    <node concept="3uibUv" id="2jDew64QLbc" role="1zkMxy">
+      <ref role="3uigEE" to="qkt:~DefaultActionGroup" resolve="DefaultActionGroup" />
+    </node>
+    <node concept="3clFbW" id="2jDew64QLbd" role="jymVt">
+      <node concept="3cqZAl" id="2jDew64QLbe" role="3clF45" />
+      <node concept="3Tm1VV" id="2jDew64QLbf" role="1B3o_S" />
+      <node concept="3clFbS" id="2jDew64QLbg" role="3clF47">
+        <node concept="XkiVB" id="2jDew64QLbh" role="3cqZAp">
+          <ref role="37wK5l" to="qkt:~DefaultActionGroup.&lt;init&gt;(java.lang.String,boolean)" resolve="DefaultActionGroup" />
+          <node concept="37vLTw" id="2jDew64QLbi" role="37wK5m">
+            <ref role="3cqZAo" node="2jDew64QLbw" resolve="shortName" />
           </node>
-          <node concept="3clFbF" id="2xgTENkTcV5" role="3cqZAp">
-            <node concept="37vLTI" id="2xgTENkTd55" role="3clFbG">
-              <node concept="37vLTw" id="2xgTENkTd7$" role="37vLTx">
-                <ref role="3cqZAo" node="2xgTENkT3Zt" resolve="intention" />
-              </node>
-              <node concept="37vLTw" id="2xgTENkTcV3" role="37vLTJ">
-                <ref role="3cqZAo" node="2xgTENkSUWY" resolve="myIntention" />
-              </node>
-            </node>
+          <node concept="37vLTw" id="2jDew64QLbj" role="37wK5m">
+            <ref role="3cqZAo" node="2jDew64QLb$" resolve="popup" />
           </node>
-          <node concept="3clFbF" id="2xgTENkTrUL" role="3cqZAp">
-            <node concept="37vLTI" id="2xgTENkTrYB" role="3clFbG">
-              <node concept="37vLTw" id="2xgTENkTshT" role="37vLTx">
-                <ref role="3cqZAo" node="2xgTENkThXi" resolve="node" />
-              </node>
-              <node concept="37vLTw" id="2xgTENkTrUJ" role="37vLTJ">
-                <ref role="3cqZAo" node="2xgTENkTgHn" resolve="myNode" />
-              </node>
+        </node>
+        <node concept="3clFbF" id="2jDew64S48G" role="3cqZAp">
+          <node concept="37vLTI" id="2jDew64S4vQ" role="3clFbG">
+            <node concept="37vLTw" id="2jDew64S4Cd" role="37vLTx">
+              <ref role="3cqZAo" node="2jDew64S3FW" resolve="produer" />
             </node>
-          </node>
-          <node concept="3clFbF" id="2xgTENkVGTF" role="3cqZAp">
-            <node concept="37vLTI" id="2xgTENkVH2I" role="3clFbG">
-              <node concept="37vLTw" id="2xgTENkVH7h" role="37vLTx">
-                <ref role="3cqZAo" node="2xgTENkUzDM" resolve="groupName" />
-              </node>
-              <node concept="37vLTw" id="2xgTENkVGTD" role="37vLTJ">
-                <ref role="3cqZAo" node="2xgTENkUFZO" resolve="myGroupName" />
-              </node>
+            <node concept="37vLTw" id="2jDew64S48E" role="37vLTJ">
+              <ref role="3cqZAo" node="2jDew64S3xv" resolve="myProducer" />
             </node>
           </node>
         </node>
-        <node concept="37vLTG" id="2xgTENkSP2J" role="3clF46">
-          <property role="TrG5h" value="shortName" />
-          <node concept="17QB3L" id="2xgTENkSSvC" role="1tU5fm" />
-        </node>
-        <node concept="37vLTG" id="2xgTENkUzDM" role="3clF46">
-          <property role="TrG5h" value="groupName" />
-          <node concept="17QB3L" id="2xgTENkU$Y7" role="1tU5fm" />
-        </node>
-        <node concept="37vLTG" id="2xgTENkSP2N" role="3clF46">
-          <property role="TrG5h" value="popup" />
-          <node concept="10P_77" id="2xgTENkSP2P" role="1tU5fm" />
-        </node>
-        <node concept="37vLTG" id="2xgTENkT3Zt" role="3clF46">
-          <property role="TrG5h" value="intention" />
-          <node concept="3uibUv" id="7me2y0SMYjc" role="1tU5fm">
-            <ref role="3uigEE" to="nddn:~IntentionExecutable" resolve="IntentionExecutable" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="2xgTENkThXi" role="3clF46">
-          <property role="TrG5h" value="node" />
-          <node concept="3Tqbb2" id="2xgTENkTjdw" role="1tU5fm" />
-        </node>
-      </node>
-      <node concept="2tJIrI" id="2xgTENkSWes" role="jymVt" />
-      <node concept="3clFb_" id="2xgTENkSYfd" role="jymVt">
-        <property role="TrG5h" value="getIntention" />
-        <node concept="3uibUv" id="7me2y0SMZFV" role="3clF45">
-          <ref role="3uigEE" to="nddn:~IntentionExecutable" resolve="IntentionExecutable" />
-        </node>
-        <node concept="3Tm1VV" id="2xgTENkSYfg" role="1B3o_S" />
-        <node concept="3clFbS" id="2xgTENkSYfh" role="3clF47">
-          <node concept="3clFbF" id="2xgTENkT3XQ" role="3cqZAp">
-            <node concept="37vLTw" id="2xgTENkT3XP" role="3clFbG">
-              <ref role="3cqZAo" node="2xgTENkSUWY" resolve="myIntention" />
+        <node concept="3clFbF" id="2jDew64QLbk" role="3cqZAp">
+          <node concept="37vLTI" id="2jDew64QLbl" role="3clFbG">
+            <node concept="37vLTw" id="2jDew64QLbm" role="37vLTx">
+              <ref role="3cqZAo" node="2jDew64QLbA" resolve="intention" />
             </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2tJIrI" id="2xgTENkTtun" role="jymVt" />
-      <node concept="3clFb_" id="2xgTENkTt_B" role="jymVt">
-        <property role="TrG5h" value="getNode" />
-        <node concept="3Tqbb2" id="2xgTENkTv1A" role="3clF45" />
-        <node concept="3Tm1VV" id="2xgTENkTt_E" role="1B3o_S" />
-        <node concept="3clFbS" id="2xgTENkTt_F" role="3clF47">
-          <node concept="3clFbF" id="2xgTENkTv2h" role="3cqZAp">
-            <node concept="37vLTw" id="2xgTENkTv2g" role="3clFbG">
-              <ref role="3cqZAo" node="2xgTENkTgHn" resolve="myNode" />
+            <node concept="37vLTw" id="2jDew64QLbn" role="37vLTJ">
+              <ref role="3cqZAo" node="2jDew64QLb1" resolve="myIntention" />
             </node>
           </node>
         </node>
-      </node>
-      <node concept="2tJIrI" id="2xgTENkTEle" role="jymVt" />
-      <node concept="3clFb_" id="2xgTENkWmQZ" role="jymVt">
-        <property role="TrG5h" value="canBePerformed" />
-        <property role="DiZV1" value="false" />
-        <property role="od$2w" value="false" />
-        <node concept="2AHcQZ" id="2xgTENkWmR5" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-        <node concept="37vLTG" id="2xgTENkWmR7" role="3clF46">
-          <property role="TrG5h" value="c" />
-          <property role="3TUv4t" value="false" />
-          <node concept="3uibUv" id="2xgTENkWmR1" role="1tU5fm">
-            <ref role="3uigEE" to="qkt:~DataContext" resolve="DataContext" />
-          </node>
-        </node>
-        <node concept="3clFbS" id="2xgTENkWmR3" role="3clF47">
-          <node concept="3cpWs6" id="2xgTENkWmRd" role="3cqZAp">
-            <node concept="3clFbT" id="2xgTENkWmRf" role="3cqZAk">
-              <property role="3clFbU" value="true" />
+        <node concept="3clFbF" id="2jDew64QLbo" role="3cqZAp">
+          <node concept="37vLTI" id="2jDew64QLbp" role="3clFbG">
+            <node concept="37vLTw" id="2jDew64QLbq" role="37vLTx">
+              <ref role="3cqZAo" node="2jDew64QLbC" resolve="node" />
+            </node>
+            <node concept="37vLTw" id="2jDew64QLbr" role="37vLTJ">
+              <ref role="3cqZAo" node="2jDew64QLb4" resolve="myNode" />
             </node>
           </node>
         </node>
-        <node concept="3Tm1VV" id="2xgTENkWmR9" role="1B3o_S" />
-        <node concept="10P_77" id="2xgTENkWmRb" role="3clF45" />
-      </node>
-      <node concept="2tJIrI" id="2xgTENkURlQ" role="jymVt" />
-      <node concept="3clFb_" id="2xgTENkWmRl" role="jymVt">
-        <property role="TrG5h" value="actionPerformed" />
-        <property role="DiZV1" value="false" />
-        <property role="od$2w" value="false" />
-        <node concept="2AHcQZ" id="2xgTENkWmRn" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-        <node concept="37vLTG" id="2xgTENkWmRh" role="3clF46">
-          <property role="TrG5h" value="e" />
-          <property role="3TUv4t" value="false" />
-          <node concept="3uibUv" id="2xgTENkWmRj" role="1tU5fm">
-            <ref role="3uigEE" to="qkt:~AnActionEvent" resolve="AnActionEvent" />
-          </node>
-        </node>
-        <node concept="3clFbS" id="2xgTENkWmQT" role="3clF47">
-          <node concept="3clFbF" id="2xgTENkWmQR" role="3cqZAp">
-            <node concept="1rXfSq" id="2xgTENkWmQP" role="3clFbG">
-              <ref role="37wK5l" node="3pwG8PSkQIH" resolve="executeIntention" />
-              <node concept="37vLTw" id="2xgTENkTLlM" role="37wK5m">
-                <ref role="3cqZAo" node="2xgTENkSUWY" resolve="myIntention" />
-              </node>
-              <node concept="37vLTw" id="2xgTENkTLof" role="37wK5m">
-                <ref role="3cqZAo" node="2xgTENkTgHn" resolve="myNode" />
-              </node>
+        <node concept="3clFbF" id="2jDew64QLbs" role="3cqZAp">
+          <node concept="37vLTI" id="2jDew64QLbt" role="3clFbG">
+            <node concept="37vLTw" id="2jDew64QLbu" role="37vLTx">
+              <ref role="3cqZAo" node="2jDew64QLby" resolve="groupName" />
+            </node>
+            <node concept="37vLTw" id="2jDew64QLbv" role="37vLTJ">
+              <ref role="3cqZAo" node="2jDew64QLb7" resolve="myGroupName" />
             </node>
           </node>
         </node>
-        <node concept="3Tm1VV" id="2xgTENkWmQX" role="1B3o_S" />
-        <node concept="3cqZAl" id="2xgTENkWmQV" role="3clF45" />
       </node>
-      <node concept="2tJIrI" id="2xgTENkUQ0g" role="jymVt" />
-      <node concept="3clFb_" id="2xgTENkUI_8" role="jymVt">
-        <property role="TrG5h" value="getGroupName" />
-        <node concept="17QB3L" id="2xgTENkUOLD" role="3clF45" />
-        <node concept="3Tm1VV" id="2xgTENkUI_b" role="1B3o_S" />
-        <node concept="3clFbS" id="2xgTENkUI_c" role="3clF47">
-          <node concept="3clFbF" id="2xgTENkUSG5" role="3cqZAp">
-            <node concept="37vLTw" id="2xgTENkUSG4" role="3clFbG">
-              <ref role="3cqZAo" node="2xgTENkUFZO" resolve="myGroupName" />
-            </node>
-          </node>
+      <node concept="37vLTG" id="2jDew64S3FW" role="3clF46">
+        <property role="TrG5h" value="produer" />
+        <node concept="3uibUv" id="2jDew64S3Ii" role="1tU5fm">
+          <ref role="3uigEE" node="2jDew64JcPx" resolve="MyIntentionMenuProducer" />
         </node>
       </node>
-    </node>
-  </node>
-  <node concept="312cEu" id="5qf1oe_zyw0">
-    <property role="TrG5h" value="StyleUtil" />
-    <property role="2bfB8j" value="true" />
-    <node concept="3Tm1VV" id="5qf1oe_zyw1" role="1B3o_S" />
-    <node concept="Wx3nA" id="2iZPrFZnMN9" role="jymVt">
-      <property role="3TUv4t" value="true" />
-      <property role="TrG5h" value="INTENTIONS_IN_READONLY_CELL" />
-      <node concept="3Tm1VV" id="5qf1oe_$8ZN" role="1B3o_S" />
-      <node concept="3uibUv" id="2iZPrFZnMN6" role="1tU5fm">
-        <ref role="3uigEE" to="hox0:~StyleAttribute" resolve="StyleAttribute" />
-        <node concept="3uibUv" id="2iZPrFZnMN7" role="11_B2D">
-          <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+      <node concept="37vLTG" id="2jDew64QLbw" role="3clF46">
+        <property role="TrG5h" value="shortName" />
+        <node concept="17QB3L" id="2jDew64QLbx" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="2jDew64QLby" role="3clF46">
+        <property role="TrG5h" value="groupName" />
+        <node concept="17QB3L" id="2jDew64QLbz" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="2jDew64QLb$" role="3clF46">
+        <property role="TrG5h" value="popup" />
+        <node concept="10P_77" id="2jDew64QLb_" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="2jDew64QLbA" role="3clF46">
+        <property role="TrG5h" value="intention" />
+        <node concept="3uibUv" id="2jDew64QLbB" role="1tU5fm">
+          <ref role="3uigEE" to="nddn:~IntentionExecutable" resolve="IntentionExecutable" />
         </node>
       </node>
-      <node concept="1Z6Ecs" id="2iZPrFZnMN8" role="33vP2m">
-        <ref role="1Z6EpT" to="zddv:5qf1oe_$9mw" resolve="intentions-in-read-only-cell" />
+      <node concept="37vLTG" id="2jDew64QLbC" role="3clF46">
+        <property role="TrG5h" value="node" />
+        <node concept="3Tqbb2" id="2jDew64QLbD" role="1tU5fm" />
       </node>
     </node>
-    <node concept="2tJIrI" id="5qf1oe_$8xF" role="jymVt" />
-    <node concept="2tJIrI" id="5qf1oe_$8Ay" role="jymVt" />
-    <node concept="2YIFZL" id="5qf1oe_zNws" role="jymVt">
-      <property role="TrG5h" value="allowIntentionsInReadOnlySelection" />
-      <node concept="37vLTG" id="5qf1oe_zNwt" role="3clF46">
-        <property role="TrG5h" value="editorComponent" />
-        <node concept="3uibUv" id="5qf1oe_zNwu" role="1tU5fm">
-          <ref role="3uigEE" to="cj4x:~EditorComponent" resolve="EditorComponent" />
-        </node>
+    <node concept="2tJIrI" id="2jDew64QLbE" role="jymVt" />
+    <node concept="3clFb_" id="2jDew64QLbF" role="jymVt">
+      <property role="TrG5h" value="getIntention" />
+      <node concept="3uibUv" id="2jDew64QLbG" role="3clF45">
+        <ref role="3uigEE" to="nddn:~IntentionExecutable" resolve="IntentionExecutable" />
       </node>
-      <node concept="3clFbS" id="5qf1oe_zNwv" role="3clF47">
-        <node concept="3cpWs8" id="5qf1oe_zNww" role="3cqZAp">
-          <node concept="3cpWsn" id="5qf1oe_zNwx" role="3cpWs9">
-            <property role="TrG5h" value="selection" />
-            <node concept="3uibUv" id="5qf1oe_zNwy" role="1tU5fm">
-              <ref role="3uigEE" to="lwvz:~Selection" resolve="Selection" />
-            </node>
-            <node concept="2OqwBi" id="5qf1oe_zNwz" role="33vP2m">
-              <node concept="2OqwBi" id="5qf1oe_zNw$" role="2Oq$k0">
-                <node concept="37vLTw" id="5qf1oe_zNw_" role="2Oq$k0">
-                  <ref role="3cqZAo" node="5qf1oe_zNwt" resolve="editorComponent" />
-                </node>
-                <node concept="liA8E" id="5qf1oe_zNwA" role="2OqNvi">
-                  <ref role="37wK5l" to="cj4x:~EditorComponent.getSelectionManager()" resolve="getSelectionManager" />
-                </node>
-              </node>
-              <node concept="liA8E" id="5qf1oe_zNwB" role="2OqNvi">
-                <ref role="37wK5l" to="lwvz:~SelectionManager.getSelection()" resolve="getSelection" />
-              </node>
-            </node>
+      <node concept="3Tm1VV" id="2jDew64QLbH" role="1B3o_S" />
+      <node concept="3clFbS" id="2jDew64QLbI" role="3clF47">
+        <node concept="3clFbF" id="2jDew64QLbJ" role="3cqZAp">
+          <node concept="37vLTw" id="2jDew64QLbK" role="3clFbG">
+            <ref role="3cqZAo" node="2jDew64QLb1" resolve="myIntention" />
           </node>
         </node>
-        <node concept="3cpWs6" id="5qf1oe_zNwC" role="3cqZAp">
-          <node concept="22lmx$" id="5qf1oe_zNwD" role="3cqZAk">
-            <node concept="3clFbC" id="5qf1oe_zNwE" role="3uHU7B">
-              <node concept="37vLTw" id="5qf1oe_zNwF" role="3uHU7B">
-                <ref role="3cqZAo" node="5qf1oe_zNwx" resolve="selection" />
-              </node>
-              <node concept="10Nm6u" id="5qf1oe_zNwG" role="3uHU7w" />
-            </node>
-            <node concept="1rXfSq" id="5qf1oe_zZ7k" role="3uHU7w">
-              <ref role="37wK5l" node="5qf1oe_zXNE" resolve="allowIntentionsInReadOnlyCells" />
-              <node concept="37vLTw" id="5qf1oe_$h66" role="37wK5m">
-                <ref role="3cqZAo" node="5qf1oe_zNwt" resolve="editorComponent" />
-              </node>
-              <node concept="2OqwBi" id="5qf1oe_$mWQ" role="37wK5m">
-                <node concept="37vLTw" id="5qf1oe_$mJW" role="2Oq$k0">
-                  <ref role="3cqZAo" node="5qf1oe_zNwx" resolve="selection" />
-                </node>
-                <node concept="liA8E" id="5qf1oe_$n5i" role="2OqNvi">
-                  <ref role="37wK5l" to="lwvz:~Selection.getSelectedCells()" resolve="getSelectedCells" />
-                </node>
-              </node>
-            </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2jDew64QLbL" role="jymVt" />
+    <node concept="3clFb_" id="2jDew64QLbM" role="jymVt">
+      <property role="TrG5h" value="getNode" />
+      <node concept="3Tqbb2" id="2jDew64QLbN" role="3clF45" />
+      <node concept="3Tm1VV" id="2jDew64QLbO" role="1B3o_S" />
+      <node concept="3clFbS" id="2jDew64QLbP" role="3clF47">
+        <node concept="3clFbF" id="2jDew64QLbQ" role="3cqZAp">
+          <node concept="37vLTw" id="2jDew64QLbR" role="3clFbG">
+            <ref role="3cqZAo" node="2jDew64QLb4" resolve="myNode" />
           </node>
         </node>
       </node>
-      <node concept="3Tm1VV" id="5qf1oe_zNwM" role="1B3o_S" />
-      <node concept="10P_77" id="5qf1oe_zNwN" role="3clF45" />
     </node>
-    <node concept="2tJIrI" id="5qf1oe_zXGa" role="jymVt" />
-    <node concept="2YIFZL" id="5qf1oe_zXNE" role="jymVt">
-      <property role="TrG5h" value="allowIntentionsInReadOnlyCells" />
-      <node concept="37vLTG" id="5qf1oe_zXNF" role="3clF46">
-        <property role="TrG5h" value="editorComponent" />
-        <node concept="3uibUv" id="5qf1oe_zXNG" role="1tU5fm">
-          <ref role="3uigEE" to="cj4x:~EditorComponent" resolve="EditorComponent" />
+    <node concept="2tJIrI" id="2jDew64QLbS" role="jymVt" />
+    <node concept="3clFb_" id="2jDew64QLbT" role="jymVt">
+      <property role="TrG5h" value="canBePerformed" />
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <node concept="2AHcQZ" id="2jDew64QLbU" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+      <node concept="37vLTG" id="2jDew64QLbV" role="3clF46">
+        <property role="TrG5h" value="c" />
+        <property role="3TUv4t" value="false" />
+        <node concept="3uibUv" id="2jDew64QLbW" role="1tU5fm">
+          <ref role="3uigEE" to="qkt:~DataContext" resolve="DataContext" />
         </node>
       </node>
-      <node concept="37vLTG" id="5qf1oe_zXNH" role="3clF46">
-        <property role="TrG5h" value="cells" />
-        <node concept="3uibUv" id="5qf1oe_zXNI" role="1tU5fm">
-          <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
-          <node concept="3uibUv" id="5qf1oe_zXNJ" role="11_B2D">
-            <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
+      <node concept="3clFbS" id="2jDew64QLbX" role="3clF47">
+        <node concept="3cpWs6" id="2jDew64QLbY" role="3cqZAp">
+          <node concept="3clFbT" id="2jDew64QLbZ" role="3cqZAk">
+            <property role="3clFbU" value="true" />
           </node>
         </node>
       </node>
-      <node concept="3clFbS" id="5qf1oe_zXNK" role="3clF47">
-        <node concept="1DcWWT" id="5qf1oe_zXNS" role="3cqZAp">
-          <node concept="37vLTw" id="5qf1oe_zXNT" role="1DdaDG">
-            <ref role="3cqZAo" node="5qf1oe_zXNH" resolve="cells" />
-          </node>
-          <node concept="3cpWsn" id="5qf1oe_zXNU" role="1Duv9x">
-            <property role="TrG5h" value="cell" />
-            <node concept="3uibUv" id="5qf1oe_zXNV" role="1tU5fm">
-              <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
+      <node concept="3Tm1VV" id="2jDew64QLc0" role="1B3o_S" />
+      <node concept="10P_77" id="2jDew64QLc1" role="3clF45" />
+    </node>
+    <node concept="2tJIrI" id="2jDew64QLc2" role="jymVt" />
+    <node concept="3clFb_" id="2jDew64QLc3" role="jymVt">
+      <property role="TrG5h" value="actionPerformed" />
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <node concept="2AHcQZ" id="2jDew64QLc4" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+      <node concept="37vLTG" id="2jDew64QLc5" role="3clF46">
+        <property role="TrG5h" value="e" />
+        <property role="3TUv4t" value="false" />
+        <node concept="3uibUv" id="2jDew64QLc6" role="1tU5fm">
+          <ref role="3uigEE" to="qkt:~AnActionEvent" resolve="AnActionEvent" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="2jDew64QLc7" role="3clF47">
+        <node concept="3clFbF" id="2jDew64S5DS" role="3cqZAp">
+          <node concept="2OqwBi" id="2jDew64S62h" role="3clFbG">
+            <node concept="37vLTw" id="2jDew64S5DQ" role="2Oq$k0">
+              <ref role="3cqZAo" node="2jDew64S3xv" resolve="myProducer" />
             </node>
-          </node>
-          <node concept="3clFbS" id="5qf1oe_zXNW" role="2LFqv$">
-            <node concept="3clFbJ" id="5qf1oe_zXNX" role="3cqZAp">
-              <node concept="22lmx$" id="5qf1oe_zXNY" role="3clFbw">
-                <node concept="3clFbC" id="5qf1oe_zXNZ" role="3uHU7B">
-                  <node concept="37vLTw" id="5qf1oe_zXO0" role="3uHU7B">
-                    <ref role="3cqZAo" node="5qf1oe_zXNU" resolve="cell" />
-                  </node>
-                  <node concept="10Nm6u" id="5qf1oe_zXO1" role="3uHU7w" />
-                </node>
-                <node concept="1rXfSq" id="5qf1oe_zXO2" role="3uHU7w">
-                  <ref role="37wK5l" node="5qf1oe_zyw2" resolve="isAllowIntentionsInReadOnlyCell" />
-                  <node concept="37vLTw" id="5qf1oe_zXO3" role="37wK5m">
-                    <ref role="3cqZAo" node="5qf1oe_zXNU" resolve="cell" />
-                  </node>
-                </node>
+            <node concept="liA8E" id="2jDew64S6nY" role="2OqNvi">
+              <ref role="37wK5l" node="2jDew64RVuQ" resolve="executeIntention" />
+              <node concept="37vLTw" id="2jDew64S6Eh" role="37wK5m">
+                <ref role="3cqZAo" node="2jDew64QLb1" resolve="myIntention" />
               </node>
-              <node concept="3clFbS" id="5qf1oe_zXO4" role="3clFbx">
-                <node concept="3cpWs6" id="5qf1oe_zXO5" role="3cqZAp">
-                  <node concept="3clFbT" id="5qf1oe_zXO6" role="3cqZAk">
-                    <property role="3clFbU" value="true" />
-                  </node>
-                </node>
+              <node concept="37vLTw" id="2jDew64S6ZS" role="37wK5m">
+                <ref role="3cqZAo" node="2jDew64QLb4" resolve="myNode" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3cpWs6" id="5qf1oe_zXO7" role="3cqZAp">
-          <node concept="3clFbT" id="5qf1oe_zXO8" role="3cqZAk" />
-        </node>
       </node>
-      <node concept="3Tm1VV" id="5qf1oe_zXO9" role="1B3o_S" />
-      <node concept="10P_77" id="5qf1oe_zXOa" role="3clF45" />
+      <node concept="3Tm1VV" id="2jDew64QLcc" role="1B3o_S" />
+      <node concept="3cqZAl" id="2jDew64QLcd" role="3clF45" />
     </node>
-    <node concept="2tJIrI" id="5qf1oe_zXJT" role="jymVt" />
-    <node concept="2tJIrI" id="5qf1oe_zMRh" role="jymVt" />
-    <node concept="2YIFZL" id="5qf1oe_zyw2" role="jymVt">
-      <property role="TrG5h" value="isAllowIntentionsInReadOnlyCell" />
-      <node concept="37vLTG" id="5qf1oe_zyw3" role="3clF46">
-        <property role="TrG5h" value="cell" />
-        <node concept="2AHcQZ" id="5qf1oe_zyw4" role="2AJF6D">
-          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
-        </node>
-        <node concept="3uibUv" id="5qf1oe_zyw5" role="1tU5fm">
-          <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="5qf1oe_zyw6" role="3clF47">
-        <node concept="3clFbF" id="5qf1oe_$3Wk" role="3cqZAp">
-          <node concept="2OqwBi" id="5qf1oe_$56t" role="3clFbG">
-            <node concept="2OqwBi" id="5qf1oe_$4nJ" role="2Oq$k0">
-              <node concept="37vLTw" id="5qf1oe_$3Wj" role="2Oq$k0">
-                <ref role="3cqZAo" node="5qf1oe_zyw3" resolve="cell" />
-              </node>
-              <node concept="liA8E" id="5qf1oe_$4Il" role="2OqNvi">
-                <ref role="37wK5l" to="f4zo:~EditorCell.getStyle()" resolve="getStyle" />
-              </node>
-            </node>
-            <node concept="liA8E" id="5qf1oe_$5uC" role="2OqNvi">
-              <ref role="37wK5l" to="hox0:~Style.get(jetbrains.mps.openapi.editor.style.StyleAttribute)" resolve="get" />
-              <node concept="37vLTw" id="5qf1oe_$nPc" role="37wK5m">
-                <ref role="3cqZAo" node="2iZPrFZnMN9" resolve="INTENTIONS_IN_READONLY_CELL" />
-              </node>
-            </node>
+    <node concept="2tJIrI" id="2jDew64QLce" role="jymVt" />
+    <node concept="3clFb_" id="2jDew64QLcf" role="jymVt">
+      <property role="TrG5h" value="getGroupName" />
+      <node concept="17QB3L" id="2jDew64QLcg" role="3clF45" />
+      <node concept="3Tm1VV" id="2jDew64QLch" role="1B3o_S" />
+      <node concept="3clFbS" id="2jDew64QLci" role="3clF47">
+        <node concept="3clFbF" id="2jDew64QLcj" role="3cqZAp">
+          <node concept="37vLTw" id="2jDew64QLck" role="3clFbG">
+            <ref role="3cqZAo" node="2jDew64QLb7" resolve="myGroupName" />
           </node>
         </node>
       </node>
-      <node concept="3Tm1VV" id="5qf1oe_zywb" role="1B3o_S" />
-      <node concept="10P_77" id="5qf1oe_zywc" role="3clF45" />
     </node>
   </node>
 </model>
diff --git a/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/models/com/mbeddr/mpsutil/intentions/runtime/plugin.mps b/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/models/com/mbeddr/mpsutil/intentions/runtime/plugin.mps
index c75baa1a7a..9456a77687 100644
--- a/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/models/com/mbeddr/mpsutil/intentions/runtime/plugin.mps
+++ b/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/models/com/mbeddr/mpsutil/intentions/runtime/plugin.mps
@@ -22,7 +22,6 @@
         <child id="481983775135178837" name="disposeBlock" index="2uRRB_" />
         <child id="481983775135178838" name="fieldDeclaration" index="2uRRBA" />
       </concept>
-      <concept id="481983775135178840" name="jetbrains.mps.lang.plugin.standalone.structure.ApplicationPluginDeclaration" flags="ng" index="2uRRBC" />
       <concept id="481983775135178819" name="jetbrains.mps.lang.plugin.standalone.structure.ProjectPluginDisposeBlock" flags="in" index="2uRRBN" />
       <concept id="481983775135178825" name="jetbrains.mps.lang.plugin.standalone.structure.ProjectPluginInitBlock" flags="in" index="2uRRBT" />
       <concept id="7520713872864775836" name="jetbrains.mps.lang.plugin.standalone.structure.StandalonePluginDescriptor" flags="ng" index="2DaZZR" />
@@ -46,6 +45,9 @@
       <concept id="1182160077978" name="jetbrains.mps.baseLanguage.structure.AnonymousClassCreator" flags="nn" index="YeOm9">
         <child id="1182160096073" name="cls" index="YeSDq" />
       </concept>
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
+        <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
+      </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
@@ -108,9 +110,6 @@
     </language>
   </registry>
   <node concept="2DaZZR" id="4Rxhc8j6pW2" />
-  <node concept="2uRRBC" id="4Rxhc8j6pXy">
-    <property role="TrG5h" value="IntentionsApplicationPlugin" />
-  </node>
   <node concept="2uRRBy" id="3pwG8PSiG1M">
     <property role="TrG5h" value="IntentionsProjectPlugin" />
     <node concept="2BZ0e9" id="3pwG8PSiG3k" role="2uRRBA">
@@ -143,12 +142,21 @@
                     <node concept="3cqZAl" id="3pwG8PSjTLM" role="3clF45" />
                     <node concept="3Tm1VV" id="3pwG8PSjTLN" role="1B3o_S" />
                     <node concept="3clFbS" id="3pwG8PSjTLP" role="3clF47">
-                      <node concept="3clFbF" id="3pwG8PSoLCS" role="3cqZAp">
-                        <node concept="2ShNRf" id="3pwG8PSoLCQ" role="3clFbG">
-                          <node concept="1pGfFk" id="3pwG8PSoVr5" role="2ShVmc">
-                            <ref role="37wK5l" to="ih8q:3pwG8PSoC4u" resolve="IntentionsMenuWithGroups" />
-                            <node concept="37vLTw" id="3pwG8PSoXa9" role="37wK5m">
-                              <ref role="3cqZAo" node="3pwG8PSjTLK" resolve="editorComponent" />
+                      <node concept="3clFbF" id="2jDew64H8Xv" role="3cqZAp">
+                        <node concept="2OqwBi" id="2jDew64HaXY" role="3clFbG">
+                          <node concept="37vLTw" id="2jDew64H8Xt" role="2Oq$k0">
+                            <ref role="3cqZAo" node="3pwG8PSjTLK" resolve="editorComponent" />
+                          </node>
+                          <node concept="liA8E" id="2jDew64Hd5G" role="2OqNvi">
+                            <ref role="37wK5l" to="exr9:~EditorComponent.setIntentionMenuProducer(jetbrains.mps.editor.intentions.IntentionMenuProducer)" resolve="setIntentionMenuProducer" />
+                            <node concept="2ShNRf" id="2jDew64L6Ki" role="37wK5m">
+                              <node concept="1pGfFk" id="2jDew64L7EE" role="2ShVmc">
+                                <property role="373rjd" value="true" />
+                                <ref role="37wK5l" to="ih8q:2jDew64KaGG" resolve="MyIntentionMenuProducer" />
+                                <node concept="37vLTw" id="2jDew64OYEu" role="37wK5m">
+                                  <ref role="3cqZAo" node="3pwG8PSjTLK" resolve="editorComponent" />
+                                </node>
+                              </node>
                             </node>
                           </node>
                         </node>

From 32a49fa15e9f4d8c15caa046288ed9746aae7254 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Sun, 15 Dec 2024 14:22:24 +0100
Subject: [PATCH 3/8] editor.dropdown: improve border color and arrow drawing

---
 .../de/itemis/mps/editor/dropdown/runtime.mps | 500 ++++++++++++------
 1 file changed, 346 insertions(+), 154 deletions(-)

diff --git a/code/widgets/solutions/de.itemis.mps.editor.dropdown.runtime/models/de/itemis/mps/editor/dropdown/runtime.mps b/code/widgets/solutions/de.itemis.mps.editor.dropdown.runtime/models/de/itemis/mps/editor/dropdown/runtime.mps
index 7bc4b1d77f..7e606a2eb3 100644
--- a/code/widgets/solutions/de.itemis.mps.editor.dropdown.runtime/models/de/itemis/mps/editor/dropdown/runtime.mps
+++ b/code/widgets/solutions/de.itemis.mps.editor.dropdown.runtime/models/de/itemis/mps/editor/dropdown/runtime.mps
@@ -17,7 +17,10 @@
     <import index="hyam" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.event(JDK/)" />
     <import index="exr9" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor(MPS.Editor/)" />
     <import index="lzb2" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui(MPS.IDEA/)" />
-    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
+    <import index="g1qu" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.util.ui(MPS.IDEA/)" />
+    <import index="l5y2" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui.scale(MPS.IDEA/)" />
+    <import index="4vzn" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ide.ui.laf.darcula(MPS.IDEA/)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -44,15 +47,14 @@
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
       </concept>
+      <concept id="1197029447546" name="jetbrains.mps.baseLanguage.structure.FieldReferenceOperation" flags="nn" index="2OwXpG">
+        <reference id="1197029500499" name="fieldDeclaration" index="2Oxat5" />
+      </concept>
       <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
         <child id="1145553007750" name="creator" index="2ShVmc" />
       </concept>
-      <concept id="1070462154015" name="jetbrains.mps.baseLanguage.structure.StaticFieldDeclaration" flags="ig" index="Wx3nA" />
       <concept id="1070475354124" name="jetbrains.mps.baseLanguage.structure.ThisExpression" flags="nn" index="Xjq3P" />
       <concept id="1070475587102" name="jetbrains.mps.baseLanguage.structure.SuperConstructorInvocation" flags="nn" index="XkiVB" />
-      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
-        <property id="1070475926801" name="value" index="Xl_RC" />
-      </concept>
       <concept id="1182160077978" name="jetbrains.mps.baseLanguage.structure.AnonymousClassCreator" flags="nn" index="YeOm9">
         <child id="1182160096073" name="cls" index="YeSDq" />
       </concept>
@@ -79,10 +81,11 @@
         <child id="1165602531693" name="superclass" index="1zkMxy" />
       </concept>
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
-        <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
-      <concept id="1092119917967" name="jetbrains.mps.baseLanguage.structure.MulExpression" flags="nn" index="17qRlL" />
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
+        <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
+      </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
@@ -91,9 +94,6 @@
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
-      <concept id="1111509017652" name="jetbrains.mps.baseLanguage.structure.FloatingPointConstant" flags="nn" index="3b6qkQ">
-        <property id="1113006610751" name="value" index="$nhwW" />
-      </concept>
       <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
         <property id="1181808852946" name="isFinal" index="DiZV1" />
         <child id="1068580123133" name="returnType" index="3clF45" />
@@ -107,6 +107,7 @@
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
+      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
       <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
         <property id="4467513934994662257" name="forceMultiLine" index="TyiWK" />
         <property id="4467513934994662256" name="forceOneLine" index="TyiWL" />
@@ -131,6 +132,7 @@
       <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
+      <concept id="1068581242869" name="jetbrains.mps.baseLanguage.structure.MinusExpression" flags="nn" index="3cpWsd" />
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
@@ -194,21 +196,6 @@
   </registry>
   <node concept="312cEu" id="_i_acSfjjx">
     <property role="TrG5h" value="EditorCell_DropDown" />
-    <node concept="Wx3nA" id="7szUFELGYVP" role="jymVt">
-      <property role="3TUv4t" value="true" />
-      <property role="TrG5h" value="BORDER_COLOR" />
-      <node concept="3Tm6S6" id="7szUFELGYVM" role="1B3o_S" />
-      <node concept="3uibUv" id="7szUFELGYVN" role="1tU5fm">
-        <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
-      </node>
-      <node concept="2YIFZM" id="2WI5qdsu9_" role="33vP2m">
-        <ref role="37wK5l" to="lzb2:~JBColor.namedColor(java.lang.String)" resolve="namedColor" />
-        <ref role="1Pybhc" to="lzb2:~JBColor" resolve="JBColor" />
-        <node concept="Xl_RD" id="2WI5qdswUT" role="37wK5m">
-          <property role="Xl_RC" value="Component.borderColor" />
-        </node>
-      </node>
-    </node>
     <node concept="2tJIrI" id="3_TG3j98RBg" role="jymVt" />
     <node concept="312cEg" id="3_TG3j98ZTa" role="jymVt">
       <property role="TrG5h" value="myButtonCell" />
@@ -365,8 +352,13 @@
                 </node>
                 <node concept="liA8E" id="7szUFELGUoX" role="2OqNvi">
                   <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color)" resolve="setColor" />
-                  <node concept="37vLTw" id="7szUFELGYW2" role="37wK5m">
-                    <ref role="3cqZAo" node="7szUFELGYVP" resolve="BORDER_COLOR" />
+                  <node concept="2YIFZM" id="2jDew655QML" role="37wK5m">
+                    <ref role="37wK5l" to="4vzn:~DarculaUIUtil.getOutlineColor(boolean,boolean)" resolve="getOutlineColor" />
+                    <ref role="1Pybhc" to="4vzn:~DarculaUIUtil" resolve="DarculaUIUtil" />
+                    <node concept="3clFbT" id="2jDew655V7U" role="37wK5m">
+                      <property role="3clFbU" value="true" />
+                    </node>
+                    <node concept="3clFbT" id="2jDew655VZx" role="37wK5m" />
                   </node>
                 </node>
               </node>
@@ -941,6 +933,7 @@
                   </node>
                 </node>
               </node>
+              <node concept="3clFbH" id="2jDew655_gp" role="3cqZAp" />
               <node concept="3clFbF" id="7szUFELFPxG" role="3cqZAp">
                 <node concept="2OqwBi" id="7szUFELFPyP" role="3clFbG">
                   <node concept="37vLTw" id="7szUFELFPxE" role="2Oq$k0">
@@ -989,8 +982,13 @@
                   </node>
                   <node concept="liA8E" id="7szUFELFOnq" role="2OqNvi">
                     <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color)" resolve="setColor" />
-                    <node concept="37vLTw" id="7szUFELGYWg" role="37wK5m">
-                      <ref role="3cqZAo" node="7szUFELGYVP" resolve="BORDER_COLOR" />
+                    <node concept="2YIFZM" id="2jDew6560Y9" role="37wK5m">
+                      <ref role="37wK5l" to="4vzn:~DarculaUIUtil.getOutlineColor(boolean,boolean)" resolve="getOutlineColor" />
+                      <ref role="1Pybhc" to="4vzn:~DarculaUIUtil" resolve="DarculaUIUtil" />
+                      <node concept="3clFbT" id="2jDew6560Ya" role="37wK5m">
+                        <property role="3clFbU" value="true" />
+                      </node>
+                      <node concept="3clFbT" id="2jDew6560Yb" role="37wK5m" />
                     </node>
                   </node>
                 </node>
@@ -1026,178 +1024,372 @@
                   </node>
                 </node>
               </node>
-              <node concept="3cpWs8" id="3_TG3j95wla" role="3cqZAp">
-                <node concept="3cpWsn" id="3_TG3j95wlb" role="3cpWs9">
-                  <property role="TrG5h" value="triangle" />
-                  <node concept="3uibUv" id="3_TG3j95wlc" role="1tU5fm">
-                    <ref role="3uigEE" to="fbzs:~GeneralPath" resolve="GeneralPath" />
-                  </node>
-                  <node concept="2ShNRf" id="3_TG3j95wqp" role="33vP2m">
-                    <node concept="1pGfFk" id="3_TG3j95wqb" role="2ShVmc">
-                      <ref role="37wK5l" to="fbzs:~GeneralPath.&lt;init&gt;()" resolve="GeneralPath" />
-                    </node>
+              <node concept="3clFbF" id="2jDew655axt" role="3cqZAp">
+                <node concept="2OqwBi" id="2jDew655cP_" role="3clFbG">
+                  <node concept="37vLTw" id="2jDew655axr" role="2Oq$k0">
+                    <ref role="3cqZAo" node="3_TG3j95npR" resolve="g" />
                   </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="3_TG3j95wvf" role="3cqZAp">
-                <node concept="2OqwBi" id="3_TG3j95wzF" role="3clFbG">
-                  <node concept="37vLTw" id="3_TG3j95wvd" role="2Oq$k0">
-                    <ref role="3cqZAo" node="3_TG3j95wlb" resolve="triangle" />
-                  </node>
-                  <node concept="liA8E" id="3_TG3j95wQn" role="2OqNvi">
-                    <ref role="37wK5l" to="fbzs:~Path2D$Float.moveTo(double,double)" resolve="moveTo" />
-                    <node concept="3cpWs3" id="3_TG3j95x9Z" role="37wK5m">
-                      <node concept="FJ1c_" id="3_TG3j95xGC" role="3uHU7w">
-                        <node concept="3b6qkQ" id="3_TG3j98_yl" role="3uHU7w">
-                          <property role="$nhwW" value="4.0" />
-                        </node>
-                        <node concept="1rXfSq" id="3_TG3j95xkC" role="3uHU7B">
-                          <ref role="37wK5l" to="g51k:~EditorCell_Basic.getWidth()" resolve="getWidth" />
-                        </node>
-                      </node>
-                      <node concept="1rXfSq" id="3_TG3j95wS8" role="3uHU7B">
-                        <ref role="37wK5l" to="g51k:~EditorCell_Basic.getX()" resolve="getX" />
-                      </node>
-                    </node>
-                    <node concept="3cpWs3" id="3_TG3j95yTE" role="37wK5m">
-                      <node concept="FJ1c_" id="3_TG3j95zVn" role="3uHU7w">
-                        <node concept="3b6qkQ" id="3_TG3j98_Mm" role="3uHU7w">
-                          <property role="$nhwW" value="3.0" />
-                        </node>
-                        <node concept="1rXfSq" id="3_TG3j95zzu" role="3uHU7B">
-                          <ref role="37wK5l" to="g51k:~EditorCell_Basic.getHeight()" resolve="getHeight" />
-                        </node>
-                      </node>
-                      <node concept="1rXfSq" id="3_TG3j95y9A" role="3uHU7B">
-                        <ref role="37wK5l" to="g51k:~EditorCell_Basic.getY()" resolve="getY" />
+                  <node concept="liA8E" id="2jDew655hhA" role="2OqNvi">
+                    <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color)" resolve="setColor" />
+                    <node concept="2YIFZM" id="2jDew655sqM" role="37wK5m">
+                      <ref role="37wK5l" to="g1qu:~JBUI$CurrentTheme$Arrow.foregroundColor(boolean)" resolve="foregroundColor" />
+                      <ref role="1Pybhc" to="g1qu:~JBUI$CurrentTheme$Arrow" resolve="JBUI.CurrentTheme.Arrow" />
+                      <node concept="3clFbT" id="2jDew655uWm" role="37wK5m">
+                        <property role="3clFbU" value="true" />
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="3clFbF" id="3_TG3j95$it" role="3cqZAp">
-                <node concept="2OqwBi" id="3_TG3j95$vv" role="3clFbG">
-                  <node concept="37vLTw" id="3_TG3j95$ir" role="2Oq$k0">
-                    <ref role="3cqZAo" node="3_TG3j95wlb" resolve="triangle" />
-                  </node>
-                  <node concept="liA8E" id="3_TG3j95$Mb" role="2OqNvi">
-                    <ref role="37wK5l" to="fbzs:~Path2D$Float.lineTo(double,double)" resolve="lineTo" />
-                    <node concept="3cpWs3" id="3_TG3j95_5G" role="37wK5m">
-                      <node concept="FJ1c_" id="3_TG3j95AwU" role="3uHU7w">
-                        <node concept="3b6qkQ" id="3_TG3j98Bgt" role="3uHU7w">
-                          <property role="$nhwW" value="4.0" />
-                        </node>
-                        <node concept="17qRlL" id="3_TG3j95A78" role="3uHU7B">
-                          <node concept="1rXfSq" id="3_TG3j95_gl" role="3uHU7B">
+              <node concept="3clFbF" id="2jDew653$_X" role="3cqZAp">
+                <node concept="2OqwBi" id="2jDew653AZv" role="3clFbG">
+                  <node concept="37vLTw" id="2jDew653$_V" role="2Oq$k0">
+                    <ref role="3cqZAo" node="3_TG3j95npR" resolve="g" />
+                  </node>
+                  <node concept="liA8E" id="2jDew653EMm" role="2OqNvi">
+                    <ref role="37wK5l" to="z60i:~Graphics2D.fill(java.awt.Shape)" resolve="fill" />
+                    <node concept="1rXfSq" id="2jDew653GhY" role="37wK5m">
+                      <ref role="37wK5l" node="2jDew653wp2" resolve="getArrowShape" />
+                      <node concept="2ShNRf" id="2jDew653VNn" role="37wK5m">
+                        <node concept="1pGfFk" id="2jDew653ZqJ" role="2ShVmc">
+                          <property role="373rjd" value="true" />
+                          <ref role="37wK5l" to="z60i:~Dimension.&lt;init&gt;(int,int)" resolve="Dimension" />
+                          <node concept="1rXfSq" id="2jDew6543Uc" role="37wK5m">
                             <ref role="37wK5l" to="g51k:~EditorCell_Basic.getWidth()" resolve="getWidth" />
                           </node>
-                          <node concept="3b6qkQ" id="3_TG3j98Bwa" role="3uHU7w">
-                            <property role="$nhwW" value="3.0" />
+                          <node concept="1rXfSq" id="2jDew654c1c" role="37wK5m">
+                            <ref role="37wK5l" to="g51k:~EditorCell_Basic.getHeight()" resolve="getHeight" />
                           </node>
                         </node>
                       </node>
-                      <node concept="1rXfSq" id="3_TG3j95$NW" role="3uHU7B">
-                        <ref role="37wK5l" to="g51k:~EditorCell_Basic.getX()" resolve="getX" />
-                      </node>
                     </node>
-                    <node concept="3cpWs3" id="3_TG3j95BJ5" role="37wK5m">
-                      <node concept="FJ1c_" id="3_TG3j95CLc" role="3uHU7w">
-                        <node concept="3b6qkQ" id="3_TG3j98A21" role="3uHU7w">
-                          <property role="$nhwW" value="3.0" />
-                        </node>
-                        <node concept="1rXfSq" id="3_TG3j95Cpj" role="3uHU7B">
-                          <ref role="37wK5l" to="g51k:~EditorCell_Basic.getHeight()" resolve="getHeight" />
-                        </node>
-                      </node>
-                      <node concept="1rXfSq" id="3_TG3j95AYC" role="3uHU7B">
-                        <ref role="37wK5l" to="g51k:~EditorCell_Basic.getY()" resolve="getY" />
-                      </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="1wplmZ" id="3spAkRYlUP8" role="1zxBo6">
+              <node concept="3clFbS" id="3_TG3j95tX5" role="1wplMD">
+                <node concept="3clFbF" id="3_TG3j95u0W" role="3cqZAp">
+                  <node concept="2OqwBi" id="3_TG3j95u1s" role="3clFbG">
+                    <node concept="37vLTw" id="3_TG3j95u0V" role="2Oq$k0">
+                      <ref role="3cqZAo" node="3_TG3j95npR" resolve="g" />
+                    </node>
+                    <node concept="liA8E" id="3_TG3j95vfH" role="2OqNvi">
+                      <ref role="37wK5l" to="z60i:~Graphics.dispose()" resolve="dispose" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="3clFbF" id="3_TG3j95Dao" role="3cqZAp">
-                <node concept="2OqwBi" id="3_TG3j95Dpy" role="3clFbG">
-                  <node concept="37vLTw" id="3_TG3j95Dam" role="2Oq$k0">
-                    <ref role="3cqZAo" node="3_TG3j95wlb" resolve="triangle" />
-                  </node>
-                  <node concept="liA8E" id="3_TG3j95DGe" role="2OqNvi">
-                    <ref role="37wK5l" to="fbzs:~Path2D$Float.lineTo(double,double)" resolve="lineTo" />
-                    <node concept="3cpWs3" id="3_TG3j95DZD" role="37wK5m">
-                      <node concept="FJ1c_" id="3_TG3j95Eye" role="3uHU7w">
-                        <node concept="3b6qkQ" id="3_TG3j98B0G" role="3uHU7w">
-                          <property role="$nhwW" value="2.0" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="2jDew6534t1" role="jymVt" />
+      <node concept="3clFb_" id="2jDew653wp2" role="jymVt">
+        <property role="TrG5h" value="getArrowShape" />
+        <node concept="3clFbS" id="2jDew653wp6" role="3clF47">
+          <node concept="3cpWs8" id="2jDew653wp7" role="3cqZAp">
+            <node concept="3cpWsn" id="2jDew653wp8" role="3cpWs9">
+              <property role="TrG5h" value="r" />
+              <node concept="3uibUv" id="2jDew653wp9" role="1tU5fm">
+                <ref role="3uigEE" to="z60i:~Rectangle" resolve="Rectangle" />
+              </node>
+              <node concept="2ShNRf" id="2jDew653wpa" role="33vP2m">
+                <node concept="1pGfFk" id="2jDew653wpb" role="2ShVmc">
+                  <ref role="37wK5l" to="z60i:~Rectangle.&lt;init&gt;(java.awt.Dimension)" resolve="Rectangle" />
+                  <node concept="37vLTw" id="2jDew653Nq3" role="37wK5m">
+                    <ref role="3cqZAo" node="2jDew653Kcm" resolve="dimension" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="2jDew653wpf" role="3cqZAp">
+            <node concept="2YIFZM" id="2jDew653wpg" role="3clFbG">
+              <ref role="1Pybhc" to="g1qu:~JBInsets" resolve="JBInsets" />
+              <ref role="37wK5l" to="g1qu:~JBInsets.removeFrom(java.awt.Rectangle,java.awt.Insets)" resolve="removeFrom" />
+              <node concept="37vLTw" id="2jDew653wph" role="37wK5m">
+                <ref role="3cqZAo" node="2jDew653wp8" resolve="r" />
+              </node>
+              <node concept="2YIFZM" id="2jDew653wpi" role="37wK5m">
+                <ref role="1Pybhc" to="g1qu:~JBUI" resolve="JBUI" />
+                <ref role="37wK5l" to="g1qu:~JBUI.insets(int,int,int,int)" resolve="insets" />
+                <node concept="3cmrfG" id="2jDew653wpj" role="37wK5m">
+                  <property role="3cmrfH" value="1" />
+                </node>
+                <node concept="3cmrfG" id="2jDew653wpk" role="37wK5m">
+                  <property role="3cmrfH" value="0" />
+                </node>
+                <node concept="3cmrfG" id="2jDew653wpl" role="37wK5m">
+                  <property role="3cmrfH" value="1" />
+                </node>
+                <node concept="3cmrfG" id="2jDew653wpm" role="37wK5m">
+                  <property role="3cmrfH" value="1" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="2jDew653wpn" role="3cqZAp">
+            <node concept="3cpWsn" id="2jDew653wpo" role="3cpWs9">
+              <property role="TrG5h" value="tW" />
+              <node concept="10Oyi0" id="2jDew653wpp" role="1tU5fm" />
+              <node concept="2YIFZM" id="2jDew653wpq" role="33vP2m">
+                <ref role="1Pybhc" to="l5y2:~JBUIScale" resolve="JBUIScale" />
+                <ref role="37wK5l" to="l5y2:~JBUIScale.scale(int)" resolve="scale" />
+                <node concept="3cmrfG" id="2jDew653wpr" role="37wK5m">
+                  <property role="3cmrfH" value="9" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="2jDew653wps" role="3cqZAp">
+            <node concept="3cpWsn" id="2jDew653wpt" role="3cpWs9">
+              <property role="TrG5h" value="tH" />
+              <node concept="10Oyi0" id="2jDew653wpu" role="1tU5fm" />
+              <node concept="2YIFZM" id="2jDew653wpv" role="33vP2m">
+                <ref role="1Pybhc" to="l5y2:~JBUIScale" resolve="JBUIScale" />
+                <ref role="37wK5l" to="l5y2:~JBUIScale.scale(int)" resolve="scale" />
+                <node concept="3cmrfG" id="2jDew653wpw" role="37wK5m">
+                  <property role="3cmrfH" value="5" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="2jDew653wpx" role="3cqZAp">
+            <node concept="3cpWsn" id="2jDew653wpy" role="3cpWs9">
+              <property role="TrG5h" value="xU" />
+              <node concept="10Oyi0" id="2jDew653wpz" role="1tU5fm" />
+              <node concept="3cpWsd" id="2jDew653wp$" role="33vP2m">
+                <node concept="FJ1c_" id="2jDew653wp_" role="3uHU7B">
+                  <node concept="1eOMI4" id="2jDew653wpA" role="3uHU7B">
+                    <node concept="3cpWsd" id="2jDew653wpB" role="1eOMHV">
+                      <node concept="2OqwBi" id="2jDew653wpC" role="3uHU7B">
+                        <node concept="37vLTw" id="2jDew653wpD" role="2Oq$k0">
+                          <ref role="3cqZAo" node="2jDew653wp8" resolve="r" />
                         </node>
-                        <node concept="1rXfSq" id="3_TG3j95Eak" role="3uHU7B">
-                          <ref role="37wK5l" to="g51k:~EditorCell_Basic.getWidth()" resolve="getWidth" />
+                        <node concept="2OwXpG" id="2jDew653wpE" role="2OqNvi">
+                          <ref role="2Oxat5" to="z60i:~Rectangle.width" resolve="width" />
                         </node>
                       </node>
-                      <node concept="1rXfSq" id="3_TG3j95DI7" role="3uHU7B">
-                        <ref role="37wK5l" to="g51k:~EditorCell_Basic.getX()" resolve="getX" />
+                      <node concept="37vLTw" id="2jDew653wpF" role="3uHU7w">
+                        <ref role="3cqZAo" node="2jDew653wpo" resolve="tW" />
                       </node>
                     </node>
-                    <node concept="3cpWs3" id="3_TG3j95FJB" role="37wK5m">
-                      <node concept="FJ1c_" id="3_TG3j95Hb4" role="3uHU7w">
-                        <node concept="3b6qkQ" id="3_TG3j98AwL" role="3uHU7w">
-                          <property role="$nhwW" value="3.0" />
+                  </node>
+                  <node concept="3cmrfG" id="2jDew653wpG" role="3uHU7w">
+                    <property role="3cmrfH" value="2" />
+                  </node>
+                </node>
+                <node concept="2YIFZM" id="2jDew653wpH" role="3uHU7w">
+                  <ref role="1Pybhc" to="l5y2:~JBUIScale" resolve="JBUIScale" />
+                  <ref role="37wK5l" to="l5y2:~JBUIScale.scale(int)" resolve="scale" />
+                  <node concept="3cmrfG" id="2jDew653wpI" role="37wK5m">
+                    <property role="3cmrfH" value="1" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="2jDew653wpJ" role="3cqZAp">
+            <node concept="3cpWsn" id="2jDew653wpK" role="3cpWs9">
+              <property role="TrG5h" value="yU" />
+              <node concept="10Oyi0" id="2jDew653wpL" role="1tU5fm" />
+              <node concept="3cpWs3" id="2jDew653wpM" role="33vP2m">
+                <node concept="FJ1c_" id="2jDew653wpN" role="3uHU7B">
+                  <node concept="1eOMI4" id="2jDew653wpO" role="3uHU7B">
+                    <node concept="3cpWsd" id="2jDew653wpP" role="1eOMHV">
+                      <node concept="2OqwBi" id="2jDew653wpQ" role="3uHU7B">
+                        <node concept="37vLTw" id="2jDew653wpR" role="2Oq$k0">
+                          <ref role="3cqZAo" node="2jDew653wp8" resolve="r" />
                         </node>
-                        <node concept="17qRlL" id="3_TG3j95GLp" role="3uHU7B">
-                          <node concept="1rXfSq" id="3_TG3j95Gpp" role="3uHU7B">
-                            <ref role="37wK5l" to="g51k:~EditorCell_Basic.getHeight()" resolve="getHeight" />
-                          </node>
-                          <node concept="3b6qkQ" id="3_TG3j98AKE" role="3uHU7w">
-                            <property role="$nhwW" value="2.0" />
-                          </node>
+                        <node concept="2OwXpG" id="2jDew653wpS" role="2OqNvi">
+                          <ref role="2Oxat5" to="z60i:~Rectangle.height" resolve="height" />
                         </node>
                       </node>
-                      <node concept="1rXfSq" id="3_TG3j95EZe" role="3uHU7B">
-                        <ref role="37wK5l" to="g51k:~EditorCell_Basic.getY()" resolve="getY" />
+                      <node concept="37vLTw" id="2jDew653wpT" role="3uHU7w">
+                        <ref role="3cqZAo" node="2jDew653wpt" resolve="tH" />
                       </node>
                     </node>
                   </node>
+                  <node concept="3cmrfG" id="2jDew653wpU" role="3uHU7w">
+                    <property role="3cmrfH" value="2" />
+                  </node>
+                </node>
+                <node concept="2YIFZM" id="2jDew653wpV" role="3uHU7w">
+                  <ref role="1Pybhc" to="l5y2:~JBUIScale" resolve="JBUIScale" />
+                  <ref role="37wK5l" to="l5y2:~JBUIScale.scale(int)" resolve="scale" />
+                  <node concept="3cmrfG" id="2jDew653wpW" role="37wK5m">
+                    <property role="3cmrfH" value="1" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="2jDew653wpX" role="3cqZAp">
+            <node concept="3cpWsn" id="2jDew653wpY" role="3cpWs9">
+              <property role="TrG5h" value="path" />
+              <node concept="3uibUv" id="2jDew653wpZ" role="1tU5fm">
+                <ref role="3uigEE" to="fbzs:~Path2D" resolve="Path2D" />
+              </node>
+              <node concept="2ShNRf" id="2jDew653wq0" role="33vP2m">
+                <node concept="1pGfFk" id="2jDew653wq1" role="2ShVmc">
+                  <ref role="37wK5l" to="fbzs:~Path2D$Float.&lt;init&gt;()" resolve="Path2D.Float" />
                 </node>
               </node>
-              <node concept="3clFbF" id="3_TG3j95HAH" role="3cqZAp">
-                <node concept="2OqwBi" id="3_TG3j95HRL" role="3clFbG">
-                  <node concept="37vLTw" id="3_TG3j95HAF" role="2Oq$k0">
-                    <ref role="3cqZAo" node="3_TG3j95wlb" resolve="triangle" />
+            </node>
+          </node>
+          <node concept="3clFbF" id="2jDew653wq2" role="3cqZAp">
+            <node concept="2OqwBi" id="2jDew653wq3" role="3clFbG">
+              <node concept="37vLTw" id="2jDew653wq4" role="2Oq$k0">
+                <ref role="3cqZAo" node="2jDew653wpY" resolve="path" />
+              </node>
+              <node concept="liA8E" id="2jDew653wq5" role="2OqNvi">
+                <ref role="37wK5l" to="fbzs:~Path2D.moveTo(double,double)" resolve="moveTo" />
+                <node concept="3cpWs3" id="2jDew654rhn" role="37wK5m">
+                  <node concept="1rXfSq" id="2jDew654vXg" role="3uHU7B">
+                    <ref role="37wK5l" to="g51k:~EditorCell_Basic.getX()" resolve="getX" />
                   </node>
-                  <node concept="liA8E" id="3_TG3j95Iat" role="2OqNvi">
-                    <ref role="37wK5l" to="fbzs:~Path2D.closePath()" resolve="closePath" />
+                  <node concept="37vLTw" id="2jDew653wq6" role="3uHU7w">
+                    <ref role="3cqZAo" node="2jDew653wpy" resolve="xU" />
                   </node>
                 </node>
-              </node>
-              <node concept="3clFbF" id="3_TG3j95mNZ" role="3cqZAp">
-                <node concept="2OqwBi" id="3_TG3j95mPc" role="3clFbG">
-                  <node concept="37vLTw" id="3_TG3j95vVT" role="2Oq$k0">
-                    <ref role="3cqZAo" node="3_TG3j95npR" resolve="g" />
+                <node concept="3cpWs3" id="2jDew654xnw" role="37wK5m">
+                  <node concept="1rXfSq" id="2jDew654yPy" role="3uHU7B">
+                    <ref role="37wK5l" to="g51k:~EditorCell_Basic.getY()" resolve="getY" />
                   </node>
-                  <node concept="liA8E" id="3_TG3j95In9" role="2OqNvi">
-                    <ref role="37wK5l" to="z60i:~Graphics2D.fill(java.awt.Shape)" resolve="fill" />
-                    <node concept="37vLTw" id="3_TG3j95IpY" role="37wK5m">
-                      <ref role="3cqZAo" node="3_TG3j95wlb" resolve="triangle" />
+                  <node concept="37vLTw" id="2jDew653wq7" role="3uHU7w">
+                    <ref role="3cqZAo" node="2jDew653wpK" resolve="yU" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="2jDew653wq8" role="3cqZAp">
+            <node concept="2OqwBi" id="2jDew653wq9" role="3clFbG">
+              <node concept="37vLTw" id="2jDew653wqa" role="2Oq$k0">
+                <ref role="3cqZAo" node="2jDew653wpY" resolve="path" />
+              </node>
+              <node concept="liA8E" id="2jDew653wqb" role="2OqNvi">
+                <ref role="37wK5l" to="fbzs:~Path2D.lineTo(double,double)" resolve="lineTo" />
+                <node concept="3cpWs3" id="2jDew653wqc" role="37wK5m">
+                  <node concept="3cpWs3" id="2jDew654$k5" role="3uHU7B">
+                    <node concept="1rXfSq" id="2jDew654B4J" role="3uHU7B">
+                      <ref role="37wK5l" to="g51k:~EditorCell_Basic.getX()" resolve="getX" />
                     </node>
+                    <node concept="37vLTw" id="2jDew653wqd" role="3uHU7w">
+                      <ref role="3cqZAo" node="2jDew653wpy" resolve="xU" />
+                    </node>
+                  </node>
+                  <node concept="37vLTw" id="2jDew653wqe" role="3uHU7w">
+                    <ref role="3cqZAo" node="2jDew653wpo" resolve="tW" />
+                  </node>
+                </node>
+                <node concept="3cpWs3" id="2jDew654Fan" role="37wK5m">
+                  <node concept="1rXfSq" id="2jDew654GDl" role="3uHU7B">
+                    <ref role="37wK5l" to="g51k:~EditorCell_Basic.getY()" resolve="getY" />
+                  </node>
+                  <node concept="37vLTw" id="2jDew653wqf" role="3uHU7w">
+                    <ref role="3cqZAo" node="2jDew653wpK" resolve="yU" />
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="1wplmZ" id="3spAkRYlUP8" role="1zxBo6">
-              <node concept="3clFbS" id="3_TG3j95tX5" role="1wplMD">
-                <node concept="3clFbF" id="3_TG3j95u0W" role="3cqZAp">
-                  <node concept="2OqwBi" id="3_TG3j95u1s" role="3clFbG">
-                    <node concept="37vLTw" id="3_TG3j95u0V" role="2Oq$k0">
-                      <ref role="3cqZAo" node="3_TG3j95npR" resolve="g" />
+          </node>
+          <node concept="3clFbF" id="2jDew653wqg" role="3cqZAp">
+            <node concept="2OqwBi" id="2jDew653wqh" role="3clFbG">
+              <node concept="37vLTw" id="2jDew653wqi" role="2Oq$k0">
+                <ref role="3cqZAo" node="2jDew653wpY" resolve="path" />
+              </node>
+              <node concept="liA8E" id="2jDew653wqj" role="2OqNvi">
+                <ref role="37wK5l" to="fbzs:~Path2D.lineTo(double,double)" resolve="lineTo" />
+                <node concept="3cpWs3" id="2jDew653wqk" role="37wK5m">
+                  <node concept="3cpWs3" id="2jDew654KL2" role="3uHU7B">
+                    <node concept="1rXfSq" id="2jDew654LUu" role="3uHU7B">
+                      <ref role="37wK5l" to="g51k:~EditorCell_Basic.getX()" resolve="getX" />
                     </node>
-                    <node concept="liA8E" id="3_TG3j95vfH" role="2OqNvi">
-                      <ref role="37wK5l" to="z60i:~Graphics.dispose()" resolve="dispose" />
+                    <node concept="37vLTw" id="2jDew653wql" role="3uHU7w">
+                      <ref role="3cqZAo" node="2jDew653wpy" resolve="xU" />
                     </node>
                   </node>
+                  <node concept="FJ1c_" id="2jDew653wqm" role="3uHU7w">
+                    <node concept="37vLTw" id="2jDew653wqn" role="3uHU7B">
+                      <ref role="3cqZAo" node="2jDew653wpo" resolve="tW" />
+                    </node>
+                    <node concept="2$xPTn" id="2jDew653wqo" role="3uHU7w">
+                      <property role="2$xPTl" value="2.0f" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3cpWs3" id="2jDew653wqp" role="37wK5m">
+                  <node concept="3cpWs3" id="2jDew654Nqr" role="3uHU7B">
+                    <node concept="1rXfSq" id="2jDew654OTM" role="3uHU7B">
+                      <ref role="37wK5l" to="g51k:~EditorCell_Basic.getY()" resolve="getY" />
+                    </node>
+                    <node concept="37vLTw" id="2jDew653wqq" role="3uHU7w">
+                      <ref role="3cqZAo" node="2jDew653wpK" resolve="yU" />
+                    </node>
+                  </node>
+                  <node concept="37vLTw" id="2jDew653wqr" role="3uHU7w">
+                    <ref role="3cqZAo" node="2jDew653wpt" resolve="tH" />
+                  </node>
                 </node>
               </node>
             </node>
           </node>
+          <node concept="3clFbF" id="2jDew653wqs" role="3cqZAp">
+            <node concept="2OqwBi" id="2jDew653wqt" role="3clFbG">
+              <node concept="37vLTw" id="2jDew653wqu" role="2Oq$k0">
+                <ref role="3cqZAo" node="2jDew653wpY" resolve="path" />
+              </node>
+              <node concept="liA8E" id="2jDew653wqv" role="2OqNvi">
+                <ref role="37wK5l" to="fbzs:~Path2D.lineTo(double,double)" resolve="lineTo" />
+                <node concept="3cpWs3" id="2jDew654Qqg" role="37wK5m">
+                  <node concept="1rXfSq" id="2jDew654RUs" role="3uHU7B">
+                    <ref role="37wK5l" to="g51k:~EditorCell_Basic.getX()" resolve="getX" />
+                  </node>
+                  <node concept="37vLTw" id="2jDew653wqw" role="3uHU7w">
+                    <ref role="3cqZAo" node="2jDew653wpy" resolve="xU" />
+                  </node>
+                </node>
+                <node concept="3cpWs3" id="2jDew654Tro" role="37wK5m">
+                  <node concept="1rXfSq" id="2jDew654UDN" role="3uHU7B">
+                    <ref role="37wK5l" to="g51k:~EditorCell_Basic.getY()" resolve="getY" />
+                  </node>
+                  <node concept="37vLTw" id="2jDew653wqx" role="3uHU7w">
+                    <ref role="3cqZAo" node="2jDew653wpK" resolve="yU" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="2jDew653wqy" role="3cqZAp">
+            <node concept="2OqwBi" id="2jDew653wqz" role="3clFbG">
+              <node concept="37vLTw" id="2jDew653wq$" role="2Oq$k0">
+                <ref role="3cqZAo" node="2jDew653wpY" resolve="path" />
+              </node>
+              <node concept="liA8E" id="2jDew653wq_" role="2OqNvi">
+                <ref role="37wK5l" to="fbzs:~Path2D.closePath()" resolve="closePath" />
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs6" id="2jDew653wqA" role="3cqZAp">
+            <node concept="37vLTw" id="2jDew653wqB" role="3cqZAk">
+              <ref role="3cqZAo" node="2jDew653wpY" resolve="path" />
+            </node>
+          </node>
+        </node>
+        <node concept="3uibUv" id="2jDew653wqC" role="3clF45">
+          <ref role="3uigEE" to="z60i:~Shape" resolve="Shape" />
+        </node>
+        <node concept="3Tm1VV" id="2jDew653yGZ" role="1B3o_S" />
+        <node concept="37vLTG" id="2jDew653Kcm" role="3clF46">
+          <property role="TrG5h" value="dimension" />
+          <node concept="3uibUv" id="2jDew653Kcl" role="1tU5fm">
+            <ref role="3uigEE" to="z60i:~Dimension" resolve="Dimension" />
+          </node>
         </node>
       </node>
+      <node concept="2tJIrI" id="2jDew6534t2" role="jymVt" />
       <node concept="2tJIrI" id="7szUFELF4h7" role="jymVt" />
       <node concept="3uibUv" id="7szUFELF1C4" role="EKbjA">
         <ref role="3uigEE" to="py4t:6mIiWXQhBr2" resolve="MouseListenerProvider" />

From a4ab1ca46a1ba6d735dee51a8b225e768996f3b3 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Tue, 17 Dec 2024 13:54:49 +0100
Subject: [PATCH 4/8] editor.diagram: keep the fitted layout in the
 PortLayouter

---
 .../mps/editor/diagram/runtime/jgraph.mps     | 104 ++++++++++++++----
 1 file changed, 80 insertions(+), 24 deletions(-)

diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
index 667833afa9..814638c347 100644
--- a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
+++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
@@ -11707,7 +11707,7 @@
         <node concept="3clFbF" id="1tbbSi4Sn63" role="3cqZAp">
           <node concept="2YIFZM" id="1tbbSi4SnNC" role="3clFbG">
             <ref role="1Pybhc" node="3FRjz$vys4Z" resolve="PortLayouter" />
-            <ref role="37wK5l" node="2BjZSlQJ_ry" resolve="layoutPortCells" />
+            <ref role="37wK5l" node="6O6KyRn8ret" resolve="layoutPortCells" />
             <node concept="1eOMI4" id="1tbbSi4SoFi" role="37wK5m">
               <node concept="10QFUN" id="1tbbSi4SoFh" role="1eOMHV">
                 <node concept="37vLTw" id="1tbbSi4SoFg" role="10QFUP">
@@ -11718,6 +11718,7 @@
                 </node>
               </node>
             </node>
+            <node concept="3clFbT" id="6O6KyRn9RFZ" role="37wK5m" />
           </node>
         </node>
       </node>
@@ -108820,6 +108821,9 @@
             </node>
             <node concept="liA8E" id="3FRjz$vGeTq" role="2OqNvi">
               <ref role="37wK5l" node="3FRjz$vyxaH" resolve="layoutPortCells" />
+              <node concept="3clFbT" id="6O6KyRn8AIg" role="37wK5m">
+                <property role="3clFbU" value="true" />
+              </node>
             </node>
           </node>
         </node>
@@ -108847,41 +108851,75 @@
       <property role="DiZV1" value="false" />
       <property role="od$2w" value="false" />
       <node concept="3clFbS" id="2BjZSlQJ_rz" role="3clF47">
-        <node concept="3clFbF" id="2BjZSlQJ_r$" role="3cqZAp">
-          <node concept="2OqwBi" id="2BjZSlQJ_r_" role="3clFbG">
-            <node concept="2ShNRf" id="2BjZSlQJ_rA" role="2Oq$k0">
-              <node concept="1pGfFk" id="2BjZSlQJ_rB" role="2ShVmc">
+        <node concept="3clFbF" id="6O6KyRn8CWl" role="3cqZAp">
+          <node concept="1rXfSq" id="6O6KyRn8CWk" role="3clFbG">
+            <ref role="37wK5l" node="6O6KyRn8ret" resolve="layoutPortCells" />
+            <node concept="37vLTw" id="6O6KyRn8D7Y" role="37wK5m">
+              <ref role="3cqZAo" node="2BjZSlQJ_rI" resolve="parentCell" />
+            </node>
+            <node concept="3clFbT" id="6O6KyRnsXRn" role="37wK5m">
+              <property role="3clFbU" value="true" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="2BjZSlQJ_rI" role="3clF46">
+        <property role="TrG5h" value="parentCell" />
+        <node concept="3uibUv" id="xqQxwszNam" role="1tU5fm">
+          <ref role="3uigEE" node="f4v_NgJPyX" resolve="BoxDCell" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="2BjZSlQJ_rK" role="3clF45" />
+      <node concept="3Tm1VV" id="2BjZSlQJ_rL" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="6O6KyRn8req" role="jymVt" />
+    <node concept="2YIFZL" id="6O6KyRn8ret" role="jymVt">
+      <property role="TrG5h" value="layoutPortCells" />
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <node concept="3clFbS" id="6O6KyRn8reu" role="3clF47">
+        <node concept="3clFbF" id="6O6KyRn8rev" role="3cqZAp">
+          <node concept="2OqwBi" id="6O6KyRn8rew" role="3clFbG">
+            <node concept="2ShNRf" id="6O6KyRn8rex" role="2Oq$k0">
+              <node concept="1pGfFk" id="6O6KyRn8rey" role="2ShVmc">
                 <ref role="37wK5l" node="3FRjz$vyT_L" resolve="PortLayouter" />
-                <node concept="2OqwBi" id="xqQxwsKNoj" role="37wK5m">
-                  <node concept="2OqwBi" id="2BjZSlQJDBi" role="2Oq$k0">
-                    <node concept="37vLTw" id="2BjZSlQJD$H" role="2Oq$k0">
-                      <ref role="3cqZAo" node="2BjZSlQJ_rI" resolve="parentCell" />
+                <node concept="2OqwBi" id="6O6KyRn8rez" role="37wK5m">
+                  <node concept="2OqwBi" id="6O6KyRn8re$" role="2Oq$k0">
+                    <node concept="37vLTw" id="6O6KyRn8re_" role="2Oq$k0">
+                      <ref role="3cqZAo" node="6O6KyRn8reF" resolve="parentCell" />
                     </node>
-                    <node concept="liA8E" id="2BjZSlQJDKg" role="2OqNvi">
+                    <node concept="liA8E" id="6O6KyRn8reA" role="2OqNvi">
                       <ref role="37wK5l" node="xqQxwsyFUA" resolve="getPorts" />
                     </node>
                   </node>
-                  <node concept="ANE8D" id="xqQxwsKP5t" role="2OqNvi" />
+                  <node concept="ANE8D" id="6O6KyRn8reB" role="2OqNvi" />
                 </node>
-                <node concept="37vLTw" id="2BjZSlQJ_rD" role="37wK5m">
-                  <ref role="3cqZAo" node="2BjZSlQJ_rI" resolve="parentCell" />
+                <node concept="37vLTw" id="6O6KyRn8reC" role="37wK5m">
+                  <ref role="3cqZAo" node="6O6KyRn8reF" resolve="parentCell" />
                 </node>
               </node>
             </node>
-            <node concept="liA8E" id="2BjZSlQJ_rE" role="2OqNvi">
+            <node concept="liA8E" id="6O6KyRn8reD" role="2OqNvi">
               <ref role="37wK5l" node="3FRjz$vyxaH" resolve="layoutPortCells" />
+              <node concept="37vLTw" id="6O6KyRn8reE" role="37wK5m">
+                <ref role="3cqZAo" node="6O6KyRn8reH" resolve="keepFittedSize" />
+              </node>
             </node>
           </node>
         </node>
       </node>
-      <node concept="37vLTG" id="2BjZSlQJ_rI" role="3clF46">
+      <node concept="37vLTG" id="6O6KyRn8reF" role="3clF46">
         <property role="TrG5h" value="parentCell" />
-        <node concept="3uibUv" id="xqQxwszNam" role="1tU5fm">
+        <node concept="3uibUv" id="6O6KyRn8reG" role="1tU5fm">
           <ref role="3uigEE" node="f4v_NgJPyX" resolve="BoxDCell" />
         </node>
       </node>
-      <node concept="3cqZAl" id="2BjZSlQJ_rK" role="3clF45" />
-      <node concept="3Tm1VV" id="2BjZSlQJ_rL" role="1B3o_S" />
+      <node concept="37vLTG" id="6O6KyRn8reH" role="3clF46">
+        <property role="TrG5h" value="keepFittedSize" />
+        <node concept="10P_77" id="6O6KyRn8reI" role="1tU5fm" />
+      </node>
+      <node concept="3cqZAl" id="6O6KyRn8reJ" role="3clF45" />
+      <node concept="3Tm1VV" id="6O6KyRn8reK" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="3FRjz$vz2gC" role="jymVt" />
     <node concept="312cEg" id="3FRjz$vyOx4" role="jymVt">
@@ -109189,6 +109227,9 @@
         <node concept="3clFbF" id="61tQzM6bsb0" role="3cqZAp">
           <node concept="1rXfSq" id="61tQzM6bsaY" role="3clFbG">
             <ref role="37wK5l" node="61tQzM6beoK" resolve="doLayoutPorts" />
+            <node concept="37vLTw" id="6O6KyRniKhD" role="37wK5m">
+              <ref role="3cqZAo" node="6O6KyRniB6Z" resolve="keepFittedSize" />
+            </node>
           </node>
         </node>
         <node concept="3clFbF" id="147Asf0q3OA" role="3cqZAp">
@@ -109202,6 +109243,10 @@
           </node>
         </node>
       </node>
+      <node concept="37vLTG" id="6O6KyRniB6Z" role="3clF46">
+        <property role="TrG5h" value="keepFittedSize" />
+        <node concept="10P_77" id="6O6KyRniB6Y" role="1tU5fm" />
+      </node>
     </node>
     <node concept="2tJIrI" id="61tQzM672xv" role="jymVt" />
     <node concept="3clFb_" id="61tQzM6beoK" role="jymVt">
@@ -109563,18 +109608,29 @@
               </node>
             </node>
           </node>
-          <node concept="3fqX7Q" id="5eqlYwi$jmV" role="3clFbw">
-            <node concept="2OqwBi" id="5eqlYwi$pVU" role="3fr31v">
-              <node concept="37vLTw" id="5eqlYwi$nel" role="2Oq$k0">
-                <ref role="3cqZAo" node="3FRjz$vyOxb" resolve="parentCell" />
+          <node concept="1Wc70l" id="6O6KyRnYdHB" role="3clFbw">
+            <node concept="3fqX7Q" id="6O6KyRnYse6" role="3uHU7w">
+              <node concept="37vLTw" id="6O6KyRnYse8" role="3fr31v">
+                <ref role="3cqZAo" node="6O6KyRniNzy" resolve="keepFittedSize" />
               </node>
-              <node concept="liA8E" id="5eqlYwi$vZ_" role="2OqNvi">
-                <ref role="37wK5l" node="5eqlYwiatMq" resolve="containsSubdiagram" />
+            </node>
+            <node concept="3fqX7Q" id="5eqlYwi$jmV" role="3uHU7B">
+              <node concept="2OqwBi" id="5eqlYwi$pVU" role="3fr31v">
+                <node concept="37vLTw" id="5eqlYwi$nel" role="2Oq$k0">
+                  <ref role="3cqZAo" node="3FRjz$vyOxb" resolve="parentCell" />
+                </node>
+                <node concept="liA8E" id="5eqlYwi$vZ_" role="2OqNvi">
+                  <ref role="37wK5l" node="5eqlYwiatMq" resolve="containsSubdiagram" />
+                </node>
               </node>
             </node>
           </node>
         </node>
       </node>
+      <node concept="37vLTG" id="6O6KyRniNzy" role="3clF46">
+        <property role="TrG5h" value="keepFittedSize" />
+        <node concept="10P_77" id="6O6KyRniWxY" role="1tU5fm" />
+      </node>
     </node>
     <node concept="2tJIrI" id="61tQzM6bcoE" role="jymVt" />
     <node concept="312cEg" id="67wtfYkgacz" role="jymVt">

From c4350fbba6723bf7c8d5aa0fe0bc601d7c0e2cc4 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Wed, 18 Dec 2024 08:36:45 +0100
Subject: [PATCH 5/8] fix resolve infos

---
 .../com/mbeddr/mpsutil/treenotation/runtime.mps  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/code/treenotation/com.mbeddr.mpsutil.treenotation.runtime/models/com/mbeddr/mpsutil/treenotation/runtime.mps b/code/treenotation/com.mbeddr.mpsutil.treenotation.runtime/models/com/mbeddr/mpsutil/treenotation/runtime.mps
index c94c744803..06c2bd01ae 100644
--- a/code/treenotation/com.mbeddr.mpsutil.treenotation.runtime/models/com/mbeddr/mpsutil/treenotation/runtime.mps
+++ b/code/treenotation/com.mbeddr.mpsutil.treenotation.runtime/models/com/mbeddr/mpsutil/treenotation/runtime.mps
@@ -90,7 +90,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1095950406618" name="jetbrains.mps.baseLanguage.structure.DivExpression" flags="nn" index="FJ1c_" />
@@ -159,7 +159,7 @@
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
-      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
         <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
       </concept>
       <concept id="1109279763828" name="jetbrains.mps.baseLanguage.structure.TypeVariableDeclaration" flags="ng" index="16euLQ" />
@@ -239,7 +239,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -271,7 +271,7 @@
       <concept id="1184952934362" name="jetbrains.mps.baseLanguage.structure.DimensionExpression" flags="nn" index="3$GHV9">
         <child id="1184953288404" name="expression" index="3$I4v7" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -366,7 +366,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -4408,7 +4408,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="HnFYK1jzWd" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
   </node>
@@ -4740,7 +4740,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="HnFYK1iQi_" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
   </node>
@@ -18191,7 +18191,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="HnFYK1iMCD" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
   </node>

From f5729d23b65ef3a7a535e4184b3a6dadae087cf8 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Wed, 18 Dec 2024 12:24:58 +0100
Subject: [PATCH 6/8] add a dependency from shadowmodels to blutil

---
 .../models/de.itemis.mps.extensions.build.mps              | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
index 9b9194fab5..5257a05196 100644
--- a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
+++ b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
@@ -106,7 +106,7 @@
       <concept id="8654221991637384182" name="jetbrains.mps.build.structure.BuildFileIncludesSelector" flags="ng" index="3qWCbU">
         <property id="8654221991637384184" name="pattern" index="3qWCbO" />
       </concept>
-      <concept id="4701820937132344003" name="jetbrains.mps.build.structure.BuildLayout_Container" flags="ng" index="1y1bJS">
+      <concept id="4701820937132344003" name="jetbrains.mps.build.structure.BuildLayout_Container" flags="ngI" index="1y1bJS">
         <child id="7389400916848037006" name="children" index="39821P" />
       </concept>
       <concept id="5610619299014309452" name="jetbrains.mps.build.structure.BuildSource_JavaExternalJarRef" flags="ng" index="3yrxFa">
@@ -125,7 +125,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -9912,6 +9912,9 @@
       <node concept="m$_yC" id="5U8hsWC7jgn" role="m$_yJ">
         <ref role="m$_y1" node="5U8hsWC762L" resolve="org.modelix.model.api" />
       </node>
+      <node concept="m$_yC" id="494a_O9Mc4K" role="m$_yJ">
+        <ref role="m$_y1" node="2NyZxKpUXYJ" />
+      </node>
     </node>
     <node concept="m$_wf" id="2OJNL7ElZsF" role="3989C9">
       <property role="m$_wk" value="de.q60.mps.collections.libs" />

From dffff8e66760efb5fc0efe7b8091768ca66b7c3d Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Wed, 18 Dec 2024 12:26:20 +0100
Subject: [PATCH 7/8] mpsutil.intentions: remove an unnecessary overwritten
 method

---
 .../com/mbeddr/mpsutil/intentions/runtime.mps | 25 -------------------
 1 file changed, 25 deletions(-)

diff --git a/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/models/com/mbeddr/mpsutil/intentions/runtime.mps b/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/models/com/mbeddr/mpsutil/intentions/runtime.mps
index 5fe0088e8a..3ca1af642c 100644
--- a/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/models/com/mbeddr/mpsutil/intentions/runtime.mps
+++ b/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/models/com/mbeddr/mpsutil/intentions/runtime.mps
@@ -606,31 +606,6 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="2jDew64QLbS" role="jymVt" />
-    <node concept="3clFb_" id="2jDew64QLbT" role="jymVt">
-      <property role="TrG5h" value="canBePerformed" />
-      <property role="DiZV1" value="false" />
-      <property role="od$2w" value="false" />
-      <node concept="2AHcQZ" id="2jDew64QLbU" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-      <node concept="37vLTG" id="2jDew64QLbV" role="3clF46">
-        <property role="TrG5h" value="c" />
-        <property role="3TUv4t" value="false" />
-        <node concept="3uibUv" id="2jDew64QLbW" role="1tU5fm">
-          <ref role="3uigEE" to="qkt:~DataContext" resolve="DataContext" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="2jDew64QLbX" role="3clF47">
-        <node concept="3cpWs6" id="2jDew64QLbY" role="3cqZAp">
-          <node concept="3clFbT" id="2jDew64QLbZ" role="3cqZAk">
-            <property role="3clFbU" value="true" />
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="2jDew64QLc0" role="1B3o_S" />
-      <node concept="10P_77" id="2jDew64QLc1" role="3clF45" />
-    </node>
     <node concept="2tJIrI" id="2jDew64QLc2" role="jymVt" />
     <node concept="3clFb_" id="2jDew64QLc3" role="jymVt">
       <property role="TrG5h" value="actionPerformed" />

From 70da8fb991818a5ff4763bd80a25cd64e2612949 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Wed, 18 Dec 2024 12:30:57 +0100
Subject: [PATCH 8/8] force save all

---
 .../models/de.itemis.mps.extensions.build.mps      |  2 +-
 .../itemis/mps/editor/diagram/runtime/jgraph.mps   | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
index 5257a05196..a3b4e92c2e 100644
--- a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
+++ b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
@@ -9913,7 +9913,7 @@
         <ref role="m$_y1" node="5U8hsWC762L" resolve="org.modelix.model.api" />
       </node>
       <node concept="m$_yC" id="494a_O9Mc4K" role="m$_yJ">
-        <ref role="m$_y1" node="2NyZxKpUXYJ" />
+        <ref role="m$_y1" node="2NyZxKpUXYJ" resolve="de.itemis.mps.blutil" />
       </node>
     </node>
     <node concept="m$_wf" id="2OJNL7ElZsF" role="3989C9">
diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
index d4afcda490..e3b4b63c1e 100644
--- a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
+++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
@@ -197,7 +197,7 @@
       <concept id="1215695201514" name="jetbrains.mps.baseLanguage.structure.MinusAssignmentExpression" flags="nn" index="d5anL" />
       <concept id="1153422105332" name="jetbrains.mps.baseLanguage.structure.RemExpression" flags="nn" index="2dk9JS" />
       <concept id="1153422305557" name="jetbrains.mps.baseLanguage.structure.LessThanOrEqualsExpression" flags="nn" index="2dkUwp" />
-      <concept id="2323553266850475941" name="jetbrains.mps.baseLanguage.structure.IHasModifiers" flags="ng" index="2frcj7">
+      <concept id="2323553266850475941" name="jetbrains.mps.baseLanguage.structure.IHasModifiers" flags="ngI" index="2frcj7">
         <child id="2323553266850475953" name="modifiers" index="2frcjj" />
       </concept>
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
@@ -233,7 +233,7 @@
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
         <child id="1188214630783" name="value" index="2B76xF" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1188214545140" name="jetbrains.mps.baseLanguage.structure.AnnotationInstanceValue" flags="ng" index="2B6LJw">
@@ -321,7 +321,7 @@
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
-      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
         <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
       </concept>
       <concept id="1109279763828" name="jetbrains.mps.baseLanguage.structure.TypeVariableDeclaration" flags="ng" index="16euLQ">
@@ -411,7 +411,7 @@
         <child id="1154542793668" name="componentType" index="3g7fb8" />
         <child id="1154542803372" name="initValue" index="3g7hyw" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
         <child id="4972241301747169160" name="typeArgument" index="3PaCim" />
@@ -457,7 +457,7 @@
       <concept id="1184952934362" name="jetbrains.mps.baseLanguage.structure.DimensionExpression" flags="nn" index="3$GHV9">
         <child id="1184953288404" name="expression" index="3$I4v7" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -576,7 +576,7 @@
       <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
       <concept id="1205769149993" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodCallOperation" flags="nn" index="2XshWL">
@@ -649,7 +649,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7">