From 8ec26b4e94b13812b7c7a32af5e31c053ba13432 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Wed, 19 Feb 2020 14:50:40 +0100
Subject: [PATCH] Support node<> argument in constraints. Prepare to get rid of
 node-ptr<>. Minor refactoring.

---
 build.xml                                     |   2 +
 .../jetbrains.mps.lang.coderules.eval.mps     |  10 +
 .../runtime/jetbrains.mps.logic.runtime.msd   |   2 +
 .../models/jetbrains.mps.logic.dataform.mps   |  55 ++
 .../models/jetbrains.mps.logic.predicate.mps  |  95 +-
 .../models/jetbrains.mps.coderules.build.mps  |   5 +
 .../models/plugin.mps                         | 810 ++++++------------
 .../jetbrains.mps.lang.coderules.template.mps |  75 ++
 ...baseLanguageExt.test.incremental@tests.mps |  45 +-
 9 files changed, 503 insertions(+), 596 deletions(-)

diff --git a/build.xml b/build.xml
index 1b72df0f..0a30bf98 100644
--- a/build.xml
+++ b/build.xml
@@ -299,6 +299,7 @@
           <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
           <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
           <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
+          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="cl" />
         </dependencies>
         <uses>
           <language id="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" />
@@ -2426,6 +2427,7 @@
           <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
           <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
           <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
+          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="cl" />
         </dependencies>
         <uses>
           <language id="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
index 48f18a73..77123b1e 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
@@ -4373,6 +4373,16 @@
         <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
       </node>
       <node concept="3Tm1VV" id="HV6urVDbvo" role="1B3o_S" />
+      <node concept="P$JXv" id="3ca5Bh29Iga" role="lGtFl">
+        <node concept="TZ5HA" id="3ca5Bh29Iq0" role="TZ5H$">
+          <node concept="1dT_AC" id="3ca5Bh29Iq1" role="1dT_Ay">
+            <property role="1dT_AB" value="Reference in 'id' is no longer used." />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="3ca5Bh29Igd" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
+      </node>
     </node>
     <node concept="2tJIrI" id="6_UQWSXaUpR" role="jymVt" />
     <node concept="3Tm1VV" id="4OKkcnfu_ze" role="1B3o_S" />
diff --git a/coderules/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd b/coderules/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd
index 7c638e95..4b2661be 100644
--- a/coderules/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd
+++ b/coderules/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd
@@ -16,6 +16,7 @@
     <dependency reexport="true">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
+    <dependency reexport="false">9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="9" />
@@ -42,6 +43,7 @@
     <module reference="9e98f4e2-decf-4e97-bf80-9109e8b759aa(jetbrains.mps.lang.feedback.context)" version="0" />
     <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
     <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
+    <module reference="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" version="0" />
   </dependencyVersions>
 </solution>
 
diff --git a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps
index 9d3d3f4e..c9323c66 100644
--- a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps
+++ b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps
@@ -14224,6 +14224,61 @@
           </node>
           <node concept="3clFbH" id="6fwi$m9aICo" role="3cqZAp" />
           <node concept="3clFbJ" id="1EFtv_BCmfc" role="3cqZAp">
+            <node concept="3eNFk2" id="3ca5Bh2aWOH" role="3eNLev">
+              <node concept="2ZW3vV" id="3ca5Bh2b4Eh" role="3eO9$A">
+                <node concept="3uibUv" id="3ca5Bh2b4OD" role="2ZW6by">
+                  <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
+                </node>
+                <node concept="37vLTw" id="3ca5Bh2b4al" role="2ZW6bz">
+                  <ref role="3cqZAo" node="1EFtv_BCm4U" resolve="value" />
+                </node>
+              </node>
+              <node concept="3clFbS" id="3ca5Bh2aWOJ" role="3eOfB_">
+                <node concept="3clFbJ" id="3ca5Bh2b4QZ" role="3cqZAp">
+                  <node concept="3clFbS" id="3ca5Bh2b4R1" role="3clFbx">
+                    <node concept="3cpWs6" id="3ca5Bh2b5MI" role="3cqZAp">
+                      <node concept="2OqwBi" id="3ca5Bh2b5MJ" role="3cqZAk">
+                        <node concept="37vLTw" id="3ca5Bh2b5MK" role="2Oq$k0">
+                          <ref role="3cqZAo" node="3KN3A4uuUFM" resolve="nodePresentable" />
+                        </node>
+                        <node concept="liA8E" id="3ca5Bh2b5ML" role="2OqNvi">
+                          <ref role="37wK5l" node="4pwDyRC680I" resolve="readPresentation" />
+                          <node concept="10QFUN" id="3ca5Bh2b5MM" role="37wK5m">
+                            <node concept="3uibUv" id="3ca5Bh2b8Ut" role="10QFUM">
+                              <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
+                            </node>
+                            <node concept="37vLTw" id="3ca5Bh2b5MO" role="10QFUP">
+                              <ref role="3cqZAo" node="1EFtv_BCm4U" resolve="value" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbH" id="3ca5Bh2b4R0" role="3cqZAp" />
+                  </node>
+                  <node concept="3y3z36" id="3ca5Bh2b5rF" role="3clFbw">
+                    <node concept="10Nm6u" id="3ca5Bh2b5sX" role="3uHU7w" />
+                    <node concept="37vLTw" id="3ca5Bh2b4Y3" role="3uHU7B">
+                      <ref role="3cqZAo" node="3KN3A4uuUFM" resolve="nodePresentable" />
+                    </node>
+                  </node>
+                  <node concept="9aQIb" id="3ca5Bh2biD2" role="9aQIa">
+                    <node concept="3clFbS" id="3ca5Bh2biD3" role="9aQI4">
+                      <node concept="3cpWs6" id="3ca5Bh2blp7" role="3cqZAp">
+                        <node concept="2YIFZM" id="3ca5Bh2blp8" role="3cqZAk">
+                          <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
+                          <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                          <node concept="37vLTw" id="3ca5Bh2blp9" role="37wK5m">
+                            <ref role="3cqZAo" node="1EFtv_BCm4U" resolve="value" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="3ca5Bh2b4Pu" role="3cqZAp" />
+              </node>
+            </node>
             <node concept="3eNFk2" id="1EFtv_BCmf$" role="3eNLev">
               <node concept="2ZW3vV" id="1EFtv_BCmf_" role="3eO9$A">
                 <node concept="3uibUv" id="1EFtv_BCmfA" role="2ZW6by">
diff --git a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps
index 3399c071..00ae24b8 100644
--- a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps
+++ b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps
@@ -22,6 +22,7 @@
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
     <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
+    <import index="i8bi" ref="r:c3548bac-30eb-4a2a-937c-0111d5697309(jetbrains.mps.lang.smodel.generator.smodelAdapter)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -8977,41 +8978,13 @@
             </node>
           </node>
           <node concept="3clFbJ" id="4ekZiHduI2T" role="3cqZAp">
-            <node concept="3clFbS" id="4ekZiHduI2U" role="3clFbx">
-              <node concept="3clFbF" id="4ekZiHduI2V" role="3cqZAp">
-                <node concept="37vLTI" id="4ekZiHduI2W" role="3clFbG">
-                  <node concept="1eOMI4" id="4ekZiHduI2X" role="37vLTx">
-                    <node concept="10QFUN" id="4ekZiHduI2Y" role="1eOMHV">
-                      <node concept="3uibUv" id="4ekZiHduI2Z" role="10QFUM">
-                        <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-                      </node>
-                      <node concept="37vLTw" id="4ekZiHduJxl" role="10QFUP">
-                        <ref role="3cqZAo" node="4ekZiHduI3m" resolve="target" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="37vLTw" id="4ekZiHduJub" role="37vLTJ">
-                    <ref role="3cqZAo" node="4ekZiHduI3i" resolve="targetRef" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbH" id="4ekZiHduI32" role="3cqZAp" />
-            </node>
-            <node concept="2ZW3vV" id="4ekZiHduI33" role="3clFbw">
-              <node concept="3uibUv" id="4ekZiHduI34" role="2ZW6by">
-                <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-              </node>
-              <node concept="37vLTw" id="4ekZiHduJlo" role="2ZW6bz">
-                <ref role="3cqZAo" node="4ekZiHduI3m" resolve="target" />
-              </node>
-            </node>
             <node concept="3eNFk2" id="4ekZiHduI36" role="3eNLev">
               <node concept="2ZW3vV" id="4ekZiHduI37" role="3eO9$A">
                 <node concept="3uibUv" id="4ekZiHduI38" role="2ZW6by">
                   <ref role="3uigEE" to="wyt6:~String" resolve="String" />
                 </node>
-                <node concept="37vLTw" id="4ekZiHduI39" role="2ZW6bz">
-                  <ref role="3cqZAo" node="1laj_RTNK7Q" resolve="template" />
+                <node concept="37vLTw" id="3ca5Bh20Ozp" role="2ZW6bz">
+                  <ref role="3cqZAo" node="4ekZiHduI3m" resolve="target" />
                 </node>
               </node>
               <node concept="3clFbS" id="4ekZiHduI3a" role="3eOfB_">
@@ -9033,8 +9006,70 @@
                     </node>
                   </node>
                 </node>
+                <node concept="3clFbH" id="3ca5Bh20LgN" role="3cqZAp" />
               </node>
             </node>
