From e77bb34fe73f0714e7c95ba52970a94c6f0b49d7 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Mon, 11 Mar 2024 08:52:51 +0100
Subject: [PATCH] grammarcells: support CellModel_ReadOnlyModelAccessor in
 optional cells

---
 CHANGELOG.md                                  |   6 +
 .../grammarcells/sandboxlang/editor.mps       |  79 ++++++
 .../grammarcells/sandboxlang/structure.mps    |  15 ++
 .../generator/template/main@generator.mps     | 241 ++++++++++++++++--
 .../models/generatorutils.mps                 |  36 ++-
 .../mpsutil/grammarcells/tests@tests.mps      |  56 ++++
 6 files changed, 400 insertions(+), 33 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d80869ce..811eb3c66 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project are documented in this file.
 Format of the log is _loosely_ based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). 
 The project does _not_ follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month.
 
+## March 2024
+
+### Added
+
+- com.mbeddr.mpsutil.grammarcells: Read-only model accessory cells can now also be used in places where constant cells are supported.
+
 ## February 2024
 
 ### Changed
diff --git a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/editor.mps b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/editor.mps
index b5ceb661c..3c121a279 100644
--- a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/editor.mps
+++ b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/editor.mps
@@ -17,6 +17,9 @@
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" implicit="true" />
     <import index="r23f" ref="r:01829650-3984-4e50-a84c-5b318a048a6a(com.mbeddr.mpsutil.grammarcells.sandboxlang.behavior)" implicit="true" />
+    <import index="cj4x" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor(MPS.Editor/)" implicit="true" />
+    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
+    <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" implicit="true" />
   </imports>
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
@@ -112,12 +115,19 @@
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
+      <concept id="1225898583838" name="jetbrains.mps.lang.editor.structure.ReadOnlyModelAccessor" flags="ng" index="1HfYo3">
+        <child id="1225898971709" name="getter" index="1Hhtcw" />
+      </concept>
+      <concept id="1225900081164" name="jetbrains.mps.lang.editor.structure.CellModel_ReadOnlyModelAccessor" flags="sg" stub="3708815482283559694" index="1HlG4h">
+        <child id="1225900141900" name="modelAccessor" index="1HlULh" />
+      </concept>
       <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ng" index="3INCJE">
         <child id="1638911550608572412" name="sections" index="IW6Ez" />
       </concept>
       <concept id="5624877018228264944" name="jetbrains.mps.lang.editor.structure.TransformationMenuContribution" flags="ng" index="3INDKC">
         <child id="6718020819489956031" name="menuReference" index="AmTjC" />
       </concept>
+      <concept id="1161622981231" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_editorContext" flags="nn" index="1Q80Hx" />
       <concept id="1088612959204" name="jetbrains.mps.lang.editor.structure.CellModel_Alternation" flags="sg" stub="8104358048506729361" index="1QoScp">
         <property id="1088613081987" name="vertical" index="1QpmdY" />
         <child id="1145918517974" name="alternationCondition" index="3e4ffs" />
@@ -128,6 +138,7 @@
         <child id="7980428675268276157" name="locations" index="1Qtc8$" />
         <child id="7980428675268276159" name="parts" index="1Qtc8A" />
       </concept>
+      <concept id="1176717841777" name="jetbrains.mps.lang.editor.structure.QueryFunction_ModelAccess_Getter" flags="in" index="3TQlhw" />
       <concept id="1166049232041" name="jetbrains.mps.lang.editor.structure.AbstractComponent" flags="ng" index="1XWOmA">
         <reference id="1166049300910" name="conceptDeclaration" index="1XX52x" />
       </concept>
@@ -2908,5 +2919,73 @@
       </node>
     </node>
   </node>
