From 8eb53d0de18e76c32eb95919717a6fc69ea38d72 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Fri, 6 Sep 2024 20:12:10 +0200
Subject: [PATCH] mpsutil.margincell: use an anchestor cell when the attached
 cell can't be found

---
 CHANGELOG.md                                  |   8 +
 .../com.mbeddr.mpsutil.review.readonly.mpl    |   1 +
 .../languageModels/editor.mps                 |  31 ++++
 .../languageModels/structure.mps              |  25 +++
 .../com/mbeddr/mpsutil/margincell/runtime.mps | 168 ++++++++++++++----
 .../com/mbeddr/mpsutil/review/sandbox.mps     |  49 +++++
 6 files changed, 243 insertions(+), 39 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e14cc4628ef..765ca314bcb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format 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 simply documented in reverse chronological order, grouped by calendar month.
 
+# September 2024
+
+## com.mbeddr.mpsutil.margincell
+
+### Fixed
+
+- When the attached cell can't be found (e.g. it is collapsed), the next suitable anchestor cell is now used to align the margin cell.
+
 # August 2024
 
 ## com.mbeddr.mpsutil.traceExplorer
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review.readonly/com.mbeddr.mpsutil.review.readonly.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review.readonly/com.mbeddr.mpsutil.review.readonly.mpl
index 557eade72ed..04f0c8a3ae0 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review.readonly/com.mbeddr.mpsutil.review.readonly.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review.readonly/com.mbeddr.mpsutil.review.readonly.mpl
@@ -20,6 +20,7 @@
     <language slang="l:120e1c9d-4e27-4478-b2af-b2c3bd3850b0:com.mbeddr.mpsutil.editor.querylist" version="0" />
     <language slang="l:92f195b6-a209-4804-ad65-f5248ecd5873:com.mbeddr.mpsutil.margincell" version="0" />
     <language slang="l:e33ff641-cba8-4703-98f4-59e63936d940:com.mbeddr.mpsutil.margincell.editor" version="0" />
+    <language slang="l:3bdedd09-792a-4e15-a4db-83970df3ee86:de.itemis.mps.editor.collapsible" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review.readonly/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review.readonly/languageModels/editor.mps
index 71beae8fe8f..f269d8feea7 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review.readonly/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review.readonly/languageModels/editor.mps
@@ -6,6 +6,7 @@
     <use id="120e1c9d-4e27-4478-b2af-b2c3bd3850b0" name="com.mbeddr.mpsutil.editor.querylist" version="0" />
     <use id="e33ff641-cba8-4703-98f4-59e63936d940" name="com.mbeddr.mpsutil.margincell.editor" version="0" />
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
+    <use id="3bdedd09-792a-4e15-a4db-83970df3ee86" name="de.itemis.mps.editor.collapsible" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -13,10 +14,14 @@
     <import index="fmr2" ref="bb6926d3-ebcc-4ca6-a3be-c618633c0dc1/r:2b3b5f84-66ef-4014-bab0-8d3017aa7a4e(com.mbeddr.mpsutil.review.runtime/com.mbeddr.mpsutil.review.runtime)" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
+    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
       <concept id="1071666914219" name="jetbrains.mps.lang.editor.structure.ConceptEditorDeclaration" flags="ig" index="24kQdi" />
+      <concept id="1140524381322" name="jetbrains.mps.lang.editor.structure.CellModel_ListWithRole" flags="ng" index="2czfm3">
+        <child id="1140524464360" name="cellLayout" index="2czzBx" />
+      </concept>
       <concept id="1106270571710" name="jetbrains.mps.lang.editor.structure.CellLayout_Vertical" flags="nn" index="2iRkQZ" />
       <concept id="1142886811589" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_node" flags="nn" index="pncrf" />
       <concept id="1080736578640" name="jetbrains.mps.lang.editor.structure.BaseEditorComponent" flags="ig" index="2wURMF">
@@ -40,9 +45,11 @@
       <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