+            <node concept="3eNFk2" id="3ca5Bh20KQX" role="3eNLev">
+              <node concept="2ZW3vV" id="4ekZiHduI33" role="3eO9$A">
+                <node concept="3uibUv" id="4ekZiHduI34" role="2ZW6by">
+                  <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+                </node>
+                <node concept="37vLTw" id="4ekZiHduJlo" role="2ZW6bz">
+                  <ref role="3cqZAo" node="4ekZiHduI3m" resolve="target" />
+                </node>
+              </node>
+              <node concept="3clFbS" id="4ekZiHduI2U" role="3eOfB_">
+                <node concept="3clFbF" id="4ekZiHduI2V" role="3cqZAp">
+                  <node concept="37vLTI" id="4ekZiHduI2W" role="3clFbG">
+                    <node concept="1eOMI4" id="4ekZiHduI2X" role="37vLTx">
+                      <node concept="10QFUN" id="4ekZiHduI2Y" role="1eOMHV">
+                        <node concept="3uibUv" id="4ekZiHduI2Z" role="10QFUM">
+                          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+                        </node>
+                        <node concept="37vLTw" id="4ekZiHduJxl" role="10QFUP">
+                          <ref role="3cqZAo" node="4ekZiHduI3m" resolve="target" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="37vLTw" id="4ekZiHduJub" role="37vLTJ">
+                      <ref role="3cqZAo" node="4ekZiHduI3i" resolve="targetRef" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="2ZW3vV" id="3ca5Bh20MuT" role="3clFbw">
+              <node concept="3uibUv" id="3ca5Bh20MOo" role="2ZW6by">
+                <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
+              </node>
+              <node concept="37vLTw" id="3ca5Bh20M0X" role="2ZW6bz">
+                <ref role="3cqZAo" node="4ekZiHduI3m" resolve="target" />
+              </node>
+            </node>
+            <node concept="3clFbS" id="3ca5Bh20KQZ" role="3clFbx">
+              <node concept="3clFbF" id="3ca5Bh20MQx" role="3cqZAp">
+                <node concept="37vLTI" id="3ca5Bh20Nmq" role="3clFbG">
+                  <node concept="2YIFZM" id="3ca5Bh20OoH" role="37vLTx">
+                    <ref role="37wK5l" to="i8bi:4o40NPkYQhu" resolve="getPointer" />
+                    <ref role="1Pybhc" to="i8bi:5IkW5anFcyt" resolve="SNodeOperations" />
+                    <node concept="1eOMI4" id="3ca5Bh20Otp" role="37wK5m">
+                      <node concept="10QFUN" id="3ca5Bh20Otm" role="1eOMHV">
+                        <node concept="3uibUv" id="3ca5Bh20Otr" role="10QFUM">
+                          <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
+                        </node>
+                        <node concept="37vLTw" id="3ca5Bh20Ots" role="10QFUP">
+                          <ref role="3cqZAo" node="4ekZiHduI3m" resolve="target" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="37vLTw" id="3ca5Bh20MQz" role="37vLTJ">
+                    <ref role="3cqZAo" node="4ekZiHduI3i" resolve="targetRef" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="3ca5Bh20MOS" role="3cqZAp" />
+            </node>
           </node>
           <node concept="3clFbF" id="4jcOV4hxxyi" role="3cqZAp">
             <node concept="2OqwBi" id="4jcOV4hxxRr" role="3clFbG">
diff --git a/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps b/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
index 55034a46..1c71bade 100644
--- a/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
@@ -506,6 +506,11 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="3ca5Bh2cpLY" role="3bR37C">
+          <node concept="3bR9La" id="3ca5Bh2cpLZ" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6Lg8" resolve="jetbrains.mps.runtime" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="7BVjoXzUxkQ" role="2G$12L">
         <property role="BnDLt" value="true" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
index 2d89249d..bea3c774 100644
--- a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
@@ -19084,6 +19084,30 @@
         </node>
         <node concept="3Tm1VV" id="3sb6Qlve15G" role="1B3o_S" />
         <node concept="3clFbS" id="3sb6Qlve15H" role="3clF47">
+          <node concept="3cpWs8" id="3ca5Bh28$aK" role="3cqZAp">
+            <node concept="3cpWsn" id="3ca5Bh28$aL" role="3cpWs9">
+              <property role="TrG5h" value="navigateTarget" />
+              <node concept="3uibUv" id="3ca5Bh28$aM" role="1tU5fm">
+                <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+              </node>
+              <node concept="10Nm6u" id="3ca5Bh28Apr" role="33vP2m" />
+            </node>
+          </node>
+          <node concept="3cpWs8" id="3ca5Bh26dAL" role="3cqZAp">
+            <node concept="3cpWsn" id="3ca5Bh26dAO" role="3cpWs9">
+              <property role="TrG5h" value="text" />
+              <node concept="17QB3L" id="3ca5Bh26dAJ" role="1tU5fm" />
+              <node concept="10Nm6u" id="3ca5Bh26fN7" role="33vP2m" />
+            </node>
+          </node>
+          <node concept="3cpWs8" id="3ca5Bh26i0p" role="3cqZAp">
+            <node concept="3cpWsn" id="3ca5Bh26i0s" role="3cpWs9">
+              <property role="TrG5h" value="tooltip" />
+              <node concept="17QB3L" id="3ca5Bh26i0n" role="1tU5fm" />
+              <node concept="10Nm6u" id="3ca5Bh26jX6" role="33vP2m" />
+            </node>
+          </node>
+          <node concept="3clFbH" id="3ca5Bh26AIV" role="3cqZAp" />
           <node concept="3clFbJ" id="3sb6Qlve15I" role="3cqZAp">
             <node concept="2ZW3vV" id="3sb6Qlve15J" role="3clFbw">
               <node concept="3uibUv" id="3sb6Qlve15K" role="2ZW6by">
@@ -19094,7 +19118,6 @@
               </node>
             </node>
             <node concept="3clFbS" id="3sb6Qlve15M" role="3clFbx">
-              <node concept="3clFbH" id="6Yb9hAqWf$E" role="3cqZAp" />
               <node concept="3SKdUt" id="6Yb9hAqWhbf" role="3cqZAp">
                 <node concept="1PaTwC" id="589APehYyqg" role="3ndbpf">
                   <node concept="3oM_SD" id="589APehYyqh" role="1PaTwD">
@@ -19239,246 +19262,71 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="3cpWs8" id="7pxta7vksdy" role="3cqZAp">
-                      <node concept="3cpWsn" id="7pxta7vksdz" role="3cpWs9">
-                        <property role="TrG5h" value="ref" />
-                        <property role="3TUv4t" value="true" />
-                        <node concept="3uibUv" id="7pxta7vksd$" role="1tU5fm">
-                          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-                        </node>
-                        <node concept="2YIFZM" id="7pxta7vksd_" role="33vP2m">
+                    <node concept="3clFbF" id="3ca5Bh28Yik" role="3cqZAp">
+                      <node concept="37vLTI" id="3ca5Bh28ZFE" role="3clFbG">
+                        <node concept="2YIFZM" id="3ca5Bh29R4w" role="37vLTx">
                           <ref role="37wK5l" to="hano:_04VjSrAA8" resolve="extractReference" />
                           <ref role="1Pybhc" to="hano:4OKkcnfu_xo" resolve="AnchorUtil" />
-                          <node concept="2YIFZM" id="7pxta7vksdA" role="37wK5m">
+                          <node concept="2YIFZM" id="3ca5Bh29R4x" role="37wK5m">
                             <ref role="37wK5l" to="6exd:6HT7BWBOXr$" resolve="ground" />
                             <ref role="1Pybhc" to="6exd:6HT7BWBOXme" resolve="DataFormUtil" />
-                            <node concept="1eOMI4" id="7pxta7vksdB" role="37wK5m">
-                              <node concept="37vLTw" id="7pxta7vksdC" role="1eOMHV">
+                            <node concept="1eOMI4" id="3ca5Bh29R4y" role="37wK5m">
+                              <node concept="37vLTw" id="3ca5Bh29R4z" role="1eOMHV">
                                 <ref role="3cqZAo" node="7pxta7vksdr" resolve="val" />
                               </node>
                             </node>
                           </node>
                         </node>
+                        <node concept="37vLTw" id="3ca5Bh28Yii" role="37vLTJ">
+                          <ref role="3cqZAo" node="3ca5Bh28$aL" resolve="navigateTarget" />
+                        </node>
                       </node>
                     </node>
-                    <node concept="3clFbJ" id="7pxta7vksdD" role="3cqZAp">
-                      <node concept="3clFbS" id="7pxta7vksdE" role="3clFbx">
-                        <node concept="3cpWs8" id="7pxta7vksdF" role="3cqZAp">
-                          <node concept="3cpWsn" id="7pxta7vksdG" role="3cpWs9">
-                            <property role="TrG5h" value="condensed" />
-                            <node concept="17QB3L" id="7pxta7vksdH" role="1tU5fm" />
+                    <node concept="3clFbF" id="7pxta7vksdN" role="3cqZAp">
+                      <node concept="37vLTI" id="7pxta7vksdO" role="3clFbG">
+                        <node concept="1rXfSq" id="7pxta7vksdP" role="37vLTx">
+                          <ref role="37wK5l" node="2tI9bOlatsa" resolve="presentation" />
+                          <node concept="37vLTw" id="7pxta7vksdQ" role="37wK5m">
+                            <ref role="3cqZAo" node="7pxta7vksdr" resolve="val" />
+                          </node>
+                          <node concept="37vLTw" id="58JqeLv2C_R" role="37wK5m">
+                            <ref role="3cqZAo" node="428_4iY$2vJ" resolve="CONDENSED" />
                           </node>
                         </node>
