From 07f342ef0fae3e2392965c547162a7da76b920d3 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Thu, 28 Sep 2023 12:10:23 +0200
Subject: [PATCH] Tests to ensure stable fixes

---
 .../jetbrains.mps.lang.smodelExt.test.msd     |   6 +
 ...jetbrains.mps.lang.smodelExt.test.code.mps | 339 +++++++++++++++++-
 ...ins.mps.lang.smodelExt.test.code@tests.mps |  66 +++-
 3 files changed, 403 insertions(+), 8 deletions(-)

diff --git a/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/jetbrains.mps.lang.smodelExt.test.msd b/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/jetbrains.mps.lang.smodelExt.test.msd
index 28bf8c5d..2224ad4b 100644
--- a/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/jetbrains.mps.lang.smodelExt.test.msd
+++ b/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/jetbrains.mps.lang.smodelExt.test.msd
@@ -22,6 +22,8 @@
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
     <dependency reexport="false">7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)</dependency>
+    <dependency reexport="false">6b3888c1-9802-44d8-8baf-f8e6c33ed689(jetbrains.mps.kotlin)</dependency>
+    <dependency reexport="false">9e4ff22b-60f1-43ef-a50b-f9f0fcec22e0(jetbrains.mps.kotlin.javaRefs)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -62,8 +64,11 @@
     <module reference="66887915-4d9e-4e24-bd35-19eb55fb75c2(jetbrains.mps.coderules.ideaplugin)" version="0" />
     <module reference="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" version="0" />
     <module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" version="0" />
+    <module reference="4caf0310-491e-41f5-8a9b-2006b3a94898(jetbrains.mps.execution.util)" version="0" />
     <module reference="bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
+    <module reference="6b3888c1-9802-44d8-8baf-f8e6c33ed689(jetbrains.mps.kotlin)" version="1" />
+    <module reference="9e4ff22b-60f1-43ef-a50b-f9f0fcec22e0(jetbrains.mps.kotlin.javaRefs)" version="1" />
     <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
     <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
@@ -74,6 +79,7 @@
     <module reference="65e59b42-e7f3-45ec-8692-6c7829780afe(jetbrains.mps.lang.smodelExt)" version="0" />
     <module reference="52e84caa-b118-4876-a544-5ed0b6603a79(jetbrains.mps.lang.smodelExt.test)" version="0" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
+    <module reference="c7fb639f-be78-4307-89b0-b5959c3fa8c8(jetbrains.mps.lang.text)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" version="0" />
     <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
diff --git a/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.code.mps b/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.code.mps
index d4c4acf0..a2eb7f8f 100644
--- a/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.code.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.code.mps
@@ -4,6 +4,11 @@
   <attribute name="doNotGenerate" value="true" />
   <languages>
     <use id="0b80a2e8-f9f1-47b3-823f-56eb115bca42" name="jetbrains.mps.typechecking.annotation" version="0" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
+    <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
+    <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="5" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -14,7 +19,10 @@
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
-    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
+    <import index="hez" ref="r:b038209d-51a9-4919-b6e5-4fafce96fa00(jetbrains.mps.kotlin.behavior)" />
+    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
+    <import index="5m2i" ref="r:13d34207-1d05-4df8-92a6-7cde496142db(jetbrains.mps.kotlin.javaRefs.structure)" />
+    <import index="hcm8" ref="r:72a7bf00-0175-42ca-b99b-fe8519b6a16f(jetbrains.mps.kotlin.structure)" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -30,6 +38,7 @@
         <child id="1068498886297" name="rValue" index="37vLTx" />
         <child id="1068498886295" name="lValue" index="37vLTJ" />
       </concept>
+      <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -39,6 +48,8 @@
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
+      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
+      <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
@@ -62,15 +73,23 @@
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
       <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
