From c8b544abbab42859b506133946b5e777cacf438d Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Thu, 7 Apr 2022 09:59:06 +0200
Subject: [PATCH 1/4] Don't allow slash as first character in CorrdCellRef

---
 .../org/iets3/core/expr/repl/constraints.mps    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/constraints.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/constraints.mps
index 318c262d0c..d39d30679e 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/constraints.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/constraints.mps
@@ -2,6 +2,7 @@
 <model ref="r:098cd5d2-6719-4a9b-9976-ee98e642cc00(org.iets3.core.expr.repl.constraints)">
   <persistence version="9" />
   <languages>
+    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="6" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
     <devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
   </languages>
@@ -598,6 +599,22 @@
               <node concept="17RlXB" id="5avmkTFi3Pj" role="2OqNvi" />
             </node>
           </node>
+          <node concept="3clFbJ" id="4INVJAvXAOI" role="3cqZAp">
+            <node concept="3clFbS" id="4INVJAvXAOK" role="3clFbx">
+              <node concept="3cpWs6" id="4INVJAvXCxh" role="3cqZAp">
+                <node concept="3clFbT" id="4INVJAvXCxq" role="3cqZAk" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="4INVJAvXBCM" role="3clFbw">
+              <node concept="1Wqviy" id="4INVJAvXB0B" role="2Oq$k0" />
+              <node concept="liA8E" id="4INVJAvXCbL" role="2OqNvi">
+                <ref role="37wK5l" to="wyt6:~String.startsWith(java.lang.String)" resolve="startsWith" />
+                <node concept="Xl_RD" id="4INVJAvXCl2" role="37wK5m">
+                  <property role="Xl_RC" value="/" />
+                </node>
+              </node>
+            </node>
+          </node>
           <node concept="3cpWs8" id="5avmkTFkueI" role="3cqZAp">
             <node concept="3cpWsn" id="5avmkTFkueJ" role="3cpWs9">
               <property role="TrG5h" value="last" />

From deb019e09c6df038f1e69d5c6c8f18711a9c7699 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Tue, 28 Jun 2022 12:56:10 +0200
Subject: [PATCH 2/4] CoordCellRef: Replace optional cell with transformation
 menu

---
 .../org/iets3/core/expr/repl/editor.mps       | 401 +++++++++++++-----
 1 file changed, 286 insertions(+), 115 deletions(-)

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/editor.mps
index b1d07646e7..ff58248f07 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/editor.mps
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <model ref="r:9741ad23-5b7e-4040-b070-51e24fd6bfee(org.iets3.core.expr.repl.editor)">
   <persistence version="9" />
+  <attribute name="doNotGenerate" value="false" />
   <languages>
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
-    <use id="9d69e719-78c8-4286-90db-fb19c107d049" name="com.mbeddr.mpsutil.grammarcells" version="2" />
+    <use id="9d69e719-78c8-4286-90db-fb19c107d049" name="com.mbeddr.mpsutil.grammarcells" version="1" />
     <use id="3bdedd09-792a-4e15-a4db-83970df3ee86" name="de.itemis.mps.editor.collapsible" version="0" />
     <use id="b33d119e-196d-4497-977c-5c167b21fe33" name="com.mbeddr.mpsutil.framecell" version="0" />
     <use id="f89904fb-9486-43a1-865e-5ad0375a8a88" name="de.itemis.mps.editor.bool" version="0" />
@@ -33,6 +34,7 @@
     <import index="reoo" ref="r:1e59a084-7ebe-4e95-89ab-c58a7e396583(de.slisson.mps.tables.editor)" />
     <import index="5ueo" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.editor.runtime.style(MPS.Editor/)" />
     <import index="g51k" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.cells(MPS.Editor/)" />
+    <import index="ykok" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.constraints(MPS.Core/)" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="5qo5" ref="r:6d93ddb1-b0b0-4eee-8079-51303666672a(org.iets3.core.expr.simpleTypes.structure)" implicit="true" />
@@ -52,6 +54,7 @@
       </concept>
       <concept id="1176897764478" name="jetbrains.mps.lang.editor.structure.QueryFunction_NodeFactory" flags="in" index="4$FPG" />
       <concept id="1597643335227097138" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_TransformationMenu_node" flags="ng" index="7Obwk" />
+      <concept id="6516520003787916624" name="jetbrains.mps.lang.editor.structure.QueryFunction_TransformationMenu_Condition" flags="ig" index="27VH4U" />
       <concept id="1140524381322" name="jetbrains.mps.lang.editor.structure.CellModel_ListWithRole" flags="ng" index="2czfm3">
         <property id="1140524450557" name="separatorText" index="2czwfO" />
         <child id="1176897874615" name="nodeFactory" index="4_6I_" />
@@ -66,18 +69,24 @@
       <concept id="6089045305654894367" name="jetbrains.mps.lang.editor.structure.SubstituteMenuReference_Named" flags="ng" index="2kknPI">
         <reference id="6089045305654944382" name="menu" index="2kkw0f" />
       </concept>
+      <concept id="6089045305654894366" name="jetbrains.mps.lang.editor.structure.SubstituteMenuReference_Default" flags="ng" index="2kknPJ" />
       <concept id="1142886221719" name="jetbrains.mps.lang.editor.structure.QueryFunction_NodeCondition" flags="in" index="pkWqt" />
       <concept id="1142886811589" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_node" flags="nn" index="pncrf" />
+      <concept id="1177327274449" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_pattern" flags="nn" index="ub8z3" />
       <concept id="1080736578640" name="jetbrains.mps.lang.editor.structure.BaseEditorComponent" flags="ig" index="2wURMF">
         <child id="1080736633877" name="cellModel" index="2wV5jI" />
       </concept>
       <concept id="795210086017940429" name="jetbrains.mps.lang.editor.structure.ReadOnlyStyleClassItem" flags="lg" index="xShMh" />
+      <concept id="6718020819487620873" name="jetbrains.mps.lang.editor.structure.TransformationMenuReference_Named" flags="ng" index="A1WHu">
+        <reference id="6718020819487620874" name="menu" index="A1WHt" />
+      </concept>
       <concept id="3473224453637651916" name="jetbrains.mps.lang.editor.structure.TransformationLocation_SideTransform_PlaceInCellHolder" flags="ng" index="CtIbL">
         <property id="3473224453637651917" name="placeInCell" index="CtIbK" />
       </concept>
       <concept id="1239814640496" name="jetbrains.mps.lang.editor.structure.CellLayout_VerticalGrid" flags="nn" index="2EHx9g" />
       <concept id="1638911550608610798" name="jetbrains.mps.lang.editor.structure.QueryFunction_TransformationMenu_Execute" flags="ig" index="IWg2L" />
       <concept id="1638911550608610278" name="jetbrains.mps.lang.editor.structure.TransformationMenuPart_Action" flags="ng" index="IWgqT">
+        <child id="6202297022026447496" name="canExecuteFunction" index="2jiSrf" />
         <child id="1638911550608610281" name="executeFunction" index="IWgqQ" />
         <child id="5692353713941573325" name="textFunction" index="1hCUd6" />
       </concept>
@@ -116,6 +125,9 @@
       <concept id="1164996492011" name="jetbrains.mps.lang.editor.structure.CellMenuPart_ReferentPrimary" flags="ng" index="ZcVJ$">
         <child id="6918029743851332884" name="matchingText" index="1NQq9M" />
       </concept>
+      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ng" index="2Z_bC8">
+        <reference id="1630016958698373342" name="concept" index="2ZyFGn" />
+      </concept>
       <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
@@ -124,9 +136,20 @@
       <concept id="1233759184865" name="jetbrains.mps.lang.editor.structure.PunctuationRightStyleClassItem" flags="ln" index="11LMrY" />
       <concept id="1220974635399" name="jetbrains.mps.lang.editor.structure.QueryFunction_FontStyle" flags="in" index="17KAyr" />
       <concept id="2115302367868116903" name="jetbrains.mps.lang.editor.structure.GeneratedSubstituteMenuAttribute" flags="ng" index="382kZG" />
+      <concept id="1896914160037421068" name="jetbrains.mps.lang.editor.structure.TransformationMenuPart_WrapSubstituteMenu" flags="ng" index="3c8P5G">
+        <child id="1896914160037421069" name="menuReference" index="3c8P5H" />
+        <child id="1896914160037423677" name="handler" index="3c8PHt" />
+      </concept>
+      <concept id="1896914160037423680" name="jetbrains.mps.lang.editor.structure.QueryFunction_TransformationMenu_WrapperHandler" flags="ig" index="3c8PGw" />
+      <concept id="1896914160037437306" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_TransformationMenu_CreatedNode" flags="ng" index="3c8USq" />
+      <concept id="1838685759388685703" name="jetbrains.mps.lang.editor.structure.TransformationFeature_DescriptionText" flags="ng" index="3cqGtN">
+        <child id="1838685759388685704" name="query" index="3cqGtW" />
+      </concept>
+      <concept id="1838685759388690401" name="jetbrains.mps.lang.editor.structure.QueryFunction_TransformationMenu_DescriptionText" flags="ig" index="3cqJkl" />
       <concept id="2896773699153795590" name="jetbrains.mps.lang.editor.structure.TransformationLocation_SideTransform" flags="ng" index="3cWJ9i">
         <child id="3473224453637651919" name="placeInCell" index="CtIbM" />
       </concept>
+      <concept id="7342352913006985500" name="jetbrains.mps.lang.editor.structure.TransformationLocation_Completion" flags="ng" index="3eGOoe" />
       <concept id="1103016434866" name="jetbrains.mps.lang.editor.structure.CellModel_JComponent" flags="sg" stub="8104358048506731196" index="3gTLQM">
         <child id="1176475119347" name="componentProvider" index="3FoqZy" />
       </concept>
@@ -134,6 +157,11 @@
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
         <child id="1088186146602" name="editorComponent" index="1sWHZn" />
       </concept>
+      <concept id="3622263992595020486" name="jetbrains.mps.lang.editor.structure.SubstituteMenuItem_MatchingText_Operation" flags="ng" index="3j5asI" />
+      <concept id="7291101478617127464" name="jetbrains.mps.lang.editor.structure.IExtensibleTransformationMenuPart" flags="ng" index="1joUw2">
+        <child id="8954657570916349207" name="features" index="2jZA2a" />
+      </concept>
+      <concept id="3622263992592371436" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_SubstituteMenu_WrappedItem" flags="ng" index="3jrdc4" />
       <concept id="7597241200646296619" name="jetbrains.mps.lang.editor.structure.QueryFunction_SNode" flags="in" index="3k4GqP" />
       <concept id="7597241200646296617" name="jetbrains.mps.lang.editor.structure.NavigatableNodeStyleClassItem" flags="ln" index="3k4GqR">
         <child id="7597241200646296618" name="functionNode" index="3k4GqO" />
@@ -156,10 +184,12 @@
         <property id="1140017977771" name="readOnly" index="1Intyy" />
         <reference id="1140103550593" name="relationDeclaration" index="1NtTu8" />
       </concept>
+      <concept id="1215085112640" name="jetbrains.mps.lang.editor.structure.FirstPositionAllowedStyleClassItem" flags="ln" index="3CHQLq" />
       <concept id="1073389214265" name="jetbrains.mps.lang.editor.structure.EditorCellModel" flags="ng" index="3EYTF0">
         <property id="1130859485024" name="attractsFocus" index="1cu_pB" />
         <child id="1142887637401" name="renderingCondition" index="pqm2j" />
         <child id="1164826688380" name="menuDescriptor" index="P5bDN" />