+      <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
       <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
+      <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>
@@ -81,6 +88,15 @@
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
     </language>
+    <language id="3bdedd09-792a-4e15-a4db-83970df3ee86" name="de.itemis.mps.editor.collapsible">
+      <concept id="4767615435807737350" name="de.itemis.mps.editor.collapsible.structure.CellModel_Collapsible" flags="ng" index="3uPbVW">
+        <property id="4767615435812496286" name="showCollapsedAlways" index="3vr1H$" />
+        <property id="4767615435813506612" name="collapsedByDefault" index="3vvbre" />
+        <property id="4767615435817184498" name="showBracketLine" index="3vD9g8" />
+        <child id="4767615435811051865" name="collapsedCell" index="3v1y6z" />
+        <child id="4767615435808541838" name="expandedCell" index="3v87hO" />
+      </concept>
+    </language>
   </registry>
   <node concept="24kQdi" id="7lmVLrULD8q">
     <ref role="1XX52x" to="731j:7lmVLrULD8n" resolve="Review" />
@@ -119,5 +135,20 @@
       </node>
     </node>
   </node>
+  <node concept="24kQdi" id="2wiIWbHCEbl">
+    <ref role="1XX52x" to="731j:2wiIWbHCDAN" resolve="MyConcept" />
+    <node concept="3uPbVW" id="2wiIWbHCF6V" role="2wV5jI">
+      <property role="3vr1H$" value="true" />
+      <property role="3vvbre" value="true" />
+      <property role="3vD9g8" value="true" />
+      <node concept="3F2HdR" id="2wiIWbHCFx$" role="3v87hO">
+        <ref role="1NtTu8" to="731j:2wiIWbHCFlm" resolve="children" />
+        <node concept="2iRkQZ" id="2wiIWbHCKZ$" role="2czzBx" />
+      </node>
+      <node concept="3F0A7n" id="2wiIWbHCFg0" role="3v1y6z">
+        <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review.readonly/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review.readonly/languageModels/structure.mps
index 0a396ed3f27..5df587aaee6 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review.readonly/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review.readonly/languageModels/structure.mps
@@ -15,9 +15,13 @@
         <property id="6714410169261853888" name="conceptId" index="EcuMT" />
         <child id="1071489727083" name="linkDeclaration" index="1TKVEi" />
       </concept>
+      <concept id="1169127622168" name="jetbrains.mps.lang.structure.structure.InterfaceConceptReference" flags="ig" index="PrWs8">
+        <reference id="1169127628841" name="intfc" index="PrY4T" />
+      </concept>
       <concept id="1071489090640" name="jetbrains.mps.lang.structure.structure.ConceptDeclaration" flags="ig" index="1TIwiD">
         <property id="1096454100552" name="rootable" index="19KtqR" />
         <reference id="1071489389519" name="extends" index="1TJDcQ" />
+        <child id="1169129564478" name="implements" index="PzmwI" />
       </concept>
       <concept id="1071489288298" name="jetbrains.mps.lang.structure.structure.LinkDeclaration" flags="ig" index="1TJgyj">
         <property id="1071599776563" name="role" index="20kJfa" />
@@ -52,5 +56,26 @@
       <ref role="20lvS9" to="7krq:10nVqVfzGFV" resolve="ReviewNote" />
     </node>
   </node>