+  <node concept="24kQdi" id="7NCbR4gZtV_">
+    <ref role="1XX52x" to="ibwz:7NCbR4gZtK$" resolve="TEST_OptionalReadOnlyModelAccessorCell_Single" />
+    <node concept="3EZMnI" id="7NCbR4gZtVB" role="2wV5jI">
+      <node concept="3F0ifn" id="7NCbR4gZtVC" role="3EZMnx">
+        <property role="3F0ifm" value="optional ready-only model accessor" />
+        <node concept="2SqB2G" id="7NCbR4gZtVD" role="2SqHTX">
+          <property role="TrG5h" value="c33" />
+        </node>
+      </node>
+      <node concept="_tjkj" id="7NCbR4gZtVE" role="3EZMnx">
+        <node concept="3EZMnI" id="7NCbR4gZu7C" role="_tjki">
+          <node concept="2iRfu4" id="7NCbR4gZu7D" role="2iSdaV" />
+          <node concept="1HlG4h" id="7NCbR4gZuqZ" role="3EZMnx">
+            <node concept="1HfYo3" id="7NCbR4gZur1" role="1HlULh">
+              <node concept="3TQlhw" id="7NCbR4gZur3" role="1Hhtcw">
+                <node concept="3clFbS" id="7NCbR4gZur5" role="2VODD2">
+                  <node concept="3clFbF" id="7NCbR4gZuvN" role="3cqZAp">
+                    <node concept="3cpWs3" id="7NCbR4higMT" role="3clFbG">
+                      <node concept="2OqwBi" id="7NCbR4hiics" role="3uHU7w">
+                        <node concept="2OqwBi" id="7NCbR4hihcB" role="2Oq$k0">
+                          <node concept="pncrf" id="7NCbR4higTX" role="2Oq$k0" />
+                          <node concept="2yIwOk" id="7NCbR4hihRv" role="2OqNvi" />
+                        </node>
+                        <node concept="3n3YKJ" id="7NCbR4hlGEf" role="2OqNvi" />
+                      </node>
+                      <node concept="3cpWs3" id="7NCbR4hig_I" role="3uHU7B">
+                        <node concept="3cpWs3" id="7NCbR4hibb9" role="3uHU7B">
+                          <node concept="Xl_RD" id="7NCbR4gZuvM" role="3uHU7B">
+                            <property role="Xl_RC" value="accessor_" />
+                          </node>
+                          <node concept="2OqwBi" id="7NCbR4hifRL" role="3uHU7w">
+                            <node concept="2OqwBi" id="7NCbR4hifhd" role="2Oq$k0">
+                              <node concept="2OqwBi" id="7NCbR4hieM7" role="2Oq$k0">
+                                <node concept="1Q80Hx" id="7NCbR4hiezs" role="2Oq$k0" />
+                                <node concept="liA8E" id="7NCbR4hieYt" role="2OqNvi">
+                                  <ref role="37wK5l" to="cj4x:~EditorContext.getSelectedNode()" resolve="getSelectedNode" />
+                                </node>
+                              </node>
+                              <node concept="liA8E" id="7NCbR4hifvz" role="2OqNvi">
+                                <ref role="37wK5l" to="mhbf:~SNode.getConcept()" resolve="getConcept" />
+                              </node>
+                            </node>
+                            <node concept="liA8E" id="7NCbR4higky" role="2OqNvi">
+                              <ref role="37wK5l" to="c17a:~SAbstractConcept.getConceptAlias()" resolve="getConceptAlias" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="Xl_RD" id="7NCbR4hig_M" role="3uHU7w">
+                          <property role="Xl_RC" value="_" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3F1sOY" id="7NCbR4gZtVF" role="3EZMnx">
+            <ref role="1NtTu8" to="ibwz:7NCbR4gZtK_" resolve="child" />
+          </node>
+        </node>
+      </node>
+      <node concept="3F0ifn" id="7NCbR4gZtWa" role="3EZMnx">
+        <property role="3F0ifm" value=";" />
+      </node>
+      <node concept="l2Vlx" id="7NCbR4gZtWb" role="2iSdaV" />
+    </node>
+  </node>
 </model>
 
diff --git a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/structure.mps b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/structure.mps
index c39679d3b..cb266bb02 100644
--- a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/structure.mps
+++ b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/structure.mps
@@ -1059,5 +1059,20 @@
       <ref role="PrY4T" node="1x69AmkdYA2" resolve="IStatement" />
     </node>
   </node>
+  <node concept="1TIwiD" id="7NCbR4gZtK$">
+    <property role="EcuMT" value="9000496017962818596" />
+    <property role="TrG5h" value="TEST_OptionalReadOnlyModelAccessorCell_Single" />
+    <property role="34LRSv" value="accessor" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="1TJgyj" id="7NCbR4gZtK_" role="1TKVEi">
+      <property role="IQ2ns" value="9000496017962818597" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="child" />
+      <ref role="20lvS9" node="6oKG1kMxn8A" resolve="IExpression" />
+    </node>
+    <node concept="PrWs8" id="7NCbR4gZtKA" role="PzmwI">
+      <ref role="PrY4T" node="1x69AmkdYA2" resolve="IStatement" />
+    </node>
+  </node>
 </model>
 