+        <child id="4202667662392416064" name="transformationMenu" index="3vIgyS" />
       </concept>
       <concept id="1073389446423" name="jetbrains.mps.lang.editor.structure.CellModel_Collection" flags="sn" stub="3013115976261988961" index="3EZMnI">
         <property id="1160590353935" name="usesFolding" index="S$Qs1" />
@@ -404,9 +434,7 @@
       <concept id="9041925471455857605" name="com.mbeddr.mpsutil.grammarcells.structure.Cell_DescriptionText" flags="ig" index="uPpia" />
       <concept id="5083944728298846680" name="com.mbeddr.mpsutil.grammarcells.structure.OptionalCell" flags="ng" index="_tjkj">
         <child id="5083944728298846681" name="option" index="_tjki" />
-        <child id="8945098465480008160" name="transformationText" index="ZWbT9" />
       </concept>
-      <concept id="8945098465480383073" name="com.mbeddr.mpsutil.grammarcells.structure.OptionalCell_TransformationText" flags="ig" index="ZYGn8" />
       <concept id="848437706375087728" name="com.mbeddr.mpsutil.grammarcells.structure.ICanHaveDescriptionText" flags="ng" index="1djCvD">
         <child id="848437706375087729" name="descriptionText" index="1djCvC" />
       </concept>
@@ -475,11 +503,16 @@
         <reference id="1139877738879" name="concept" index="1A0vxQ" />
       </concept>
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
+      <concept id="2644386474302386080" name="jetbrains.mps.lang.smodel.structure.PropertyIdRefExpression" flags="nn" index="355D3s">
+        <reference id="2644386474302386081" name="conceptDeclaration" index="355D3t" />
+        <reference id="2644386474302386082" name="propertyDeclaration" index="355D3u" />
+      </concept>
       <concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
       <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
         <child id="1177027386292" name="conceptArgument" index="cj9EA" />
       </concept>
       <concept id="1171999116870" name="jetbrains.mps.lang.smodel.structure.Node_IsNullOperation" flags="nn" index="3w_OXm" />
+      <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
       <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
         <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
       </concept>
@@ -4995,161 +5028,162 @@
   <node concept="24kQdi" id="5xEoEMrqNzH">
     <property role="3GE5qa" value="sheet.ref" />
     <ref role="1XX52x" to="wtll:5xEoEMrqNzj" resolve="CoordCellRef" />
-    <node concept="3EZMnI" id="5xEoEMrFDD9" role="2wV5jI">
-      <node concept="2iRfu4" id="5xEoEMrFDDa" role="2iSdaV" />
-      <node concept="3F0ifn" id="5xEoEMrqNzJ" role="3EZMnx">
-        <property role="3F0ifm" value="$" />
-        <node concept="11L4FC" id="3pIANU$W0tA" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-          <node concept="3nzxsE" id="3pIANU$W0_L" role="3n$kyP">
-            <node concept="3clFbS" id="3pIANU$W0_M" role="2VODD2">
-              <node concept="3clFbF" id="3pIANU$W0GW" role="3cqZAp">
-                <node concept="3y3z36" id="3pIANU$W1Tq" role="3clFbG">
-                  <node concept="10Nm6u" id="3pIANU$W23e" role="3uHU7w" />
-                  <node concept="2OqwBi" id="3pIANU$W0Wh" role="3uHU7B">
-                    <node concept="pncrf" id="3pIANU$W0GV" role="2Oq$k0" />
-                    <node concept="3TrEf2" id="3pIANU$W1lx" role="2OqNvi">
-                      <ref role="3Tt5mk" to="wtll:3pIANU$T$6B" resolve="finder" />
+    <node concept="3EZMnI" id="5tXCpgboXH9" role="2wV5jI">
+      <node concept="2iRkQZ" id="5tXCpgboXHa" role="2iSdaV" />
+      <node concept="3EZMnI" id="5xEoEMrFDD9" role="3EZMnx">
+        <node concept="2iRfu4" id="5xEoEMrFDDa" role="2iSdaV" />
+        <node concept="3F0ifn" id="5xEoEMrqNzJ" role="3EZMnx">
+          <property role="3F0ifm" value="$" />
+          <node concept="11L4FC" id="3pIANU$W0tA" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+            <node concept="3nzxsE" id="3pIANU$W0_L" role="3n$kyP">
+              <node concept="3clFbS" id="3pIANU$W0_M" role="2VODD2">
+                <node concept="3clFbF" id="3pIANU$W0GW" role="3cqZAp">
+                  <node concept="3y3z36" id="3pIANU$W1Tq" role="3clFbG">
+                    <node concept="10Nm6u" id="3pIANU$W23e" role="3uHU7w" />
+                    <node concept="2OqwBi" id="3pIANU$W0Wh" role="3uHU7B">
+                      <node concept="pncrf" id="3pIANU$W0GV" role="2Oq$k0" />
+                      <node concept="3TrEf2" id="3pIANU$W1lx" role="2OqNvi">
+                        <ref role="3Tt5mk" to="wtll:3pIANU$T$6B" resolve="finder" />
+                      </node>
                     </node>
                   </node>
                 </node>
               </node>
             </node>
           </node>
-        </node>
-        <node concept="11LMrY" id="5xEoEMrqN$M" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="3k4GqR" id="5xEoEMruHWv" role="3F10Kt">
-          <node concept="3k4GqP" id="5xEoEMruHWw" role="3k4GqO">
-            <node concept="3clFbS" id="5xEoEMruHWx" role="2VODD2">
-              <node concept="3clFbF" id="5xEoEMruIVR" role="3cqZAp">
-                <node concept="2OqwBi" id="5xEoEMruIVT" role="3clFbG">
-                  <node concept="pncrf" id="5xEoEMruIVU" role="2Oq$k0" />
-                  <node concept="2qgKlT" id="5xEoEMrEFUC" role="2OqNvi">
-                    <ref role="37wK5l" to="31n1:5xEoEMrDTcu" resolve="resolve" />
+          <node concept="11LMrY" id="5xEoEMrqN$M" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+          <node concept="3k4GqR" id="5xEoEMruHWv" role="3F10Kt">
+            <node concept="3k4GqP" id="5xEoEMruHWw" role="3k4GqO">
+              <node concept="3clFbS" id="5xEoEMruHWx" role="2VODD2">
+                <node concept="3clFbF" id="5xEoEMruIVR" role="3cqZAp">
+                  <node concept="2OqwBi" id="5xEoEMruIVT" role="3clFbG">
+                    <node concept="pncrf" id="5xEoEMruIVU" role="2Oq$k0" />
+                    <node concept="2qgKlT" id="5xEoEMrEFUC" role="2OqNvi">
+                      <ref role="37wK5l" to="31n1:5xEoEMrDTcu" resolve="resolve" />
+                    </node>
                   </node>
                 </node>
               </node>
             </node>
           </node>
         </node>
-      </node>
-      <node concept="_tjkj" id="3pIANU$TNte" role="3EZMnx">
-        <node concept="ZYGn8" id="3pIANU$TNRQ" role="ZWbT9">
-          <node concept="3clFbS" id="3pIANU$TNRR" role="2VODD2">
-            <node concept="3clFbF" id="3pIANU$TNSD" role="3cqZAp">
-              <node concept="Xl_RD" id="3pIANU$TNSC" role="3clFbG">
-                <property role="Xl_RC" value="/" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3EZMnI" id="3pIANU$VZUl" role="_tjki">
-          <node concept="2iRfu4" id="3pIANU$VZUo" role="2iSdaV" />
-          <node concept="VPM3Z" id="3pIANU$VZUp" role="3F10Kt">
-            <property role="VOm3f" value="false" />
-          </node>
-          <node concept="11LMrY" id="3pIANU$XU6e" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
-          <node concept="3F1sOY" id="3pIANU$W2xO" role="3EZMnx">
+        <node concept="3EZMnI" id="5tXCpgbyXWv" role="3EZMnx">
+          <node concept="2iRfu4" id="5tXCpgbyXWw" role="2iSdaV" />
+          <node concept="3F1sOY" id="5tXCpgbyXQV" role="3EZMnx">
             <ref role="1NtTu8" to="wtll:3pIANU$T$6B" resolve="finder" />
           </node>
-          <node concept="3F0ifn" id="3pIANU$Xfrp" role="3EZMnx">
+          <node concept="3F0ifn" id="5tXCpgbyY29" role="3EZMnx">
             <property role="3F0ifm" value="/" />
-            <node concept="11L4FC" id="3pIANU$Xfrv" role="3F10Kt">
+            <node concept="11L4FC" id="5tXCpgbyY2d" role="3F10Kt">
               <property role="VOm3f" value="true" />
             </node>
-            <node concept="11LMrY" id="3pIANU$Xfr$" role="3F10Kt">
+            <node concept="11LMrY" id="5tXCpgbyY2i" role="3F10Kt">
               <property role="VOm3f" value="true" />
             </node>
           </node>
-        </node>
-        <node concept="uPpia" id="1ZlHRbgqJid" role="1djCvC">
-          <node concept="3clFbS" id="1ZlHRbgqJie" role="2VODD2">
-            <node concept="3clFbF" id="1ZlHRbgqJiD" role="3cqZAp">
-              <node concept="Xl_RD" id="1ZlHRbgqJiC" role="3clFbG">
-                <property role="Xl_RC" value="a finder for the coordinate cell reference" />
+          <node concept="pkWqt" id="5tXCpgbyY2m" role="pqm2j">
+            <node concept="3clFbS" id="5tXCpgbyY2n" role="2VODD2">
+              <node concept="3clFbF" id="5tXCpgbyY6i" role="3cqZAp">
+                <node concept="2OqwBi" id="5tXCpgbyYWu" role="3clFbG">
+                  <node concept="2OqwBi" id="5tXCpgbyYn$" role="2Oq$k0">
+                    <node concept="pncrf" id="5tXCpgbyY6h" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="5tXCpgbyYM5" role="2OqNvi">
+                      <ref role="3Tt5mk" to="wtll:3pIANU$T$6B" resolve="finder" />
+                    </node>
+                  </node>
+                  <node concept="3x8VRR" id="5tXCpgbyZgO" role="2OqNvi" />
+                </node>
               </node>
             </node>
           </node>
         </node>
-      </node>
-      <node concept="3F0A7n" id="5avmkTFcXRb" role="3EZMnx">
-        <ref role="1NtTu8" to="wtll:5avmkTFcWo6" resolve="cell" />
-        <node concept="3k4GqR" id="5avmkTFeTnD" role="3F10Kt">
-          <node concept="3k4GqP" id="5avmkTFeTnE" role="3k4GqO">
-            <node concept="3clFbS" id="5avmkTFeTnF" role="2VODD2">
-              <node concept="3clFbF" id="5avmkTFeTCk" role="3cqZAp">
-                <node concept="2OqwBi" id="5avmkTFeTOD" role="3clFbG">
-                  <node concept="pncrf" id="5avmkTFeTCj" role="2Oq$k0" />
-                  <node concept="2qgKlT" id="5avmkTFeUgL" role="2OqNvi">
-                    <ref role="37wK5l" to="31n1:5xEoEMrDTcu" resolve="resolve" />
+        <node concept="3F0A7n" id="5avmkTFcXRb" role="3EZMnx">
+          <ref role="1NtTu8" to="wtll:5avmkTFcWo6" resolve="cell" />
+          <node concept="3k4GqR" id="5avmkTFeTnD" role="3F10Kt">
+            <node concept="3k4GqP" id="5avmkTFeTnE" role="3k4GqO">
+              <node concept="3clFbS" id="5avmkTFeTnF" role="2VODD2">
+                <node concept="3clFbF" id="5avmkTFeTCk" role="3cqZAp">
+                  <node concept="2OqwBi" id="5avmkTFeTOD" role="3clFbG">
+                    <node concept="pncrf" id="5avmkTFeTCj" role="2Oq$k0" />
+                    <node concept="2qgKlT" id="5avmkTFeUgL" role="2OqNvi">
+                      <ref role="37wK5l" to="31n1:5xEoEMrDTcu" resolve="resolve" />
+                    </node>
                   </node>
                 </node>
               </node>
             </node>
           </node>