+  <node concept="1TIwiD" id="2wiIWbHCD63">
+    <property role="EcuMT" value="2887576756982813059" />
+    <property role="TrG5h" value="MyChild" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+  </node>
+  <node concept="1TIwiD" id="2wiIWbHCDAN">
+    <property role="EcuMT" value="2887576756982815155" />
+    <property role="TrG5h" value="MyConcept" />
+    <property role="19KtqR" value="true" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <node concept="1TJgyj" id="2wiIWbHCFlm" role="1TKVEi">
+      <property role="IQ2ns" value="2887576756982822230" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="children" />
+      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <ref role="20lvS9" node="2wiIWbHCD63" resolve="MyChild" />
+    </node>
+    <node concept="PrWs8" id="2wiIWbHCFck" role="PzmwI">
+      <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
+    </node>
+  </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.margincell.runtime/models/com/mbeddr/mpsutil/margincell/runtime.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.margincell.runtime/models/com/mbeddr/mpsutil/margincell/runtime.mps
index 8e0a9f01ffd..c9c97a23370 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.margincell.runtime/models/com/mbeddr/mpsutil/margincell/runtime.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.margincell.runtime/models/com/mbeddr/mpsutil/margincell/runtime.mps
@@ -28,6 +28,7 @@
     <import index="eh3q" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.text(MPS.Editor/)" />
     <import index="fdmd" ref="r:491a72d0-a89c-45f5-92ff-c5c32c0ab953(com.mbeddr.mpsutil.margincell.editor.editor)" />
     <import index="hhnx" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.editor.runtime(MPS.Editor/)" />
+    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
   </imports>
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
@@ -282,6 +283,11 @@
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
+      <concept id="8866923313515890008" name="jetbrains.mps.lang.smodel.structure.AsNodeOperation" flags="nn" index="FGMqu" />
+      <concept id="2644386474300074836" name="jetbrains.mps.lang.smodel.structure.ConceptIdRefExpression" flags="nn" index="35c_gC">
+        <reference id="2644386474300074837" name="conceptDeclaration" index="35c_gD" />
+      </concept>
+      <concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
       </concept>
@@ -291,9 +297,6 @@
       <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
         <reference id="1138056516764" name="link" index="3Tt5mk" />
       </concept>
-      <concept id="1172424058054" name="jetbrains.mps.lang.smodel.structure.ConceptRefExpression" flags="nn" index="3TUQnm">
-        <reference id="1172424100906" name="conceptDeclaration" index="3TV0OU" />
-      </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
@@ -801,6 +804,33 @@
         </node>
       </node>
       <node concept="3clFbS" id="4A3glljUQIz" role="3clF47">
+        <node concept="3cpWs8" id="2wiIWbHIs_s" role="3cqZAp">
+          <node concept="3cpWsn" id="2wiIWbHIs_t" role="3cpWs9">
+            <property role="TrG5h" value="repository" />
+            <node concept="3uibUv" id="2wiIWbHIryR" role="1tU5fm">
+              <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+            </node>
+            <node concept="2OqwBi" id="2wiIWbHIs_u" role="33vP2m">
+              <node concept="2OqwBi" id="2wiIWbHIs_v" role="2Oq$k0">
+                <node concept="2OqwBi" id="2wiIWbHIs_w" role="2Oq$k0">
+                  <node concept="37vLTw" id="2wiIWbHIs_x" role="2Oq$k0">
+                    <ref role="3cqZAo" node="4A3glljUQIx" resolve="editorCell" />
+                  </node>
+                  <node concept="liA8E" id="2wiIWbHIs_y" role="2OqNvi">
+                    <ref role="37wK5l" to="f4zo:~EditorCell.getEditorComponent()" resolve="getEditorComponent" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="2wiIWbHIs_z" role="2OqNvi">
+                  <ref role="37wK5l" to="cj4x:~EditorComponent.getEditorContext()" resolve="getEditorContext" />
+                </node>
+              </node>
+              <node concept="liA8E" id="2wiIWbHIs_$" role="2OqNvi">
+                <ref role="37wK5l" to="cj4x:~EditorContext.getRepository()" resolve="getRepository" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="2wiIWbHIwbB" role="3cqZAp" />
         <node concept="3cpWs8" id="7lmVLrUo3Y$" role="3cqZAp">
           <node concept="3cpWsn" id="7lmVLrUo3Y_" role="3cpWs9">
             <property role="TrG5h" value="x" />
@@ -1141,8 +1171,17 @@
                 </node>
               </node>
             </node>
