From ba39d7d047808cc8c103c0c70ffd599cf167a8c3 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Fri, 6 Nov 2020 10:14:40 +0100
Subject: [PATCH] Fix NPE during processing of classifier type with null
 classifier.

---
 .../jetbrains.mps.baseLanguageExt.types.mps   | 420 ++++++++++--------
 1 file changed, 224 insertions(+), 196 deletions(-)

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 29fa280d..314cae13 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
@@ -700,6 +700,10 @@
         <child id="7889373009908940350" name="valueProvider" index="21kp3d" />
         <child id="7889373009908940348" name="key" index="21kp3f" />
       </concept>
+      <concept id="7326790520856487884" name="jetbrains.mps.lang.coderules.structure.ProvideFeedbackOperation" flags="ng" index="26X5F$">
+        <property id="7326790520856501351" name="severity" index="26X25f" />
+        <child id="7326790520856501349" name="message" index="26X25d" />
+      </concept>
       <concept id="1980609059169917031" name="jetbrains.mps.lang.coderules.structure.CopyItem" flags="ng" index="9KH4l">
         <child id="1980609059169917850" name="origin" index="9KHbC" />
       </concept>
@@ -37672,230 +37676,254 @@
           </node>
         </node>
         <node concept="3clFbJ" id="3c$Di5ODE7E" role="3cqZAp">
-          <node concept="2OqwBi" id="53tmmMtdo1$" role="3clFbw">
-            <node concept="37vLTw" id="53tmmMtdlTD" role="2Oq$k0">
-              <ref role="3cqZAo" node="4btN1w5LWif" resolve="tyArgs" />
+          <node concept="3clFbC" id="6zber0NgCyF" role="3clFbw">
+            <node concept="10Nm6u" id="6zber0NgCHp" role="3uHU7w" />
+            <node concept="37vLTw" id="6zber0NgChX" role="3uHU7B">
+              <ref role="3cqZAo" node="4btN1w5LWi9" resolve="cls" />
             </node>
-            <node concept="3GX2aA" id="53tmmMtdoZm" role="2OqNvi" />
           </node>
-          <node concept="3clFbS" id="4btN1w5KhF0" role="3clFbx">
-            <node concept="3SKdUt" id="4btN1w5M62x" role="3cqZAp">
-              <node concept="1PaTwC" id="4btN1w5M62y" role="1aUNEU">
-                <node concept="3oM_SD" id="4btN1w5M62z" role="1PaTwD">
-                  <property role="3oM_SC" value="todo:" />
+          <node concept="3clFbS" id="6zber0Negxn" role="3clFbx">
+            <node concept="3clFbF" id="6zber0NgCHE" role="3cqZAp">
+              <node concept="2OqwBi" id="6zber0NgCZd" role="3clFbG">
+                <node concept="3A2sRY" id="6zber0NgCOJ" role="2Oq$k0">
+                  <ref role="3A2yKK" node="4btN1w5KirY" resolve="clsTy" />
                 </node>