+          <node concept="11L4FC" id="5tXCpgbzTTD" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+          <node concept="3CHQLq" id="5tXCpgbzU2s" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+          <node concept="A1WHu" id="5tXCpgb_Vg2" role="3vIgyS">
+            <ref role="A1WHt" node="5tXCpgbx60V" resolve="Finders" />
+          </node>
         </node>
-      </node>
-      <node concept="PMmxH" id="5xEoEMrFEc$" role="3EZMnx">
-        <ref role="PMmxG" node="5xEoEMrFs7i" resolve="argList" />
-        <node concept="pkWqt" id="5xEoEMrFEc_" role="pqm2j">
-          <node concept="3clFbS" id="5xEoEMrFEcA" role="2VODD2">
-            <node concept="3clFbF" id="5xEoEMrFEcB" role="3cqZAp">
-              <node concept="2OqwBi" id="5xEoEMrFEcC" role="3clFbG">
-                <node concept="pncrf" id="5xEoEMrFEcD" role="2Oq$k0" />
-                <node concept="2qgKlT" id="5xEoEMrFEcE" role="2OqNvi">
-                  <ref role="37wK5l" to="31n1:5xEoEMrFtHl" resolve="needsActuals" />
+        <node concept="PMmxH" id="5xEoEMrFEc$" role="3EZMnx">
+          <ref role="PMmxG" node="5xEoEMrFs7i" resolve="argList" />
+          <node concept="pkWqt" id="5xEoEMrFEc_" role="pqm2j">
+            <node concept="3clFbS" id="5xEoEMrFEcA" role="2VODD2">
+              <node concept="3clFbF" id="5xEoEMrFEcB" role="3cqZAp">
+                <node concept="2OqwBi" id="5xEoEMrFEcC" role="3clFbG">
+                  <node concept="pncrf" id="5xEoEMrFEcD" role="2Oq$k0" />
+                  <node concept="2qgKlT" id="5xEoEMrFEcE" role="2OqNvi">
+                    <ref role="37wK5l" to="31n1:5xEoEMrFtHl" resolve="needsActuals" />
+                  </node>
                 </node>
               </node>
             </node>
           </node>
+          <node concept="11L4FC" id="5xEoEMrGg7L" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
         </node>
-        <node concept="11L4FC" id="5xEoEMrGg7L" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
-      <node concept="Veino" id="5avmkTFCmpY" role="3F10Kt">
-        <node concept="3ZlJ5R" id="5avmkTFCmEQ" role="VblUZ">
-          <node concept="3clFbS" id="5avmkTFCmER" role="2VODD2">
-            <node concept="3clFbJ" id="5avmkTFCmLP" role="3cqZAp">
-              <node concept="3clFbS" id="5avmkTFCmLQ" role="3clFbx">
-                <node concept="3cpWs6" id="5avmkTFCmLR" role="3cqZAp">
-                  <node concept="2ShNRf" id="5avmkTFCmLS" role="3cqZAk">
-                    <node concept="1pGfFk" id="5avmkTFCmLT" role="2ShVmc">
-                      <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
-                      <node concept="3cmrfG" id="5avmkTFCmLU" role="37wK5m">
-                        <property role="3cmrfH" value="224" />
-                      </node>
-                      <node concept="3cmrfG" id="5avmkTFCmLV" role="37wK5m">
-                        <property role="3cmrfH" value="247" />
-                      </node>
-                      <node concept="3cmrfG" id="5avmkTFCmLW" role="37wK5m">
-                        <property role="3cmrfH" value="255" />
+        <node concept="Veino" id="5avmkTFCmpY" role="3F10Kt">
+          <node concept="3ZlJ5R" id="5avmkTFCmEQ" role="VblUZ">
+            <node concept="3clFbS" id="5avmkTFCmER" role="2VODD2">
+              <node concept="3clFbJ" id="5avmkTFCmLP" role="3cqZAp">
+                <node concept="3clFbS" id="5avmkTFCmLQ" role="3clFbx">
+                  <node concept="3cpWs6" id="5avmkTFCmLR" role="3cqZAp">
+                    <node concept="2ShNRf" id="5avmkTFCmLS" role="3cqZAk">
+                      <node concept="1pGfFk" id="5avmkTFCmLT" role="2ShVmc">
+                        <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
+                        <node concept="3cmrfG" id="5avmkTFCmLU" role="37wK5m">
+                          <property role="3cmrfH" value="224" />
+                        </node>
+                        <node concept="3cmrfG" id="5avmkTFCmLV" role="37wK5m">
+                          <property role="3cmrfH" value="247" />
+                        </node>
+                        <node concept="3cmrfG" id="5avmkTFCmLW" role="37wK5m">
+                          <property role="3cmrfH" value="255" />
+                        </node>
                       </node>
                     </node>
                   </node>
                 </node>
-              </node>
-              <node concept="2OqwBi" id="5avmkTFCmLX" role="3clFbw">
-                <node concept="2OqwBi" id="5avmkTFCoe4" role="2Oq$k0">
-                  <node concept="2OqwBi" id="5avmkTFCmLY" role="2Oq$k0">
-                    <node concept="pncrf" id="5avmkTFCmLZ" role="2Oq$k0" />
-                    <node concept="2qgKlT" id="5avmkTFCnUB" role="2OqNvi">
-                      <ref role="37wK5l" to="31n1:5xEoEMrDTcu" resolve="resolve" />
+                <node concept="2OqwBi" id="5avmkTFCmLX" role="3clFbw">
+                  <node concept="2OqwBi" id="5avmkTFCoe4" role="2Oq$k0">
+                    <node concept="2OqwBi" id="5avmkTFCmLY" role="2Oq$k0">
+                      <node concept="pncrf" id="5avmkTFCmLZ" role="2Oq$k0" />
+                      <node concept="2qgKlT" id="5avmkTFCnUB" role="2OqNvi">
+                        <ref role="37wK5l" to="31n1:5xEoEMrDTcu" resolve="resolve" />
+                      </node>
+                    </node>
+                    <node concept="3Tsc0h" id="5avmkTFCoKO" role="2OqNvi">
+                      <ref role="3TtcxE" to="wtll:5xEoEMrzSo8" resolve="args" />
                     </node>
                   </node>
-                  <node concept="3Tsc0h" id="5avmkTFCoKO" role="2OqNvi">
-                    <ref role="3TtcxE" to="wtll:5xEoEMrzSo8" resolve="args" />
-                  </node>
+                  <node concept="3GX2aA" id="5avmkTFCmM1" role="2OqNvi" />
                 </node>
-                <node concept="3GX2aA" id="5avmkTFCmM1" role="2OqNvi" />
               </node>
-            </node>
-            <node concept="3cpWs6" id="5avmkTFCpir" role="3cqZAp">
-              <node concept="10Nm6u" id="5avmkTFCpqE" role="3cqZAk" />
+              <node concept="3cpWs6" id="5avmkTFCpir" role="3cqZAp">
+                <node concept="10Nm6u" id="5avmkTFCpqE" role="3cqZAk" />
+              </node>
             </node>
           </node>
         </node>
@@ -6058,5 +6092,142 @@
       <property role="3F0ifm" value="Workaround to fix contributions to BaseConcept generated by grammarCells." />
     </node>
   </node>