-            <node concept="3clFbJ" id="4A3glljUQJk" role="3cqZAp">
-              <node concept="3clFbS" id="4A3glljUQJl" role="3clFbx">
+            <node concept="3cpWs8" id="2wiIWbHHcwD" role="3cqZAp">
+              <node concept="3cpWsn" id="2wiIWbHHcwG" role="3cpWs9">
+                <property role="TrG5h" value="currentNode" />
+                <node concept="3Tqbb2" id="2wiIWbHHcwB" role="1tU5fm" />
+                <node concept="37vLTw" id="2wiIWbHHHSU" role="33vP2m">
+                  <ref role="3cqZAo" node="4A3glljUQIX" resolve="attachedNode" />
+                </node>
+              </node>
+            </node>
+            <node concept="2$JKZl" id="2wiIWbHHnbu" role="3cqZAp">
+              <node concept="3clFbS" id="2wiIWbHHnbw" role="2LFqv$">
                 <node concept="3clFbF" id="4A3glljUQJm" role="3cqZAp">
                   <node concept="37vLTI" id="4A3glljUQJn" role="3clFbG">
                     <node concept="2OqwBi" id="4A3glljUQJo" role="37vLTx">
@@ -1156,8 +1195,8 @@
                       </node>
                       <node concept="liA8E" id="4A3glljUQJs" role="2OqNvi">
                         <ref role="37wK5l" to="cj4x:~EditorComponent.findNodeCell(org.jetbrains.mps.openapi.model.SNode)" resolve="findNodeCell" />
-                        <node concept="37vLTw" id="4A3glljUQJt" role="37wK5m">
-                          <ref role="3cqZAo" node="4A3glljUQIX" resolve="attachedNode" />
+                        <node concept="37vLTw" id="2wiIWbHHZQB" role="37wK5m">
+                          <ref role="3cqZAo" node="2wiIWbHHcwG" resolve="currentNode" />
                         </node>
                       </node>
                     </node>
@@ -1166,46 +1205,88 @@
                     </node>
                   </node>
                 </node>
+                <node concept="1QHqEK" id="2wiIWbHIneu" role="3cqZAp">
+                  <node concept="1QHqEC" id="2wiIWbHInew" role="1QHqEI">
+                    <node concept="3clFbS" id="2wiIWbHIney" role="1bW5cS">
+                      <node concept="3clFbF" id="2wiIWbHIqMD" role="3cqZAp">
+                        <node concept="37vLTI" id="2wiIWbHI3BH" role="3clFbG">
+                          <node concept="2OqwBi" id="2wiIWbHI6BT" role="37vLTx">
+                            <node concept="37vLTw" id="2wiIWbHI5L5" role="2Oq$k0">
+                              <ref role="3cqZAo" node="2wiIWbHHcwG" resolve="currentNode" />
+                            </node>
+                            <node concept="1mfA1w" id="2wiIWbHI8xE" role="2OqNvi" />
+                          </node>
+                          <node concept="37vLTw" id="2wiIWbHI1EB" role="37vLTJ">
+                            <ref role="3cqZAo" node="2wiIWbHHcwG" resolve="currentNode" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="37vLTw" id="2wiIWbHIBQ3" role="ukAjM">
+                    <ref role="3cqZAo" node="2wiIWbHIs_t" resolve="repository" />
+                  </node>
+                </node>
               </node>