-                        <node concept="3clFbH" id="58JqeLv24Z8" role="3cqZAp" />
-                        <node concept="3clFbF" id="7pxta7vksdN" role="3cqZAp">
-                          <node concept="37vLTI" id="7pxta7vksdO" role="3clFbG">
-                            <node concept="1rXfSq" id="7pxta7vksdP" role="37vLTx">
-                              <ref role="37wK5l" node="2tI9bOlatsa" resolve="presentation" />
-                              <node concept="37vLTw" id="7pxta7vksdQ" role="37wK5m">
-                                <ref role="3cqZAo" node="7pxta7vksdr" resolve="val" />
-                              </node>
-                              <node concept="37vLTw" id="58JqeLv2C_R" role="37wK5m">
-                                <ref role="3cqZAo" node="428_4iY$2vJ" resolve="CONDENSED" />
-                              </node>
-                            </node>
-                            <node concept="37vLTw" id="7pxta7vksdR" role="37vLTJ">
-                              <ref role="3cqZAo" node="7pxta7vksdG" resolve="condensed" />
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3clFbH" id="58JqeLv2$AT" role="3cqZAp" />
-                        <node concept="3cpWs8" id="7pxta7vksdS" role="3cqZAp">
-                          <node concept="3cpWsn" id="7pxta7vksdT" role="3cpWs9">
-                            <property role="TrG5h" value="toolTip" />
-                            <node concept="17QB3L" id="7pxta7vksdU" role="1tU5fm" />
-                          </node>
-                        </node>
-                        <node concept="3clFbF" id="7pxta7vkse0" role="3cqZAp">
-                          <node concept="37vLTI" id="7pxta7vkse1" role="3clFbG">
-                            <node concept="3cpWs3" id="7pxta7vkse2" role="37vLTx">
-                              <node concept="1rXfSq" id="7pxta7vkse3" role="3uHU7w">
-                                <ref role="37wK5l" node="2tI9bOlatsa" resolve="presentation" />
-                                <node concept="37vLTw" id="7pxta7vkse4" role="37wK5m">
-                                  <ref role="3cqZAo" node="7pxta7vksdr" resolve="val" />
-                                </node>
-                                <node concept="37vLTw" id="58JqeLv2G9A" role="37wK5m">
-                                  <ref role="3cqZAo" node="428_4iYA1gr" resolve="FULL" />
-                                </node>
-                              </node>
-                              <node concept="3cpWs3" id="7pxta7vkse5" role="3uHU7B">
-                                <node concept="2OqwBi" id="7pxta7vkse6" role="3uHU7B">
-                                  <node concept="37vLTw" id="7pxta7vkse7" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="3sb6Qlve15O" resolve="logical" />
-                                  </node>
-                                  <node concept="liA8E" id="7pxta7vkse8" role="2OqNvi">
-                                    <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
-                                  </node>
-                                </node>
-                                <node concept="Xl_RD" id="7pxta7vkse9" role="3uHU7w">
-                                  <property role="Xl_RC" value="=" />
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="37vLTw" id="7pxta7vksea" role="37vLTJ">
-                              <ref role="3cqZAo" node="7pxta7vksdT" resolve="toolTip" />
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3clFbH" id="7pxta7vkseb" role="3cqZAp" />
-                        <node concept="3cpWs6" id="7pxta7vksec" role="3cqZAp">
-                          <node concept="2ShNRf" id="7pxta7vksed" role="3cqZAk">
-                            <node concept="1pGfFk" id="7pxta7vksee" role="2ShVmc">
-                              <ref role="37wK5l" node="5pDu2jaXBtq" resolve="TableCellInfo" />
-                              <node concept="37vLTw" id="7pxta7vksef" role="37wK5m">
-                                <ref role="3cqZAo" node="7pxta7vksdG" resolve="condensed" />
-                              </node>
-                              <node concept="37vLTw" id="7pxta7vkseg" role="37wK5m">
-                                <ref role="3cqZAo" node="7pxta7vksdT" resolve="toolTip" />
-                              </node>
-                              <node concept="2ShNRf" id="7pxta7vkseh" role="37wK5m">
-                                <node concept="YeOm9" id="7pxta7vksei" role="2ShVmc">
-                                  <node concept="1Y3b0j" id="7pxta7vksej" role="YeSDq">
-                                    <property role="2bfB8j" value="true" />
-                                    <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                                    <ref role="1Y3XeK" to="wyt6:~Runnable" resolve="Runnable" />
-                                    <node concept="3Tm1VV" id="7pxta7vksek" role="1B3o_S" />
-                                    <node concept="3clFb_" id="7pxta7vksel" role="jymVt">
-                                      <property role="1EzhhJ" value="false" />
-                                      <property role="TrG5h" value="run" />
-                                      <property role="DiZV1" value="false" />
-                                      <property role="od$2w" value="false" />
-                                      <node concept="3Tm1VV" id="7pxta7vksem" role="1B3o_S" />
-                                      <node concept="3cqZAl" id="7pxta7vksen" role="3clF45" />
-                                      <node concept="3clFbS" id="7pxta7vkseo" role="3clF47">
-                                        <node concept="3clFbF" id="7pxta7vksep" role="3cqZAp">
-                                          <node concept="2OqwBi" id="7pxta7vkseq" role="3clFbG">
-                                            <node concept="2OqwBi" id="7pxta7vkser" role="2Oq$k0">
-                                              <node concept="2OqwBi" id="7pxta7vkses" role="2Oq$k0">
-                                                <node concept="2ShNRf" id="7pxta7vkset" role="2Oq$k0">
-                                                  <node concept="1pGfFk" id="7pxta7vkseu" role="2ShVmc">
-                                                    <ref role="37wK5l" to="kz9k:~EditorNavigator.&lt;init&gt;(jetbrains.mps.project.Project)" resolve="EditorNavigator" />
-                                                    <node concept="37vLTw" id="7pxta7vksev" role="37wK5m">
-                                                      <ref role="3cqZAo" node="6QkkSolKz4F" resolve="mpsProject" />
-                                                    </node>
-                                                  </node>
-                                                </node>
-                                                <node concept="liA8E" id="7pxta7vksew" role="2OqNvi">
-                                                  <ref role="37wK5l" to="kz9k:~EditorNavigator.shallFocus(boolean)" resolve="shallFocus" />
-                                                  <node concept="3clFbT" id="7pxta7vksex" role="37wK5m">
-                                                    <property role="3clFbU" value="false" />
-                                                  </node>
-                                                </node>
-                                              </node>
-                                              <node concept="liA8E" id="7pxta7vksey" role="2OqNvi">
-                                                <ref role="37wK5l" to="kz9k:~EditorNavigator.shallSelect(boolean)" resolve="shallSelect" />
-                                                <node concept="3clFbT" id="7pxta7vksez" role="37wK5m">
-                                                  <property role="3clFbU" value="true" />
-                                                </node>
-                                              </node>
-                                            </node>
-                                            <node concept="liA8E" id="7pxta7vkse$" role="2OqNvi">
-                                              <ref role="37wK5l" to="kz9k:~EditorNavigator.open(org.jetbrains.mps.openapi.model.SNodeReference)" resolve="open" />
-                                              <node concept="37vLTw" id="7pxta7vkse_" role="37wK5m">
-                                                <ref role="3cqZAo" node="7pxta7vksdz" resolve="ref" />
-                                              </node>
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3clFbH" id="7pxta7vkseA" role="3cqZAp" />
-                      </node>
-                      <node concept="3y3z36" id="7pxta7vkseB" role="3clFbw">
-                        <node concept="10Nm6u" id="7pxta7vkseC" role="3uHU7w" />
-                        <node concept="37vLTw" id="7pxta7vkseD" role="3uHU7B">
-                          <ref role="3cqZAo" node="7pxta7vksdz" resolve="ref" />
+                        <node concept="37vLTw" id="3ca5Bh26mhR" role="37vLTJ">
+                          <ref role="3cqZAo" node="3ca5Bh26dAO" resolve="text" />
                         </node>
                       </node>
-                      <node concept="9aQIb" id="7pxta7vkseE" role="9aQIa">
-                        <node concept="3clFbS" id="7pxta7vkseF" role="9aQI4">
-                          <node concept="3cpWs8" id="7pxta7vkseG" role="3cqZAp">
-                            <node concept="3cpWsn" id="7pxta7vkseH" role="3cpWs9">
-                              <property role="TrG5h" value="condensed" />
-                              <node concept="17QB3L" id="7pxta7vkseI" role="1tU5fm" />
+                    </node>
+                    <node concept="3clFbF" id="7pxta7vkse0" role="3cqZAp">
+                      <node concept="37vLTI" id="7pxta7vkse1" role="3clFbG">
+                        <node concept="3cpWs3" id="7pxta7vkse2" role="37vLTx">
+                          <node concept="1rXfSq" id="7pxta7vkse3" role="3uHU7w">
+                            <ref role="37wK5l" node="2tI9bOlatsa" resolve="presentation" />
+                            <node concept="37vLTw" id="7pxta7vkse4" role="37wK5m">
+                              <ref role="3cqZAo" node="7pxta7vksdr" resolve="val" />
+                            </node>
+                            <node concept="37vLTw" id="58JqeLv2G9A" role="37wK5m">
+                              <ref role="3cqZAo" node="428_4iYA1gr" resolve="FULL" />
                             </node>
                           </node>
-                          <node concept="3clFbF" id="7pxta7vkseO" role="3cqZAp">
-                            <node concept="37vLTI" id="7pxta7vkseP" role="3clFbG">
-                              <node concept="1rXfSq" id="7pxta7vkseQ" role="37vLTx">
-                                <ref role="37wK5l" node="2tI9bOlatsa" resolve="presentation" />
-                                <node concept="37vLTw" id="7pxta7vkseR" role="37wK5m">
-                                  <ref role="3cqZAo" node="7pxta7vksdr" resolve="val" />
-                                </node>
-                                <node concept="37vLTw" id="58JqeLv2JyL" role="37wK5m">
-                                  <ref role="3cqZAo" node="428_4iY$2vJ" resolve="CONDENSED" />
-                                </node>
+                          <node concept="3cpWs3" id="7pxta7vkse5" role="3uHU7B">
+                            <node concept="2OqwBi" id="7pxta7vkse6" role="3uHU7B">
+                              <node concept="37vLTw" id="7pxta7vkse7" role="2Oq$k0">
+                                <ref role="3cqZAo" node="3sb6Qlve15O" resolve="logical" />
                               </node>
-                              <node concept="37vLTw" id="7pxta7vkseS" role="37vLTJ">
-                                <ref role="3cqZAo" node="7pxta7vkseH" resolve="condensed" />
+                              <node concept="liA8E" id="7pxta7vkse8" role="2OqNvi">
+                                <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
                               </node>
                             </node>
