From d9041746be07e7fe3655cba5e3f220c6a275fc1c Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Thu, 12 Dec 2024 08:34:50 +0100
Subject: [PATCH 1/3] editor.querylist: set the target concept in the generated
 editor cell

---
 .../mpsutil/editor/querylist/runtime.mps      | 44 ++++++++++++++++---
 .../generator/template/main@generator.mps     | 29 ++++++++++++
 2 files changed, 68 insertions(+), 5 deletions(-)

diff --git a/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com/mbeddr/mpsutil/editor/querylist/runtime.mps b/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com/mbeddr/mpsutil/editor/querylist/runtime.mps
index f35770188..320f162b3 100644
--- a/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com/mbeddr/mpsutil/editor/querylist/runtime.mps
+++ b/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com/mbeddr/mpsutil/editor/querylist/runtime.mps
@@ -384,6 +384,12 @@
       <node concept="10P_77" id="T_6DrmD7d7" role="1tU5fm" />
       <node concept="3clFbT" id="T_6DrmD8Fh" role="33vP2m" />
     </node>
+    <node concept="312cEg" id="7vDkgomUWu3" role="jymVt">
+      <property role="TrG5h" value="targetConcept" />
+      <node concept="3Tm6S6" id="7vDkgomUVu8" role="1B3o_S" />
+      <node concept="3bZ5Sz" id="7vDkgomUX7l" role="1tU5fm" />
+      <node concept="10Nm6u" id="7vDkgomV3yM" role="33vP2m" />
+    </node>
     <node concept="2tJIrI" id="T_6DrmD699" role="jymVt" />
     <node concept="3clFbW" id="5oklODahdFh" role="jymVt">
       <node concept="3cqZAl" id="5oklODahdFj" role="3clF45" />
@@ -485,11 +491,9 @@
                       <ref role="3uigEE" to="c17a:~SAbstractConcept" resolve="SAbstractConcept" />
                     </node>
                     <node concept="3clFbS" id="1GpxVmA6URZ" role="3clF47">
-                      <node concept="YS8fn" id="3kkgokhwfpC" role="3cqZAp">
-                        <node concept="2ShNRf" id="3kkgokhwfpD" role="YScLw">
-                          <node concept="1pGfFk" id="3kkgokhwfpE" role="2ShVmc">
-                            <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
-                          </node>
+                      <node concept="3clFbF" id="7vDkgomV9Cn" role="3cqZAp">
+                        <node concept="37vLTw" id="7vDkgomV9Cm" role="3clFbG">
+                          <ref role="3cqZAo" node="7vDkgomUWu3" resolve="targetConcept" />
                         </node>
                       </node>
                     </node>
@@ -497,6 +501,7 @@
                       <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                     </node>
                   </node>
+                  <node concept="2tJIrI" id="7vDkgomV4a7" role="jymVt" />
                   <node concept="3clFb_" id="1GpxVmA6US3" role="jymVt">
                     <property role="1EzhhJ" value="false" />
                     <property role="TrG5h" value="getName" />
@@ -518,6 +523,7 @@
                       <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                     </node>
                   </node>
+                  <node concept="2tJIrI" id="7vDkgomV4Js" role="jymVt" />
                   <node concept="3clFb_" id="1GpxVmA6USg" role="jymVt">
                     <property role="1EzhhJ" value="false" />
                     <property role="TrG5h" value="isValid" />
@@ -538,6 +544,7 @@
                       <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                     </node>
                   </node>
+                  <node concept="2tJIrI" id="7vDkgomV5kL" role="jymVt" />
                   <node concept="3clFb_" id="1GpxVmA6USr" role="jymVt">
                     <property role="1EzhhJ" value="false" />
                     <property role="TrG5h" value="getRole" />
@@ -559,6 +566,7 @@
                       <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                     </node>
                   </node>
+                  <node concept="2tJIrI" id="7vDkgomV5U6" role="jymVt" />
                   <node concept="3clFb_" id="1GpxVmA6USD" role="jymVt">
                     <property role="1EzhhJ" value="false" />
                     <property role="TrG5h" value="isOptional" />
@@ -577,6 +585,7 @@
                       <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                     </node>
                   </node>
+                  <node concept="2tJIrI" id="7vDkgomV6vr" role="jymVt" />
                   <node concept="3clFb_" id="1GpxVmA6USN" role="jymVt">
                     <property role="1EzhhJ" value="false" />
                     <property role="TrG5h" value="getOwner" />
@@ -602,6 +611,7 @@
                       <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                     </node>
                   </node>