-              <node concept="3clFbC" id="4A3glljUQJv" role="3clFbw">
-                <node concept="10Nm6u" id="4A3glljUQJw" role="3uHU7w" />
-                <node concept="37vLTw" id="4A3glljUQJx" role="3uHU7B">
-                  <ref role="3cqZAo" node="4A3glljUQJb" resolve="attachedCell" />
+              <node concept="1Wc70l" id="2wiIWbHHuWT" role="2$JKZa">
+                <node concept="3y3z36" id="2wiIWbHHLAR" role="3uHU7w">
+                  <node concept="10Nm6u" id="2wiIWbHHMEB" role="3uHU7w" />
+                  <node concept="37vLTw" id="2wiIWbHHJGu" role="3uHU7B">
+                    <ref role="3cqZAo" node="2wiIWbHHcwG" resolve="currentNode" />
+                  </node>
+                </node>
+                <node concept="3clFbC" id="2wiIWbHHrd$" role="3uHU7B">
+                  <node concept="37vLTw" id="2wiIWbHHpkO" role="3uHU7B">
+                    <ref role="3cqZAo" node="4A3glljUQJb" resolve="attachedCell" />
+                  </node>
+                  <node concept="10Nm6u" id="2wiIWbHHt9x" role="3uHU7w" />
                 </node>
               </node>
             </node>
             <node concept="3clFbJ" id="10nVqVg6gNA" role="3cqZAp">
               <node concept="3clFbS" id="10nVqVg6gND" role="3clFbx">
-                <node concept="RRSsy" id="42VTAcDfnMO" role="3cqZAp">
-                  <property role="RRSoG" value="gZ5fksE/warn" />
-                  <node concept="3cpWs3" id="10nVqVg6_3I" role="RRSoy">
-                    <node concept="Xl_RD" id="10nVqVg6_3R" role="3uHU7w">
-                      <property role="Xl_RC" value="'" />
-                    </node>
-                    <node concept="3cpWs3" id="10nVqVg6$HA" role="3uHU7B">
-                      <node concept="3cpWs3" id="10nVqVg6zTj" role="3uHU7B">
-                        <node concept="3cpWs3" id="10nVqVg6zf6" role="3uHU7B">
-                          <node concept="Xl_RD" id="10nVqVg6z67" role="3uHU7B">
-                            <property role="Xl_RC" value="Cannot find attached node for " />
+                <node concept="1QHqEK" id="2wiIWbHD$n9" role="3cqZAp">
+                  <node concept="1QHqEC" id="2wiIWbHD$nb" role="1QHqEI">
+                    <node concept="3clFbS" id="2wiIWbHD$nd" role="1bW5cS">
+                      <node concept="RRSsy" id="42VTAcDfnMO" role="3cqZAp">
+                        <property role="RRSoG" value="gZ5fksE/warn" />
+                        <node concept="3cpWs3" id="10nVqVg6_3I" role="RRSoy">
+                          <node concept="Xl_RD" id="10nVqVg6_3R" role="3uHU7w">
+                            <property role="Xl_RC" value="'" />
                           </node>
-                          <node concept="2OqwBi" id="10nVqVg6zsQ" role="3uHU7w">
-                            <node concept="3TUQnm" id="10nVqVg6zfN" role="2Oq$k0">
-                              <ref role="3TV0OU" to="elym:10nVqVftA9h" resolve="IMarginCellContent" />
+                          <node concept="3cpWs3" id="10nVqVg6$HA" role="3uHU7B">
+                            <node concept="3cpWs3" id="10nVqVg6zTj" role="3uHU7B">
+                              <node concept="3cpWs3" id="10nVqVg6zf6" role="3uHU7B">
+                                <node concept="Xl_RD" id="10nVqVg6z67" role="3uHU7B">
+                                  <property role="Xl_RC" value="Cannot find attached node for " />
+                                </node>
+                                <node concept="2OqwBi" id="2wiIWbHEo5F" role="3uHU7w">
+                                  <node concept="2OqwBi" id="2wiIWbHEeOP" role="2Oq$k0">
+                                    <node concept="35c_gC" id="2wiIWbHE3zC" role="2Oq$k0">
+                                      <ref role="35c_gD" to="elym:10nVqVftA9h" resolve="IMarginCellContent" />
+                                    </node>
+                                    <node concept="FGMqu" id="2wiIWbHEhBl" role="2OqNvi" />
+                                  </node>
+                                  <node concept="3TrcHB" id="2wiIWbHEs6E" role="2OqNvi">
+                                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="Xl_RD" id="10nVqVg6$0h" role="3uHU7w">
+                                <property role="Xl_RC" value=" '" />
+                              </node>
                             </node>