+  <node concept="3ICUPy" id="5tXCpgbx60V">
+    <property role="3GE5qa" value="sheet.ref" />
+    <ref role="aqKnT" to="wtll:5xEoEMrqNzj" resolve="CoordCellRef" />
+    <node concept="1Qtc8_" id="5tXCpgbx67H" role="IW6Ez">
+      <node concept="3eGOoe" id="5tXCpgbx67L" role="1Qtc8$" />
+      <node concept="IWgqT" id="5tXCpgbFy4Q" role="1Qtc8A">
+        <node concept="1hCUdq" id="5tXCpgbFy4S" role="1hCUd6">
+          <node concept="3clFbS" id="5tXCpgbFy4U" role="2VODD2">
+            <node concept="3clFbF" id="5tXCpgbFy7L" role="3cqZAp">
+              <node concept="ub8z3" id="5tXCpgbFy7K" role="3clFbG" />
+            </node>
+          </node>
+        </node>
+        <node concept="IWg2L" id="5tXCpgbFy4W" role="IWgqQ">
+          <node concept="3clFbS" id="5tXCpgbFy4Y" role="2VODD2">
+            <node concept="3clFbF" id="5tXCpgbF$_8" role="3cqZAp">
+              <node concept="37vLTI" id="5tXCpgbF_dG" role="3clFbG">
+                <node concept="ub8z3" id="5tXCpgbF_il" role="37vLTx" />
+                <node concept="2OqwBi" id="5tXCpgbF$Kg" role="37vLTJ">
+                  <node concept="7Obwk" id="5tXCpgbF$_7" role="2Oq$k0" />
+                  <node concept="3TrcHB" id="5tXCpgbF_9r" role="2OqNvi">
+                    <ref role="3TsBF5" to="wtll:5avmkTFcWo6" resolve="cell" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cqGtN" id="5tXCpgbF_lm" role="2jZA2a">
+          <node concept="3cqJkl" id="5tXCpgbF_ln" role="3cqGtW">
+            <node concept="3clFbS" id="5tXCpgbF_lo" role="2VODD2">
+              <node concept="3clFbF" id="5tXCpgbF_qt" role="3cqZAp">
+                <node concept="Xl_RD" id="5tXCpgbF_qs" role="3clFbG">
+                  <property role="Xl_RC" value="coordinate" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="27VH4U" id="5tXCpgbGuMZ" role="2jiSrf">
+          <node concept="3clFbS" id="5tXCpgbGuN0" role="2VODD2">
+            <node concept="3clFbF" id="5tXCpgbGuRp" role="3cqZAp">
+              <node concept="1Wc70l" id="5tXCpgbHuE_" role="3clFbG">
+                <node concept="2YIFZM" id="5tXCpgbHuKR" role="3uHU7w">
+                  <ref role="1Pybhc" to="ykok:~ModelConstraints" resolve="ModelConstraints" />
+                  <ref role="37wK5l" to="ykok:~ModelConstraints.validatePropertyValue(org.jetbrains.mps.openapi.model.SNode,org.jetbrains.mps.openapi.language.SProperty,java.lang.Object,jetbrains.mps.smodel.runtime.CheckingNodeContext)" resolve="validatePropertyValue" />
+                  <node concept="7Obwk" id="5tXCpgbHv$b" role="37wK5m" />
+                  <node concept="355D3s" id="5tXCpgbHvSq" role="37wK5m">
+                    <ref role="355D3t" to="wtll:5xEoEMrqNzj" resolve="CoordCellRef" />
+                    <ref role="355D3u" to="wtll:5avmkTFcWo6" resolve="cell" />
+                  </node>
+                  <node concept="ub8z3" id="5tXCpgbHwg$" role="37wK5m" />
+                  <node concept="10Nm6u" id="5tXCpgbHwgL" role="37wK5m" />
+                </node>
+                <node concept="2OqwBi" id="5tXCpgbGv0i" role="3uHU7B">
+                  <node concept="ub8z3" id="5tXCpgbGuRo" role="2Oq$k0" />
+                  <node concept="17RvpY" id="5tXCpgbGvsx" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3c8P5G" id="5tXCpgbx67O" role="1Qtc8A">
+        <node concept="2kknPJ" id="5tXCpgbx684" role="3c8P5H">
+          <ref role="2ZyFGn" to="wtll:3pIANU$T$67" resolve="AbstractSheetFinder" />
+        </node>
+        <node concept="3c8PGw" id="5tXCpgbx67Q" role="3c8PHt">
+          <node concept="3clFbS" id="5tXCpgbx67R" role="2VODD2">
+            <node concept="3clFbF" id="5tXCpgbx689" role="3cqZAp">
+              <node concept="37vLTI" id="5tXCpgbx7c_" role="3clFbG">
+                <node concept="2OqwBi" id="5tXCpgbx6jh" role="37vLTJ">
+                  <node concept="7Obwk" id="5tXCpgbx688" role="2Oq$k0" />
+                  <node concept="3TrEf2" id="5tXCpgbx6Ha" role="2OqNvi">
+                    <ref role="3Tt5mk" to="wtll:3pIANU$T$6B" resolve="finder" />
+                  </node>
+                </node>
+                <node concept="3c8USq" id="5tXCpgby3HU" role="37vLTx" />
+              </node>
+            </node>
+            <node concept="3clFbF" id="5tXCpgbATag" role="3cqZAp">
+              <node concept="2OqwBi" id="5tXCpgbATgd" role="3clFbG">
+                <node concept="1Q80Hx" id="5tXCpgbATaf" role="2Oq$k0" />
+                <node concept="liA8E" id="5tXCpgbATrA" role="2OqNvi">
+                  <ref role="37wK5l" to="cj4x:~EditorContext.selectWRTFocusPolicy(org.jetbrains.mps.openapi.model.SNode)" resolve="selectWRTFocusPolicy" />
+                  <node concept="7Obwk" id="5tXCpgbATrY" role="37wK5m" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cqGtN" id="5tXCpgbCM0m" role="2jZA2a">
+          <node concept="3cqJkl" id="5tXCpgbCM0n" role="3cqGtW">
+            <node concept="3clFbS" id="5tXCpgbCM0o" role="2VODD2">
+              <node concept="3cpWs6" id="5tXCpgbJyRp" role="3cqZAp">
+                <node concept="3K4zz7" id="5tXCpgbJ_AW" role="3cqZAk">
+                  <node concept="3y3z36" id="5tXCpgbJ$Yx" role="3K4Cdx">
+                    <node concept="10Nm6u" id="5tXCpgbJ_yU" role="3uHU7w" />
+                    <node concept="2OqwBi" id="5tXCpgbJ$6S" role="3uHU7B">
+                      <node concept="7Obwk" id="5tXCpgbJySk" role="2Oq$k0" />
+                      <node concept="3TrcHB" id="5tXCpgbJ$8K" role="2OqNvi">
+                        <ref role="3TsBF5" to="wtll:5avmkTFcWo6" resolve="cell" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3cpWs3" id="5tXCpgbCMAw" role="3K4E3e">
+                    <node concept="2OqwBi" id="5tXCpgbCMN1" role="3uHU7w">
+                      <node concept="7Obwk" id="5tXCpgbCMBm" role="2Oq$k0" />
+                      <node concept="3TrcHB" id="5tXCpgbCNl0" role="2OqNvi">
+                        <ref role="3TsBF5" to="wtll:5avmkTFcWo6" resolve="cell" />
+                      </node>
+                    </node>
+                    <node concept="3cpWs3" id="5tXCpgbDHp4" role="3uHU7B">
+                      <node concept="Xl_RD" id="5tXCpgbCMnU" role="3uHU7w">
+                        <property role="Xl_RC" value="/" />
+                      </node>
+                      <node concept="2OqwBi" id="5tXCpgbDIfF" role="3uHU7B">
+                        <node concept="3jrdc4" id="5tXCpgbDIak" role="2Oq$k0" />
+                        <node concept="3j5asI" id="5tXCpgbDIsr" role="2OqNvi" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="5tXCpgbJ_K1" role="3K4GZi">
+                    <node concept="3jrdc4" id="5tXCpgbJ_K2" role="2Oq$k0" />
+                    <node concept="3j5asI" id="5tXCpgbJ_K3" role="2OqNvi" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="22hDWg" id="5tXCpgbx61V" role="22hAXT">
+      <property role="TrG5h" value="Finders" />
+    </node>
+  </node>
 </model>
 

From ad0194d7a0956401a0d636b7931545f28d4f9e37 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Mon, 25 Jul 2022 12:45:58 +0200
Subject: [PATCH 3/4] Improve CoordCellRef editor + add editor tests for
 optional finder

---
 .../org/iets3/core/expr/repl/editor.mps       | 281 +++++-----
 .../org/iets3/opensource/build/build.mps      |   6 +-
 .../models/test.ts.expr.os.sheets@tests.mps   | 506 ++++++++++++++++++
 .../tests/test.ts.expr.os/test.ts.expr.os.msd |   2 +
 4 files changed, 643 insertions(+), 152 deletions(-)
 create mode 100644 code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test.ts.expr.os.sheets@tests.mps

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/editor.mps
index ff58248f07..6236bdcd9f 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/editor.mps
@@ -5028,162 +5028,160 @@
   <node concept="24kQdi" id="5xEoEMrqNzH">
     <property role="3GE5qa" value="sheet.ref" />
     <ref role="1XX52x" to="wtll:5xEoEMrqNzj" resolve="CoordCellRef" />
-    <node concept="3EZMnI" id="5tXCpgboXH9" role="2wV5jI">
-      <node concept="2iRkQZ" id="5tXCpgboXHa" role="2iSdaV" />
-      <node concept="3EZMnI" id="5xEoEMrFDD9" role="3EZMnx">
-        <node concept="2iRfu4" id="5xEoEMrFDDa" role="2iSdaV" />
-        <node concept="3F0ifn" id="5xEoEMrqNzJ" role="3EZMnx">
-          <property role="3F0ifm" value="$" />
-          <node concept="11L4FC" id="3pIANU$W0tA" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-            <node concept="3nzxsE" id="3pIANU$W0_L" role="3n$kyP">
-              <node concept="3clFbS" id="3pIANU$W0_M" role="2VODD2">
-                <node concept="3clFbF" id="3pIANU$W0GW" role="3cqZAp">
-                  <node concept="3y3z36" id="3pIANU$W1Tq" role="3clFbG">
-                    <node concept="10Nm6u" id="3pIANU$W23e" role="3uHU7w" />
-                    <node concept="2OqwBi" id="3pIANU$W0Wh" role="3uHU7B">
-                      <node concept="pncrf" id="3pIANU$W0GV" role="2Oq$k0" />
-                      <node concept="3TrEf2" id="3pIANU$W1lx" role="2OqNvi">
-                        <ref role="3Tt5mk" to="wtll:3pIANU$T$6B" resolve="finder" />
-                      </node>
+    <node concept="3EZMnI" id="5xEoEMrFDD9" role="2wV5jI">
+      <node concept="2iRfu4" id="5xEoEMrFDDa" role="2iSdaV" />
+      <node concept="3F0ifn" id="5xEoEMrqNzJ" role="3EZMnx">
+        <property role="3F0ifm" value="$" />
+        <node concept="11L4FC" id="3pIANU$W0tA" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+          <node concept="3nzxsE" id="3pIANU$W0_L" role="3n$kyP">
+            <node concept="3clFbS" id="3pIANU$W0_M" role="2VODD2">
+              <node concept="3clFbF" id="3pIANU$W0GW" role="3cqZAp">
+                <node concept="3y3z36" id="3pIANU$W1Tq" role="3clFbG">
+                  <node concept="10Nm6u" id="3pIANU$W23e" role="3uHU7w" />
+                  <node concept="2OqwBi" id="3pIANU$W0Wh" role="3uHU7B">
+                    <node concept="pncrf" id="3pIANU$W0GV" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="3pIANU$W1lx" role="2OqNvi">
+                      <ref role="3Tt5mk" to="wtll:3pIANU$T$6B" resolve="finder" />
                     </node>
                   </node>
                 </node>
               </node>
             </node>
           </node>
-          <node concept="11LMrY" id="5xEoEMrqN$M" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
-          <node concept="3k4GqR" id="5xEoEMruHWv" role="3F10Kt">
-            <node concept="3k4GqP" id="5xEoEMruHWw" role="3k4GqO">
-              <node concept="3clFbS" id="5xEoEMruHWx" role="2VODD2">
-                <node concept="3clFbF" id="5xEoEMruIVR" role="3cqZAp">
-                  <node concept="2OqwBi" id="5xEoEMruIVT" role="3clFbG">
-                    <node concept="pncrf" id="5xEoEMruIVU" role="2Oq$k0" />
-                    <node concept="2qgKlT" id="5xEoEMrEFUC" role="2OqNvi">
-                      <ref role="37wK5l" to="31n1:5xEoEMrDTcu" resolve="resolve" />
-                    </node>
+        </node>
+        <node concept="11LMrY" id="5xEoEMrqN$M" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="3k4GqR" id="5xEoEMruHWv" role="3F10Kt">
+          <node concept="3k4GqP" id="5xEoEMruHWw" role="3k4GqO">
+            <node concept="3clFbS" id="5xEoEMruHWx" role="2VODD2">
+              <node concept="3clFbF" id="5xEoEMruIVR" role="3cqZAp">
+                <node concept="2OqwBi" id="5xEoEMruIVT" role="3clFbG">
+                  <node concept="pncrf" id="5xEoEMruIVU" role="2Oq$k0" />
+                  <node concept="2qgKlT" id="5xEoEMrEFUC" role="2OqNvi">
+                    <ref role="37wK5l" to="31n1:5xEoEMrDTcu" resolve="resolve" />
                   </node>
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3EZMnI" id="5tXCpgbyXWv" role="3EZMnx">
-          <node concept="2iRfu4" id="5tXCpgbyXWw" role="2iSdaV" />
-          <node concept="3F1sOY" id="5tXCpgbyXQV" role="3EZMnx">
-            <ref role="1NtTu8" to="wtll:3pIANU$T$6B" resolve="finder" />
+      </node>
+      <node concept="3EZMnI" id="5tXCpgbyXWv" role="3EZMnx">
+        <node concept="2iRfu4" id="5tXCpgbyXWw" role="2iSdaV" />
+        <node concept="3F1sOY" id="5tXCpgbyXQV" role="3EZMnx">
+          <ref role="1NtTu8" to="wtll:3pIANU$T$6B" resolve="finder" />
+        </node>
+        <node concept="3F0ifn" id="5tXCpgbyY29" role="3EZMnx">
+          <property role="3F0ifm" value="/" />
+          <node concept="11L4FC" id="5tXCpgbyY2d" role="3F10Kt">
+            <property role="VOm3f" value="true" />
           </node>
-          <node concept="3F0ifn" id="5tXCpgbyY29" role="3EZMnx">
-            <property role="3F0ifm" value="/" />
-            <node concept="11L4FC" id="5tXCpgbyY2d" role="3F10Kt">
-              <property role="VOm3f" value="true" />
-            </node>
-            <node concept="11LMrY" id="5tXCpgbyY2i" role="3F10Kt">
-              <property role="VOm3f" value="true" />
-            </node>
+          <node concept="11LMrY" id="5tXCpgbyY2i" role="3F10Kt">
+            <property role="VOm3f" value="true" />
           </node>