+                  <node concept="2tJIrI" id="7vDkgomV74K" role="jymVt" />
                   <node concept="3clFb_" id="1GpxVmA6USZ" role="jymVt">
                     <property role="1EzhhJ" value="false" />
                     <property role="TrG5h" value="isReference" />
@@ -646,6 +656,7 @@
                       <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                     </node>
                   </node>
+                  <node concept="2tJIrI" id="7vDkgomV7E5" role="jymVt" />
                   <node concept="3clFb_" id="3kkgokhvYxm" role="jymVt">
                     <property role="TrG5h" value="getRoleName" />
                     <node concept="3Tm1VV" id="3kkgokhvYxn" role="1B3o_S" />
@@ -664,6 +675,7 @@
                       <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                     </node>
                   </node>
+                  <node concept="2tJIrI" id="7vDkgomV8fq" role="jymVt" />
                   <node concept="3clFb_" id="3kkgokhvYxz" role="jymVt">
                     <property role="TrG5h" value="isUnordered" />
                     <node concept="3Tm1VV" id="3kkgokhvYx$" role="1B3o_S" />
@@ -745,6 +757,28 @@
       <node concept="3Tm1VV" id="T_6DrmDg8K" role="1B3o_S" />
       <node concept="10P_77" id="T_6DrmDh4R" role="3clF45" />
     </node>
+    <node concept="2tJIrI" id="7vDkgomUXdq" role="jymVt" />
+    <node concept="3clFb_" id="7vDkgomUY9j" role="jymVt">
+      <property role="TrG5h" value="setTargeConcept" />
+      <node concept="3clFbS" id="7vDkgomUY9m" role="3clF47">
+        <node concept="3clFbF" id="7vDkgomUZHe" role="3cqZAp">
+          <node concept="37vLTI" id="7vDkgomV15y" role="3clFbG">
+            <node concept="37vLTw" id="7vDkgomV1SJ" role="37vLTx">
+              <ref role="3cqZAo" node="7vDkgomUZ1n" resolve="concept" />
+            </node>
+            <node concept="37vLTw" id="7vDkgomUZHd" role="37vLTJ">
+              <ref role="3cqZAo" node="7vDkgomUWu3" resolve="targetConcept" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="7vDkgomUXpO" role="1B3o_S" />
+      <node concept="3cqZAl" id="7vDkgomUXy7" role="3clF45" />
+      <node concept="37vLTG" id="7vDkgomUZ1n" role="3clF46">
+        <property role="TrG5h" value="concept" />
+        <node concept="3bZ5Sz" id="7vDkgomUZ1m" role="1tU5fm" />
+      </node>
+    </node>
     <node concept="3Tm1VV" id="5oklODahdyR" role="1B3o_S" />
     <node concept="3uibUv" id="5oklODahe60" role="1zkMxy">
       <ref role="3uigEE" to="g51k:~EditorCell_Collection" resolve="EditorCell_Collection" />
diff --git a/code/querylist/com.mbeddr.mpsutil.editor.querylist/generator/template/main@generator.mps b/code/querylist/com.mbeddr.mpsutil.editor.querylist/generator/template/main@generator.mps
index f5d274c33..a9f8fc7c3 100644
--- a/code/querylist/com.mbeddr.mpsutil.editor.querylist/generator/template/main@generator.mps
+++ b/code/querylist/com.mbeddr.mpsutil.editor.querylist/generator/template/main@generator.mps
@@ -1242,6 +1242,35 @@
                       </node>
                     </node>
                   </node>
+                  <node concept="3clFbF" id="7vDkgomVfmM" role="3cqZAp">
+                    <node concept="2OqwBi" id="7vDkgomViaV" role="3clFbG">
+                      <node concept="37vLTw" id="7vDkgomVfmK" role="2Oq$k0">
+                        <ref role="3cqZAo" node="1WjrBsNI_nG" resolve="editorCell" />
+                      </node>
+                      <node concept="liA8E" id="7vDkgomVqJ1" role="2OqNvi">
+                        <ref role="37wK5l" to="d2zl:7vDkgomUY9j" resolve="setTargeConcept" />
+                        <node concept="35c_gC" id="7vDkgomWFe8" role="37wK5m">
+                          <ref role="35c_gD" to="tpck:gw2VY9q" resolve="BaseConcept" />
+                          <node concept="1ZhdrF" id="7vDkgomWJov" role="lGtFl">
+                            <property role="2qtEX8" value="conceptDeclaration" />
+                            <property role="P3scX" value="7866978e-a0f0-4cc7-81bc-4d213d9375e1/2644386474300074836/2644386474300074837" />
+                            <node concept="3$xsQk" id="7vDkgomWJow" role="3$ytzL">
+                              <node concept="3clFbS" id="7vDkgomWJox" role="2VODD2">
+                                <node concept="3clFbF" id="7vDkgomWLHP" role="3cqZAp">
+                                  <node concept="2OqwBi" id="7vDkgomWNq2" role="3clFbG">
+                                    <node concept="30H73N" id="7vDkgomWLHO" role="2Oq$k0" />
+                                    <node concept="3TrEf2" id="7vDkgomWOZ7" role="2OqNvi">
+                                      <ref role="3Tt5mk" to="bbp5:C$q8A2yeI6" resolve="elementsConcept" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
                   <node concept="3cpWs8" id="1WjrBsNI_pV" role="3cqZAp">
                     <node concept="5jKBG" id="76N1O$KguuA" role="lGtFl">
                       <ref role="v9R2y" to="tpc3:4v1iCryNDHi" resolve="template_cellSetupBlock" />