diff --git a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps
index 2bd0bd1f7..6aa409bfb 100755
--- a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps
+++ b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps
@@ -5158,6 +5158,20 @@
             </node>
             <node concept="1eYWSL" id="3KoBPk18Pin" role="1eYxyj">
               <node concept="3clFbS" id="3KoBPk18Pio" role="2VODD2">
+                <node concept="3cpWs8" id="7NCbR4h9UKL" role="3cqZAp">
+                  <node concept="3cpWsn" id="7NCbR4h9UKM" role="3cpWs9">
+                    <property role="TrG5h" value="editorContext" />
+                    <node concept="3uibUv" id="7NCbR4h9UKN" role="1tU5fm">
+                      <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
+                    </node>
+                    <node concept="2OqwBi" id="7NCbR4h204j" role="33vP2m">
+                      <node concept="2kS8pE" id="7NCbR4h204k" role="2Oq$k0" />
+                      <node concept="liA8E" id="7NCbR4h204l" role="2OqNvi">
+                        <ref role="37wK5l" to="uddc:~TransformationMenuContext.getEditorContext()" resolve="getEditorContext" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
                 <node concept="3clFbF" id="3KoBPk18Pip" role="3cqZAp">
                   <node concept="Xl_RD" id="3KoBPk18Piq" role="3clFbG">
                     <property role="Xl_RC" value="" />
@@ -13250,7 +13264,6 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="4qdNcH$407y" role="3cqZAp" />
         <node concept="9aQIb" id="4qdNcH$407z" role="3cqZAp">
           <node concept="3clFbS" id="4qdNcH$407$" role="9aQI4">
             <node concept="3clFbF" id="4qdNcH$407_" role="3cqZAp">
@@ -15776,7 +15789,6 @@
                 </node>
               </node>
             </node>
-            <node concept="3clFbH" id="4qdNcHzZSe1" role="3cqZAp" />
             <node concept="3clFbH" id="7KznU_4fGDd" role="3cqZAp" />
             <node concept="3SKdUt" id="7KznU_459C1" role="3cqZAp">
               <node concept="1PaTwC" id="7WTFIQIcXiS" role="1aUNEU">
@@ -15894,10 +15906,26 @@
                     </node>
                   </node>
                 </node>
-                <node concept="3clFbH" id="7KznU_4552j" role="3cqZAp" />
+                <node concept="3cpWs8" id="7NCbR4haoLl" role="3cqZAp">
+                  <node concept="3cpWsn" id="7NCbR4haoLj" role="3cpWs9">
+                    <property role="3TUv4t" value="true" />
+                    <property role="TrG5h" value="editorContext" />
+                    <node concept="3uibUv" id="7NCbR4has3Y" role="1tU5fm">
+                      <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
+                    </node>
+                    <node concept="2OqwBi" id="7NCbR4haD3T" role="33vP2m">
+                      <node concept="37vLTw" id="7NCbR4ha_LO" role="2Oq$k0">
+                        <ref role="3cqZAo" node="4qdNcHzZSdO" resolve="_context" />
+                      </node>
+                      <node concept="liA8E" id="7NCbR4haGjy" role="2OqNvi">
+                        <ref role="37wK5l" to="uddc:~TransformationMenuContext.getEditorContext()" resolve="getEditorContext" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="7NCbR4haluw" role="3cqZAp" />
                 <node concept="3clFbJ" id="7KznU_4552S" role="3cqZAp">
                   <node concept="3clFbS" id="7KznU_4552T" role="3clFbx">
-                    <node concept="3clFbH" id="7KznU_4552U" role="3cqZAp" />
                     <node concept="3cpWs8" id="7KznU_45jjH" role="3cqZAp">
                       <node concept="3cpWsn" id="7KznU_45jjI" role="3cpWs9">
                         <property role="TrG5h" value="matchingText" />
@@ -16393,6 +16421,23 @@
                             </node>
                           </node>
                         </node>