-          <node concept="pkWqt" id="5tXCpgbyY2m" role="pqm2j">
-            <node concept="3clFbS" id="5tXCpgbyY2n" role="2VODD2">
-              <node concept="3clFbF" id="5tXCpgbyY6i" role="3cqZAp">
-                <node concept="2OqwBi" id="5tXCpgbyYWu" role="3clFbG">
-                  <node concept="2OqwBi" id="5tXCpgbyYn$" role="2Oq$k0">
-                    <node concept="pncrf" id="5tXCpgbyY6h" role="2Oq$k0" />
-                    <node concept="3TrEf2" id="5tXCpgbyYM5" role="2OqNvi">
-                      <ref role="3Tt5mk" to="wtll:3pIANU$T$6B" resolve="finder" />
-                    </node>
+        </node>
+        <node concept="pkWqt" id="5tXCpgbyY2m" role="pqm2j">
+          <node concept="3clFbS" id="5tXCpgbyY2n" role="2VODD2">
+            <node concept="3clFbF" id="5tXCpgbyY6i" role="3cqZAp">
+              <node concept="2OqwBi" id="5tXCpgbyYWu" role="3clFbG">
+                <node concept="2OqwBi" id="5tXCpgbyYn$" role="2Oq$k0">
+                  <node concept="pncrf" id="5tXCpgbyY6h" role="2Oq$k0" />
+                  <node concept="3TrEf2" id="5tXCpgbyYM5" role="2OqNvi">
+                    <ref role="3Tt5mk" to="wtll:3pIANU$T$6B" resolve="finder" />
                   </node>
-                  <node concept="3x8VRR" id="5tXCpgbyZgO" role="2OqNvi" />
                 </node>
+                <node concept="3x8VRR" id="5tXCpgbyZgO" role="2OqNvi" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3F0A7n" id="5avmkTFcXRb" role="3EZMnx">
-          <ref role="1NtTu8" to="wtll:5avmkTFcWo6" resolve="cell" />
-          <node concept="3k4GqR" id="5avmkTFeTnD" role="3F10Kt">
-            <node concept="3k4GqP" id="5avmkTFeTnE" role="3k4GqO">
-              <node concept="3clFbS" id="5avmkTFeTnF" role="2VODD2">
-                <node concept="3clFbF" id="5avmkTFeTCk" role="3cqZAp">
-                  <node concept="2OqwBi" id="5avmkTFeTOD" role="3clFbG">
-                    <node concept="pncrf" id="5avmkTFeTCj" role="2Oq$k0" />
-                    <node concept="2qgKlT" id="5avmkTFeUgL" role="2OqNvi">
-                      <ref role="37wK5l" to="31n1:5xEoEMrDTcu" resolve="resolve" />
-                    </node>
+      </node>
+      <node concept="3F0A7n" id="5avmkTFcXRb" role="3EZMnx">
+        <property role="1cu_pB" value="gtguBGO/firstEditableCell" />
+        <ref role="1NtTu8" to="wtll:5avmkTFcWo6" resolve="cell" />
+        <node concept="3k4GqR" id="5avmkTFeTnD" role="3F10Kt">
+          <node concept="3k4GqP" id="5avmkTFeTnE" role="3k4GqO">
+            <node concept="3clFbS" id="5avmkTFeTnF" role="2VODD2">
+              <node concept="3clFbF" id="5avmkTFeTCk" role="3cqZAp">
+                <node concept="2OqwBi" id="5avmkTFeTOD" role="3clFbG">
+                  <node concept="pncrf" id="5avmkTFeTCj" role="2Oq$k0" />
+                  <node concept="2qgKlT" id="5avmkTFeUgL" role="2OqNvi">
+                    <ref role="37wK5l" to="31n1:5xEoEMrDTcu" resolve="resolve" />
                   </node>
                 </node>
               </node>
             </node>
           </node>
-          <node concept="11L4FC" id="5tXCpgbzTTD" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
-          <node concept="3CHQLq" id="5tXCpgbzU2s" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
-          <node concept="A1WHu" id="5tXCpgb_Vg2" role="3vIgyS">
-            <ref role="A1WHt" node="5tXCpgbx60V" resolve="Finders" />
-          </node>
         </node>
-        <node concept="PMmxH" id="5xEoEMrFEc$" role="3EZMnx">
-          <ref role="PMmxG" node="5xEoEMrFs7i" resolve="argList" />
-          <node concept="pkWqt" id="5xEoEMrFEc_" role="pqm2j">
-            <node concept="3clFbS" id="5xEoEMrFEcA" role="2VODD2">
-              <node concept="3clFbF" id="5xEoEMrFEcB" role="3cqZAp">
-                <node concept="2OqwBi" id="5xEoEMrFEcC" role="3clFbG">
-                  <node concept="pncrf" id="5xEoEMrFEcD" role="2Oq$k0" />
-                  <node concept="2qgKlT" id="5xEoEMrFEcE" role="2OqNvi">
-                    <ref role="37wK5l" to="31n1:5xEoEMrFtHl" resolve="needsActuals" />
-                  </node>
+        <node concept="11L4FC" id="5tXCpgbzTTD" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="3CHQLq" id="5tXCpgbzU2s" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="A1WHu" id="5tXCpgb_Vg2" role="3vIgyS">
+          <ref role="A1WHt" node="5tXCpgbx60V" resolve="Finders" />
+        </node>
+      </node>
+      <node concept="PMmxH" id="5xEoEMrFEc$" role="3EZMnx">
+        <ref role="PMmxG" node="5xEoEMrFs7i" resolve="argList" />
+        <node concept="pkWqt" id="5xEoEMrFEc_" role="pqm2j">
+          <node concept="3clFbS" id="5xEoEMrFEcA" role="2VODD2">
+            <node concept="3clFbF" id="5xEoEMrFEcB" role="3cqZAp">
+              <node concept="2OqwBi" id="5xEoEMrFEcC" role="3clFbG">
+                <node concept="pncrf" id="5xEoEMrFEcD" role="2Oq$k0" />
+                <node concept="2qgKlT" id="5xEoEMrFEcE" role="2OqNvi">
+                  <ref role="37wK5l" to="31n1:5xEoEMrFtHl" resolve="needsActuals" />
                 </node>
               </node>
             </node>
           </node>
-          <node concept="11L4FC" id="5xEoEMrGg7L" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
         </node>
-        <node concept="Veino" id="5avmkTFCmpY" role="3F10Kt">
-          <node concept="3ZlJ5R" id="5avmkTFCmEQ" role="VblUZ">
-            <node concept="3clFbS" id="5avmkTFCmER" role="2VODD2">
-              <node concept="3clFbJ" id="5avmkTFCmLP" role="3cqZAp">
-                <node concept="3clFbS" id="5avmkTFCmLQ" role="3clFbx">
-                  <node concept="3cpWs6" id="5avmkTFCmLR" role="3cqZAp">
-                    <node concept="2ShNRf" id="5avmkTFCmLS" role="3cqZAk">
-                      <node concept="1pGfFk" id="5avmkTFCmLT" role="2ShVmc">
-                        <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
-                        <node concept="3cmrfG" id="5avmkTFCmLU" role="37wK5m">
-                          <property role="3cmrfH" value="224" />
-                        </node>
-                        <node concept="3cmrfG" id="5avmkTFCmLV" role="37wK5m">
-                          <property role="3cmrfH" value="247" />
-                        </node>
-                        <node concept="3cmrfG" id="5avmkTFCmLW" role="37wK5m">
-                          <property role="3cmrfH" value="255" />
-                        </node>
+        <node concept="11L4FC" id="5xEoEMrGg7L" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+      </node>
+      <node concept="Veino" id="5avmkTFCmpY" role="3F10Kt">
+        <node concept="3ZlJ5R" id="5avmkTFCmEQ" role="VblUZ">
+          <node concept="3clFbS" id="5avmkTFCmER" role="2VODD2">
+            <node concept="3clFbJ" id="5avmkTFCmLP" role="3cqZAp">
+              <node concept="3clFbS" id="5avmkTFCmLQ" role="3clFbx">
+                <node concept="3cpWs6" id="5avmkTFCmLR" role="3cqZAp">
+                  <node concept="2ShNRf" id="5avmkTFCmLS" role="3cqZAk">
+                    <node concept="1pGfFk" id="5avmkTFCmLT" role="2ShVmc">
+                      <ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
+                      <node concept="3cmrfG" id="5avmkTFCmLU" role="37wK5m">
+                        <property role="3cmrfH" value="224" />
+                      </node>
+                      <node concept="3cmrfG" id="5avmkTFCmLV" role="37wK5m">
+                        <property role="3cmrfH" value="247" />
+                      </node>
+                      <node concept="3cmrfG" id="5avmkTFCmLW" role="37wK5m">
+                        <property role="3cmrfH" value="255" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="2OqwBi" id="5avmkTFCmLX" role="3clFbw">
-                  <node concept="2OqwBi" id="5avmkTFCoe4" role="2Oq$k0">
-                    <node concept="2OqwBi" id="5avmkTFCmLY" role="2Oq$k0">
-                      <node concept="pncrf" id="5avmkTFCmLZ" role="2Oq$k0" />
-                      <node concept="2qgKlT" id="5avmkTFCnUB" role="2OqNvi">
-                        <ref role="37wK5l" to="31n1:5xEoEMrDTcu" resolve="resolve" />
-                      </node>
-                    </node>
-                    <node concept="3Tsc0h" id="5avmkTFCoKO" role="2OqNvi">
-                      <ref role="3TtcxE" to="wtll:5xEoEMrzSo8" resolve="args" />
+              </node>
+              <node concept="2OqwBi" id="5avmkTFCmLX" role="3clFbw">
+                <node concept="2OqwBi" id="5avmkTFCoe4" role="2Oq$k0">
+                  <node concept="2OqwBi" id="5avmkTFCmLY" role="2Oq$k0">
+                    <node concept="pncrf" id="5avmkTFCmLZ" role="2Oq$k0" />
+                    <node concept="2qgKlT" id="5avmkTFCnUB" role="2OqNvi">
+                      <ref role="37wK5l" to="31n1:5xEoEMrDTcu" resolve="resolve" />
                     </node>
                   </node>
-                  <node concept="3GX2aA" id="5avmkTFCmM1" role="2OqNvi" />
+                  <node concept="3Tsc0h" id="5avmkTFCoKO" role="2OqNvi">
+                    <ref role="3TtcxE" to="wtll:5xEoEMrzSo8" resolve="args" />
+                  </node>
                 </node>
+                <node concept="3GX2aA" id="5avmkTFCmM1" role="2OqNvi" />
               </node>
-              <node concept="3cpWs6" id="5avmkTFCpir" role="3cqZAp">
-                <node concept="10Nm6u" id="5avmkTFCpqE" role="3cqZAk" />
-              </node>
+            </node>
+            <node concept="3cpWs6" id="5avmkTFCpir" role="3cqZAp">
+              <node concept="10Nm6u" id="5avmkTFCpqE" role="3cqZAk" />
             </node>
           </node>
         </node>
@@ -6172,6 +6170,19 @@
                 <node concept="3c8USq" id="5tXCpgby3HU" role="37vLTx" />
               </node>
             </node>
+            <node concept="3clFbF" id="3JvidvJG3bm" role="3cqZAp">
+              <node concept="37vLTI" id="3JvidvJG43b" role="3clFbG">
+                <node concept="Xl_RD" id="3JvidvJG48v" role="37vLTx">
+                  <property role="Xl_RC" value="" />
+                </node>
+                <node concept="2OqwBi" id="3JvidvJG3n3" role="37vLTJ">
+                  <node concept="7Obwk" id="3JvidvJG3bl" role="2Oq$k0" />
+                  <node concept="3TrcHB" id="3JvidvJG3KD" role="2OqNvi">
+                    <ref role="3TsBF5" to="wtll:5avmkTFcWo6" resolve="cell" />
+                  </node>
+                </node>
+              </node>
+            </node>
             <node concept="3clFbF" id="5tXCpgbATag" role="3cqZAp">
               <node concept="2OqwBi" id="5tXCpgbATgd" role="3clFbG">
                 <node concept="1Q80Hx" id="5tXCpgbATaf" role="2Oq$k0" />