From f9b08a55da296b427cea869944abf97c656ab5bf Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Thu, 12 Dec 2024 08:37:37 +0100
Subject: [PATCH 2/3] editor.querylist: set SRole#isValid to false

---
 .../com/mbeddr/mpsutil/editor/querylist/runtime.mps       | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com/mbeddr/mpsutil/editor/querylist/runtime.mps b/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com/mbeddr/mpsutil/editor/querylist/runtime.mps
index 320f162b3..bee24b806 100644
--- a/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com/mbeddr/mpsutil/editor/querylist/runtime.mps
+++ b/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com/mbeddr/mpsutil/editor/querylist/runtime.mps
@@ -532,12 +532,8 @@
                     <node concept="3Tm1VV" id="1GpxVmA6USh" role="1B3o_S" />
                     <node concept="10P_77" id="1GpxVmA6USj" role="3clF45" />
                     <node concept="3clFbS" id="1GpxVmA6USn" role="3clF47">
-                      <node concept="YS8fn" id="3kkgokhweDF" role="3cqZAp">
-                        <node concept="2ShNRf" id="3kkgokhweDG" role="YScLw">
-                          <node concept="1pGfFk" id="3kkgokhweDH" role="2ShVmc">
-                            <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
-                          </node>
-                        </node>
+                      <node concept="3clFbF" id="7vDkgomY8wU" role="3cqZAp">
+                        <node concept="3clFbT" id="7vDkgomY8wT" role="3clFbG" />
                       </node>
                     </node>
                     <node concept="2AHcQZ" id="1GpxVmA6USo" role="2AJF6D">

From 2f63fbb30b1c4b66c77ac93422b745b6ee4b4ff7 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Thu, 12 Dec 2024 08:50:32 +0100
Subject: [PATCH 3/3] editor.querylist: implement some more role methods

---
 .../mpsutil/editor/querylist/runtime.mps      | 87 +++++++++++++------
 .../generator/template/main@generator.mps     | 17 ++++
 2 files changed, 77 insertions(+), 27 deletions(-)

diff --git a/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com/mbeddr/mpsutil/editor/querylist/runtime.mps b/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com/mbeddr/mpsutil/editor/querylist/runtime.mps
index bee24b806..e796218d1 100644
--- a/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com/mbeddr/mpsutil/editor/querylist/runtime.mps
+++ b/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com/mbeddr/mpsutil/editor/querylist/runtime.mps
@@ -57,6 +57,13 @@
     <import index="d6hs" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors.item(MPS.Core/)" />
     <import index="e5kc" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang.invoke(JDK/)" />
     <import index="ycmz" ref="r:af3e1a90-527b-4262-8066-857208a4f4fb(de.slisson.mps.reflection.runtime)" />
+    <import index="kpve" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.message(MPS.Editor/)" />
+    <import index="y49u" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.util(MPS.OpenAPI/)" />
+    <import index="c84v" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.cells.collections(MPS.Editor/)" />
+    <import index="hyam" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.event(JDK/)" />
+    <import index="j0b4" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.keyboard(MPS.Editor/)" />
+    <import index="uddc" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.menus.transformation(MPS.Editor/)" />
+    <import index="hox0" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.style(MPS.Editor/)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -390,6 +397,12 @@
       <node concept="3bZ5Sz" id="7vDkgomUX7l" role="1tU5fm" />
       <node concept="10Nm6u" id="7vDkgomV3yM" role="33vP2m" />
     </node>