+                        <node concept="3cpWs8" id="7NCbR4haQ9W" role="3cqZAp">
+                          <node concept="3cpWsn" id="7NCbR4haQ9U" role="3cpWs9">
+                            <property role="3TUv4t" value="true" />
+                            <property role="TrG5h" value="editorContext" />
+                            <node concept="3uibUv" id="7NCbR4haTCs" role="1tU5fm">
+                              <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
+                            </node>
+                            <node concept="2OqwBi" id="7NCbR4hb6Ww" role="33vP2m">
+                              <node concept="37vLTw" id="7NCbR4hb546" role="2Oq$k0">
+                                <ref role="3cqZAo" node="4qdNcHzZSdO" resolve="_context" />
+                              </node>
+                              <node concept="liA8E" id="7NCbR4hbaar" role="2OqNvi">
+                                <ref role="37wK5l" to="uddc:~TransformationMenuContext.getEditorContext()" resolve="getEditorContext" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
                         <node concept="3clFbJ" id="4qdNcHzZSgU" role="3cqZAp">
                           <node concept="3clFbS" id="4qdNcHzZSgV" role="3clFbx">
                             <node concept="3cpWs8" id="7KznU_4dEn2" role="3cqZAp">
@@ -19814,7 +19859,6 @@
                 </node>
                 <node concept="1DcWWT" id="19dgrWh_gjB" role="3cqZAp">
                   <node concept="3clFbS" id="19dgrWh_gjD" role="2LFqv$">
-                    <node concept="3clFbH" id="19dgrWh_gjC" role="3cqZAp" />
                     <node concept="3cpWs8" id="19dgrWhDrIk" role="3cqZAp">
                       <node concept="3cpWsn" id="19dgrWhDrIl" role="3cpWs9">
                         <property role="TrG5h" value="matchingText" />
@@ -21283,6 +21327,55 @@
         </node>
       </node>
     </node>
+    <node concept="3aamgX" id="7NCbR4h0uHT" role="3aUrZf">
+      <property role="36QftV" value="true" />
+      <ref role="30HIoZ" to="tpc2:hPHlG0c" resolve="CellModel_ReadOnlyModelAccessor" />
+      <node concept="1Koe21" id="7NCbR4h0uHU" role="1lVwrX">
+        <node concept="3clFb_" id="7NCbR4hc1vF" role="1Koe22">
+          <property role="TrG5h" value="m" />
+          <node concept="A3Dl8" id="7NCbR4hc3p3" role="3clF45">
+            <node concept="17QB3L" id="7NCbR4hc3GE" role="A3Ik2" />
+          </node>
+          <node concept="3Tm1VV" id="7NCbR4hc1vH" role="1B3o_S" />
+          <node concept="3clFbS" id="7NCbR4hc1vI" role="3clF47">
+            <node concept="3clFbF" id="7NCbR4hcaSD" role="3cqZAp">
+              <node concept="2OqwBi" id="7NCbR4hcaSF" role="3clFbG">
+                <node concept="2ShNRf" id="7NCbR4hcaSG" role="2Oq$k0">
+                  <node concept="2HTt$P" id="7NCbR4hcaSH" role="2ShVmc">
+                    <node concept="17QB3L" id="7NCbR4hcaSI" role="2HTBi0" />
+                    <node concept="Xl_RD" id="7NCbR4hcaSJ" role="2HTEbv">
+                      <property role="Xl_RC" value="" />
+                      <node concept="5jKBG" id="7NCbR4hcaSK" role="lGtFl">
+                        <ref role="v9R2y" node="7NCbR4h0ASk" resolve="template_readonlyModelAccessorQueryText" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3zZkjj" id="7NCbR4hcaSL" role="2OqNvi">
+                  <node concept="1bVj0M" id="7NCbR4hcaSM" role="23t8la">
+                    <node concept="3clFbS" id="7NCbR4hcaSN" role="1bW5cS">
+                      <node concept="3clFbF" id="7NCbR4hcaSO" role="3cqZAp">
+                        <node concept="2OqwBi" id="7NCbR4hcaSP" role="3clFbG">
+                          <node concept="37vLTw" id="7NCbR4hcaSQ" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7NCbR4hcaSS" resolve="it" />
+                          </node>
+                          <node concept="17RvpY" id="7NCbR4hcaSR" role="2OqNvi" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="Rh6nW" id="7NCbR4hcaSS" role="1bW2Oz">
+                      <property role="TrG5h" value="it" />
+                      <node concept="2jxLKc" id="7NCbR4hcaST" role="1tU5fm" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="raruj" id="7NCbR4hcaSU" role="lGtFl" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="3aamgX" id="1Ia5rYlHzyw" role="3aUrZf">
       <property role="36QftV" value="true" />
       <ref role="30HIoZ" to="teg0:1Ia5rYlGwDa" resolve="WrapperCell_TransformationText" />