-                          </node>
-                          <node concept="3cpWs8" id="7pxta7vkseT" role="3cqZAp">
-                            <node concept="3cpWsn" id="7pxta7vkseU" role="3cpWs9">
-                              <property role="TrG5h" value="toolTip" />
-                              <node concept="17QB3L" id="7pxta7vkseV" role="1tU5fm" />
-                            </node>
-                          </node>
-                          <node concept="3clFbF" id="7pxta7vksf1" role="3cqZAp">
-                            <node concept="37vLTI" id="7pxta7vksf2" role="3clFbG">
-                              <node concept="3cpWs3" id="7pxta7vksf3" role="37vLTx">
-                                <node concept="1rXfSq" id="7pxta7vksf4" role="3uHU7w">
-                                  <ref role="37wK5l" node="2tI9bOlatsa" resolve="presentation" />
-                                  <node concept="37vLTw" id="7pxta7vksf5" role="37wK5m">
-                                    <ref role="3cqZAo" node="7pxta7vksdr" resolve="val" />
-                                  </node>
-                                  <node concept="37vLTw" id="58JqeLv2MKv" role="37wK5m">
-                                    <ref role="3cqZAo" node="428_4iYA1gr" resolve="FULL" />
-                                  </node>
-                                </node>
-                                <node concept="3cpWs3" id="7pxta7vksf6" role="3uHU7B">
-                                  <node concept="2OqwBi" id="7pxta7vksf7" role="3uHU7B">
-                                    <node concept="37vLTw" id="7pxta7vksf8" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="3sb6Qlve15O" resolve="logical" />
-                                    </node>
-                                    <node concept="liA8E" id="7pxta7vksf9" role="2OqNvi">
-                                      <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
-                                    </node>
-                                  </node>
-                                  <node concept="Xl_RD" id="7pxta7vksfa" role="3uHU7w">
-                                    <property role="Xl_RC" value="=" />
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="37vLTw" id="7pxta7vksfb" role="37vLTJ">
-                                <ref role="3cqZAo" node="7pxta7vkseU" resolve="toolTip" />
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="3clFbH" id="7pxta7vksfc" role="3cqZAp" />
-                          <node concept="3cpWs6" id="7pxta7vksfd" role="3cqZAp">
-                            <node concept="2ShNRf" id="7pxta7vksfe" role="3cqZAk">
-                              <node concept="1pGfFk" id="7pxta7vksff" role="2ShVmc">
-                                <ref role="37wK5l" node="7vxJ_H4nq2z" resolve="TableCellInfo" />
-                                <node concept="37vLTw" id="7pxta7vksfg" role="37wK5m">
-                                  <ref role="3cqZAo" node="7pxta7vkseH" resolve="condensed" />
-                                </node>
-                                <node concept="37vLTw" id="7pxta7vksfh" role="37wK5m">
-                                  <ref role="3cqZAo" node="7pxta7vkseU" resolve="toolTip" />
-                                </node>
-                                <node concept="37vLTw" id="7pxta7vksfi" role="37wK5m">
-                                  <ref role="3cqZAo" node="3sb6Qlve67Z" resolve="style" />
-                                </node>
-                              </node>
+                            <node concept="Xl_RD" id="7pxta7vkse9" role="3uHU7w">
+                              <property role="Xl_RC" value="=" />
                             </node>
                           </node>
                         </node>
+                        <node concept="37vLTw" id="3ca5Bh26q72" role="37vLTJ">
+                          <ref role="3cqZAo" node="3ca5Bh26i0s" resolve="tooltip" />
+                        </node>
                       </node>
                     </node>
                     <node concept="3clFbH" id="7pxta7vkvA_" role="3cqZAp" />
@@ -19494,13 +19342,9 @@
                 </node>
                 <node concept="9aQIb" id="7pxta7vkv$1" role="9aQIa">
                   <node concept="3clFbS" id="7pxta7vkv$2" role="9aQI4">
-                    <node concept="3cpWs8" id="7pxta7vkv$5" role="3cqZAp">
-                      <node concept="3cpWsn" id="7pxta7vkv$6" role="3cpWs9">
-                        <property role="TrG5h" value="text" />
-                        <node concept="3uibUv" id="7pxta7vkv$7" role="1tU5fm">
-                          <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-                        </node>
-                        <node concept="1rXfSq" id="7pxta7vkv$8" role="33vP2m">
+                    <node concept="3clFbF" id="3ca5Bh29pQC" role="3cqZAp">
+                      <node concept="37vLTI" id="3ca5Bh29pQE" role="3clFbG">
+                        <node concept="1rXfSq" id="7pxta7vkv$8" role="37vLTx">
                           <ref role="37wK5l" node="2tI9bOlatsa" resolve="presentation" />
                           <node concept="37vLTw" id="7pxta7vkvEf" role="37wK5m">
                             <ref role="3cqZAo" node="7pxta7vkvE6" resolve="value" />
@@ -19509,15 +19353,14 @@
                             <ref role="3cqZAo" node="58JqeLv2Q9M" resolve="DEFAULT" />
                           </node>
                         </node>
+                        <node concept="37vLTw" id="3ca5Bh29ssR" role="37vLTJ">
+                          <ref role="3cqZAo" node="3ca5Bh26dAO" resolve="text" />
+                        </node>
                       </node>
                     </node>
-                    <node concept="3cpWs8" id="7pxta7vkv$a" role="3cqZAp">
-                      <node concept="3cpWsn" id="7pxta7vkv$b" role="3cpWs9">
-                        <property role="TrG5h" value="details" />
-                        <node concept="3uibUv" id="7pxta7vkv$c" role="1tU5fm">
-                          <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-                        </node>
-                        <node concept="3K4zz7" id="7pxta7vkv$d" role="33vP2m">
+                    <node concept="3clFbF" id="3ca5Bh29tY3" role="3cqZAp">
+                      <node concept="37vLTI" id="3ca5Bh29tY5" role="3clFbG">
+                        <node concept="3K4zz7" id="7pxta7vkv$d" role="37vLTx">
                           <node concept="2OqwBi" id="7pxta7vkv$e" role="3K4E3e">
                             <node concept="2OqwBi" id="7pxta7vkv$f" role="2Oq$k0">
                               <node concept="37vLTw" id="7pxta7vkv$g" role="2Oq$k0">
@@ -19539,22 +19382,8 @@
                             </node>
                           </node>
                         </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbH" id="7pxta7vkv$n" role="3cqZAp" />
-                    <node concept="3cpWs6" id="7pxta7vkv$o" role="3cqZAp">
-                      <node concept="2ShNRf" id="7pxta7vkv$p" role="3cqZAk">
-                        <node concept="1pGfFk" id="7pxta7vkv$q" role="2ShVmc">
-                          <ref role="37wK5l" node="7vxJ_H4nq2z" resolve="TableCellInfo" />
-                          <node concept="37vLTw" id="7pxta7vkv$r" role="37wK5m">
-                            <ref role="3cqZAo" node="7pxta7vkv$6" resolve="text" />
-                          </node>
-                          <node concept="37vLTw" id="7pxta7vkv$s" role="37wK5m">
-                            <ref role="3cqZAo" node="7pxta7vkv$b" resolve="details" />
-                          </node>
-                          <node concept="37vLTw" id="7pxta7vkv$t" role="37wK5m">
-                            <ref role="3cqZAo" node="3sb6Qlve67Z" resolve="style" />
-                          </node>
+                        <node concept="37vLTw" id="3ca5Bh29wwf" role="37vLTJ">
+                          <ref role="3cqZAo" node="3ca5Bh26i0s" resolve="tooltip" />
                         </node>
                       </node>
                     </node>
@@ -19573,7 +19402,6 @@
                 </node>
               </node>
               <node concept="3clFbS" id="3sb6Qlve16S" role="3eOfB_">
-                <node concept="3clFbH" id="6Yb9hAqWbtL" role="3cqZAp" />
                 <node concept="3cpWs8" id="3sb6Qlve16T" role="3cqZAp">
                   <node concept="3cpWsn" id="3sb6Qlve16U" role="3cpWs9">
                     <property role="TrG5h" value="ref" />
@@ -19603,11 +19431,19 @@
                 </node>
                 <node concept="3clFbJ" id="3sb6Qlve172" role="3cqZAp">
                   <node concept="3clFbS" id="3sb6Qlve173" role="3clFbx">
-                    <node concept="3cpWs8" id="3sb6Qlve174" role="3cqZAp">
-                      <node concept="3cpWsn" id="3sb6Qlve175" role="3cpWs9">
-                        <property role="TrG5h" value="details" />
-                        <node concept="17QB3L" id="3sb6Qlve176" role="1tU5fm" />
-                        <node concept="1rXfSq" id="3sb6Qlve177" role="33vP2m">
+                    <node concept="3clFbF" id="3ca5Bh294Ef" role="3cqZAp">
+                      <node concept="37vLTI" id="3ca5Bh296al" role="3clFbG">
+                        <node concept="37vLTw" id="3ca5Bh296pm" role="37vLTx">
+                          <ref role="3cqZAo" node="3sb6Qlve16U" resolve="ref" />
+                        </node>
+                        <node concept="37vLTw" id="3ca5Bh294Ed" role="37vLTJ">
+                          <ref role="3cqZAo" node="3ca5Bh28$aL" resolve="navigateTarget" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="3ca5Bh28emp" role="3cqZAp">
+                      <node concept="37vLTI" id="3ca5Bh28emr" role="3clFbG">
+                        <node concept="1rXfSq" id="3sb6Qlve177" role="37vLTx">
                           <ref role="37wK5l" node="2tI9bOlatsa" resolve="presentation" />
                           <node concept="37vLTw" id="3sb6Qlve178" role="37wK5m">
                             <ref role="3cqZAo" node="3sb6Qlve15D" resolve="arg" />
@@ -19616,73 +19452,8 @@
                             <ref role="3cqZAo" node="58JqeLv2Q9M" resolve="DEFAULT" />
                           </node>
                         </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbH" id="6Yb9hAqWxSf" role="3cqZAp" />