+      <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
+        <child id="1082485599094" name="ifFalseStatement" index="9aQIa" />
+        <child id="1068580123160" name="condition" index="3clFbw" />
+        <child id="1068580123161" name="ifTrue" index="3clFbx" />
+      </concept>
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
+      <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
+        <child id="1068581517676" name="expression" index="3cqZAk" />
+      </concept>
       <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
         <child id="4972241301747169160" name="typeArgument" index="3PaCim" />
@@ -85,26 +104,64 @@
         <reference id="1107535924139" name="classifier" index="3uigEE" />
         <child id="1109201940907" name="parameter" index="11_B2D" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
+      <concept id="5497648299878491908" name="jetbrains.mps.baseLanguage.structure.BaseVariableReference" flags="nn" index="1M0zk4">
+        <reference id="5497648299878491909" name="baseVariableDeclaration" index="1M0zk5" />
+      </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
+      <concept id="1199542442495" name="jetbrains.mps.baseLanguage.closures.structure.FunctionType" flags="in" index="1ajhzC">
+        <child id="1199542457201" name="resultType" index="1ajl9A" />
+      </concept>
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
+    <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
+      <concept id="5455284157994012186" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitLink" flags="ng" index="2pIpSj">
+        <reference id="5455284157994012188" name="link" index="2pIpSl" />
+        <child id="1595412875168045827" name="initValue" index="28nt2d" />
+      </concept>
+      <concept id="5455284157993863837" name="jetbrains.mps.lang.quotation.structure.NodeBuilder" flags="nn" index="2pJPEk">
+        <child id="5455284157993863838" name="quotedNode" index="2pJPEn" />
+      </concept>
+      <concept id="5455284157993863840" name="jetbrains.mps.lang.quotation.structure.NodeBuilderNode" flags="nn" index="2pJPED">
+        <reference id="5455284157993910961" name="concept" index="2pJxaS" />
+        <child id="5455284157993911099" name="values" index="2pJxcM" />
+      </concept>
+      <concept id="8182547171709752110" name="jetbrains.mps.lang.quotation.structure.NodeBuilderExpression" flags="nn" index="36biLy">
+        <child id="8182547171709752112" name="expression" index="36biLW" />
+      </concept>
+    </language>
     <language id="0b80a2e8-f9f1-47b3-823f-56eb115bca42" name="jetbrains.mps.typechecking.annotation">
       <concept id="1942415814694854601" name="jetbrains.mps.typechecking.annotation.structure.ErrorAnnotation" flags="ng" index="1U20sH">
         <property id="1942415814694854612" name="text" index="1U20sK" />
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
+        <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
+      </concept>
+      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
+      <concept id="4693937538533521280" name="jetbrains.mps.lang.smodel.structure.OfConceptOperation" flags="ng" index="v3k3i">
+        <child id="4693937538533538124" name="requestedConcept" index="v3oSu" />
+      </concept>
       <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
         <reference id="1145383142433" name="elementConcept" index="2I9WkF" />
       </concept>
+      <concept id="1883223317721008708" name="jetbrains.mps.lang.smodel.structure.IfInstanceOfStatement" flags="nn" index="Jncv_">
+        <reference id="1883223317721008712" name="nodeConcept" index="JncvD" />
+        <child id="1883223317721008709" name="body" index="Jncv$" />
+        <child id="1883223317721008711" name="variable" index="JncvA" />
+        <child id="1883223317721008710" name="nodeExpression" index="JncvB" />
+      </concept>
+      <concept id="1883223317721008713" name="jetbrains.mps.lang.smodel.structure.IfInstanceOfVariable" flags="ng" index="JncvC" />
+      <concept id="1883223317721107059" name="jetbrains.mps.lang.smodel.structure.IfInstanceOfVarReference" flags="nn" index="Jnkvi" />
       <concept id="2644386474300074836" name="jetbrains.mps.lang.smodel.structure.ConceptIdRefExpression" flags="nn" index="35c_gC">
         <reference id="2644386474300074837" name="conceptDeclaration" index="35c_gD" />
       </concept>