@@ -6186,38 +6197,10 @@
         <node concept="3cqGtN" id="5tXCpgbCM0m" role="2jZA2a">
           <node concept="3cqJkl" id="5tXCpgbCM0n" role="3cqGtW">
             <node concept="3clFbS" id="5tXCpgbCM0o" role="2VODD2">
-              <node concept="3cpWs6" id="5tXCpgbJyRp" role="3cqZAp">
-                <node concept="3K4zz7" id="5tXCpgbJ_AW" role="3cqZAk">
-                  <node concept="3y3z36" id="5tXCpgbJ$Yx" role="3K4Cdx">
-                    <node concept="10Nm6u" id="5tXCpgbJ_yU" role="3uHU7w" />
-                    <node concept="2OqwBi" id="5tXCpgbJ$6S" role="3uHU7B">
-                      <node concept="7Obwk" id="5tXCpgbJySk" role="2Oq$k0" />
-                      <node concept="3TrcHB" id="5tXCpgbJ$8K" role="2OqNvi">
-                        <ref role="3TsBF5" to="wtll:5avmkTFcWo6" resolve="cell" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3cpWs3" id="5tXCpgbCMAw" role="3K4E3e">
-                    <node concept="2OqwBi" id="5tXCpgbCMN1" role="3uHU7w">
-                      <node concept="7Obwk" id="5tXCpgbCMBm" role="2Oq$k0" />
-                      <node concept="3TrcHB" id="5tXCpgbCNl0" role="2OqNvi">
-                        <ref role="3TsBF5" to="wtll:5avmkTFcWo6" resolve="cell" />
-                      </node>
-                    </node>
-                    <node concept="3cpWs3" id="5tXCpgbDHp4" role="3uHU7B">
-                      <node concept="Xl_RD" id="5tXCpgbCMnU" role="3uHU7w">
-                        <property role="Xl_RC" value="/" />
-                      </node>
-                      <node concept="2OqwBi" id="5tXCpgbDIfF" role="3uHU7B">
-                        <node concept="3jrdc4" id="5tXCpgbDIak" role="2Oq$k0" />
-                        <node concept="3j5asI" id="5tXCpgbDIsr" role="2OqNvi" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="2OqwBi" id="5tXCpgbJ_K1" role="3K4GZi">
-                    <node concept="3jrdc4" id="5tXCpgbJ_K2" role="2Oq$k0" />
-                    <node concept="3j5asI" id="5tXCpgbJ_K3" role="2OqNvi" />
-                  </node>
+              <node concept="3clFbF" id="3JvidvJF51D" role="3cqZAp">
+                <node concept="2OqwBi" id="5tXCpgbDIfF" role="3clFbG">
+                  <node concept="3jrdc4" id="5tXCpgbDIak" role="2Oq$k0" />
+                  <node concept="3j5asI" id="5tXCpgbDIsr" role="2OqNvi" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
index 5d39be13a2..3ba0c28460 100755
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
@@ -9652,6 +9652,9 @@
         <node concept="1E0d5M" id="2xddOZL76P6" role="1E1XAP">
           <ref role="1E0d5P" node="7jAOwAVRc2S" resolve="org.iets3.core.expr.simpleTypes.runtime" />
         </node>
+        <node concept="1E0d5M" id="2IeAAg0yr_m" role="1E1XAP">
+          <ref role="1E0d5P" node="5Nr2ndjUDzy" resolve="org.iets3.core.expr.collections.rt" />
+        </node>
         <node concept="1SiIV0" id="4W3jsc44qIn" role="3bR37C">
           <node concept="Rbm2T" id="4W3jsc44qIo" role="1SiIV1">
             <ref role="1E1Vl2" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
@@ -9667,9 +9670,6 @@
             <ref role="1E1Vl2" to="ffeo:7Kfy9QB6L0h" resolve="jetbrains.mps.baseLanguage.collections" />
           </node>
         </node>
-        <node concept="1E0d5M" id="2IeAAg0yr_m" role="1E1XAP">
-          <ref role="1E0d5P" node="5Nr2ndjUDzy" resolve="org.iets3.core.expr.collections.rt" />
-        </node>
       </node>
       <node concept="1E1JtD" id="26tZ$Z4qWbm" role="2G$12L">
         <property role="BnDLt" value="true" />