-                    <node concept="3cpWs6" id="3sb6Qlve179" role="3cqZAp">
-                      <node concept="2ShNRf" id="3sb6Qlve17a" role="3cqZAk">
-                        <node concept="1pGfFk" id="3sb6Qlve17b" role="2ShVmc">
-                          <ref role="37wK5l" node="5pDu2jaXBtq" resolve="TableCellInfo" />
-                          <node concept="37vLTw" id="3sb6Qlve17c" role="37wK5m">
-                            <ref role="3cqZAo" node="3sb6Qlve175" resolve="details" />
-                          </node>
-                          <node concept="37vLTw" id="3sb6Qlve17d" role="37wK5m">
-                            <ref role="3cqZAo" node="3sb6Qlve175" resolve="details" />
-                          </node>
-                          <node concept="2ShNRf" id="3sb6Qlve17e" role="37wK5m">
-                            <node concept="YeOm9" id="3sb6Qlve17f" role="2ShVmc">
-                              <node concept="1Y3b0j" id="3sb6Qlve17g" role="YeSDq">
-                                <property role="2bfB8j" value="true" />
-                                <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                                <ref role="1Y3XeK" to="wyt6:~Runnable" resolve="Runnable" />
-                                <node concept="3Tm1VV" id="3sb6Qlve17h" role="1B3o_S" />
-                                <node concept="3clFb_" id="3sb6Qlve17i" role="jymVt">
-                                  <property role="1EzhhJ" value="false" />
-                                  <property role="TrG5h" value="run" />
-                                  <property role="DiZV1" value="false" />
-                                  <property role="od$2w" value="false" />
-                                  <node concept="3Tm1VV" id="3sb6Qlve17j" role="1B3o_S" />
-                                  <node concept="3cqZAl" id="3sb6Qlve17k" role="3clF45" />
-                                  <node concept="3clFbS" id="3sb6Qlve17l" role="3clF47">
-                                    <node concept="3clFbF" id="3sb6Qlve17m" role="3cqZAp">
-                                      <node concept="2OqwBi" id="3sb6Qlve17n" role="3clFbG">
-                                        <node concept="2OqwBi" id="3sb6Qlve17o" role="2Oq$k0">
-                                          <node concept="2OqwBi" id="3sb6Qlve17p" role="2Oq$k0">
-                                            <node concept="2ShNRf" id="3sb6Qlve17q" role="2Oq$k0">
-                                              <node concept="1pGfFk" id="3sb6Qlve17r" role="2ShVmc">
-                                                <ref role="37wK5l" to="kz9k:~EditorNavigator.&lt;init&gt;(jetbrains.mps.project.Project)" resolve="EditorNavigator" />
-                                                <node concept="37vLTw" id="3sb6Qlve17s" role="37wK5m">
-                                                  <ref role="3cqZAo" node="6QkkSolKz4F" resolve="mpsProject" />
-                                                </node>
-                                              </node>
-                                            </node>
-                                            <node concept="liA8E" id="3sb6Qlve17t" role="2OqNvi">
-                                              <ref role="37wK5l" to="kz9k:~EditorNavigator.shallFocus(boolean)" resolve="shallFocus" />
-                                              <node concept="3clFbT" id="3sb6Qlve17u" role="37wK5m">
-                                                <property role="3clFbU" value="false" />
-                                              </node>
-                                            </node>
-                                          </node>
-                                          <node concept="liA8E" id="3sb6Qlve17v" role="2OqNvi">
-                                            <ref role="37wK5l" to="kz9k:~EditorNavigator.shallSelect(boolean)" resolve="shallSelect" />
-                                            <node concept="3clFbT" id="3sb6Qlve17w" role="37wK5m">
-                                              <property role="3clFbU" value="true" />
-                                            </node>
-                                          </node>
-                                        </node>
-                                        <node concept="liA8E" id="3sb6Qlve17x" role="2OqNvi">
-                                          <ref role="37wK5l" to="kz9k:~EditorNavigator.open(org.jetbrains.mps.openapi.model.SNodeReference)" resolve="open" />
-                                          <node concept="37vLTw" id="3sb6Qlve17y" role="37wK5m">
-                                            <ref role="3cqZAo" node="3sb6Qlve16U" resolve="ref" />
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
+                        <node concept="37vLTw" id="3ca5Bh28g21" role="37vLTJ">
+                          <ref role="3cqZAo" node="3ca5Bh26dAO" resolve="text" />
                         </node>
                       </node>
                     </node>
@@ -19696,17 +19467,10 @@
                   </node>
                   <node concept="9aQIb" id="3sb6Qlve17B" role="9aQIa">
                     <node concept="3clFbS" id="3sb6Qlve17C" role="9aQI4">
-                      <node concept="3clFbH" id="6Yb9hAqW4SA" role="3cqZAp" />
-                      <node concept="3cpWs8" id="3sb6Qlve17G" role="3cqZAp">
-                        <node concept="3cpWsn" id="3sb6Qlve17H" role="3cpWs9">
-                          <property role="TrG5h" value="label" />
-                          <node concept="17QB3L" id="3sb6Qlve17I" role="1tU5fm" />
-                        </node>
-                      </node>
                       <node concept="3clFbF" id="3sb6Qlve17L" role="3cqZAp">
                         <node concept="37vLTI" id="3sb6Qlve17M" role="3clFbG">
-                          <node concept="37vLTw" id="3sb6Qlve17N" role="37vLTJ">
-                            <ref role="3cqZAo" node="3sb6Qlve17H" resolve="label" />
+                          <node concept="37vLTw" id="3ca5Bh28nG1" role="37vLTJ">
+                            <ref role="3cqZAo" node="3ca5Bh26dAO" resolve="text" />
                           </node>
                           <node concept="1rXfSq" id="428_4iYCHDR" role="37vLTx">
                             <ref role="37wK5l" node="2tI9bOlatsa" resolve="presentation" />
@@ -19719,16 +19483,10 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="3cpWs8" id="428_4iYAbpk" role="3cqZAp">
-                        <node concept="3cpWsn" id="428_4iYAbpl" role="3cpWs9">
-                          <property role="TrG5h" value="toolTip" />
-                          <node concept="17QB3L" id="428_4iYAp$r" role="1tU5fm" />
-                        </node>
-                      </node>
                       <node concept="3clFbF" id="428_4iYAj5z" role="3cqZAp">
                         <node concept="37vLTI" id="428_4iYAj5_" role="3clFbG">
-                          <node concept="37vLTw" id="428_4iYAj5D" role="37vLTJ">
-                            <ref role="3cqZAo" node="428_4iYAbpl" resolve="toolTip" />
+                          <node concept="37vLTw" id="3ca5Bh28uxT" role="37vLTJ">
+                            <ref role="3cqZAo" node="3ca5Bh26i0s" resolve="tooltip" />
                           </node>
                           <node concept="1rXfSq" id="428_4iYCI_B" role="37vLTx">
                             <ref role="37wK5l" node="2tI9bOlatsa" resolve="presentation" />
@@ -19741,24 +19499,6 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="3clFbH" id="6Yb9hAqWenF" role="3cqZAp" />
-                      <node concept="3cpWs6" id="3sb6Qlve17V" role="3cqZAp">
-                        <node concept="2ShNRf" id="3sb6Qlve17W" role="3cqZAk">
-                          <node concept="1pGfFk" id="3sb6Qlve17X" role="2ShVmc">
-                            <ref role="37wK5l" node="7vxJ_H4nq2z" resolve="TableCellInfo" />
-                            <node concept="37vLTw" id="3sb6Qlve17Y" role="37wK5m">
-                              <ref role="3cqZAo" node="3sb6Qlve17H" resolve="label" />
-                            </node>
-                            <node concept="37vLTw" id="428_4iYAbpp" role="37wK5m">
-                              <ref role="3cqZAo" node="428_4iYAbpl" resolve="toolTip" />
-                            </node>
-                            <node concept="37vLTw" id="3sb6QlvereC" role="37wK5m">
-                              <ref role="3cqZAo" node="3sb6Qlve67Z" resolve="style" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbH" id="6Yb9hAqW66o" role="3cqZAp" />
                     </node>
                   </node>
                 </node>
@@ -19775,35 +19515,31 @@
                 </node>
               </node>
               <node concept="3clFbS" id="3sb6Qlve187" role="3eOfB_">
-                <node concept="3cpWs8" id="7pRv4ettlrH" role="3cqZAp">
-                  <node concept="3cpWsn" id="7pRv4ettlrI" role="3cpWs9">
-                    <property role="TrG5h" value="ref" />
-                    <property role="3TUv4t" value="true" />
-                    <node concept="3uibUv" id="7pRv4ettlrJ" role="1tU5fm">
-                      <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-                    </node>
-                    <node concept="2OqwBi" id="7pRv4ettoMA" role="33vP2m">
-                      <node concept="1eOMI4" id="7pRv4ettlrK" role="2Oq$k0">
-                        <node concept="10QFUN" id="7pRv4ettlrL" role="1eOMHV">
-                          <node concept="3uibUv" id="7pRv4ettorR" role="10QFUM">
+                <node concept="3clFbF" id="3ca5Bh29bDF" role="3cqZAp">
+                  <node concept="37vLTI" id="3ca5Bh29cMw" role="3clFbG">
+                    <node concept="2OqwBi" id="3ca5Bh29dDO" role="37vLTx">
+                      <node concept="1eOMI4" id="3ca5Bh29dDP" role="2Oq$k0">
+                        <node concept="10QFUN" id="3ca5Bh29dDQ" role="1eOMHV">
+                          <node concept="3uibUv" id="3ca5Bh29dDR" role="10QFUM">
                             <ref role="3uigEE" to="w1kc:~SNode" resolve="SNode" />
                           </node>
-                          <node concept="37vLTw" id="7pRv4ettlrN" role="10QFUP">
+                          <node concept="37vLTw" id="3ca5Bh29dDS" role="10QFUP">
                             <ref role="3cqZAo" node="3sb6Qlve15D" resolve="arg" />
                           </node>
                         </node>
                       </node>
-                      <node concept="liA8E" id="7pRv4ettp31" role="2OqNvi">
+                      <node concept="liA8E" id="3ca5Bh29dDT" role="2OqNvi">
                         <ref role="37wK5l" to="w1kc:~SNode.getReference()" resolve="getReference" />
                       </node>
                     </node>
+                    <node concept="37vLTw" id="3ca5Bh29bDD" role="37vLTJ">
+                      <ref role="3cqZAo" node="3ca5Bh28$aL" resolve="navigateTarget" />
+                    </node>
                   </node>
                 </node>
-                <node concept="3cpWs8" id="3sb6Qlve188" role="3cqZAp">
-                  <node concept="3cpWsn" id="3sb6Qlve189" role="3cpWs9">
-                    <property role="TrG5h" value="text" />
-                    <node concept="17QB3L" id="3sb6Qlve18a" role="1tU5fm" />
-                    <node concept="1rXfSq" id="3sb6Qlve18b" role="33vP2m">
+                <node concept="3clFbF" id="3ca5Bh27Qvn" role="3cqZAp">
+                  <node concept="37vLTI" id="3ca5Bh27Qvp" role="3clFbG">
+                    <node concept="1rXfSq" id="3sb6Qlve18b" role="37vLTx">
                       <ref role="37wK5l" node="2tI9bOlatsa" resolve="presentation" />
                       <node concept="37vLTw" id="3sb6Qlve18c" role="37wK5m">
                         <ref role="3cqZAo" node="3sb6Qlve15D" resolve="arg" />
@@ -19812,73 +19548,8 @@
                         <ref role="3cqZAo" node="58JqeLv2Q9M" resolve="DEFAULT" />
                       </node>
                     </node>
