From 0cea4073cc1e749fc18963fdf630ace03c3c86e4 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Fri, 14 May 2021 11:52:43 +0200
Subject: [PATCH] Fix BL types: ensure proper type inference and incremental
 typechecking

---
 .../jetbrains.mps.baseLanguageExt.types.mps   | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)

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 0ea7eb2d..6ebd687f 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
@@ -2965,6 +2965,11 @@
                 </node>
               </node>
             </node>
+            <node concept="Oftf1" id="72yxqve1Gam" role="3cqZAp">
+              <node concept="37vLTw" id="72yxqve1GdB" role="Oftjs">
+                <ref role="3cqZAo" node="4xoHD1GiPrP" resolve="tyArgs" />
+              </node>
+            </node>
             <node concept="3cpWs8" id="4xoHD1GibhX" role="3cqZAp">
               <node concept="3cpWsn" id="4xoHD1Gibi0" role="3cpWs9">
                 <property role="TrG5h" value="args" />
@@ -2981,6 +2986,53 @@
                 </node>
               </node>
             </node>
+            <node concept="3clFbJ" id="72yxqve3iJY" role="3cqZAp">
+              <node concept="3clFbS" id="72yxqve3iK0" role="3clFbx">
+                <node concept="3SKdUt" id="72yxqve3qL_" role="3cqZAp">
+                  <node concept="1PaTwC" id="72yxqve3qLA" role="1aUNEU">
+                    <node concept="3oM_SD" id="72yxqve3qLK" role="1PaTwD">
+                      <property role="3oM_SC" value="include" />
+                    </node>
+                    <node concept="3oM_SD" id="72yxqve3qLM" role="1PaTwD">
+                      <property role="3oM_SC" value="type" />
+                    </node>
+                    <node concept="3oM_SD" id="72yxqve3qLP" role="1PaTwD">
+                      <property role="3oM_SC" value="inference" />
+                    </node>
+                    <node concept="3oM_SD" id="72yxqve3qLT" role="1PaTwD">
+                      <property role="3oM_SC" value="context" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="1mebxG" id="72yxqve3qfN" role="3cqZAp">
+                  <node concept="2OqwBi" id="72yxqve3qgl" role="1mebXD">
+                    <node concept="3A2sRY" id="72yxqve3qfV" role="2Oq$k0">
+                      <ref role="3A2yKK" node="3R6X$QWrjDp" resolve="bmc" />
+                    </node>
+                    <node concept="1mfA1w" id="72yxqve3qLm" role="2OqNvi" />
+                  </node>
+                </node>
+              </node>
+              <node concept="1Wc70l" id="72yxqve3oQv" role="3clFbw">
+                <node concept="2OqwBi" id="72yxqve3oRf" role="3uHU7w">
+                  <node concept="37vLTw" id="72yxqve3oQT" role="2Oq$k0">
+                    <ref role="3cqZAo" node="4xoHD1Gibi0" resolve="args" />
+                  </node>
+                  <node concept="1v1jN8" id="72yxqve3qfG" role="2OqNvi" />
+                </node>
+                <node concept="2OqwBi" id="72yxqve3koy" role="3uHU7B">
+                  <node concept="2OqwBi" id="72yxqve3iO8" role="2Oq$k0">
+                    <node concept="37vLTw" id="72yxqve3iNk" role="2Oq$k0">
+                      <ref role="3cqZAo" node="3R6X$QWrjvr" resolve="mdecl" />
+                    </node>
+                    <node concept="3Tsc0h" id="72yxqve3jQY" role="2OqNvi">
+                      <ref role="3TtcxE" to="tpee:g96eVAe" resolve="typeVariableDeclaration" />
+                    </node>
+                  </node>
+                  <node concept="3GX2aA" id="72yxqve3oa5" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
             <node concept="3clFbH" id="53tmmMsEmeL" role="3cqZAp" />
             <node concept="3cpWs8" id="53tmmMsBUNl" role="3cqZAp">
               <node concept="3cpWsn" id="53tmmMsBUNm" role="3cpWs9">