+    <node concept="312cEg" id="7vDkgomYHx5" role="jymVt">
+      <property role="TrG5h" value="owner" />
+      <node concept="3Tm6S6" id="7vDkgomYHx6" role="1B3o_S" />
+      <node concept="3bZ5Sz" id="7vDkgomYHx7" role="1tU5fm" />
+      <node concept="10Nm6u" id="7vDkgomYHx8" role="33vP2m" />
+    </node>
     <node concept="2tJIrI" id="T_6DrmD699" role="jymVt" />
     <node concept="3clFbW" id="5oklODahdFh" role="jymVt">
       <node concept="3cqZAl" id="5oklODahdFj" role="3clF45" />
@@ -427,17 +440,7 @@
                     <property role="DiZV1" value="false" />
                     <property role="od$2w" value="false" />
                     <node concept="3Tm1VV" id="1GpxVmA6Bn7" role="1B3o_S" />
-                    <node concept="2AHcQZ" id="1GpxVmA6Bn9" role="2AJF6D">
-                      <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-                    </node>
                     <node concept="P$JXv" id="1GpxVmA6Bna" role="lGtFl">
-                      <node concept="TZ5HI" id="1GpxVmA6Bnb" role="3nqlJM">
-                        <node concept="TZ5HA" id="1GpxVmA6Bnc" role="3HnX3l">
-                          <node concept="1dT_AC" id="1GpxVmA6CMP" role="1dT_Ay">
-                            <property role="1dT_AB" value="" />
-                          </node>
-                        </node>
-                      </node>
                       <node concept="TZ5HA" id="1GpxVmA6CPn" role="TZ5H$">
                         <node concept="1dT_AC" id="1GpxVmA6CPo" role="1dT_Ay">
                           <property role="1dT_AB" value="Important for " />
@@ -595,11 +598,9 @@
                       <ref role="3uigEE" to="c17a:~SAbstractConcept" resolve="SAbstractConcept" />
                     </node>
                     <node concept="3clFbS" id="1GpxVmA6USV" role="3clF47">
-                      <node concept="YS8fn" id="3kkgokhwdEZ" role="3cqZAp">
-                        <node concept="2ShNRf" id="3kkgokhwdF0" role="YScLw">
-                          <node concept="1pGfFk" id="3kkgokhwdF1" role="2ShVmc">
-                            <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
-                          </node>
+                      <node concept="3clFbF" id="7vDkgomYM7H" role="3cqZAp">
+                        <node concept="37vLTw" id="7vDkgomYM7G" role="3clFbG">
+                          <ref role="3cqZAo" node="7vDkgomYHx5" resolve="owner" />
                         </node>
                       </node>
                     </node>
@@ -627,6 +628,7 @@
                       <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                     </node>
                   </node>
+                  <node concept="2tJIrI" id="7vDkgomYKEX" role="jymVt" />
                   <node concept="3clFb_" id="3kkgokhvYx5" role="jymVt">
                     <property role="TrG5h" value="getDeclarationNode" />
                     <node concept="3Tm1VV" id="3kkgokhvYx6" role="1B3o_S" />
@@ -640,12 +642,8 @@
                       <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
                     </node>
                     <node concept="3clFbS" id="3kkgokhvYxi" role="3clF47">
-                      <node concept="YS8fn" id="3kkgokhwdxR" role="3cqZAp">
-                        <node concept="2ShNRf" id="3kkgokhwdxS" role="YScLw">
-                          <node concept="1pGfFk" id="3kkgokhwdxT" role="2ShVmc">
-                            <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
-                          </node>
-                        </node>
+                      <node concept="3clFbF" id="7vDkgomYNvX" role="3cqZAp">
+                        <node concept="10Nm6u" id="7vDkgomYNvW" role="3clFbG" />
                       </node>
                     </node>
                     <node concept="2AHcQZ" id="3kkgokhvYxj" role="2AJF6D">
@@ -677,18 +675,30 @@
                     <node concept="3Tm1VV" id="3kkgokhvYx$" role="1B3o_S" />
                     <node concept="10P_77" id="3kkgokhvYxA" role="3clF45" />
                     <node concept="3clFbS" id="3kkgokhvYxC" role="3clF47">
-                      <node concept="YS8fn" id="3kkgokhwdul" role="3cqZAp">
-                        <node concept="2ShNRf" id="3kkgokhwdum" role="YScLw">
-                          <node concept="1pGfFk" id="3kkgokhwdun" role="2ShVmc">
-                            <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
-                          </node>
-                        </node>
+                      <node concept="3clFbF" id="7vDkgomZwU8" role="3cqZAp">
+                        <node concept="3clFbT" id="7vDkgomZwU7" role="3clFbG" />
                       </node>
                     </node>
                     <node concept="2AHcQZ" id="3kkgokhvYxD" role="2AJF6D">
                       <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                     </node>
                   </node>