@@ -21866,6 +21959,24 @@
                               </node>
                             </node>
                           </node>
+                          <node concept="3cpWs8" id="6gjbwab7wAw" role="3cqZAp">
+                            <node concept="3cpWsn" id="6gjbwab7wAx" role="3cpWs9">
+                              <property role="TrG5h" value="editorContext" />
+                              <property role="3TUv4t" value="true" />
+                              <node concept="3uibUv" id="6gjbwab7uyf" role="1tU5fm">
+                                <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
+                              </node>
+                              <node concept="2OqwBi" id="6gjbwab7wAy" role="33vP2m">
+                                <node concept="37vLTw" id="6gjbwab7wAz" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="5n4nn1a79YN" resolve="_context" />
+                                </node>
+                                <node concept="liA8E" id="6gjbwab7wA$" role="2OqNvi">
+                                  <ref role="37wK5l" to="uddc:~TransformationMenuContext.getEditorContext()" resolve="getEditorContext" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3clFbH" id="7NCbR4hbBRu" role="3cqZAp" />
                           <node concept="3clFbJ" id="6B579NGqSU5" role="3cqZAp">
                             <node concept="3clFbS" id="6B579NGqSU7" role="3clFbx">
                               <node concept="3cpWs8" id="6B579NGr$G_" role="3cqZAp">
@@ -21981,22 +22092,6 @@
                                       </node>
                                       <node concept="3clFbJ" id="5n4nn1a79Z$" role="3cqZAp">
                                         <node concept="3clFbS" id="5n4nn1a79Z_" role="3clFbx">
-                                          <node concept="3cpWs8" id="6gjbwab7wAw" role="3cqZAp">
-                                            <node concept="3cpWsn" id="6gjbwab7wAx" role="3cpWs9">
-                                              <property role="TrG5h" value="editorContext" />
-                                              <node concept="3uibUv" id="6gjbwab7uyf" role="1tU5fm">
-                                                <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
-                                              </node>
-                                              <node concept="2OqwBi" id="6gjbwab7wAy" role="33vP2m">
-                                                <node concept="37vLTw" id="6gjbwab7wAz" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="5n4nn1a79YN" resolve="_context" />
-                                                </node>
-                                                <node concept="liA8E" id="6gjbwab7wA$" role="2OqNvi">
-                                                  <ref role="37wK5l" to="uddc:~TransformationMenuContext.getEditorContext()" resolve="getEditorContext" />
-                                                </node>
-                                              </node>
-                                            </node>
-                                          </node>
                                           <node concept="3cpWs8" id="49FqtR5VyJX" role="3cqZAp">
                                             <node concept="3cpWsn" id="49FqtR5VyJY" role="3cpWs9">
                                               <property role="TrG5h" value="sideTransformationEnabled" />
@@ -30035,5 +30130,109 @@
       </node>
     </node>
   </node>