-                  </node>
-                </node>
-                <node concept="3clFbH" id="6Yb9hAqW_QZ" role="3cqZAp" />
-                <node concept="3cpWs6" id="3sb6Qlve18d" role="3cqZAp">
-                  <node concept="2ShNRf" id="3sb6Qlve18e" role="3cqZAk">
-                    <node concept="1pGfFk" id="3sb6Qlve18f" role="2ShVmc">
-                      <ref role="37wK5l" node="5pDu2jaXBtq" resolve="TableCellInfo" />
-                      <node concept="37vLTw" id="3sb6Qlve18g" role="37wK5m">
-                        <ref role="3cqZAo" node="3sb6Qlve189" resolve="text" />
-                      </node>
-                      <node concept="37vLTw" id="3sb6Qlve18h" role="37wK5m">
-                        <ref role="3cqZAo" node="3sb6Qlve189" resolve="text" />
-                      </node>
-                      <node concept="2ShNRf" id="7pRv4ettsgh" role="37wK5m">
-                        <node concept="YeOm9" id="7pRv4ettsgi" role="2ShVmc">
-                          <node concept="1Y3b0j" id="7pRv4ettsgj" role="YeSDq">
-                            <property role="2bfB8j" value="true" />
-                            <ref role="1Y3XeK" to="wyt6:~Runnable" resolve="Runnable" />
-                            <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                            <node concept="3Tm1VV" id="7pRv4ettsgk" role="1B3o_S" />
-                            <node concept="3clFb_" id="7pRv4ettsgl" role="jymVt">
-                              <property role="1EzhhJ" value="false" />
-                              <property role="TrG5h" value="run" />
-                              <property role="DiZV1" value="false" />
-                              <property role="od$2w" value="false" />
-                              <node concept="3Tm1VV" id="7pRv4ettsgm" role="1B3o_S" />
-                              <node concept="3cqZAl" id="7pRv4ettsgn" role="3clF45" />
-                              <node concept="3clFbS" id="7pRv4ettsgo" role="3clF47">
-                                <node concept="3clFbF" id="7pRv4ettsgp" role="3cqZAp">
-                                  <node concept="2OqwBi" id="7pRv4ettsgq" role="3clFbG">
-                                    <node concept="2OqwBi" id="7pRv4ettsgr" role="2Oq$k0">
-                                      <node concept="2OqwBi" id="7pRv4ettsgs" role="2Oq$k0">
-                                        <node concept="2ShNRf" id="7pRv4ettsgt" role="2Oq$k0">
-                                          <node concept="1pGfFk" id="7pRv4ettsgu" role="2ShVmc">
-                                            <ref role="37wK5l" to="kz9k:~EditorNavigator.&lt;init&gt;(jetbrains.mps.project.Project)" resolve="EditorNavigator" />
-                                            <node concept="37vLTw" id="7pRv4ettsgv" role="37wK5m">
-                                              <ref role="3cqZAo" node="6QkkSolKz4F" resolve="mpsProject" />
-                                            </node>
-                                          </node>
-                                        </node>
-                                        <node concept="liA8E" id="7pRv4ettsgw" role="2OqNvi">
-                                          <ref role="37wK5l" to="kz9k:~EditorNavigator.shallFocus(boolean)" resolve="shallFocus" />
-                                          <node concept="3clFbT" id="7pRv4ettsgx" role="37wK5m">
-                                            <property role="3clFbU" value="false" />
-                                          </node>
-                                        </node>
-                                      </node>
-                                      <node concept="liA8E" id="7pRv4ettsgy" role="2OqNvi">
-                                        <ref role="37wK5l" to="kz9k:~EditorNavigator.shallSelect(boolean)" resolve="shallSelect" />
-                                        <node concept="3clFbT" id="7pRv4ettsgz" role="37wK5m">
-                                          <property role="3clFbU" value="true" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                    <node concept="liA8E" id="7pRv4ettsg$" role="2OqNvi">
-                                      <ref role="37wK5l" to="kz9k:~EditorNavigator.open(org.jetbrains.mps.openapi.model.SNodeReference)" resolve="open" />
-                                      <node concept="37vLTw" id="7pRv4ettsg_" role="37wK5m">
-                                        <ref role="3cqZAo" node="7pRv4ettlrI" resolve="ref" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
+                    <node concept="37vLTw" id="3ca5Bh27SQ6" role="37vLTJ">
+                      <ref role="3cqZAo" node="3ca5Bh26dAO" resolve="text" />
                     </node>
                   </node>
                 </node>
@@ -19895,30 +19566,26 @@
                 </node>
               </node>
               <node concept="3clFbS" id="7pRv4etsVvq" role="3eOfB_">
-                <node concept="3cpWs8" id="7pRv4etthHv" role="3cqZAp">
-                  <node concept="3cpWsn" id="7pRv4etthHw" role="3cpWs9">
-                    <property role="TrG5h" value="ref" />
-                    <property role="3TUv4t" value="true" />
-                    <node concept="3uibUv" id="7pRv4etthDv" role="1tU5fm">
-                      <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-                    </node>
-                    <node concept="1eOMI4" id="7pRv4etthHx" role="33vP2m">
-                      <node concept="10QFUN" id="7pRv4etthHy" role="1eOMHV">
-                        <node concept="3uibUv" id="7pRv4etthHz" role="10QFUM">
+                <node concept="3clFbF" id="3ca5Bh29jgz" role="3cqZAp">
+                  <node concept="37vLTI" id="3ca5Bh29lAd" role="3clFbG">
+                    <node concept="1eOMI4" id="3ca5Bh29lRa" role="37vLTx">
+                      <node concept="10QFUN" id="3ca5Bh29lRb" role="1eOMHV">
+                        <node concept="3uibUv" id="3ca5Bh29lRc" role="10QFUM">
                           <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
                         </node>
-                        <node concept="37vLTw" id="7pRv4etthH$" role="10QFUP">
+                        <node concept="37vLTw" id="3ca5Bh29lRd" role="10QFUP">
                           <ref role="3cqZAo" node="3sb6Qlve15D" resolve="arg" />
                         </node>
                       </node>
                     </node>
+                    <node concept="37vLTw" id="3ca5Bh29jgx" role="37vLTJ">
+                      <ref role="3cqZAo" node="3ca5Bh28$aL" resolve="navigateTarget" />
+                    </node>
                   </node>
                 </node>
-                <node concept="3cpWs8" id="7pRv4etsVvr" role="3cqZAp">
-                  <node concept="3cpWsn" id="7pRv4etsVvs" role="3cpWs9">
-                    <property role="TrG5h" value="text" />
-                    <node concept="17QB3L" id="7pRv4etsVvt" role="1tU5fm" />
-                    <node concept="1rXfSq" id="7pRv4etsVvu" role="33vP2m">
+                <node concept="3clFbF" id="3ca5Bh27qFg" role="3cqZAp">
+                  <node concept="37vLTI" id="3ca5Bh27qFi" role="3clFbG">
+                    <node concept="1rXfSq" id="7pRv4etsVvu" role="37vLTx">
                       <ref role="37wK5l" node="2tI9bOlatsa" resolve="presentation" />
                       <node concept="37vLTw" id="7pRv4etsVvv" role="37wK5m">
                         <ref role="3cqZAo" node="3sb6Qlve15D" resolve="arg" />
@@ -19927,73 +19594,8 @@
                         <ref role="3cqZAo" node="58JqeLv2Q9M" resolve="DEFAULT" />
                       </node>
                     </node>
-                  </node>
-                </node>
-                <node concept="3clFbH" id="7pRv4etsVvx" role="3cqZAp" />
-                <node concept="3cpWs6" id="7pRv4etsVvy" role="3cqZAp">
-                  <node concept="2ShNRf" id="7pRv4etsVvz" role="3cqZAk">
-                    <node concept="1pGfFk" id="7pRv4etsVv$" role="2ShVmc">
-                      <ref role="37wK5l" node="5pDu2jaXBtq" resolve="TableCellInfo" />
-                      <node concept="37vLTw" id="7pRv4etsVv_" role="37wK5m">
-                        <ref role="3cqZAo" node="7pRv4etsVvs" resolve="text" />
-                      </node>
-                      <node concept="37vLTw" id="7pRv4etsVvA" role="37wK5m">
-                        <ref role="3cqZAo" node="7pRv4etsVvs" resolve="text" />
-                      </node>
-                      <node concept="2ShNRf" id="7pRv4ettaTk" role="37wK5m">
-                        <node concept="YeOm9" id="7pRv4ettaTl" role="2ShVmc">
-                          <node concept="1Y3b0j" id="7pRv4ettaTm" role="YeSDq">
-                            <property role="2bfB8j" value="true" />
-                            <ref role="1Y3XeK" to="wyt6:~Runnable" resolve="Runnable" />
-                            <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                            <node concept="3Tm1VV" id="7pRv4ettaTn" role="1B3o_S" />
-                            <node concept="3clFb_" id="7pRv4ettaTo" role="jymVt">
-                              <property role="1EzhhJ" value="false" />
-                              <property role="TrG5h" value="run" />
-                              <property role="DiZV1" value="false" />
-                              <property role="od$2w" value="false" />
-                              <node concept="3Tm1VV" id="7pRv4ettaTp" role="1B3o_S" />
-                              <node concept="3cqZAl" id="7pRv4ettaTq" role="3clF45" />
-                              <node concept="3clFbS" id="7pRv4ettaTr" role="3clF47">
-                                <node concept="3clFbF" id="7pRv4ettaTs" role="3cqZAp">
-                                  <node concept="2OqwBi" id="7pRv4ettaTt" role="3clFbG">
-                                    <node concept="2OqwBi" id="7pRv4ettaTu" role="2Oq$k0">
-                                      <node concept="2OqwBi" id="7pRv4ettaTv" role="2Oq$k0">
-                                        <node concept="2ShNRf" id="7pRv4ettaTw" role="2Oq$k0">
-                                          <node concept="1pGfFk" id="7pRv4ettaTx" role="2ShVmc">
-                                            <ref role="37wK5l" to="kz9k:~EditorNavigator.&lt;init&gt;(jetbrains.mps.project.Project)" resolve="EditorNavigator" />
-                                            <node concept="37vLTw" id="7pRv4ettaTy" role="37wK5m">
-                                              <ref role="3cqZAo" node="6QkkSolKz4F" resolve="mpsProject" />
-                                            </node>
-                                          </node>
-                                        </node>
-                                        <node concept="liA8E" id="7pRv4ettaTz" role="2OqNvi">
-                                          <ref role="37wK5l" to="kz9k:~EditorNavigator.shallFocus(boolean)" resolve="shallFocus" />
-                                          <node concept="3clFbT" id="7pRv4ettaT$" role="37wK5m">
-                                            <property role="3clFbU" value="false" />
-                                          </node>
-                                        </node>
-                                      </node>
-                                      <node concept="liA8E" id="7pRv4ettaT_" role="2OqNvi">
-                                        <ref role="37wK5l" to="kz9k:~EditorNavigator.shallSelect(boolean)" resolve="shallSelect" />
-                                        <node concept="3clFbT" id="7pRv4ettaTA" role="37wK5m">
-                                          <property role="3clFbU" value="true" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                    <node concept="liA8E" id="7pRv4ettaTB" role="2OqNvi">
-                                      <ref role="37wK5l" to="kz9k:~EditorNavigator.open(org.jetbrains.mps.openapi.model.SNodeReference)" resolve="open" />
-                                      <node concept="37vLTw" id="7pRv4ettln3" role="37wK5m">
-                                        <ref role="3cqZAo" node="7pRv4etthHw" resolve="ref" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
+                    <node concept="37vLTw" id="3ca5Bh27sSi" role="37vLTJ">
+                      <ref role="3cqZAo" node="3ca5Bh26dAO" resolve="text" />
                     </node>
                   </node>
                 </node>