-                            <node concept="3TrcHB" id="10nVqVg6z_j" role="2OqNvi">
-                              <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                            <node concept="37vLTw" id="10nVqVg6$Vs" role="3uHU7w">
+                              <ref role="3cqZAo" node="4A3glljUQIP" resolve="contentNode" />
                             </node>
                           </node>
                         </node>
-                        <node concept="Xl_RD" id="10nVqVg6$0h" role="3uHU7w">
-                          <property role="Xl_RC" value=" '" />
-                        </node>
-                      </node>
-                      <node concept="37vLTw" id="10nVqVg6$Vs" role="3uHU7w">
-                        <ref role="3cqZAo" node="4A3glljUQIP" resolve="contentNode" />
                       </node>
                     </node>
                   </node>
+                  <node concept="37vLTw" id="2wiIWbHIs__" role="ukAjM">
+                    <ref role="3cqZAo" node="2wiIWbHIs_t" resolve="repository" />
+                  </node>
                 </node>
                 <node concept="3N13vt" id="10nVqVg6_ck" role="3cqZAp" />
               </node>
@@ -3888,13 +3969,22 @@
             <node concept="3cmrfG" id="10nVqVfFG4V" role="3uHU7w">
               <property role="3cmrfH" value="15" />
             </node>
-            <node concept="2OqwBi" id="6YgBu0_SLX9" role="3uHU7B">
-              <node concept="2YIFZM" id="6YgBu0_SLXa" role="2Oq$k0">
-                <ref role="37wK5l" to="exr9:~EditorSettings.getInstance()" resolve="getInstance" />
-                <ref role="1Pybhc" to="exr9:~EditorSettings" resolve="EditorSettings" />
+            <node concept="2OqwBi" id="2wiIWbHJis1" role="3uHU7B">
+              <node concept="2OqwBi" id="2wiIWbHJgQl" role="2Oq$k0">
+                <node concept="2OqwBi" id="2wiIWbHJf5y" role="2Oq$k0">
+                  <node concept="37vLTw" id="2wiIWbHJepK" role="2Oq$k0">
+                    <ref role="3cqZAo" node="10nVqVg8C7X" resolve="contentCell" />
+                  </node>
+                  <node concept="liA8E" id="2wiIWbHJgiv" role="2OqNvi">
+                    <ref role="37wK5l" to="f4zo:~EditorCell.getEditorComponent()" resolve="getEditorComponent" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="2wiIWbHJhCu" role="2OqNvi">
+                  <ref role="37wK5l" to="cj4x:~EditorComponent.getEditorComponentSettings()" resolve="getEditorComponentSettings" />
+                </node>
               </node>
-              <node concept="liA8E" id="6YgBu0_SLXb" role="2OqNvi">
-                <ref role="37wK5l" to="exr9:~EditorSettings.getVerticalBoundWidth()" resolve="getVerticalBoundWidth" />
+              <node concept="liA8E" id="2wiIWbHJjj8" role="2OqNvi">
+                <ref role="37wK5l" to="cj4x:~EditorComponentSettings.getRightMargin()" resolve="getRightMargin" />
               </node>
             </node>
           </node>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.review.sandbox/models/com/mbeddr/mpsutil/review/sandbox.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.review.sandbox/models/com/mbeddr/mpsutil/review/sandbox.mps
index 43cbd847700..86bfb57d4cd 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.review.sandbox/models/com/mbeddr/mpsutil/review/sandbox.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.review.sandbox/models/com/mbeddr/mpsutil/review/sandbox.mps
@@ -56,6 +56,10 @@
         <reference id="8455208232410321432" name="reviewedRoot" index="2f$7Oe" />
         <child id="8455208232410321433" name="notes" index="2f$7Of" />
       </concept>