+  <node concept="13MO4I" id="7NCbR4h0ASk">
+    <property role="TrG5h" value="template_readonlyModelAccessorQueryText" />
+    <ref role="3gUMe" to="tpc2:hPHlG0c" resolve="CellModel_ReadOnlyModelAccessor" />
+    <node concept="3clFb_" id="7NCbR4h0ASl" role="13RCb5">
+      <property role="TrG5h" value="m" />
+      <node concept="17QB3L" id="7NCbR4h0ASm" role="3clF45" />
+      <node concept="3Tm1VV" id="7NCbR4h0ASn" role="1B3o_S" />
+      <node concept="3clFbS" id="7NCbR4h0ASo" role="3clF47">
+        <node concept="3cpWs8" id="7NCbR4h4xvN" role="3cqZAp">
+          <node concept="3cpWsn" id="7NCbR4h4xvO" role="3cpWs9">
+            <property role="TrG5h" value="sourceNode" />
+            <node concept="3Tqbb2" id="7NCbR4h4xvP" role="1tU5fm" />
+            <node concept="10Nm6u" id="7NCbR4h4xvQ" role="33vP2m" />
+          </node>
+        </node>
+        <node concept="3cpWs8" id="7NCbR4hcdub" role="3cqZAp">
+          <node concept="3cpWsn" id="7NCbR4hcduc" role="3cpWs9">
+            <property role="TrG5h" value="editorContext" />
+            <node concept="3uibUv" id="7NCbR4hcdud" role="1tU5fm">
+              <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
+            </node>
+            <node concept="10Nm6u" id="7NCbR4hcdWq" role="33vP2m" />
+          </node>
+        </node>
+        <node concept="3clFbH" id="7NCbR4h4xir" role="3cqZAp" />
+        <node concept="3clFbF" id="7NCbR4h0ASt" role="3cqZAp">
+          <node concept="2OqwBi" id="7NCbR4h0ASu" role="3clFbG">
+            <node concept="2ShNRf" id="7NCbR4h0ASv" role="2Oq$k0">
+              <node concept="YeOm9" id="7NCbR4h0ASw" role="2ShVmc">
+                <node concept="1Y3b0j" id="7NCbR4h0ASx" role="YeSDq">
+                  <property role="2bfB8j" value="true" />
+                  <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                  <ref role="1Y3XeK" to="wyt6:~Object" resolve="Object" />
+                  <node concept="3Tm1VV" id="7NCbR4h0ASy" role="1B3o_S" />
+                  <node concept="3clFb_" id="7NCbR4h0ASz" role="jymVt">
+                    <property role="TrG5h" value="query" />
+                    <node concept="17QB3L" id="7NCbR4h0AS$" role="3clF45" />
+                    <node concept="3Tm1VV" id="7NCbR4h0AS_" role="1B3o_S" />
+                    <node concept="3clFbS" id="7NCbR4h0ASA" role="3clF47">
+                      <node concept="3clFbF" id="7NCbR4h0ASB" role="3cqZAp">
+                        <node concept="Xl_RD" id="7NCbR4h0ASC" role="3clFbG">
+                          <property role="Xl_RC" value="" />
+                        </node>
+                        <node concept="2b32R4" id="7NCbR4h0ASD" role="lGtFl">
+                          <node concept="3JmXsc" id="7NCbR4h0ASE" role="2P8S$">
+                            <node concept="3clFbS" id="7NCbR4h0ASF" role="2VODD2">
+                              <node concept="3clFbF" id="7NCbR4h0ASG" role="3cqZAp">
+                                <node concept="2OqwBi" id="7NCbR4h0ASH" role="3clFbG">
+                                  <node concept="2OqwBi" id="7NCbR4hdtzZ" role="2Oq$k0">
+                                    <node concept="2OqwBi" id="7NCbR4h0ASI" role="2Oq$k0">
+                                      <node concept="2OqwBi" id="7NCbR4h0ASJ" role="2Oq$k0">
+                                        <node concept="30H73N" id="7NCbR4h0ASK" role="2Oq$k0" />
+                                        <node concept="3TrEf2" id="7NCbR4h0ASL" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="tpc2:hPHlUPc" resolve="modelAccessor" />
+                                        </node>
+                                      </node>
+                                      <node concept="3TrEf2" id="7NCbR4h0ASM" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="tpc2:hPHht8X" resolve="getter" />
+                                      </node>
+                                    </node>
+                                    <node concept="3TrEf2" id="7NCbR4hdukh" role="2OqNvi">
+                                      <ref role="3Tt5mk" to="tpee:gyVODHa" resolve="body" />
+                                    </node>
+                                  </node>
+                                  <node concept="3Tsc0h" id="7NCbR4h0ASN" role="2OqNvi">
+                                    <ref role="3TtcxE" to="tpee:fzcqZ_x" resolve="statement" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="37vLTG" id="7NCbR4h4nfM" role="3clF46">
+                      <property role="TrG5h" value="editorContext" />
+                      <node concept="3uibUv" id="7NCbR4h4nFc" role="1tU5fm">
+                        <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
+                      </node>
+                    </node>
+                    <node concept="37vLTG" id="7NCbR4h4ocb" role="3clF46">
+                      <property role="TrG5h" value="node" />
+                      <node concept="3Tqbb2" id="7NCbR4h4oti" role="1tU5fm" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="liA8E" id="7NCbR4h0ASQ" role="2OqNvi">
+              <ref role="37wK5l" node="7NCbR4h0ASz" resolve="query" />
+              <node concept="37vLTw" id="7NCbR4hcecN" role="37wK5m">
+                <ref role="3cqZAo" node="7NCbR4hcduc" resolve="editorContext" />
+              </node>
+              <node concept="37vLTw" id="7NCbR4h4xz8" role="37wK5m">
+                <ref role="3cqZAo" node="7NCbR4h4xvO" resolve="sourceNode" />
+              </node>
+            </node>
+            <node concept="raruj" id="7NCbR4h0ASS" role="lGtFl" />
+          </node>
+        </node>
+        <node concept="3clFbH" id="7NCbR4h0AST" role="3cqZAp" />
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/generatorutils.mps b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/generatorutils.mps
index 47a0126c6..7a4b934b9 100644
--- a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/generatorutils.mps
+++ b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/generatorutils.mps
@@ -567,24 +567,36 @@
       <property role="od$2w" value="false" />
       <node concept="3clFbS" id="7KznU_3Pb4g" role="3clF47">
         <node concept="3clFbF" id="7KznU_3PbmM" role="3cqZAp">