+                  <node concept="2tJIrI" id="14DpnPom0_H" role="jymVt" />
+                  <node concept="3clFb_" id="14DpnPom1eN" role="jymVt">
+                    <property role="TrG5h" value="isTransient" />
+                    <node concept="3Tm1VV" id="14DpnPom1eP" role="1B3o_S" />
+                    <node concept="10P_77" id="14DpnPom1eR" role="3clF45" />
+                    <node concept="3clFbS" id="14DpnPom1f2" role="3clF47">
+                      <node concept="3clFbF" id="14DpnPom4h5" role="3cqZAp">
+                        <node concept="3clFbT" id="14DpnPom4h4" role="3clFbG">
+                          <property role="3clFbU" value="true" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2AHcQZ" id="14DpnPom1f3" role="2AJF6D">
+                      <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                    </node>
+                  </node>
                 </node>
               </node>
             </node>
@@ -775,6 +785,29 @@
         <node concept="3bZ5Sz" id="7vDkgomUZ1m" role="1tU5fm" />
       </node>
     </node>
+    <node concept="2tJIrI" id="7vDkgomYIqp" role="jymVt" />
+    <node concept="3clFb_" id="7vDkgomYIqr" role="jymVt">
+      <property role="TrG5h" value="setOwner" />
+      <node concept="3clFbS" id="7vDkgomYIqs" role="3clF47">
+        <node concept="3clFbF" id="7vDkgomYIqt" role="3cqZAp">
+          <node concept="37vLTI" id="7vDkgomYIqu" role="3clFbG">
+            <node concept="37vLTw" id="7vDkgomYIqv" role="37vLTx">
+              <ref role="3cqZAo" node="7vDkgomYIqz" resolve="concept" />
+            </node>
+            <node concept="37vLTw" id="7vDkgomYIqw" role="37vLTJ">
+              <ref role="3cqZAo" node="7vDkgomYHx5" resolve="owner" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="7vDkgomYIqx" role="1B3o_S" />
+      <node concept="3cqZAl" id="7vDkgomYIqy" role="3clF45" />
+      <node concept="37vLTG" id="7vDkgomYIqz" role="3clF46">
+        <property role="TrG5h" value="concept" />
+        <node concept="3bZ5Sz" id="7vDkgomYIq$" role="1tU5fm" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7vDkgomYIqq" role="jymVt" />
     <node concept="3Tm1VV" id="5oklODahdyR" role="1B3o_S" />
     <node concept="3uibUv" id="5oklODahe60" role="1zkMxy">
       <ref role="3uigEE" to="g51k:~EditorCell_Collection" resolve="EditorCell_Collection" />
diff --git a/code/querylist/com.mbeddr.mpsutil.editor.querylist/generator/template/main@generator.mps b/code/querylist/com.mbeddr.mpsutil.editor.querylist/generator/template/main@generator.mps
index a9f8fc7c3..43469bbe7 100644
--- a/code/querylist/com.mbeddr.mpsutil.editor.querylist/generator/template/main@generator.mps
+++ b/code/querylist/com.mbeddr.mpsutil.editor.querylist/generator/template/main@generator.mps
@@ -338,6 +338,7 @@
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
       <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="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
         <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
@@ -1271,6 +1272,22 @@
                       </node>
                     </node>
                   </node>
+                  <node concept="3clFbF" id="7vDkgomYQCT" role="3cqZAp">
+                    <node concept="2OqwBi" id="7vDkgomYQCU" role="3clFbG">
+                      <node concept="37vLTw" id="7vDkgomYQCV" role="2Oq$k0">
+                        <ref role="3cqZAo" node="1WjrBsNI_nG" resolve="editorCell" />
+                      </node>
+                      <node concept="liA8E" id="7vDkgomYQCW" role="2OqNvi">
+                        <ref role="37wK5l" to="d2zl:7vDkgomYIqr" resolve="setOwner" />
+                        <node concept="2OqwBi" id="7vDkgomYZkC" role="37wK5m">
+                          <node concept="37vLTw" id="7vDkgomYXNx" role="2Oq$k0">
+                            <ref role="3cqZAo" node="fYh_FQ7" resolve="node" />
+                          </node>
+                          <node concept="2yIwOk" id="7vDkgomZ1OU" role="2OqNvi" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
                   <node concept="3cpWs8" id="1WjrBsNI_pV" role="3cqZAp">
                     <node concept="5jKBG" id="76N1O$KguuA" role="lGtFl">
                       <ref role="v9R2y" to="tpc3:4v1iCryNDHi" resolve="template_cellSetupBlock" />