diff --git a/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test.ts.expr.os.sheets@tests.mps b/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test.ts.expr.os.sheets@tests.mps
new file mode 100644
index 0000000000..72e4e24d6e
--- /dev/null
+++ b/code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test.ts.expr.os.sheets@tests.mps
@@ -0,0 +1,506 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:0e2473af-039d-4849-a5b5-d6e35554df3d(test.ts.expr.os.sheets@tests)">
+  <persistence version="9" />
+  <languages>
+    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="5" />
+    <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
+    <use id="18001c94-33a7-4f68-a7c1-ffddc4b39be1" name="org.iets3.core.expr.repl" version="0" />
+    <devkit ref="c4e521ab-b605-4ef9-a7c3-68075da058f0(org.iets3.core.expr.core.devkit)" />
+  </languages>
+  <imports>
+    <import index="ekwn" ref="r:9832fb5f-2578-4b58-8014-a5de79da988e(jetbrains.mps.ide.editor.actions)" />
+  </imports>
+  <registry>
+    <language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
+      <concept id="1228934484974" name="jetbrains.mps.lang.test.structure.PressKeyStatement" flags="nn" index="yd1bK">
+        <child id="1228934507814" name="keyStrokes" index="yd6KS" />
+      </concept>
+      <concept id="7011073693661765739" name="jetbrains.mps.lang.test.structure.InvokeActionStatement" flags="nn" index="2HxZob">
+        <child id="1101347953350127927" name="actionReference" index="3iKnsn" />
+      </concept>
+      <concept id="1229187653856" name="jetbrains.mps.lang.test.structure.EditorTestCase" flags="lg" index="LiM7Y">
+        <child id="3143335925185262946" name="testNodeBefore" index="25YQCW" />
+        <child id="3143335925185262981" name="testNodeResult" index="25YQFr" />
+        <child id="1229187755283" name="code" index="LjaKd" />
+      </concept>
+      <concept id="1229194968594" name="jetbrains.mps.lang.test.structure.AnonymousCellAnnotation" flags="ng" index="LIFWc">
+        <property id="6268941039745498163" name="selectionStart" index="p6zMq" />
+        <property id="6268941039745498165" name="selectionEnd" index="p6zMs" />
+        <property id="1229194968596" name="caretPosition" index="LIFWa" />
+        <property id="1229194968595" name="cellId" index="LIFWd" />
+        <property id="1932269937152561478" name="useLabelSelection" index="OXtK3" />
+        <property id="1229432188737" name="isLastPosition" index="ZRATv" />
+      </concept>
+      <concept id="1227182079811" name="jetbrains.mps.lang.test.structure.TypeKeyStatement" flags="nn" index="2TK7Tu">
+        <property id="1227184461946" name="keys" index="2TTd_B" />
+      </concept>
+      <concept id="5097124989038916362" name="jetbrains.mps.lang.test.structure.TestInfo" flags="ng" index="2XOHcx">
+        <property id="5097124989038916363" name="projectPath" index="2XOHcw" />
+      </concept>
+      <concept id="4239542196496927193" name="jetbrains.mps.lang.test.structure.MPSActionReference" flags="ng" index="1iFQzN">
+        <reference id="4239542196496929559" name="action" index="1iFR8X" />
+      </concept>
+      <concept id="1216989428737" name="jetbrains.mps.lang.test.structure.TestNode" flags="ng" index="1qefOq">
+        <child id="1216989461394" name="nodeToCheck" index="1qenE9" />
+      </concept>
+    </language>
+    <language id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin">
+      <concept id="1207318242772" name="jetbrains.mps.lang.plugin.structure.KeyMapKeystroke" flags="ng" index="pLAjd">
+        <property id="1207318242774" name="keycode" index="pLAjf" />
+      </concept>
+    </language>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
+        <child id="1068581517665" name="statement" index="3cqZAp" />
+      </concept>
+    </language>
+    <language id="cfaa4966-b7d5-4b69-b66a-309a6e1a7290" name="org.iets3.core.expr.base">
+      <concept id="7425695345928347719" name="org.iets3.core.expr.base.structure.Expression" flags="ng" index="2vmvVl" />
+    </language>
+    <language id="d441fba0-f46b-43cd-b723-dad7b65da615" name="org.iets3.core.expr.tests">
+      <concept id="543569365052056273" name="org.iets3.core.expr.tests.structure.EqualsTestOp" flags="ng" index="_fku$" />
+      <concept id="543569365052056263" name="org.iets3.core.expr.tests.structure.TestCase" flags="ng" index="_fkuM">
+        <child id="543569365052056368" name="items" index="_fkp5" />
+      </concept>
+      <concept id="543569365052056266" name="org.iets3.core.expr.tests.structure.AssertTestItem" flags="ng" index="_fkuZ">
+        <child id="543569365052056302" name="op" index="_fkur" />
+        <child id="543569365052056269" name="expected" index="_fkuS" />
+        <child id="543569365052056267" name="actual" index="_fkuY" />
+      </concept>
+      <concept id="543569365052711055" name="org.iets3.core.expr.tests.structure.TestSuite" flags="ng" index="_iOnU">
+        <property id="7740953487931061385" name="referenceOnlyLocalStuff" index="1XBH2A" />
+        <child id="543569365052711058" name="contents" index="_iOnB" />
+      </concept>
+    </language>
+    <language id="6b277d9a-d52d-416f-a209-1919bd737f50" name="org.iets3.core.expr.simpleTypes">
+      <concept id="5115872837157054170" name="org.iets3.core.expr.simpleTypes.structure.NumberLiteral" flags="ng" index="30bXRB">
+        <property id="5115872837157054173" name="value" index="30bXRw" />
+      </concept>
+    </language>
+    <language id="71934284-d7d1-45ee-a054-8c072591085f" name="org.iets3.core.expr.toplevel">
+      <concept id="543569365052765011" name="org.iets3.core.expr.toplevel.structure.EmptyToplevelContent" flags="ng" index="_ixoA" />
+    </language>
+    <language id="18001c94-33a7-4f68-a7c1-ffddc4b39be1" name="org.iets3.core.expr.repl">
+      <concept id="3922243018845679935" name="org.iets3.core.expr.repl.structure.NamedSheetFinder" flags="ng" index="2joYC1">
+        <reference id="3922243018845679964" name="sheet" index="2joYDy" />
+      </concept>
+      <concept id="4767524222579030357" name="org.iets3.core.expr.repl.structure.SheetEmbedExpr" flags="ng" index="yNhXg">
+        <property id="4767524222579031187" name="rows" index="yNhEm" />
+        <property id="4767524222579031186" name="cols" index="yNhEn" />
+        <child id="4767524222579031467" name="sheet" index="yNhII" />
+      </concept>
+      <concept id="6371013116350380243" name="org.iets3.core.expr.repl.structure.CoordCellRef" flags="ng" index="330lDZ">
+        <property id="5953575425747961350" name="cell" index="TF9X8" />
+      </concept>
+      <concept id="6371013116349131336" name="org.iets3.core.expr.repl.structure.Cell" flags="ng" index="33c$z$">
+        <property id="4767524222579496545" name="result" index="yKB1$" />
+        <child id="6371013116349198040" name="expr" index="33cOLO" />
+      </concept>
+      <concept id="6371013116349123787" name="org.iets3.core.expr.repl.structure.Sheet" flags="ng" index="33cATB">
+        <property id="5953575425754185855" name="NUM_COLS" index="T3p$L" />
+        <property id="5953575425754185860" name="NUM_ROWS" index="T3pBa" />
+        <property id="5953575425748559551" name="showValues" index="TCVZL" />
+        <property id="6371013116351340119" name="booleansAreChecks" index="334VNV" />
+        <child id="6371013116349426088" name="cells" index="33dGG4" />
+      </concept>
+      <concept id="6371013116354333364" name="org.iets3.core.expr.repl.structure.AbstractCellRef" flags="ng" index="33Nuwo">
+        <child id="3922243018843111847" name="finder" index="2iydEp" />
+      </concept>
+      <concept id="4139771920860714356" name="org.iets3.core.expr.repl.structure.TopLevelSheet" flags="ng" index="3junBk">
+        <child id="4139771920860714362" name="sheet" index="3junBq" />
+      </concept>
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
+        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
+      </concept>
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="LiM7Y" id="3JvidvJD$4d">
+    <property role="TrG5h" value="AddFinderToCoordCellRef" />
+    <node concept="1qefOq" id="3JvidvJDEPQ" role="25YQCW">
+      <node concept="_iOnU" id="3JvidvJDEPO" role="1qenE9">
+        <property role="1XBH2A" value="true" />
+        <property role="TrG5h" value="Test" />
+        <node concept="3junBk" id="3pIANU_2aP$" role="_iOnB">
+          <property role="TrG5h" value="S2" />
+          <node concept="yNhXg" id="3pIANU_2aPA" role="3junBq">
+            <property role="yNhEn" value="3" />
+            <property role="yNhEm" value="3" />
+            <node concept="33cATB" id="3pIANU_2aR_" role="yNhII">
+              <property role="T3p$L" value="3" />
+              <property role="T3pBa" value="3" />
+              <property role="334VNV" value="true" />
+              <property role="TrG5h" value="sheet1519402797765" />
+              <property role="TCVZL" value="true" />
+              <node concept="33c$z$" id="3pIANU_2aRA" role="33dGG4">
+                <node concept="30bXRB" id="3JvidvJDHlv" role="33cOLO">
+                  <property role="30bXRw" value="1" />
+                </node>
+              </node>
+              <node concept="33c$z$" id="3pIANU_2aRB" role="33dGG4">
+                <node concept="30bXRB" id="3JvidvJDHAG" role="33cOLO">
+                  <property role="30bXRw" value="1" />
+                </node>
+              </node>
+              <node concept="33c$z$" id="3pIANU_2aRC" role="33dGG4">
+                <node concept="30bXRB" id="3JvidvJDHNL" role="33cOLO">
+                  <property role="30bXRw" value="1" />
+                </node>
+              </node>
+              <node concept="33c$z$" id="3pIANU_2aRD" role="33dGG4">
+                <node concept="30bXRB" id="3pIANU_6Qmj" role="33cOLO">
+                  <property role="30bXRw" value="1" />
+                </node>
+              </node>
+              <node concept="33c$z$" id="3pIANU_2aRE" role="33dGG4">
+                <node concept="30bXRB" id="3JvidvJDHLr" role="33cOLO">
+                  <property role="30bXRw" value="1" />
+                </node>
+              </node>
+              <node concept="33c$z$" id="3pIANU_2aRF" role="33dGG4">
+                <node concept="30bXRB" id="3JvidvJDHMr" role="33cOLO">
+                  <property role="30bXRw" value="1" />
+                </node>
+              </node>
+              <node concept="33c$z$" id="3pIANU_2aRG" role="33dGG4">
+                <node concept="30bXRB" id="3JvidvJDHPd" role="33cOLO">
+                  <property role="30bXRw" value="1" />
+                </node>
+              </node>
+              <node concept="33c$z$" id="3pIANU_2aRH" role="33dGG4">
+                <property role="yKB1$" value="true" />
+                <node concept="30bXRB" id="1mFXz_FVH8f" role="33cOLO">
+                  <property role="30bXRw" value="1" />
+                </node>
+              </node>
+              <node concept="33c$z$" id="3pIANU_2aRI" role="33dGG4">
+                <node concept="30bXRB" id="3JvidvJDHO_" role="33cOLO">
+                  <property role="30bXRw" value="1" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="_ixoA" id="3JvidvJDHi5" role="_iOnB" />
+        <node concept="_fkuM" id="3JvidvJDEPP" role="_iOnB">
+          <property role="TrG5h" value="testCase" />
+          <node concept="_fkuZ" id="3pIANU_6QwV" role="_fkp5">
+            <node concept="_fku$" id="3pIANU_6QwW" role="_fkur" />
+            <node concept="30bXRB" id="3pIANU_74Oo" role="_fkuS">
+              <property role="30bXRw" value="5" />
+            </node>
+            <node concept="2vmvVl" id="3JvidvJH1nh" role="_fkuY">
+              <node concept="LIFWc" id="3JvidvJH1nw" role="lGtFl">
+                <property role="ZRATv" value="true" />
+                <property role="OXtK3" value="true" />
+                <property role="p6zMq" value="0" />
+                <property role="p6zMs" value="0" />
+                <property role="LIFWd" value="Custom_1ltshm_a0" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3clFbS" id="3JvidvJDHT8" role="LjaKd">
+      <node concept="2TK7Tu" id="3JvidvJE5l5" role="3cqZAp">
+        <property role="2TTd_B" value="$" />
+      </node>
+      <node concept="2TK7Tu" id="3JvidvJDHT7" role="3cqZAp">
+        <property role="2TTd_B" value="S2" />
+      </node>
+      <node concept="2HxZob" id="3JvidvJH2RR" role="3cqZAp">
+        <node concept="1iFQzN" id="3JvidvJH2VH" role="3iKnsn">
+          <ref role="1iFR8X" to="ekwn:2XByp9s_j7f" resolve="Complete" />
+        </node>
+      </node>
+      <node concept="yd1bK" id="3JvidvJH542" role="3cqZAp">
+        <node concept="pLAjd" id="3JvidvJH544" role="yd6KS">
+          <property role="pLAjf" value="VK_ENTER" />
+        </node>
+      </node>
+      <node concept="2TK7Tu" id="3JvidvJDHTl" role="3cqZAp">
+        <property role="2TTd_B" value="A1" />
+      </node>
+      <node concept="3clFbH" id="3JvidvJDHTc" role="3cqZAp" />
+    </node>
+    <node concept="1qefOq" id="3JvidvJDHTv" role="25YQFr">
+      <node concept="_iOnU" id="3JvidvJDHTw" role="1qenE9">
+        <property role="1XBH2A" value="true" />
+        <property role="TrG5h" value="Test" />
+        <node concept="3junBk" id="3JvidvJDHTx" role="_iOnB">
+          <property role="TrG5h" value="S2" />
+          <node concept="yNhXg" id="3JvidvJDHTy" role="3junBq">
+            <property role="yNhEn" value="3" />
+            <property role="yNhEm" value="3" />
+            <node concept="33cATB" id="3JvidvJDHTz" role="yNhII">
+              <property role="T3p$L" value="3" />
+              <property role="T3pBa" value="3" />
+              <property role="334VNV" value="true" />
+              <property role="TrG5h" value="sheet1519402797765" />
+              <property role="TCVZL" value="true" />
+              <node concept="33c$z$" id="3JvidvJDHT$" role="33dGG4">
+                <node concept="30bXRB" id="3JvidvJDHT_" role="33cOLO">
+                  <property role="30bXRw" value="1" />
+                </node>
+              </node>
+              <node concept="33c$z$" id="3JvidvJDHTA" role="33dGG4">
+                <node concept="30bXRB" id="3JvidvJDHTB" role="33cOLO">
+                  <property role="30bXRw" value="1" />
+                </node>
+              </node>
+              <node concept="33c$z$" id="3JvidvJDHTC" role="33dGG4">
+                <node concept="30bXRB" id="3JvidvJDHTD" role="33cOLO">
+                  <property role="30bXRw" value="1" />
+                </node>
+              </node>
+              <node concept="33c$z$" id="3JvidvJDHTE" role="33dGG4">
+                <node concept="30bXRB" id="3JvidvJDHTF" role="33cOLO">
+                  <property role="30bXRw" value="1" />
+                </node>
+              </node>
+              <node concept="33c$z$" id="3JvidvJDHTG" role="33dGG4">
+                <node concept="30bXRB" id="3JvidvJDHTH" role="33cOLO">
+                  <property role="30bXRw" value="1" />
+                </node>
+              </node>
+              <node concept="33c$z$" id="3JvidvJDHTI" role="33dGG4">
+                <node concept="30bXRB" id="3JvidvJDHTJ" role="33cOLO">
+                  <property role="30bXRw" value="1" />
+                </node>
+              </node>
+              <node concept="33c$z$" id="3JvidvJDHTK" role="33dGG4">
+                <node concept="30bXRB" id="3JvidvJDHTL" role="33cOLO">
+                  <property role="30bXRw" value="1" />
+                </node>
+              </node>
+              <node concept="33c$z$" id="3JvidvJDHTM" role="33dGG4">
+                <property role="yKB1$" value="true" />
+                <node concept="30bXRB" id="3JvidvJDHTN" role="33cOLO">
+                  <property role="30bXRw" value="1" />
+                </node>
+              </node>
+              <node concept="33c$z$" id="3JvidvJDHTO" role="33dGG4">
+                <node concept="30bXRB" id="3JvidvJDHTP" role="33cOLO">
+                  <property role="30bXRw" value="1" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="_ixoA" id="3JvidvJDHTQ" role="_iOnB" />
+        <node concept="_fkuM" id="3JvidvJDHTR" role="_iOnB">
+          <property role="TrG5h" value="testCase" />
+          <node concept="_fkuZ" id="3JvidvJDHTS" role="_fkp5">
+            <node concept="_fku$" id="3JvidvJDHTT" role="_fkur" />
+            <node concept="30bXRB" id="3JvidvJDHTU" role="_fkuS">
+              <property role="30bXRw" value="5" />
+            </node>
+            <node concept="330lDZ" id="3JvidvJDK8Y" role="_fkuY">
+              <property role="TF9X8" value="A1" />
+              <node concept="2joYC1" id="3JvidvJDK92" role="2iydEp">
+                <ref role="2joYDy" node="3JvidvJDHTx" resolve="S2" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="2XOHcx" id="4rZeNQ6M9GV">
+    <property role="2XOHcw" value="${iets3.github.opensource.home}/code/languages/org.iets3.opensource" />
+  </node>
+  <node concept="LiM7Y" id="2LepRDoPXVa">
+    <property role="TrG5h" value="AddFinderToCoordCellRef2" />
+    <node concept="1qefOq" id="2LepRDoPXVb" role="25YQCW">
+      <node concept="_iOnU" id="2LepRDoPXVc" role="1qenE9">
+        <property role="1XBH2A" value="true" />
+        <property role="TrG5h" value="Test" />
+        <node concept="3junBk" id="2LepRDoPXVd" role="_iOnB">
+          <property role="TrG5h" value="S2" />
+          <node concept="yNhXg" id="2LepRDoPXVe" role="3junBq">
+            <property role="yNhEn" value="3" />
+            <property role="yNhEm" value="3" />
+            <node concept="33cATB" id="2LepRDoPXVf" role="yNhII">
+              <property role="T3p$L" value="3" />
+              <property role="T3pBa" value="3" />
+              <property role="334VNV" value="true" />
+              <property role="TrG5h" value="sheet1519402797765" />
+              <property role="TCVZL" value="true" />
+              <node concept="33c$z$" id="2LepRDoPXVg" role="33dGG4">
+                <node concept="30bXRB" id="2LepRDoPXVh" role="33cOLO">
+                  <property role="30bXRw" value="1" />
+                </node>
+              </node>
+              <node concept="33c$z$" id="2LepRDoPXVi" role="33dGG4">
+                <node concept="30bXRB" id="2LepRDoPXVj" role="33cOLO">
+                  <property role="30bXRw" value="1" />
+                </node>
+              </node>
+              <node concept="33c$z$" id="2LepRDoPXVk" role="33dGG4">
+                <node concept="30bXRB" id="2LepRDoPXVl" role="33cOLO">
+                  <property role="30bXRw" value="1" />
+                </node>
+              </node>
+              <node concept="33c$z$" id="2LepRDoPXVm" role="33dGG4">
+                <node concept="30bXRB" id="2LepRDoPXVn" role="33cOLO">
+                  <property role="30bXRw" value="1" />
+                </node>
+              </node>
+              <node concept="33c$z$" id="2LepRDoPXVo" role="33dGG4">
+                <node concept="30bXRB" id="2LepRDoPXVp" role="33cOLO">
+                  <property role="30bXRw" value="1" />
+                </node>
+              </node>
+              <node concept="33c$z$" id="2LepRDoPXVq" role="33dGG4">
+                <node concept="30bXRB" id="2LepRDoPXVr" role="33cOLO">
+                  <property role="30bXRw" value="1" />
+                </node>
+              </node>
+              <node concept="33c$z$" id="2LepRDoPXVs" role="33dGG4">
+                <node concept="30bXRB" id="2LepRDoPXVt" role="33cOLO">
+                  <property role="30bXRw" value="1" />
+                </node>
+              </node>
+              <node concept="33c$z$" id="2LepRDoPXVu" role="33dGG4">
+                <property role="yKB1$" value="true" />
+                <node concept="30bXRB" id="2LepRDoPXVv" role="33cOLO">
+                  <property role="30bXRw" value="1" />
+                </node>
+              </node>
+              <node concept="33c$z$" id="2LepRDoPXVw" role="33dGG4">
+                <node concept="30bXRB" id="2LepRDoPXVx" role="33cOLO">
+                  <property role="30bXRw" value="1" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="_ixoA" id="2LepRDoPXVy" role="_iOnB" />
+        <node concept="_fkuM" id="2LepRDoPXVz" role="_iOnB">
+          <property role="TrG5h" value="testCase" />
+          <node concept="_fkuZ" id="2LepRDoPXV$" role="_fkp5">
+            <node concept="_fku$" id="2LepRDoPXV_" role="_fkur" />
+            <node concept="30bXRB" id="2LepRDoPXVA" role="_fkuS">
+              <property role="30bXRw" value="5" />
+            </node>
+            <node concept="330lDZ" id="2LepRDoPY0i" role="_fkuY">
+              <property role="TF9X8" value="A0" />
+              <node concept="LIFWc" id="2LepRDoQ1pc" role="lGtFl">
+                <property role="LIFWa" value="0" />
+                <property role="OXtK3" value="true" />
+                <property role="p6zMq" value="0" />
+                <property role="p6zMs" value="0" />
+                <property role="LIFWd" value="property_cell" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3clFbS" id="2LepRDoPXVD" role="LjaKd">
+      <node concept="2HxZob" id="2LepRDoPXVG" role="3cqZAp">
+        <node concept="1iFQzN" id="2LepRDoPXVH" role="3iKnsn">
+          <ref role="1iFR8X" to="ekwn:2XByp9s_j7f" resolve="Complete" />
+        </node>
+      </node>
+      <node concept="yd1bK" id="2LepRDoPZzS" role="3cqZAp">
+        <node concept="pLAjd" id="2LepRDoPZzT" role="yd6KS">
+          <property role="pLAjf" value="VK_ENTER" />
+        </node>
+      </node>
+      <node concept="2TK7Tu" id="2LepRDoPXVK" role="3cqZAp">
+        <property role="2TTd_B" value="B0" />
+      </node>
+      <node concept="3clFbH" id="2LepRDoPXVL" role="3cqZAp" />
+    </node>
+    <node concept="1qefOq" id="2LepRDoPXVM" role="25YQFr">
+      <node concept="_iOnU" id="2LepRDoPXVN" role="1qenE9">
+        <property role="1XBH2A" value="true" />
+        <property role="TrG5h" value="Test" />
+        <node concept="3junBk" id="2LepRDoPXVO" role="_iOnB">
+          <property role="TrG5h" value="S2" />
+          <node concept="yNhXg" id="2LepRDoPXVP" role="3junBq">
+            <property role="yNhEn" value="3" />
+            <property role="yNhEm" value="3" />
+            <node concept="33cATB" id="2LepRDoPXVQ" role="yNhII">
+              <property role="T3p$L" value="3" />
+              <property role="T3pBa" value="3" />
+              <property role="334VNV" value="true" />
+              <property role="TrG5h" value="sheet1519402797765" />
+              <property role="TCVZL" value="true" />
+              <node concept="33c$z$" id="2LepRDoPXVR" role="33dGG4">
+                <node concept="30bXRB" id="2LepRDoPXVS" role="33cOLO">
+                  <property role="30bXRw" value="1" />
+                </node>
+              </node>
+              <node concept="33c$z$" id="2LepRDoPXVT" role="33dGG4">
+                <node concept="30bXRB" id="2LepRDoPXVU" role="33cOLO">
+                  <property role="30bXRw" value="1" />
+                </node>
+              </node>
+              <node concept="33c$z$" id="2LepRDoPXVV" role="33dGG4">
+                <node concept="30bXRB" id="2LepRDoPXVW" role="33cOLO">
+                  <property role="30bXRw" value="1" />
+                </node>
+              </node>
+              <node concept="33c$z$" id="2LepRDoPXVX" role="33dGG4">
+                <node concept="30bXRB" id="2LepRDoPXVY" role="33cOLO">
+                  <property role="30bXRw" value="1" />
+                </node>
+              </node>
+              <node concept="33c$z$" id="2LepRDoPXVZ" role="33dGG4">
+                <node concept="30bXRB" id="2LepRDoPXW0" role="33cOLO">
+                  <property role="30bXRw" value="1" />
+                </node>
+              </node>
+              <node concept="33c$z$" id="2LepRDoPXW1" role="33dGG4">
+                <node concept="30bXRB" id="2LepRDoPXW2" role="33cOLO">
+                  <property role="30bXRw" value="1" />
+                </node>
+              </node>
+              <node concept="33c$z$" id="2LepRDoPXW3" role="33dGG4">
+                <node concept="30bXRB" id="2LepRDoPXW4" role="33cOLO">
+                  <property role="30bXRw" value="1" />
+                </node>
+              </node>
+              <node concept="33c$z$" id="2LepRDoPXW5" role="33dGG4">
+                <property role="yKB1$" value="true" />
+                <node concept="30bXRB" id="2LepRDoPXW6" role="33cOLO">
+                  <property role="30bXRw" value="1" />
+                </node>
+              </node>
+              <node concept="33c$z$" id="2LepRDoPXW7" role="33dGG4">
+                <node concept="30bXRB" id="2LepRDoPXW8" role="33cOLO">
+                  <property role="30bXRw" value="1" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="_ixoA" id="2LepRDoPXW9" role="_iOnB" />
+        <node concept="_fkuM" id="2LepRDoPXWa" role="_iOnB">
+          <property role="TrG5h" value="testCase" />
+          <node concept="_fkuZ" id="2LepRDoPXWb" role="_fkp5">
+            <node concept="_fku$" id="2LepRDoPXWc" role="_fkur" />
+            <node concept="30bXRB" id="2LepRDoPXWd" role="_fkuS">
+              <property role="30bXRw" value="5" />
+            </node>
+            <node concept="330lDZ" id="2LepRDoPY0a" role="_fkuY">
+              <property role="TF9X8" value="B0" />
+              <node concept="2joYC1" id="2LepRDoPY0C" role="2iydEp">
+                <ref role="2joYDy" node="2LepRDoPXVO" resolve="S2" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+</model>
+
diff --git a/code/languages/org.iets3.opensource/tests/test.ts.expr.os/test.ts.expr.os.msd b/code/languages/org.iets3.opensource/tests/test.ts.expr.os/test.ts.expr.os.msd
index f63b20aa11..a5c409d422 100755
--- a/code/languages/org.iets3.opensource/tests/test.ts.expr.os/test.ts.expr.os.msd
+++ b/code/languages/org.iets3.opensource/tests/test.ts.expr.os/test.ts.expr.os.msd
@@ -30,6 +30,7 @@
     <dependency reexport="false">4621d3e3-b8a3-4bbe-b7ac-234b6e2d1d68(org.iets3.core.expr.temporal)</dependency>
     <dependency reexport="false">289fb12b-7f53-4ef7-bc2e-1ed2c6a7c998(org.iets3.core.expr.datetime)</dependency>
     <dependency reexport="false">9c3cc6fb-ae5e-46d1-ace2-1e08bb47d03d(org.iets3.core.expr.typetags.bindingtime)</dependency>