-          <node concept="22lmx$" id="7KznU_3PbCn" role="3clFbG">
-            <node concept="2OqwBi" id="7KznU_3PbpG" role="3uHU7B">
-              <node concept="37vLTw" id="7KznU_3PbmL" role="2Oq$k0">
+          <node concept="22lmx$" id="7NCbR4gZUaH" role="3clFbG">
+            <node concept="2OqwBi" id="7NCbR4gZUAe" role="3uHU7w">
+              <node concept="37vLTw" id="7NCbR4gZUma" role="2Oq$k0">
                 <ref role="3cqZAo" node="7KznU_3PbcO" resolve="cell" />
               </node>
-              <node concept="1mIQ4w" id="7KznU_3PbyR" role="2OqNvi">
-                <node concept="chp4Y" id="7KznU_3Pb$b" role="cj9EA">
-                  <ref role="cht4Q" to="tpc2:fBF0icI" resolve="CellModel_Constant" />
+              <node concept="1mIQ4w" id="7NCbR4gZV0I" role="2OqNvi">
+                <node concept="chp4Y" id="7NCbR4gZVcN" role="cj9EA">
+                  <ref role="cht4Q" to="tpc2:hPHlG0c" resolve="CellModel_ReadOnlyModelAccessor" />
                 </node>
               </node>
             </node>
-            <node concept="2OqwBi" id="7KznU_3PbVF" role="3uHU7w">
-              <node concept="37vLTw" id="7KznU_3PbRj" role="2Oq$k0">
-                <ref role="3cqZAo" node="7KznU_3PbcO" resolve="cell" />
+            <node concept="22lmx$" id="7KznU_3PbCn" role="3uHU7B">
+              <node concept="2OqwBi" id="7KznU_3PbpG" role="3uHU7B">
+                <node concept="37vLTw" id="7KznU_3PbmL" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7KznU_3PbcO" resolve="cell" />
+                </node>
+                <node concept="1mIQ4w" id="7KznU_3PbyR" role="2OqNvi">
+                  <node concept="chp4Y" id="7KznU_3Pb$b" role="cj9EA">
+                    <ref role="cht4Q" to="tpc2:fBF0icI" resolve="CellModel_Constant" />
+                  </node>
+                </node>
               </node>
-              <node concept="1mIQ4w" id="7KznU_3Pc6X" role="2OqNvi">
-                <node concept="chp4Y" id="7KznU_3Pc9R" role="cj9EA">
-                  <ref role="cht4Q" to="teg0:2uT2PLn1Z87" resolve="IConstantCell" />
+              <node concept="2OqwBi" id="7KznU_3PbVF" role="3uHU7w">
+                <node concept="37vLTw" id="7KznU_3PbRj" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7KznU_3PbcO" resolve="cell" />
+                </node>
+                <node concept="1mIQ4w" id="7KznU_3Pc6X" role="2OqNvi">
+                  <node concept="chp4Y" id="7KznU_3Pc9R" role="cj9EA">
+                    <ref role="cht4Q" to="teg0:2uT2PLn1Z87" resolve="IConstantCell" />
+                  </node>
                 </node>
               </node>
             </node>
diff --git a/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.tests/models/com/mbeddr/mpsutil/grammarcells/tests@tests.mps b/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.tests/models/com/mbeddr/mpsutil/grammarcells/tests@tests.mps
index 42925fb1a..7dc9c0c8c 100644
--- a/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.tests/models/com/mbeddr/mpsutil/grammarcells/tests@tests.mps
+++ b/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.tests/models/com/mbeddr/mpsutil/grammarcells/tests@tests.mps
@@ -58,6 +58,7 @@
       <concept id="1216989428737" name="jetbrains.mps.lang.test.structure.TestNode" flags="ng" index="1qefOq">
         <child id="1216989461394" name="nodeToCheck" index="1qenE9" />
       </concept>