@@ -20002,13 +19604,9 @@
             </node>
             <node concept="9aQIb" id="3sb6Qlve18j" role="9aQIa">
               <node concept="3clFbS" id="3sb6Qlve18k" role="9aQI4">
-                <node concept="3cpWs8" id="3sb6Qlve18l" role="3cqZAp">
-                  <node concept="3cpWsn" id="3sb6Qlve18m" role="3cpWs9">
-                    <property role="TrG5h" value="text" />
-                    <node concept="3uibUv" id="3sb6Qlve18n" role="1tU5fm">
-                      <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-                    </node>
-                    <node concept="1rXfSq" id="3sb6Qlve18o" role="33vP2m">
+                <node concept="3clFbF" id="3ca5Bh27exD" role="3cqZAp">
+                  <node concept="37vLTI" id="3ca5Bh27exF" role="3clFbG">
+                    <node concept="1rXfSq" id="3sb6Qlve18o" role="37vLTx">
                       <ref role="37wK5l" node="2tI9bOlatsa" resolve="presentation" />
                       <node concept="37vLTw" id="3sb6Qlve18p" role="37wK5m">
                         <ref role="3cqZAo" node="3sb6Qlve15D" resolve="arg" />
@@ -20017,15 +19615,14 @@
                         <ref role="3cqZAo" node="58JqeLv2Q9M" resolve="DEFAULT" />
                       </node>
                     </node>
+                    <node concept="37vLTw" id="3ca5Bh27hzW" role="37vLTJ">
+                      <ref role="3cqZAo" node="3ca5Bh26dAO" resolve="text" />
+                    </node>
                   </node>
                 </node>
-                <node concept="3cpWs8" id="3sb6Qlve18q" role="3cqZAp">
-                  <node concept="3cpWsn" id="3sb6Qlve18r" role="3cpWs9">
-                    <property role="TrG5h" value="details" />
-                    <node concept="3uibUv" id="3sb6Qlve18s" role="1tU5fm">
-                      <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-                    </node>
-                    <node concept="3K4zz7" id="3sb6Qlve18t" role="33vP2m">
+                <node concept="3clFbF" id="3ca5Bh27jer" role="3cqZAp">
+                  <node concept="37vLTI" id="3ca5Bh27jet" role="3clFbG">
+                    <node concept="3K4zz7" id="3sb6Qlve18t" role="37vLTx">
                       <node concept="2OqwBi" id="3sb6Qlve18u" role="3K4E3e">
                         <node concept="2OqwBi" id="3sb6Qlve18v" role="2Oq$k0">
                           <node concept="37vLTw" id="3sb6Qlve18w" role="2Oq$k0">
@@ -20047,20 +19644,139 @@
                         </node>
                       </node>
                     </node>
+                    <node concept="37vLTw" id="3ca5Bh27lls" role="37vLTJ">
+                      <ref role="3cqZAo" node="3ca5Bh26i0s" resolve="tooltip" />
+                    </node>
                   </node>
                 </node>
-                <node concept="3clFbH" id="3sb6QlvecnS" role="3cqZAp" />
-                <node concept="3cpWs6" id="3sb6Qlve18B" role="3cqZAp">
-                  <node concept="2ShNRf" id="3sb6Qlve18C" role="3cqZAk">
-                    <node concept="1pGfFk" id="3sb6Qlve18D" role="2ShVmc">
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="3ca5Bh27d77" role="3cqZAp" />
+          <node concept="3clFbJ" id="3ca5Bh27HzB" role="3cqZAp">
+            <node concept="3clFbS" id="3ca5Bh27HzD" role="3clFbx">
+              <node concept="3clFbF" id="3ca5Bh27NFw" role="3cqZAp">
+                <node concept="37vLTI" id="3ca5Bh27OeN" role="3clFbG">
+                  <node concept="37vLTw" id="3ca5Bh27OtU" role="37vLTx">
+                    <ref role="3cqZAo" node="3ca5Bh26dAO" resolve="text" />
+                  </node>
+                  <node concept="37vLTw" id="3ca5Bh27NFu" role="37vLTJ">
+                    <ref role="3cqZAo" node="3ca5Bh26i0s" resolve="tooltip" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbC" id="3ca5Bh27Lmj" role="3clFbw">
+              <node concept="10Nm6u" id="3ca5Bh27Mq1" role="3uHU7w" />
+              <node concept="37vLTw" id="3ca5Bh27Jst" role="3uHU7B">
+                <ref role="3cqZAo" node="3ca5Bh26i0s" resolve="tooltip" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="3ca5Bh28R3x" role="3cqZAp" />
+          <node concept="3clFbJ" id="3ca5Bh26DF0" role="3cqZAp">
+            <node concept="3clFbS" id="3ca5Bh26DF2" role="3clFbx">
+              <node concept="3cpWs8" id="3ca5Bh28LWb" role="3cqZAp">
+                <node concept="3cpWsn" id="3ca5Bh28LWc" role="3cpWs9">
+                  <property role="TrG5h" value="ref" />
+                  <property role="3TUv4t" value="true" />
+                  <node concept="3uibUv" id="3ca5Bh28LWd" role="1tU5fm">
+                    <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+                  </node>
+                  <node concept="37vLTw" id="3ca5Bh28Ogc" role="33vP2m">
+                    <ref role="3cqZAo" node="3ca5Bh28$aL" resolve="navigateTarget" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="3ca5Bh28AL2" role="3cqZAp" />
+              <node concept="3cpWs6" id="7pxta7vksec" role="3cqZAp">
+                <node concept="2ShNRf" id="7pxta7vksed" role="3cqZAk">
+                  <node concept="1pGfFk" id="7pxta7vksee" role="2ShVmc">
+                    <ref role="37wK5l" node="5pDu2jaXBtq" resolve="TableCellInfo" />
+                    <node concept="37vLTw" id="3ca5Bh26qNs" role="37wK5m">
+                      <ref role="3cqZAo" node="3ca5Bh26dAO" resolve="text" />
+                    </node>
+                    <node concept="37vLTw" id="3ca5Bh26tTd" role="37wK5m">
+                      <ref role="3cqZAo" node="3ca5Bh26i0s" resolve="tooltip" />
+                    </node>
+                    <node concept="2ShNRf" id="3ca5Bh28OUY" role="37wK5m">
+                      <node concept="YeOm9" id="3ca5Bh28OUZ" role="2ShVmc">
+                        <node concept="1Y3b0j" id="3ca5Bh28OV0" role="YeSDq">
+                          <property role="2bfB8j" value="true" />
+                          <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                          <ref role="1Y3XeK" to="wyt6:~Runnable" resolve="Runnable" />
+                          <node concept="3Tm1VV" id="3ca5Bh28OV1" role="1B3o_S" />
+                          <node concept="3clFb_" id="3ca5Bh28OV2" role="jymVt">
+                            <property role="1EzhhJ" value="false" />
+                            <property role="TrG5h" value="run" />
+                            <property role="DiZV1" value="false" />
+                            <property role="od$2w" value="false" />
+                            <node concept="3Tm1VV" id="3ca5Bh28OV3" role="1B3o_S" />
+                            <node concept="3cqZAl" id="3ca5Bh28OV4" role="3clF45" />
+                            <node concept="3clFbS" id="3ca5Bh28OV5" role="3clF47">
+                              <node concept="3clFbF" id="3ca5Bh28OV6" role="3cqZAp">
+                                <node concept="2OqwBi" id="3ca5Bh28OV7" role="3clFbG">
+                                  <node concept="2OqwBi" id="3ca5Bh28OV8" role="2Oq$k0">
+                                    <node concept="2OqwBi" id="3ca5Bh28OV9" role="2Oq$k0">
+                                      <node concept="2ShNRf" id="3ca5Bh28OVa" role="2Oq$k0">
+                                        <node concept="1pGfFk" id="3ca5Bh28OVb" role="2ShVmc">
+                                          <ref role="37wK5l" to="kz9k:~EditorNavigator.&lt;init&gt;(jetbrains.mps.project.Project)" resolve="EditorNavigator" />
+                                          <node concept="37vLTw" id="3ca5Bh28OVc" role="37wK5m">
+                                            <ref role="3cqZAo" node="6QkkSolKz4F" resolve="mpsProject" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                      <node concept="liA8E" id="3ca5Bh28OVd" role="2OqNvi">
+                                        <ref role="37wK5l" to="kz9k:~EditorNavigator.shallFocus(boolean)" resolve="shallFocus" />
+                                        <node concept="3clFbT" id="3ca5Bh28OVe" role="37wK5m">
+                                          <property role="3clFbU" value="false" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="liA8E" id="3ca5Bh28OVf" role="2OqNvi">
+                                      <ref role="37wK5l" to="kz9k:~EditorNavigator.shallSelect(boolean)" resolve="shallSelect" />
+                                      <node concept="3clFbT" id="3ca5Bh28OVg" role="37wK5m">
+                                        <property role="3clFbU" value="true" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="liA8E" id="3ca5Bh28OVh" role="2OqNvi">
+                                    <ref role="37wK5l" to="kz9k:~EditorNavigator.open(org.jetbrains.mps.openapi.model.SNodeReference)" resolve="open" />
+                                    <node concept="37vLTw" id="3ca5Bh28OVi" role="37wK5m">
+                                      <ref role="3cqZAo" node="3ca5Bh28LWc" resolve="ref" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="3ca5Bh26Zik" role="3cqZAp" />
+            </node>
+            <node concept="3y3z36" id="3ca5Bh26Hiz" role="3clFbw">
+              <node concept="10Nm6u" id="3ca5Bh26Hxh" role="3uHU7w" />
+              <node concept="37vLTw" id="3ca5Bh28AE7" role="3uHU7B">
+                <ref role="3cqZAo" node="3ca5Bh28$aL" resolve="navigateTarget" />
+              </node>
+            </node>
+            <node concept="9aQIb" id="3ca5Bh26MqC" role="9aQIa">
+              <node concept="3clFbS" id="3ca5Bh26MqD" role="9aQI4">
+                <node concept="3cpWs6" id="3ca5Bh26Oxn" role="3cqZAp">
+                  <node concept="2ShNRf" id="3ca5Bh26QkY" role="3cqZAk">
+                    <node concept="1pGfFk" id="3ca5Bh26Q6m" role="2ShVmc">
                       <ref role="37wK5l" node="7vxJ_H4nq2z" resolve="TableCellInfo" />