-                <node concept="3oM_SD" id="4btN1w5M62$" role="1PaTwD">
-                  <property role="3oM_SC" value="where" />
-                </node>
-                <node concept="3oM_SD" id="4btN1w5M62_" role="1PaTwD">
-                  <property role="3oM_SC" value="should" />
-                </node>
-                <node concept="3oM_SD" id="4btN1w5M62A" role="1PaTwD">
-                  <property role="3oM_SC" value="ContextTVSubs" />
-                </node>
-                <node concept="3oM_SD" id="4btN1w5M62B" role="1PaTwD">
-                  <property role="3oM_SC" value="come" />
-                </node>
-                <node concept="3oM_SD" id="4btN1w5M62C" role="1PaTwD">
-                  <property role="3oM_SC" value="from?" />
-                </node>
-              </node>
-            </node>
-            <node concept="3SKdUt" id="2TBKtozZhla" role="3cqZAp">
-              <node concept="1PaTwC" id="4btN1w5MwRj" role="1aUNEU">
-                <node concept="3oM_SD" id="4btN1w5Mwk8" role="1PaTwD">
-                  <property role="3oM_SC" value="for" />
-                </node>
-                <node concept="3oM_SD" id="4btN1w5MwrT" role="1PaTwD">
-                  <property role="3oM_SC" value="nested" />
-                </node>
-                <node concept="3oM_SD" id="4btN1w5MwvJ" role="1PaTwD">
-                  <property role="3oM_SC" value="generics:" />
-                </node>
-                <node concept="3oM_SD" id="4btN1w5MwzA" role="1PaTwD">
-                  <property role="3oM_SC" value="from" />
-                </node>
-                <node concept="3oM_SD" id="4btN1w5MwBu" role="1PaTwD">
-                  <property role="3oM_SC" value="dot" />
-                </node>
-                <node concept="3oM_SD" id="4btN1w5MwFn" role="1PaTwD">
-                  <property role="3oM_SC" value="expr" />
-                </node>
-                <node concept="3oM_SD" id="4btN1w5MwJh" role="1PaTwD">
-                  <property role="3oM_SC" value="on" />
-                </node>
-                <node concept="3oM_SD" id="4btN1w5MwJp" role="1PaTwD">
-                  <property role="3oM_SC" value="their" />
-                </node>
-                <node concept="3oM_SD" id="4btN1w5Mx75" role="1PaTwD">
-                  <property role="3oM_SC" value="creation" />
-                </node>
-                <node concept="3oM_SD" id="4btN1w5Mxft" role="1PaTwD">
-                  <property role="3oM_SC" value="or" />
-                </node>
-                <node concept="3oM_SD" id="4btN1w5MxfF" role="1PaTwD">
-                  <property role="3oM_SC" value="from" />
-                </node>
-                <node concept="3oM_SD" id="4btN1w5MwVt" role="1PaTwD">
-                  <property role="3oM_SC" value="dot" />
-                </node>
-                <node concept="3oM_SD" id="4btN1w5MwVx" role="1PaTwD">
-                  <property role="3oM_SC" value="for" />
-                </node>
-                <node concept="3oM_SD" id="4btN1w5MwZp" role="1PaTwD">
-                  <property role="3oM_SC" value="types" />
-                </node>
-                <node concept="3oM_SD" id="53tmmMtd9MF" role="1PaTwD">
-                  <property role="3oM_SC" value="(?)" />
-                </node>
-              </node>
-            </node>
-            <node concept="3cpWs8" id="53tmmMtcWGJ" role="3cqZAp">
-              <node concept="3cpWsn" id="53tmmMtcWGM" role="3cpWs9">
-                <property role="TrG5h" value="enclosingScope" />
-                <node concept="3Tqbb2" id="53tmmMtcWGH" role="1tU5fm">
-                  <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
-                </node>
-                <node concept="3K4zz7" id="53tmmMtd03K" role="33vP2m">
-                  <node concept="10Nm6u" id="53tmmMtd0pt" role="3K4E3e" />
-                  <node concept="2OqwBi" id="53tmmMtcZgv" role="3K4Cdx">
-                    <node concept="37vLTw" id="53tmmMtcY4B" role="2Oq$k0">
-                      <ref role="3cqZAo" node="4btN1w5LWi9" resolve="cls" />
-                    </node>
-                    <node concept="2qgKlT" id="53tmmMtcZEr" role="2OqNvi">
-                      <ref role="37wK5l" to="tpek:6r77ob2USS8" resolve="isStatic" />
-                    </node>
+                <node concept="26X5F$" id="6zber0NgDww" role="2OqNvi">
+                  <property role="26X25f" value="4jcOV4hu0n_/ERROR" />
+                  <node concept="Xl_RD" id="6zber0NgDwy" role="26X25d">
+                    <property role="Xl_RC" value="malformed type" />
                   </node>
-                  <node concept="2OqwBi" id="53tmmMtcX10" role="3K4GZi">
-                    <node concept="37vLTw" id="53tmmMtcWQP" role="2Oq$k0">
-                      <ref role="3cqZAo" node="4btN1w5LWi9" resolve="cls" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="6zber0Nis7S" role="3cqZAp" />
+          </node>
+          <node concept="3eNFk2" id="6zber0Negxl" role="3eNLev">
+            <node concept="2OqwBi" id="53tmmMtdo1$" role="3eO9$A">
+              <node concept="37vLTw" id="53tmmMtdlTD" role="2Oq$k0">
+                <ref role="3cqZAo" node="4btN1w5LWif" resolve="tyArgs" />
+              </node>
+              <node concept="3GX2aA" id="53tmmMtdoZm" role="2OqNvi" />
+            </node>
+            <node concept="3clFbS" id="4btN1w5KhF0" role="3eOfB_">
+              <node concept="3SKdUt" id="4btN1w5M62x" role="3cqZAp">
+                <node concept="1PaTwC" id="4btN1w5M62y" role="1aUNEU">
+                  <node concept="3oM_SD" id="4btN1w5M62z" role="1PaTwD">
+                    <property role="3oM_SC" value="todo:" />
+                  </node>
+                  <node concept="3oM_SD" id="4btN1w5M62$" role="1PaTwD">
+                    <property role="3oM_SC" value="where" />
+                  </node>
+                  <node concept="3oM_SD" id="4btN1w5M62_" role="1PaTwD">
+                    <property role="3oM_SC" value="should" />
+                  </node>
+                  <node concept="3oM_SD" id="4btN1w5M62A" role="1PaTwD">
+                    <property role="3oM_SC" value="ContextTVSubs" />
+                  </node>
+                  <node concept="3oM_SD" id="4btN1w5M62B" role="1PaTwD">
+                    <property role="3oM_SC" value="come" />
+                  </node>
+                  <node concept="3oM_SD" id="4btN1w5M62C" role="1PaTwD">
+                    <property role="3oM_SC" value="from?" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3SKdUt" id="2TBKtozZhla" role="3cqZAp">
+                <node concept="1PaTwC" id="4btN1w5MwRj" role="1aUNEU">
+                  <node concept="3oM_SD" id="4btN1w5Mwk8" role="1PaTwD">
+                    <property role="3oM_SC" value="for" />
+                  </node>
+                  <node concept="3oM_SD" id="4btN1w5MwrT" role="1PaTwD">
+                    <property role="3oM_SC" value="nested" />
+                  </node>
+                  <node concept="3oM_SD" id="4btN1w5MwvJ" role="1PaTwD">
+                    <property role="3oM_SC" value="generics:" />
+                  </node>
+                  <node concept="3oM_SD" id="4btN1w5MwzA" role="1PaTwD">
+                    <property role="3oM_SC" value="from" />
+                  </node>
+                  <node concept="3oM_SD" id="4btN1w5MwBu" role="1PaTwD">
+                    <property role="3oM_SC" value="dot" />
+                  </node>
+                  <node concept="3oM_SD" id="4btN1w5MwFn" role="1PaTwD">
+                    <property role="3oM_SC" value="expr" />
+                  </node>
+                  <node concept="3oM_SD" id="4btN1w5MwJh" role="1PaTwD">
+                    <property role="3oM_SC" value="on" />
+                  </node>
+                  <node concept="3oM_SD" id="4btN1w5MwJp" role="1PaTwD">
+                    <property role="3oM_SC" value="their" />
+                  </node>
+                  <node concept="3oM_SD" id="4btN1w5Mx75" role="1PaTwD">
+                    <property role="3oM_SC" value="creation" />
+                  </node>
+                  <node concept="3oM_SD" id="4btN1w5Mxft" role="1PaTwD">
+                    <property role="3oM_SC" value="or" />
+                  </node>
+                  <node concept="3oM_SD" id="4btN1w5MxfF" role="1PaTwD">
+                    <property role="3oM_SC" value="from" />
+                  </node>
+                  <node concept="3oM_SD" id="4btN1w5MwVt" role="1PaTwD">
+                    <property role="3oM_SC" value="dot" />
+                  </node>
+                  <node concept="3oM_SD" id="4btN1w5MwVx" role="1PaTwD">
+                    <property role="3oM_SC" value="for" />
+                  </node>
+                  <node concept="3oM_SD" id="4btN1w5MwZp" role="1PaTwD">
+                    <property role="3oM_SC" value="types" />
+                  </node>
+                  <node concept="3oM_SD" id="53tmmMtd9MF" role="1PaTwD">
+                    <property role="3oM_SC" value="(?)" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWs8" id="53tmmMtcWGJ" role="3cqZAp">
+                <node concept="3cpWsn" id="53tmmMtcWGM" role="3cpWs9">
+                  <property role="TrG5h" value="enclosingScope" />
+                  <node concept="3Tqbb2" id="53tmmMtcWGH" role="1tU5fm">
+                    <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
+                  </node>
+                  <node concept="3K4zz7" id="53tmmMtd03K" role="33vP2m">
+                    <node concept="10Nm6u" id="53tmmMtd0pt" role="3K4E3e" />
+                    <node concept="2OqwBi" id="53tmmMtcZgv" role="3K4Cdx">
+                      <node concept="37vLTw" id="53tmmMtcY4B" role="2Oq$k0">
+                        <ref role="3cqZAo" node="4btN1w5LWi9" resolve="cls" />
+                      </node>
+                      <node concept="2qgKlT" id="53tmmMtcZEr" role="2OqNvi">
+                        <ref role="37wK5l" to="tpek:6r77ob2USS8" resolve="isStatic" />
+                      </node>
                     </node>
-                    <node concept="2Xjw5R" id="53tmmMtcX2g" role="2OqNvi">
-                      <node concept="1xMEDy" id="53tmmMtcX2i" role="1xVPHs">
-                        <node concept="chp4Y" id="53tmmMtcX4t" role="ri$Ld">
-                          <ref role="cht4Q" to="tpee:g7pOWCK" resolve="Classifier" />
+                    <node concept="2OqwBi" id="53tmmMtcX10" role="3K4GZi">
+                      <node concept="37vLTw" id="53tmmMtcWQP" role="2Oq$k0">
+                        <ref role="3cqZAo" node="4btN1w5LWi9" resolve="cls" />
+                      </node>
+                      <node concept="2Xjw5R" id="53tmmMtcX2g" role="2OqNvi">
+                        <node concept="1xMEDy" id="53tmmMtcX2i" role="1xVPHs">
+                          <node concept="chp4Y" id="53tmmMtcX4t" role="ri$Ld">
+                            <ref role="cht4Q" to="tpee:g7pOWCK" resolve="Classifier" />
+                          </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
-            </node>
-            <node concept="3cpWs8" id="53tmmMtd2Iv" role="3cqZAp">
-              <node concept="3cpWsn" id="53tmmMtd2Iw" role="3cpWs9">
-                <property role="TrG5h" value="contextTvds" />
-                <node concept="2I9FWS" id="53tmmMtd2Ix" role="1tU5fm">
-                  <ref role="2I9WkF" to="tpee:g96euPO" resolve="TypeVariableDeclaration" />
-                </node>
-                <node concept="3K4zz7" id="53tmmMtfLzg" role="33vP2m">
-                  <node concept="2OqwBi" id="53tmmMtfQMC" role="3K4GZi">
-                    <node concept="37vLTw" id="53tmmMtfLAw" role="2Oq$k0">
-                      <ref role="3cqZAo" node="53tmmMtcWGM" resolve="enclosingScope" />
-                    </node>
-                    <node concept="3Tsc0h" id="53tmmMtfRfN" role="2OqNvi">
-                      <ref role="3TtcxE" to="tpee:g96eVAe" resolve="typeVariableDeclaration" />
-                    </node>
+              <node concept="3cpWs8" id="53tmmMtd2Iv" role="3cqZAp">
+                <node concept="3cpWsn" id="53tmmMtd2Iw" role="3cpWs9">
+                  <property role="TrG5h" value="contextTvds" />
+                  <node concept="2I9FWS" id="53tmmMtd2Ix" role="1tU5fm">
+                    <ref role="2I9WkF" to="tpee:g96euPO" resolve="TypeVariableDeclaration" />
                   </node>
-                  <node concept="2OqwBi" id="53tmmMtfK8D" role="3K4Cdx">
-                    <node concept="37vLTw" id="53tmmMtfJ4r" role="2Oq$k0">
-                      <ref role="3cqZAo" node="53tmmMtcWGM" resolve="enclosingScope" />
+                  <node concept="3K4zz7" id="53tmmMtfLzg" role="33vP2m">
+                    <node concept="2OqwBi" id="53tmmMtfQMC" role="3K4GZi">
+                      <node concept="37vLTw" id="53tmmMtfLAw" role="2Oq$k0">
+                        <ref role="3cqZAo" node="53tmmMtcWGM" resolve="enclosingScope" />
+                      </node>
+                      <node concept="3Tsc0h" id="53tmmMtfRfN" role="2OqNvi">
+                        <ref role="3TtcxE" to="tpee:g96eVAe" resolve="typeVariableDeclaration" />
+                      </node>
                     </node>
-                    <node concept="3w_OXm" id="53tmmMtfL4q" role="2OqNvi" />
-                  </node>
-                  <node concept="2ShNRf" id="53tmmMtd38g" role="3K4E3e">
-                    <node concept="2T8Vx0" id="53tmmMtd3vY" role="2ShVmc">
-                      <node concept="2I9FWS" id="53tmmMtd3w0" role="2T96Bj">
-                        <ref role="2I9WkF" to="tpee:g96euPO" resolve="TypeVariableDeclaration" />
+                    <node concept="2OqwBi" id="53tmmMtfK8D" role="3K4Cdx">
+                      <node concept="37vLTw" id="53tmmMtfJ4r" role="2Oq$k0">
+                        <ref role="3cqZAo" node="53tmmMtcWGM" resolve="enclosingScope" />
+                      </node>
+                      <node concept="3w_OXm" id="53tmmMtfL4q" role="2OqNvi" />
+                    </node>
+                    <node concept="2ShNRf" id="53tmmMtd38g" role="3K4E3e">
+                      <node concept="2T8Vx0" id="53tmmMtd3vY" role="2ShVmc">
+                        <node concept="2I9FWS" id="53tmmMtd3w0" role="2T96Bj">
+                          <ref role="2I9WkF" to="tpee:g96euPO" resolve="TypeVariableDeclaration" />
+                        </node>
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
-            </node>
-            <node concept="3clFbH" id="4xoHD1FRYYR" role="3cqZAp" />
-            <node concept="1nLNNL" id="4btN1w5Kjll" role="3cqZAp">
-              <node concept="1nLNMm" id="4btN1w5Kjln" role="1nLNNK">
-                <node concept="3Aq93q" id="4btN1w5KjO3" role="1nLNMb">
-                  <property role="3ArMco" value="true" />
-                  <node concept="3I6sU6" id="4btN1w5KjO4" role="3Ip0Jz">
-                    <node concept="3I6s7M" id="4btN1w5KlNI" role="3I6sU7">
-                      <node concept="3Aqt3T" id="5Oz70LKdlWp" role="3I6s78">
-                        <ref role="3AqCNq" node="4btN1w5Ki4T" resolve="checkDecls" />
-                      </node>
-                    </node>
-                    <node concept="3I6s7M" id="4btN1w5KjRV" role="3I6sU7">
-                      <node concept="3Aqt3T" id="4btN1w5KjRU" role="3I6s78">
-                        <ref role="3AqCNq" node="4btN1w5A2ZH" resolve="genDecl" />
-                        <node concept="37jhX" id="4btN1w5KmeO" role="3AunhB">
-                          <node concept="37vLTw" id="53tmmMtdpBu" role="37jj2">
-                            <ref role="3cqZAo" node="4btN1w5LWi9" resolve="cls" />
-                          </node>
-                        </node>
-                        <node concept="a7P8L" id="4btN1w5MoUY" role="3AunhB">
-                          <ref role="a7OzE" node="4btN1w5KovN" resolve="TyScheme" />
+              <node concept="3clFbH" id="4xoHD1FRYYR" role="3cqZAp" />
+              <node concept="1nLNNL" id="4btN1w5Kjll" role="3cqZAp">
+                <node concept="1nLNMm" id="4btN1w5Kjln" role="1nLNNK">
+                  <node concept="3Aq93q" id="4btN1w5KjO3" role="1nLNMb">
+                    <property role="3ArMco" value="true" />
+                    <node concept="3I6sU6" id="4btN1w5KjO4" role="3Ip0Jz">
+                      <node concept="3I6s7M" id="4btN1w5KlNI" role="3I6sU7">
+                        <node concept="3Aqt3T" id="5Oz70LKdlWp" role="3I6s78">
+                          <ref role="3AqCNq" node="4btN1w5Ki4T" resolve="checkDecls" />
                         </node>
                       </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3NuqgR" id="4btN1w5KjwR" role="0Rg$4">
-                  <node concept="aZer4" id="4btN1w5KjwS" role="3XD1gS">
-                    <property role="TrG5h" value="InstClsTy" />
-                  </node>
-                  <node concept="aZer4" id="4btN1w5KovN" role="3XD1gS">
-                    <property role="TrG5h" value="TyScheme" />
-                  </node>
-                  <node concept="32pEOW" id="24ciDNzxNHz" role="3vLBG7" />
-                </node>
-                <node concept="3NuqgR" id="53tmmMtd1l$" role="0Rg$4">
-                  <node concept="aZer4" id="53tmmMtd1l_" role="3XD1gS">
-                    <property role="TrG5h" value="ContextTVSubs" />
-                    <node concept="2OqwBi" id="53tmmMtd7z5" role="3gj$pD">
-                      <node concept="37vLTw" id="53tmmMtd58v" role="2Oq$k0">
-                        <ref role="3cqZAo" node="53tmmMtd2Iw" resolve="contextTvds" />
-                      </node>
-                      <node concept="34oBXx" id="53tmmMtd9Lz" role="2OqNvi" />
-                    </node>
-                  </node>
-                  <node concept="32pEOW" id="53tmmMtd1lZ" role="3vLBG7" />
-                </node>
-                <node concept="3xSepi" id="6E2cNicdim9" role="3xSepv">
-                  <node concept="3Aq9E8" id="4btN1w5KnXf" role="3xSepj">
-                    <node concept="3I6sU6" id="4btN1w5KnXg" role="3Ip0Jz">
-                      <node concept="3I6s7M" id="53tmmMtdd5t" role="3I6sU7">
-                        <node concept="3jm4v3" id="53tmmMtd1jW" role="3I6s78">
-                          <ref role="3jm46O" node="53tmmMs9igR" resolve="instantiateScheme" />
-                          <node concept="37vLTw" id="53tmmMtdcmu" role="3jicU7">
-                            <ref role="3cqZAo" node="4btN1w5LWi9" resolve="cls" />
+                      <node concept="3I6s7M" id="4btN1w5KjRV" role="3I6sU7">
+                        <node concept="3Aqt3T" id="4btN1w5KjRU" role="3I6s78">
+                          <ref role="3AqCNq" node="4btN1w5A2ZH" resolve="genDecl" />
+                          <node concept="37jhX" id="4btN1w5KmeO" role="3AunhB">
+                            <node concept="37vLTw" id="53tmmMtdpBu" role="37jj2">
+                              <ref role="3cqZAo" node="4btN1w5LWi9" resolve="cls" />
+                            </node>
                           </node>
-                          <node concept="37vLTw" id="53tmmMtdcmi" role="3jicU7">
-                            <ref role="3cqZAo" node="4btN1w5LWif" resolve="tyArgs" />
-                          </node>
-                          <node concept="37vLTw" id="53tmmMtdcm_" role="3jicU7">
-                            <ref role="3cqZAo" node="53tmmMtd2Iw" resolve="contextTvds" />
-                          </node>
-                          <node concept="a7P8L" id="53tmmMtd1kW" role="3jm6SO">
-                            <ref role="a7OzE" node="4btN1w5KjwS" resolve="InstClsTy" />
-                          </node>
-                          <node concept="a7P8L" id="53tmmMtd1lr" role="3jm6SO">
+                          <node concept="a7P8L" id="4btN1w5MoUY" role="3AunhB">
                             <ref role="a7OzE" node="4btN1w5KovN" resolve="TyScheme" />
                           </node>
-                          <node concept="a7P8L" id="53tmmMtdcm7" role="3jm6SO">
-                            <ref role="a7OzE" node="53tmmMtd1l_" resolve="ContextTVSubs" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3NuqgR" id="4btN1w5KjwR" role="0Rg$4">
+                    <node concept="aZer4" id="4btN1w5KjwS" role="3XD1gS">
+                      <property role="TrG5h" value="InstClsTy" />
+                    </node>
+                    <node concept="aZer4" id="4btN1w5KovN" role="3XD1gS">
+                      <property role="TrG5h" value="TyScheme" />
+                    </node>
+                    <node concept="32pEOW" id="24ciDNzxNHz" role="3vLBG7" />
+                  </node>
+                  <node concept="3NuqgR" id="53tmmMtd1l$" role="0Rg$4">
+                    <node concept="aZer4" id="53tmmMtd1l_" role="3XD1gS">
+                      <property role="TrG5h" value="ContextTVSubs" />
+                      <node concept="2OqwBi" id="53tmmMtd7z5" role="3gj$pD">
+                        <node concept="37vLTw" id="53tmmMtd58v" role="2Oq$k0">
+                          <ref role="3cqZAo" node="53tmmMtd2Iw" resolve="contextTvds" />
+                        </node>
+                        <node concept="34oBXx" id="53tmmMtd9Lz" role="2OqNvi" />
+                      </node>
+                    </node>
+                    <node concept="32pEOW" id="53tmmMtd1lZ" role="3vLBG7" />
+                  </node>
+                  <node concept="3xSepi" id="6E2cNicdim9" role="3xSepv">
+                    <node concept="3Aq9E8" id="4btN1w5KnXf" role="3xSepj">
+                      <node concept="3I6sU6" id="4btN1w5KnXg" role="3Ip0Jz">
+                        <node concept="3I6s7M" id="53tmmMtdd5t" role="3I6sU7">
+                          <node concept="3jm4v3" id="53tmmMtd1jW" role="3I6s78">
+                            <ref role="3jm46O" node="53tmmMs9igR" resolve="instantiateScheme" />
+                            <node concept="37vLTw" id="53tmmMtdcmu" role="3jicU7">
+                              <ref role="3cqZAo" node="4btN1w5LWi9" resolve="cls" />
+                            </node>
+                            <node concept="37vLTw" id="53tmmMtdcmi" role="3jicU7">
+                              <ref role="3cqZAo" node="4btN1w5LWif" resolve="tyArgs" />
+                            </node>
+                            <node concept="37vLTw" id="53tmmMtdcm_" role="3jicU7">
+                              <ref role="3cqZAo" node="53tmmMtd2Iw" resolve="contextTvds" />
+                            </node>
+                            <node concept="a7P8L" id="53tmmMtd1kW" role="3jm6SO">
+                              <ref role="a7OzE" node="4btN1w5KjwS" resolve="InstClsTy" />
+                            </node>
+                            <node concept="a7P8L" id="53tmmMtd1lr" role="3jm6SO">
+                              <ref role="a7OzE" node="4btN1w5KovN" resolve="TyScheme" />
+                            </node>
+                            <node concept="a7P8L" id="53tmmMtdcm7" role="3jm6SO">
+                              <ref role="a7OzE" node="53tmmMtd1l_" resolve="ContextTVSubs" />
+                            </node>
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                </node>
-                <node concept="3xSepi" id="6E2cNicdima" role="3xSepv">
-                  <node concept="3Aq9E8" id="5o9$c3znqRQ" role="3xSepj">
-                    <node concept="3I6sU6" id="5o9$c3znqRR" role="3Ip0Jz">
-                      <node concept="3I6s7M" id="5o9$c3znr1x" role="3I6sU7">
-                        <node concept="1lHd6T" id="5o9$c3znr1w" role="3I6s78">
-                          <property role="1lHdp1" value="4jcOV4hu0n_/ERROR" />
-                          <node concept="Xl_RD" id="5o9$c3znr1$" role="1ljv2e">
-                            <property role="Xl_RC" value="malformed type" />
+                  <node concept="3xSepi" id="6E2cNicdima" role="3xSepv">
+                    <node concept="3Aq9E8" id="5o9$c3znqRQ" role="3xSepj">
+                      <node concept="3I6sU6" id="5o9$c3znqRR" role="3Ip0Jz">
+                        <node concept="3I6s7M" id="5o9$c3znr1x" role="3I6sU7">
+                          <node concept="1lHd6T" id="5o9$c3znr1w" role="3I6s78">
+                            <property role="1lHdp1" value="4jcOV4hu0n_/ERROR" />
+                            <node concept="Xl_RD" id="5o9$c3znr1$" role="1ljv2e">
+                              <property role="Xl_RC" value="malformed type" />
+                            </node>
                           </node>
                         </node>
                       </node>