+      <concept id="1210673684636" name="jetbrains.mps.lang.test.structure.TestNodeAnnotation" flags="ng" index="3xLA65" />
     </language>
     <language id="5dc5fc0d-37ef-4782-8192-8b5ce1f69f80" name="jetbrains.mps.baseLanguage.extensionMethods">
       <concept id="8022092943110829337" name="jetbrains.mps.baseLanguage.extensionMethods.structure.BaseExtensionMethodContainer" flags="ng" index="a7sou">
@@ -281,6 +282,9 @@
       <concept id="3651222753554065097" name="com.mbeddr.mpsutil.grammarcells.sandboxlang.structure.TEST_LayoutOfChildInOptional" flags="ng" index="3BK__Q">
         <child id="3651222753554065098" name="child" index="3BK__P" />
       </concept>
+      <concept id="9000496017962818596" name="com.mbeddr.mpsutil.grammarcells.sandboxlang.structure.TEST_OptionalReadOnlyModelAccessorCell_Single" flags="ng" index="1G5vdl">
+        <child id="9000496017962818597" name="child" index="1G5vdk" />
+      </concept>
       <concept id="6380604244804284912" name="com.mbeddr.mpsutil.grammarcells.sandboxlang.structure.TEST_OptionalWithoutText_Single" flags="ng" index="1JpcgL">
         <child id="6380604244804360648" name="child" index="1JpqK9" />
       </concept>
@@ -4147,5 +4151,57 @@
       <node concept="3clFbH" id="3aFJVZlyfBe" role="3cqZAp" />
     </node>
   </node>
+  <node concept="LiM7Y" id="7NCbR4hezuP">
+    <property role="TrG5h" value="OptionalReadOnlyModelAccessorCell_Single" />
+    <node concept="3clFbS" id="7NCbR4hezuQ" role="LjaKd">
+      <node concept="2TK7Tu" id="7NCbR4hezuR" role="3cqZAp">
+        <property role="2TTd_B" value="accessor_accessor_accessor" />
+      </node>
+      <node concept="2TK7Tu" id="7NCbR4hhYLh" role="3cqZAp">
+        <property role="2TTd_B" value="1" />
+      </node>
+    </node>
+    <node concept="1qefOq" id="7NCbR4hezuS" role="25YQCW">
+      <node concept="2cssWn" id="7NCbR4hezuT" role="1qenE9">
+        <property role="TrG5h" value="m" />
+        <node concept="2cssWt" id="7NCbR4hezuU" role="2cssWm">
+          <property role="TrG5h" value="f" />
+          <node concept="2cssWo" id="7NCbR4hezuV" role="2cssWr">
+            <node concept="1G5vdl" id="7NCbR4hhXom" role="2cssZA">
+              <node concept="LIFWc" id="7NCbR4hhXot" role="lGtFl">
+                <property role="ZRATv" value="true" />
+                <property role="OXtK3" value="true" />
+                <property role="p6zMq" value="34" />
+                <property role="p6zMs" value="34" />
+                <property role="LIFWd" value="c33" />
+              </node>
+            </node>
+          </node>
+          <node concept="yzEQC" id="7NCbR4hezuY" role="yzEPe" />
+          <node concept="3xLA65" id="7NCbR4hhYLP" role="lGtFl">
+            <property role="TrG5h" value="dummy" />
+          </node>
+        </node>
+        <node concept="2cssZD" id="7NCbR4hezuZ" role="2cssWm" />
+      </node>
+    </node>
+    <node concept="1qefOq" id="7NCbR4hezv0" role="25YQFr">
+      <node concept="2cssWn" id="7NCbR4hezv1" role="1qenE9">
+        <property role="TrG5h" value="m" />
+        <node concept="2cssWt" id="7NCbR4hezv2" role="2cssWm">
+          <property role="TrG5h" value="f" />
+          <node concept="2cssWo" id="7NCbR4hezv3" role="2cssWr">
+            <node concept="1G5vdl" id="7NCbR4hhXoI" role="2cssZA">
+              <node concept="yA7Z4" id="7NCbR4hhXoZ" role="1G5vdk">
+                <property role="yA7Zo" value="1" />
+              </node>
+            </node>
+          </node>
+          <node concept="yzEQC" id="7NCbR4hezv8" role="yzEPe" />
+        </node>
+        <node concept="2cssZD" id="7NCbR4hezv9" role="2cssWm" />
+      </node>
+    </node>
+  </node>
 </model>