-                      <node concept="37vLTw" id="3sb6Qlve18E" role="37wK5m">
-                        <ref role="3cqZAo" node="3sb6Qlve18m" resolve="text" />
+                      <node concept="37vLTw" id="3ca5Bh26Sox" role="37wK5m">
+                        <ref role="3cqZAo" node="3ca5Bh26dAO" resolve="text" />
                       </node>
-                      <node concept="37vLTw" id="3sb6Qlve18F" role="37wK5m">
-                        <ref role="3cqZAo" node="3sb6Qlve18r" resolve="details" />
+                      <node concept="37vLTw" id="3ca5Bh26UUQ" role="37wK5m">
+                        <ref role="3cqZAo" node="3ca5Bh26i0s" resolve="tooltip" />
                       </node>
-                      <node concept="37vLTw" id="3sb6Qlveh79" role="37wK5m">
+                      <node concept="37vLTw" id="3ca5Bh26W5V" role="37wK5m">
                         <ref role="3cqZAo" node="3sb6Qlve67Z" resolve="style" />
                       </node>
                     </node>
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
index 21270455..c98f2650 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
@@ -4344,6 +4344,81 @@
                 </node>
               </node>
             </node>
+            <node concept="3clFbF" id="3ca5Bh1XLGx" role="3cqZAp">
+              <node concept="1rXfSq" id="3ca5Bh1XLGy" role="3clFbG">
+                <ref role="37wK5l" node="cmlg9NBpHK" resolve="forEachOfType" />
+                <node concept="37vLTw" id="3ca5Bh1XLGz" role="37wK5m">
+                  <ref role="3cqZAo" node="5yr01fECOnu" resolve="arg" />
+                </node>
+                <node concept="3VsKOn" id="3ca5Bh1XLG$" role="37wK5m">
+                  <ref role="3VsUkX" to="mhbf:~SNode" resolve="SNode" />
+                </node>
+                <node concept="1bVj0M" id="3ca5Bh1XLG_" role="37wK5m">
+                  <node concept="37vLTG" id="3ca5Bh1XLGA" role="1bW2Oz">
+                    <property role="TrG5h" value="node" />
+                    <node concept="3uibUv" id="3ca5Bh1XPGZ" role="1tU5fm">
+                      <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
+                    </node>
+                  </node>
+                  <node concept="3clFbS" id="3ca5Bh1XLGC" role="1bW5cS">
+                    <node concept="3clFbJ" id="3ca5Bh1XLGD" role="3cqZAp">
+                      <node concept="3y3z36" id="3ca5Bh1XLGE" role="3clFbw">
+                        <node concept="10Nm6u" id="3ca5Bh1XLGF" role="3uHU7w" />
+                        <node concept="37vLTw" id="3ca5Bh1XLGG" role="3uHU7B">
+                          <ref role="3cqZAo" node="5yr01fEduwQ" resolve="session" />
+                        </node>
+                      </node>
+                      <node concept="3clFbS" id="3ca5Bh1XLGH" role="3clFbx">
+                        <node concept="3clFbF" id="3ca5Bh1XLGI" role="3cqZAp">
+                          <node concept="2OqwBi" id="3ca5Bh1XLGJ" role="3clFbG">
+                            <node concept="37vLTw" id="3ca5Bh1XLGK" role="2Oq$k0">
+                              <ref role="3cqZAo" node="5yr01fEduwQ" resolve="session" />
+                            </node>
+                            <node concept="liA8E" id="3ca5Bh1XLGL" role="2OqNvi">
+                              <ref role="37wK5l" node="36tQV5BDE0Q" resolve="require" />
+                              <node concept="10QFUN" id="3ca5Bh1XLGM" role="37wK5m">
+                                <node concept="37vLTw" id="3ca5Bh1XLGN" role="10QFUP">
+                                  <ref role="3cqZAo" node="3ca5Bh1XLGA" resolve="node" />
+                                </node>
+                                <node concept="3Tqbb2" id="3ca5Bh1XR0Y" role="10QFUM" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="3ca5Bh1XLGP" role="3cqZAp">
+                      <node concept="d57v9" id="3ca5Bh1XLGQ" role="3clFbG">
+                        <node concept="3cpWs3" id="3ca5Bh1XLGR" role="37vLTx">
+                          <node concept="2OqwBi" id="3ca5Bh1XLGS" role="3uHU7w">
+                            <node concept="37vLTw" id="3ca5Bh1XLGT" role="2Oq$k0">
+                              <ref role="3cqZAo" node="3ca5Bh1XLGA" resolve="node" />
+                            </node>
+                            <node concept="liA8E" id="3ca5Bh1XLGU" role="2OqNvi">
+                              <ref role="37wK5l" to="wyt6:~Object.hashCode()" resolve="hashCode" />
+                            </node>
+                          </node>
+                          <node concept="17qRlL" id="3ca5Bh1XLGV" role="3uHU7B">
+                            <node concept="37vLTw" id="3ca5Bh1XLGW" role="3uHU7B">
+                              <ref role="3cqZAo" node="cmlg9NyC84" resolve="requiredHash" />
+                            </node>
+                            <node concept="3cmrfG" id="3ca5Bh1XLGX" role="3uHU7w">
+                              <property role="3cmrfH" value="37" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="2OqwBi" id="3ca5Bh1XLGY" role="37vLTJ">
+                          <node concept="Xjq3P" id="3ca5Bh1XLGZ" role="2Oq$k0" />
+                          <node concept="2OwXpG" id="3ca5Bh1XLH0" role="2OqNvi">
+                            <ref role="2Oxat5" node="cmlg9NyC84" resolve="requiredHash" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
           </node>
           <node concept="3cpWsn" id="5yr01fECOnu" role="1Duv9x">
             <property role="TrG5h" value="arg" />
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps
index 31e5c8ab..45750365 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps
@@ -274,6 +274,7 @@
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
+      <concept id="5045161044515397667" name="jetbrains.mps.lang.smodel.structure.Node_PointerOperation" flags="ng" index="iZEcu" />
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
       <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
@@ -839,15 +840,8 @@
                 <node concept="37vLTw" id="3FGJ5nvneGh" role="2XxRq1">
                   <ref role="3cqZAo" node="3FGJ5nvncdC" resolve="testNodeRules" />
                 </node>
-                <node concept="2OqwBi" id="3FGJ5nvmPyT" role="2XxRq1">
-                  <node concept="liA8E" id="3FGJ5nvmPKU" role="2OqNvi">
-                    <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
-                  </node>
-                  <node concept="2JrnkZ" id="3FGJ5nvmPyY" role="2Oq$k0">
-                    <node concept="37vLTw" id="3FGJ5nvmPqI" role="2JrQYb">
-                      <ref role="3cqZAo" node="3FGJ5nvmG0Z" resolve="replacedNode" />
-                    </node>
-                  </node>
+                <node concept="37vLTw" id="3FGJ5nvmPqI" role="2XxRq1">
+                  <ref role="3cqZAo" node="3FGJ5nvmG0Z" resolve="replacedNode" />
                 </node>
               </node>
             </node>
@@ -1679,10 +1673,8 @@
         </node>
       </node>
       <node concept="37vLTG" id="7eQMSyzljNe" role="3clF46">
-        <property role="TrG5h" value="nodeRef" />
-        <node concept="3uibUv" id="7eQMSyzljOp" role="1tU5fm">
-          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-        </node>
+        <property role="TrG5h" value="nodeToFind" />
+        <node concept="3Tqbb2" id="3ca5Bh1Zngj" role="1tU5fm" />
       </node>
       <node concept="A3Dl8" id="7eQMSyzlipp" role="3clF45">
         <node concept="3uibUv" id="7eQMSyzlipV" role="A3Ik2">
@@ -1802,13 +1794,28 @@
             </node>
             <node concept="3clFbH" id="7eQMSyzmk80" role="3cqZAp" />
             <node concept="3clFbJ" id="7eQMSyzlHHV" role="3cqZAp">
-              <node concept="2OqwBi" id="7eQMSyzmcUe" role="3clFbw">
-                <node concept="37vLTw" id="7eQMSyzm9W8" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7eQMSyzlIT9" resolve="found" />
+              <node concept="22lmx$" id="3ca5Bh1Zo6J" role="3clFbw">
+                <node concept="2OqwBi" id="3ca5Bh1ZoH6" role="3uHU7w">
+                  <node concept="37vLTw" id="3ca5Bh1Zo81" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7eQMSyzlIT9" resolve="found" />
+                  </node>
+                  <node concept="3JPx81" id="3ca5Bh1Zpzp" role="2OqNvi">
+                    <node concept="2OqwBi" id="3ca5Bh1ZpHt" role="25WWJ7">
+                      <node concept="37vLTw" id="3ca5Bh1ZpAR" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7eQMSyzljNe" resolve="nodeToFind" />
+                      </node>
+                      <node concept="iZEcu" id="3ca5Bh1ZpRh" role="2OqNvi" />
+                    </node>
+                  </node>
                 </node>
-                <node concept="3JPx81" id="7eQMSyzmet5" role="2OqNvi">
-                  <node concept="37vLTw" id="7eQMSyzmeuQ" role="25WWJ7">
-                    <ref role="3cqZAo" node="7eQMSyzljNe" resolve="nodeRef" />
+                <node concept="2OqwBi" id="7eQMSyzmcUe" role="3uHU7B">
+                  <node concept="37vLTw" id="7eQMSyzm9W8" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7eQMSyzlIT9" resolve="found" />
+                  </node>
+                  <node concept="3JPx81" id="7eQMSyzmet5" role="2OqNvi">
+                    <node concept="37vLTw" id="7eQMSyzmeuQ" role="25WWJ7">
+                      <ref role="3cqZAo" node="7eQMSyzljNe" resolve="nodeToFind" />
+                    </node>
                   </node>
                 </node>
               </node>