@@ -122,11 +179,14 @@
       <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
+      <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
+        <child id="1204796294226" name="closure" index="23t8la" />
+      </concept>
       <concept id="1226511727824" name="jetbrains.mps.baseLanguage.collections.structure.SetType" flags="in" index="2hMVRd">
         <child id="1226511765987" name="elementType" index="2hN53Y" />
       </concept>
@@ -136,6 +196,8 @@
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
+      <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
+      <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
     </language>
   </registry>
   <node concept="312cEu" id="3bgqfmmMWJj">
@@ -3219,5 +3281,274 @@
     <node concept="2tJIrI" id="72yxqve1qic" role="jymVt" />
     <node concept="3Tm1VV" id="72yxqve1iL3" role="1B3o_S" />
   </node>
+  <node concept="312cEu" id="6EJsc2LuFkC">
+    <property role="TrG5h" value="Misc" />
+    <node concept="3clFb_" id="7KwZg7EYn_" role="jymVt">
+      <property role="TrG5h" value="fn" />
+      <node concept="3clFbS" id="7KwZg7EYnC" role="3clF47">
+        <node concept="3clFbF" id="7KwZg7FlQ5" role="3cqZAp">
+          <node concept="2OqwBi" id="7KwZg7FmhP" role="3clFbG">
+            <node concept="2OqwBi" id="7KwZg7FlR3" role="2Oq$k0">
+              <node concept="37vLTw" id="7KwZg7FlQ4" role="2Oq$k0">
+                <ref role="3cqZAo" node="7KwZg7EYqa" resolve="node" />
+              </node>
+              <node concept="v3k3i" id="7KwZg7Fm5A" role="2OqNvi">
+                <node concept="chp4Y" id="7KwZg7Fmfi" role="v3oSu">
+                  <ref role="cht4Q" to="hcm8:2yYXHtl6Jh1" resolve="IType" />
+                </node>
+              </node>
+            </node>
+            <node concept="3$u5V9" id="1OIEKu3NaRV" role="2OqNvi">
+              <node concept="1bVj0M" id="1OIEKu3NaRX" role="23t8la">
+                <node concept="3clFbS" id="1OIEKu3NaRY" role="1bW5cS">
+                  <node concept="3clFbF" id="1OIEKu3NaRZ" role="3cqZAp">
+                    <node concept="2OqwBi" id="1OIEKu3NaS0" role="3clFbG">
+                      <node concept="37vLTw" id="1OIEKu3NaS1" role="2Oq$k0">
+                        <ref role="3cqZAo" node="1OIEKu3NaS3" resolve="it" />
+                      </node>
+                      <node concept="2qgKlT" id="1OIEKu3NaS2" role="2OqNvi">
+                        <ref role="37wK5l" to="hez:2gj5XQXIqKf" resolve="asInvariantProjection" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="gl6BB" id="1OIEKu3NaS3" role="1bW2Oz">
+                  <property role="TrG5h" value="it" />
+                  <node concept="2jxLKc" id="1OIEKu3NaS4" role="1tU5fm" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="1OIEKu3NdXr" role="3cqZAp" />
+        <node concept="Jncv_" id="1OIEKu3NdZD" role="3cqZAp">
+          <ref role="JncvD" to="hcm8:1502Vug_kWi" resolve="AndExpression" />
+          <node concept="2OqwBi" id="1OIEKu3Nexe" role="JncvB">
+            <node concept="37vLTw" id="1OIEKu3Ne23" role="2Oq$k0">
+              <ref role="3cqZAo" node="7KwZg7EYqa" resolve="node" />
+            </node>
+            <node concept="1uHKPH" id="1OIEKu3NfuP" role="2OqNvi" />
+          </node>
+          <node concept="3clFbS" id="1OIEKu3NdZH" role="Jncv$">
+            <node concept="3clFbF" id="1OIEKu3Ne4Q" role="3cqZAp">
+              <node concept="2OqwBi" id="1OIEKu3NetS" role="3clFbG">
+                <node concept="Jnkvi" id="1OIEKu3Ne4P" role="2Oq$k0">
+                  <ref role="1M0zk5" node="1OIEKu3NdZJ" resolve="loop" />
+                </node>
+                <node concept="2qgKlT" id="2ZpF_RgXV43" role="2OqNvi">
+                  <ref role="37wK5l" to="hez:Cy8Bus9niD" resolve="assignableState" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="JncvC" id="1OIEKu3NdZJ" role="JncvA">
+            <property role="TrG5h" value="loop" />
+            <node concept="2jxLKc" id="1OIEKu3NdZK" role="1tU5fm" />
+          </node>
+        </node>
+      </node>
+      <node concept="3cqZAl" id="7KwZg7EYmY" role="3clF45" />
+      <node concept="3Tm1VV" id="7KwZg7EYpl" role="1B3o_S" />
+      <node concept="37vLTG" id="7KwZg7EYqa" role="3clF46">
+        <property role="TrG5h" value="node" />
+        <node concept="2I9FWS" id="7KwZg7FlJY" role="1tU5fm">
+          <ref role="2I9WkF" to="hcm8:1502Vug_kWi" resolve="AndExpression" />
+        </node>
+      </node>
+    </node>
+    <node concept="3Tm1VV" id="6EJsc2LuFkD" role="1B3o_S" />
+  </node>
+  <node concept="312cEu" id="vp2bUKkYnm">
+    <property role="TrG5h" value="Intersection" />
+    <node concept="3clFb_" id="6EJsc2LuF_p" role="jymVt">
+      <property role="TrG5h" value="getFn1" />
+      <node concept="37vLTG" id="6EJsc2LuF_q" role="3clF46">
+        <property role="TrG5h" value="which" />
+        <node concept="10P_77" id="6EJsc2LuF_r" role="1tU5fm" />
+      </node>
+      <node concept="3clFbS" id="6EJsc2LuF_s" role="3clF47">
+        <node concept="3cpWs6" id="6EJsc2LuF_t" role="3cqZAp">
+          <node concept="1bVj0M" id="6EJsc2LuF_u" role="3cqZAk">
+            <node concept="3clFbS" id="6EJsc2LuF_F" role="1bW5cS">
+              <node concept="3clFbJ" id="2$1CHwF$8dN" role="3cqZAp">
+                <node concept="3clFbS" id="2$1CHwF$8dP" role="3clFbx">
+                  <node concept="3cpWs6" id="2$1CHwG8Rne" role="3cqZAp">
+                    <node concept="2pJPEk" id="2$1CHwG9da9" role="3cqZAk">
+                      <node concept="2pJPED" id="2$1CHwG9dab" role="2pJPEn">
+                        <ref role="2pJxaS" to="5m2i:26mUjU3jlvc" resolve="JavaMethodCall" />
+                        <node concept="2pIpSj" id="2CC$v$8uu5M" role="2pJxcM">
+                          <ref role="2pIpSl" to="5m2i:26mUjU3jlzY" resolve="method" />
+                          <node concept="36biLy" id="2CC$v$8uu6I" role="28nt2d">
+                            <node concept="10Nm6u" id="2CC$v$8uu6H" role="36biLW" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="37vLTw" id="2$1CHwF$8h0" role="3clFbw">
+                  <ref role="3cqZAo" node="6EJsc2LuF_q" resolve="which" />
+                </node>
+                <node concept="9aQIb" id="2CC$v$8usXD" role="9aQIa">
+                  <node concept="3clFbS" id="2CC$v$8usXE" role="9aQI4">
+                    <node concept="3cpWs6" id="2$1CHwG9hiF" role="3cqZAp">
+                      <node concept="2pJPEk" id="2$1CHwF$8O9" role="3cqZAk">
+                        <node concept="2pJPED" id="2$1CHwF$8Ob" role="2pJPEn">
+                          <ref role="2pJxaS" to="5m2i:5H$PF0dovDV" resolve="JavaDefaultConstructorCall" />
+                          <node concept="2pIpSj" id="2$1CHwF$97S" role="2pJxcM">
+                            <ref role="2pIpSl" to="5m2i:5H$PF0dovE2" resolve="classifier" />
+                            <node concept="36biLy" id="2$1CHwF$9dW" role="28nt2d">
+                              <node concept="10Nm6u" id="2CC$v$8urXZ" role="36biLW" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="6EJsc2LuF_G" role="1B3o_S" />
+      <node concept="1ajhzC" id="6EJsc2LuG6m" role="3clF45">
+        <node concept="3Tqbb2" id="6EJsc2LuJk7" role="1ajl9A">
+          <ref role="ehGHo" to="hcm8:2yYXHtl6Jjg" resolve="IExpression" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="vp2bUKkVQi" role="jymVt" />
+    <node concept="3clFb_" id="2CC$v$8uuEC" role="jymVt">
+      <property role="TrG5h" value="getFn2" />
+      <node concept="37vLTG" id="2CC$v$8uuED" role="3clF46">
+        <property role="TrG5h" value="which" />
+        <node concept="10P_77" id="2CC$v$8uuEE" role="1tU5fm" />
+      </node>
+      <node concept="3clFbS" id="2CC$v$8uuEF" role="3clF47">
+        <node concept="3cpWs6" id="2CC$v$8uuEG" role="3cqZAp">
+          <node concept="1bVj0M" id="2CC$v$8uuEH" role="3cqZAk">
+            <node concept="3clFbS" id="2CC$v$8uuEI" role="1bW5cS">
+              <node concept="3clFbJ" id="2CC$v$8uuEJ" role="3cqZAp">
+                <node concept="3clFbS" id="2CC$v$8uuEK" role="3clFbx">
+                  <node concept="3cpWs6" id="2CC$v$8uuEL" role="3cqZAp">
+                    <node concept="2pJPEk" id="2CC$v$8uuEM" role="3cqZAk">
+                      <node concept="2pJPED" id="2CC$v$8uuEN" role="2pJPEn">
+                        <ref role="2pJxaS" to="hcm8:1502Vug_kWi" resolve="AndExpression" />
+                        <node concept="2pIpSj" id="2CC$v$8uuEO" role="2pJxcM">
+                          <ref role="2pIpSl" to="hcm8:1502Vug_kVw" resolve="left" />
+                          <node concept="36biLy" id="2CC$v$8uuEP" role="28nt2d">
+                            <node concept="10Nm6u" id="2CC$v$8uuEQ" role="36biLW" />
+                          </node>
+                        </node>
+                        <node concept="2pIpSj" id="2CC$v$8uuER" role="2pJxcM">
+                          <ref role="2pIpSl" to="hcm8:1502Vug_kVy" resolve="right" />
+                          <node concept="36biLy" id="2CC$v$8uuES" role="28nt2d">
+                            <node concept="10Nm6u" id="2CC$v$8uuET" role="36biLW" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="37vLTw" id="2CC$v$8uuEU" role="3clFbw">
+                  <ref role="3cqZAo" node="2CC$v$8uuED" resolve="which" />
+                </node>
+                <node concept="9aQIb" id="2CC$v$8uuEV" role="9aQIa">
+                  <node concept="3clFbS" id="2CC$v$8uuEW" role="9aQI4">
+                    <node concept="3cpWs6" id="2CC$v$8uuEX" role="3cqZAp">
+                      <node concept="2pJPEk" id="2CC$v$8uuEY" role="3cqZAk">
+                        <node concept="2pJPED" id="2CC$v$8uuEZ" role="2pJPEn">
+                          <ref role="2pJxaS" to="5m2i:5H$PF0dovDV" resolve="JavaDefaultConstructorCall" />
+                          <node concept="2pIpSj" id="2CC$v$8uuF0" role="2pJxcM">
+                            <ref role="2pIpSl" to="5m2i:5H$PF0dovE2" resolve="classifier" />
+                            <node concept="36biLy" id="2CC$v$8uuF1" role="28nt2d">
+                              <node concept="10Nm6u" id="2CC$v$8uuF2" role="36biLW" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="2CC$v$8uuF3" role="1B3o_S" />
+      <node concept="1ajhzC" id="2CC$v$8uuF4" role="3clF45">
+        <node concept="3Tqbb2" id="2CC$v$8uuF5" role="1ajl9A">
+          <ref role="ehGHo" to="hcm8:2yYXHtl6Jjg" resolve="IExpression" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2CC$v$8uvA3" role="jymVt" />
+    <node concept="3clFb_" id="2CC$v$8utUm" role="jymVt">
+      <property role="TrG5h" value="getFn3" />
+      <node concept="37vLTG" id="2CC$v$8utUn" role="3clF46">
+        <property role="TrG5h" value="which" />
+        <node concept="10P_77" id="2CC$v$8utUo" role="1tU5fm" />
+      </node>
+      <node concept="3clFbS" id="2CC$v$8utUp" role="3clF47">
+        <node concept="3cpWs6" id="2CC$v$8utUq" role="3cqZAp">
+          <node concept="1bVj0M" id="2CC$v$8utUr" role="3cqZAk">
+            <node concept="3clFbS" id="2CC$v$8utUs" role="1bW5cS">
+              <node concept="3clFbJ" id="2CC$v$8utUt" role="3cqZAp">
+                <node concept="3clFbS" id="2CC$v$8utUu" role="3clFbx">
+                  <node concept="3cpWs6" id="2CC$v$8utUv" role="3cqZAp">
+                    <node concept="2pJPEk" id="2CC$v$8uuY_" role="3cqZAk">
+                      <node concept="2pJPED" id="2CC$v$8uuYA" role="2pJPEn">
+                        <ref role="2pJxaS" to="5m2i:26mUjU3jlvc" resolve="JavaMethodCall" />
+                        <node concept="2pIpSj" id="2CC$v$8uuYB" role="2pJxcM">
+                          <ref role="2pIpSl" to="5m2i:26mUjU3jlzY" resolve="method" />
+                          <node concept="36biLy" id="2CC$v$8uuYC" role="28nt2d">
+                            <node concept="10Nm6u" id="2CC$v$8uuYD" role="36biLW" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="37vLTw" id="2CC$v$8utUC" role="3clFbw">
+                  <ref role="3cqZAo" node="2CC$v$8utUn" resolve="which" />
+                </node>
+                <node concept="9aQIb" id="2CC$v$8utUD" role="9aQIa">
+                  <node concept="3clFbS" id="2CC$v$8utUE" role="9aQI4">
+                    <node concept="3cpWs6" id="2CC$v$8utUF" role="3cqZAp">
+                      <node concept="2pJPEk" id="2CC$v$8uuUm" role="3cqZAk">
+                        <node concept="2pJPED" id="2CC$v$8uuUn" role="2pJPEn">
+                          <ref role="2pJxaS" to="hcm8:1502Vug_kWi" resolve="AndExpression" />
+                          <node concept="2pIpSj" id="2CC$v$8uuUo" role="2pJxcM">
+                            <ref role="2pIpSl" to="hcm8:1502Vug_kVw" resolve="left" />
+                            <node concept="36biLy" id="2CC$v$8uuUp" role="28nt2d">
+                              <node concept="10Nm6u" id="2CC$v$8uuUq" role="36biLW" />
+                            </node>
+                          </node>
+                          <node concept="2pIpSj" id="2CC$v$8uuUr" role="2pJxcM">
+                            <ref role="2pIpSl" to="hcm8:1502Vug_kVy" resolve="right" />
+                            <node concept="36biLy" id="2CC$v$8uuUs" role="28nt2d">
+                              <node concept="10Nm6u" id="2CC$v$8uuUt" role="36biLW" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="2CC$v$8utUL" role="1B3o_S" />
+      <node concept="1ajhzC" id="2CC$v$8utUM" role="3clF45">
+        <node concept="3Tqbb2" id="2CC$v$8utUN" role="1ajl9A">
+          <ref role="ehGHo" to="hcm8:2yYXHtl6Jjg" resolve="IExpression" />
+        </node>
+      </node>
+    </node>
+    <node concept="3Tm1VV" id="vp2bUKkYnn" role="1B3o_S" />
+  </node>
 </model>
 
diff --git a/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.code@tests.mps b/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.code@tests.mps
index 75400288..b784aebd 100644
--- a/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.code@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.code@tests.mps
@@ -68,11 +68,11 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
@@ -92,7 +92,7 @@
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
       <concept id="1205769003971" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodDeclaration" flags="ng" index="2XrIbr" />
@@ -132,7 +132,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -264,6 +264,64 @@
         </node>
       </node>
     </node>
+    <node concept="1LZb2c" id="vp2bUKkYue" role="1SL9yI">
+      <property role="TrG5h" value="misc" />
+      <node concept="3cqZAl" id="vp2bUKkYuf" role="3clF45" />
+      <node concept="3clFbS" id="vp2bUKkYug" role="3clF47">
+        <node concept="2Hmddi" id="vp2bUKkYuh" role="3cqZAp">
+          <node concept="2OqwBi" id="vp2bUKkYui" role="2Hmdds">
+            <node concept="2YIFZM" id="vp2bUKkYuj" role="2Oq$k0">
+              <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
+              <node concept="2OqwBi" id="vp2bUKkYuk" role="37wK5m">
+                <node concept="2WthIp" id="vp2bUKkYul" role="2Oq$k0" />
+                <node concept="2XshWL" id="vp2bUKkYum" role="2OqNvi">
+                  <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                  <node concept="2tJFMh" id="vp2bUKkYun" role="2XxRq1">
+                    <node concept="ZC_QK" id="vp2bUKkYuo" role="2tJFKM">
+                      <ref role="2aWVGs" to="ar5v:6EJsc2LuFkC" resolve="Misc" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="1jxXqW" id="vp2bUKkYup" role="37wK5m" />
+            </node>
+            <node concept="liA8E" id="vp2bUKkYuq" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1LZb2c" id="vp2bUKkZIX" role="1SL9yI">
+      <property role="TrG5h" value="intersection" />
+      <node concept="3cqZAl" id="vp2bUKkZIY" role="3clF45" />
+      <node concept="3clFbS" id="vp2bUKkZIZ" role="3clF47">
+        <node concept="2Hmddi" id="vp2bUKkZJ0" role="3cqZAp">
+          <node concept="2OqwBi" id="vp2bUKkZJ1" role="2Hmdds">
+            <node concept="2YIFZM" id="vp2bUKkZJ2" role="2Oq$k0">
+              <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
+              <node concept="2OqwBi" id="vp2bUKkZJ3" role="37wK5m">
+                <node concept="2WthIp" id="vp2bUKkZJ4" role="2Oq$k0" />
+                <node concept="2XshWL" id="vp2bUKkZJ5" role="2OqNvi">
+                  <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                  <node concept="2tJFMh" id="vp2bUKkZJ6" role="2XxRq1">
+                    <node concept="ZC_QK" id="vp2bUKkZJ7" role="2tJFKM">
+                      <ref role="2aWVGs" to="ar5v:vp2bUKkYnm" resolve="Intersection" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="1jxXqW" id="vp2bUKkZJ8" role="37wK5m" />
+            </node>
+            <node concept="liA8E" id="vp2bUKkZJ9" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
   </node>
 </model>