From c5fed5f2e0e99b8987121537ad5f66c582d996e1 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Fri, 11 Dec 2020 12:00:06 +0100
Subject: [PATCH] BL and closure types: add necessary explicit dependencies.
 Fix tests.

In order to ensure properly functioning incremental typechecking
some explicit dependencies are to be declared.
---
 ...ins.mps.baseLanguage.closuresExt.types.mps | 12 ++-
 .../jetbrains.mps.baseLanguageExt.types.mps   | 78 +++++++++++++++++++
 2 files changed, 89 insertions(+), 1 deletion(-)

diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/models/jetbrains.mps.baseLanguage.closuresExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/models/jetbrains.mps.baseLanguage.closuresExt.types.mps
index 991fa12c..ee2589e5 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/models/jetbrains.mps.baseLanguage.closuresExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/models/jetbrains.mps.baseLanguage.closuresExt.types.mps
@@ -782,7 +782,17 @@
             <node concept="1mfA1w" id="4S1mDSNOyp5" role="2OqNvi" />
           </node>
         </node>
-        <node concept="3clFbH" id="4Z0pyZICXxt" role="3cqZAp" />
+        <node concept="1mebxG" id="2hQbw6H1idg" role="3cqZAp">
+          <node concept="2OqwBi" id="2hQbw6H1iFo" role="1mebXD">
+            <node concept="3A2sRY" id="2hQbw6H1is5" role="2Oq$k0">
+              <ref role="3A2yKK" node="4S1mDSNOe5l" resolve="cl" />
+            </node>
+            <node concept="3TrEf2" id="2hQbw6H1l$d" role="2OqNvi">
+              <ref role="3Tt5mk" to="tp2c:htbW58J" resolve="body" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="2hQbw6H1lC7" role="3cqZAp" />
         <node concept="3cpWs8" id="4Z0pyZICXA_" role="3cqZAp">
           <node concept="3cpWsn" id="4Z0pyZICXAA" role="3cpWs9">
             <property role="TrG5h" value="helper" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
index 5e2b8093..5c6f0136 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
@@ -37105,6 +37105,58 @@
         </node>
       </node>
     </node>
+    <node concept="1nLNMY" id="2hQbw6HgM$R" role="1nK1Vg">
+      <property role="TrG5h" value="interface_requireExtended" />
+      <node concept="3clFbS" id="2hQbw6HgM$S" role="1nLNMH">
+        <node concept="Oftf1" id="2hQbw6HgNAQ" role="3cqZAp">
+          <node concept="2OqwBi" id="2hQbw6HgNAR" role="Oftjs">
+            <node concept="3A2sRY" id="2hQbw6HgNH5" role="2Oq$k0">
+              <ref role="3A2yKK" node="2hQbw6HgM$U" resolve="i" />
+            </node>
+            <node concept="3Tsc0h" id="2hQbw6HgOpx" role="2OqNvi">
+              <ref role="3TtcxE" to="tpee:g7HQHFn" resolve="extendedInterface" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2t___k" id="2hQbw6HgM$T" role="1nLNMg">
+        <ref role="2t_S0q" to="tpee:g7HP654" resolve="Interface" />
+        <node concept="3A20r5" id="2hQbw6HgM$U" role="2t_VXX">
+          <property role="TrG5h" value="i" />
+        </node>
+      </node>
+    </node>
+    <node concept="1nLNMY" id="2hQbw6HjmeY" role="1nK1Vg">
+      <property role="TrG5h" value="classConcept_requireSuper" />
+      <node concept="3clFbS" id="2hQbw6HjmeZ" role="1nLNMH">
+        <node concept="Oftf1" id="2hQbw6Hjnn4" role="3cqZAp">
+          <node concept="2OqwBi" id="2hQbw6Hjnn5" role="Oftjs">
+            <node concept="3A2sRY" id="2hQbw6Hjnsx" role="2Oq$k0">
+              <ref role="3A2yKK" node="2hQbw6Hjmf1" resolve="cc" />
+            </node>
+            <node concept="3Tsc0h" id="2hQbw6Hjofl" role="2OqNvi">
+              <ref role="3TtcxE" to="tpee:fWEKbgp" resolve="implementedInterface" />
+            </node>
+          </node>
+        </node>
+        <node concept="1mebxG" id="2hQbw6Hjont" role="3cqZAp">
+          <node concept="2OqwBi" id="2hQbw6HjoJh" role="1mebXD">
+            <node concept="3A2sRY" id="2hQbw6HjonK" role="2Oq$k0">
+              <ref role="3A2yKK" node="2hQbw6Hjmf1" resolve="cc" />
+            </node>
+            <node concept="3TrEf2" id="2hQbw6HjoRr" role="2OqNvi">
+              <ref role="3Tt5mk" to="tpee:gXzkM_H" resolve="superclass" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2t___k" id="2hQbw6Hjmf0" role="1nLNMg">
+        <ref role="2t_S0q" to="tpee:fz12cDA" resolve="ClassConcept" />
+        <node concept="3A20r5" id="2hQbw6Hjmf1" role="2t_VXX">
+          <property role="TrG5h" value="cc" />
+        </node>
+      </node>
+    </node>
     <node concept="1nLNMY" id="1sJZ0_oUxQC" role="1nK1Vg">
       <property role="TrG5h" value="typeVariable_requireDecl" />
       <node concept="3clFbS" id="1sJZ0_oUxQD" role="1nLNMH">
@@ -53536,5 +53588,31 @@
       </node>
     </node>
   </node>
+  <node concept="AVZre" id="2hQbw6HdHMi">
+    <property role="3GE5qa" value="rule.code" />
+    <property role="TrG5h" value="MethDecl" />
+    <ref role="2YbDB9" node="34$A1Mf51rY" resolve="TypeOf" />
+    <node concept="1nLNMY" id="2hQbw6HdHMl" role="1nK1Vg">
+      <property role="TrG5h" value="baseMethodDeclaration" />
+      <node concept="3clFbS" id="2hQbw6HdHMm" role="1nLNMH">
+        <node concept="Oftf1" id="2hQbw6HdHMw" role="3cqZAp">
+          <node concept="2OqwBi" id="2hQbw6HdI9k" role="Oftjs">
+            <node concept="3A2sRY" id="2hQbw6HdHMR" role="2Oq$k0">
+              <ref role="3A2yKK" node="2hQbw6HdHMo" resolve="bmd" />
+            </node>
+            <node concept="3Tsc0h" id="2hQbw6HdJ6I" role="2OqNvi">
+              <ref role="3TtcxE" to="tpee:fzclF7Y" resolve="parameter" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2t___k" id="2hQbw6HdHMn" role="1nLNMg">
+        <ref role="2t_S0q" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
+        <node concept="3A20r5" id="2hQbw6HdHMo" role="2t_VXX">
+          <property role="TrG5h" value="bmd" />
+        </node>
+      </node>
+    </node>
+  </node>
 </model>