+      <concept id="2887576756982815155" name="com.mbeddr.mpsutil.review.readonly.structure.MyConcept" flags="ng" index="35G29L">
+        <child id="2887576756982822230" name="children" index="35G0Uk" />
+      </concept>
+      <concept id="2887576756982813059" name="com.mbeddr.mpsutil.review.readonly.structure.MyChild" flags="ng" index="35G2D1" />
     </language>
     <language id="7a060fae-09e0-4372-be36-6696d6554c0e" name="com.mbeddr.mpsutil.review.annotation">
       <concept id="8455208232410333108" name="com.mbeddr.mpsutil.review.annotation.structure.CommentAnnotationContainer" flags="ng" index="2f$52y">
@@ -243,5 +247,50 @@
       </node>
     </node>
   </node>
+  <node concept="35G29L" id="2wiIWbHCJkU">
+    <property role="TrG5h" value="Collapsible" />
+    <node concept="35G2D1" id="2wiIWbHCKy1" role="35G0Uk" />
+    <node concept="35G2D1" id="2wiIWbHCKy3" role="35G0Uk" />
+    <node concept="35G2D1" id="2wiIWbHCNLd" role="35G0Uk" />
+    <node concept="35G2D1" id="2wiIWbHCNLh" role="35G0Uk" />
+    <node concept="35G2D1" id="2wiIWbHCNLm" role="35G0Uk" />
+    <node concept="35G2D1" id="2wiIWbHCNLs" role="35G0Uk" />
+    <node concept="35G2D1" id="2wiIWbHCNLz" role="35G0Uk" />
+    <node concept="35G2D1" id="2wiIWbHCNLF" role="35G0Uk" />
+    <node concept="35G2D1" id="2wiIWbHCNLO" role="35G0Uk" />
+    <node concept="35G2D1" id="2wiIWbHCNLY" role="35G0Uk" />
+    <node concept="35G2D1" id="2wiIWbHCNM9" role="35G0Uk" />
+    <node concept="35G2D1" id="2wiIWbHCNMl" role="35G0Uk" />
+    <node concept="35G2D1" id="2wiIWbHCNMy" role="35G0Uk" />
+    <node concept="35G2D1" id="2wiIWbHCNMK" role="35G0Uk" />
+    <node concept="35G2D1" id="2wiIWbHCNMZ" role="35G0Uk" />
+    <node concept="35G2D1" id="2wiIWbHCNNf" role="35G0Uk" />
+    <node concept="35G2D1" id="2wiIWbHCNNw" role="35G0Uk" />
+    <node concept="35G2D1" id="2wiIWbHCNNM" role="35G0Uk" />
+    <node concept="2f$52y" id="2wiIWbHCNO5" role="lGtFl">
+      <node concept="3vAitl" id="2wiIWbHCNO6" role="2f$52z">
+        <property role="3ajGZW" value="apann" />
+        <property role="3ajGZ3" value="6 Sept 2024, 5:33:35 pm" />
+        <property role="19LeSh" value="constant_0" />
+        <ref role="19LoX1" node="2wiIWbHCNLz" />
+        <node concept="19SGf9" id="2wiIWbHCNO7" role="3ajGZ5">
+          <node concept="19SUe$" id="2wiIWbHCNO8" role="19SJt6">
+            <property role="19SUeA" value="Annotation 2" />
+          </node>
+        </node>
+      </node>
+      <node concept="3vAitl" id="2wiIWbHJrqB" role="2f$52z">
+        <property role="3ajGZW" value="apann" />
+        <property role="3ajGZ3" value="6 Sept 2024, 6:07:44 pm" />
+        <property role="19LeSh" value="constant_0" />
+        <ref role="19LoX1" node="2wiIWbHCKy3" />
+        <node concept="19SGf9" id="2wiIWbHJrqC" role="3ajGZ5">
+          <node concept="19SUe$" id="2wiIWbHJrqD" role="19SJt6">
+            <property role="19SUeA" value=" Annotation" />
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>