+    <dependency reexport="false">5b1f863d-65a0-41a6-a801-33896be24202(jetbrains.mps.ide.editor)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
@@ -111,6 +112,7 @@
     <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
     <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
+    <module reference="f61473f9-130f-42f6-b98d-6c438812c2f6(jetbrains.mps.baseLanguage.unitTest)" version="0" />
     <module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
     <module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />

From 09a28d2a5a52e9296bf2f042b41c019c32d8f790 Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Sun, 10 Mar 2024 17:26:24 +0100
Subject: [PATCH 4/4] Run migrations + update the build script

---
 .../models/org/iets3/opensource/build/build.mps              | 5 +++++
 .../tests/test.ts.expr.os/test.ts.expr.os.msd                | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
index 3ba0c28460..5ced0b2526 100755
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
@@ -12992,6 +12992,11 @@
           <ref role="3bR37D" node="2utoDiy1iVD" resolve="org.iets3.core.expr.typetags.bindingtime" />
         </node>
       </node>
+      <node concept="1SiIV0" id="7GRsXVz40NC" role="3bR37C">
+        <node concept="3bR9La" id="7GRsXVz40ND" role="1SiIV1">
+          <ref role="3bR37D" to="ffeo:1TaHNgiIbJ$" resolve="jetbrains.mps.ide.editor" />
+        </node>
+      </node>
     </node>
     <node concept="1E1JtA" id="OJuIQp$d7j" role="3989C9">
       <property role="BnDLt" value="true" />
diff --git a/code/languages/org.iets3.opensource/tests/test.ts.expr.os/test.ts.expr.os.msd b/code/languages/org.iets3.opensource/tests/test.ts.expr.os/test.ts.expr.os.msd
index a5c409d422..4220ff9f44 100755
--- a/code/languages/org.iets3.opensource/tests/test.ts.expr.os/test.ts.expr.os.msd
+++ b/code/languages/org.iets3.opensource/tests/test.ts.expr.os/test.ts.expr.os.msd
@@ -112,7 +112,7 @@
     <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
     <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
-    <module reference="f61473f9-130f-42f6-b98d-6c438812c2f6(jetbrains.mps.baseLanguage.unitTest)" version="0" />
+    <module reference="5b1f863d-65a0-41a6-a801-33896be24202(jetbrains.mps.ide.editor)" version="0" />
     <module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
     <module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />