From f33d94dead84b26f8fa1b2dcd721e075fda0239f Mon Sep 17 00:00:00 2001
From: Grigorii Kirgizov <grigorii.kirgizov@jetbrains.com>
Date: Mon, 9 Dec 2019 19:17:42 +0300
Subject: [PATCH] Add default classifierType macro expansion for
 ThisExpression. Fix calls to this macro. (MPSCR-16)

---
 .../jetbrains.mps.baseLanguageExt.types.mps   | 306 +++++++++++++-----
 1 file changed, 219 insertions(+), 87 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 8e995287..67822998 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
@@ -2584,19 +2584,19 @@
               <node concept="3I6sU6" id="4nIWweB_zCV" role="3Ip0Jz">
                 <node concept="3I6s7M" id="2gC7UhU5sgL" role="3I6sU7">
                   <node concept="B_ONY" id="2gC7UhU5sgH" role="3I6s78">
-                    <ref role="17QRF" node="7XRk2O3zfxt" resolve="classifierType" />
+                    <ref role="17QRF" node="4btN1w5JZi$" resolve="classifierType" />
                     <node concept="a7P8L" id="2gC7UhU5skO" role="B_OMz">
                       <ref role="a7OzE" node="5JTOzCQRR4X" resolve="C" />
                     </node>
                     <node concept="1Q7qz5" id="2gC7UhU5ssy" role="150vd">
                       <node concept="1Q7q5z" id="2gC7UhU5swn" role="1Q7qz4">
-                        <ref role="1Q7tcy" node="7XRk2O3zfpB" resolve="cls" />
+                        <ref role="1Q7tcy" node="4btN1w5K2NJ" resolve="cls" />
                         <node concept="37vLTw" id="2gC7UhU5s$e" role="1KxKwY">
                           <ref role="3cqZAo" node="4nIWweB_wxn" resolve="cc" />
                         </node>
                       </node>
                       <node concept="1Q7q5z" id="2gC7UhU5sC6" role="1Q7qz4">
-                        <ref role="1Q7tcy" node="7XRk2O3zfvv" resolve="arguments" />
+                        <ref role="1Q7tcy" node="4btN1w5K05d" resolve="tyArgs" />
                         <node concept="10Nm6u" id="2gC7UhU5sN_" role="1KxKwY" />
                       </node>
                     </node>
@@ -8238,13 +8238,13 @@
                           <node concept="3clFbS" id="27bTNFf4Kw_" role="1$59iG">
                             <node concept="3Aqczg" id="6EY0p2wknZm" role="3cqZAp">
                               <node concept="B_ONY" id="4MEOIDFrx1t" role="3Aqpz8">
-                                <ref role="17QRF" node="7XRk2O3zfxt" resolve="classifierType" />
+                                <ref role="17QRF" node="4btN1w5JZi$" resolve="classifierType" />
                                 <node concept="a7P8L" id="4MEOIDFrx1Z" role="B_OMz">
                                   <ref role="a7OzE" node="3m6K8XLd4h0" resolve="InstType" />
                                 </node>
                                 <node concept="1Q7qz5" id="4MEOIDFrx1z" role="150vd">
                                   <node concept="1Q7q5z" id="4MEOIDFrx24" role="1Q7qz4">
-                                    <ref role="1Q7tcy" node="7XRk2O3zfpB" resolve="cls" />
+                                    <ref role="1Q7tcy" node="4btN1w5K2NJ" resolve="cls" />
                                     <node concept="2OqwBi" id="4MEOIDFrx28" role="1KxKwY">
                                       <node concept="3A2sRY" id="4MEOIDFrx29" role="2Oq$k0">
                                         <ref role="3A2yKK" node="3m6K8XLd3xH" resolve="dcc" />
@@ -8255,7 +8255,7 @@
                                     </node>
                                   </node>
                                   <node concept="1Q7q5z" id="4MEOIDFrx4j" role="1Q7qz4">
-                                    <ref role="1Q7tcy" node="7XRk2O3zfvv" resolve="arguments" />
+                                    <ref role="1Q7tcy" node="4btN1w5K05d" resolve="tyArgs" />
                                     <node concept="2OqwBi" id="4MEOIDFrx4r" role="1KxKwY">
                                       <node concept="3A2sRY" id="4MEOIDFrx4s" role="2Oq$k0">
                                         <ref role="3A2yKK" node="3m6K8XLd3xH" resolve="dcc" />
@@ -8604,13 +8604,13 @@
                                 <node concept="3clFbS" id="27bTNFf5mEp" role="1$59iG">
                                   <node concept="3Aqczg" id="6EY0p2w$m0Y" role="3cqZAp">
                                     <node concept="B_ONY" id="6EY0p2w$m0U" role="3Aqpz8">
-                                      <ref role="17QRF" node="7XRk2O3zfxt" resolve="classifierType" />
+                                      <ref role="17QRF" node="4btN1w5JZi$" resolve="classifierType" />
                                       <node concept="a7P8L" id="6EY0p2w$m14" role="B_OMz">
                                         <ref role="a7OzE" node="70Wv0dIXILY" resolve="InstT" />
                                       </node>
                                       <node concept="1Q7qz5" id="6EY0p2w$m17" role="150vd">
                                         <node concept="1Q7q5z" id="6EY0p2w$m19" role="1Q7qz4">
-                                          <ref role="1Q7tcy" node="7XRk2O3zfpB" resolve="cls" />
+                                          <ref role="1Q7tcy" node="4btN1w5K2NJ" resolve="cls" />
                                           <node concept="2OqwBi" id="6EY0p2w$m1a" role="1KxKwY">
                                             <node concept="3A2sRY" id="6EY0p2w$m1b" role="2Oq$k0">
                                               <ref role="3A2yKK" node="70Wv0dIXgif" resolve="anonCls" />
@@ -8621,7 +8621,7 @@
                                           </node>
                                         </node>
                                         <node concept="1Q7q5z" id="6EY0p2w$m1d" role="1Q7qz4">
-                                          <ref role="1Q7tcy" node="7XRk2O3zfvv" resolve="arguments" />
+                                          <ref role="1Q7tcy" node="4btN1w5K05d" resolve="tyArgs" />
                                           <node concept="2OqwBi" id="6EY0p2w$m1e" role="1KxKwY">
                                             <node concept="3A2sRY" id="6EY0p2w$m1f" role="2Oq$k0">
                                               <ref role="3A2yKK" node="70Wv0dIXgif" resolve="anonCls" />
@@ -9254,19 +9254,19 @@
                                 <node concept="3clFbS" id="6EY0p2yeWT_" role="1$59iG">
                                   <node concept="3Aqczg" id="70Wv0dJ7uKJ" role="3cqZAp">
                                     <node concept="B_ONY" id="70Wv0dJ7uKF" role="3Aqpz8">
-                                      <ref role="17QRF" node="7XRk2O3zfxt" resolve="classifierType" />
+                                      <ref role="17QRF" node="4btN1w5JZi$" resolve="classifierType" />
                                       <node concept="a7P8L" id="70Wv0dJ7xmZ" role="B_OMz">
                                         <ref role="a7OzE" node="70Wv0dJ7m1o" resolve="InstT" />
                                       </node>
                                       <node concept="1Q7qz5" id="70Wv0dJ7uKR" role="150vd">
                                         <node concept="1Q7q5z" id="70Wv0dJ7uKX" role="1Q7qz4">
-                                          <ref role="1Q7tcy" node="7XRk2O3zfpB" resolve="cls" />
+                                          <ref role="1Q7tcy" node="4btN1w5K2NJ" resolve="cls" />
                                           <node concept="37vLTw" id="70Wv0dJ7xdb" role="1KxKwY">
                                             <ref role="3cqZAo" node="70Wv0dJ7xd4" resolve="cls" />
                                           </node>
                                         </node>
                                         <node concept="1Q7q5z" id="70Wv0dJ7uKT" role="1Q7qz4">
-                                          <ref role="1Q7tcy" node="7XRk2O3zfvv" resolve="arguments" />
+                                          <ref role="1Q7tcy" node="4btN1w5K05d" resolve="tyArgs" />
                                           <node concept="2OqwBi" id="27bTNFf4Lo7" role="1KxKwY">
                                             <node concept="3A2sRY" id="27bTNFf4Lo8" role="2Oq$k0">
                                               <ref role="3A2yKK" node="70Wv0dJ7h$U" resolve="cc" />
@@ -21220,19 +21220,19 @@
               <node concept="3I6sU6" id="2rIdnPwk4iV" role="3Ip0Jz">
                 <node concept="3I6s7M" id="2rIdnPwk4ZE" role="3I6sU7">
                   <node concept="B_ONY" id="2rIdnPwk4me" role="3I6s78">
-                    <ref role="17QRF" node="7XRk2O3zfxt" resolve="classifierType" />
+                    <ref role="17QRF" node="4btN1w5JZi$" resolve="classifierType" />
                     <node concept="a7P8L" id="2rIdnPwk4nU" role="B_OMz">
                       <ref role="a7OzE" node="2rIdnPwk29h" resolve="T" />
                     </node>
                     <node concept="1Q7qz5" id="2rIdnPwk4r9" role="150vd">
                       <node concept="1Q7q5z" id="2rIdnPwk4w1" role="1Q7qz4">
-                        <ref role="1Q7tcy" node="7XRk2O3zfpB" resolve="cls" />
+                        <ref role="1Q7tcy" node="4btN1w5K2NJ" resolve="cls" />
                         <node concept="3A2sRY" id="2rIdnPwk4zh" role="1KxKwY">
                           <ref role="3A2yKK" node="2rIdnPwk1UA" resolve="cls" />
                         </node>
                       </node>
                       <node concept="1Q7q5z" id="2rIdnPwk4$U" role="1Q7qz4">
-                        <ref role="1Q7tcy" node="7XRk2O3zfvv" resolve="arguments" />
+                        <ref role="1Q7tcy" node="4btN1w5K05d" resolve="tyArgs" />
                         <node concept="2ShNRf" id="2rIdnPwk4Cc" role="1KxKwY">
                           <node concept="2T8Vx0" id="2rIdnPwk4Wo" role="2ShVmc">
                             <node concept="2I9FWS" id="2rIdnPwk4Wq" role="2T96Bj" />
@@ -35236,77 +35236,6 @@
           <node concept="3clFbJ" id="5Oz70LKcbFn" role="3cqZAp">
             <node concept="3clFbS" id="5Oz70LKcbFp" role="3clFbx">
               <node concept="3clFbJ" id="5Oz70LKc5fj" role="3cqZAp">
-                <node concept="3clFbS" id="5Oz70LKc5fl" role="3clFbx">
-                  <node concept="3clFbH" id="5Oz70LKcnqz" role="3cqZAp" />
-                  <node concept="1DcWWT" id="4btN1w5K8Wh" role="3cqZAp">
-                    <node concept="3clFbS" id="4btN1w5K8Wj" role="2LFqv$">
-                      <node concept="3Aqczg" id="4btN1w5KaFE" role="3cqZAp">
-                        <node concept="1imXTs" id="4btN1w5KaF$" role="3Aqpz8">
-                          <node concept="a7P8L" id="4btN1w5KaZh" role="1imXu6">
-                            <ref role="a7OzE" node="4btN1w5K1tx" resolve="TyArgs" />
-                            <node concept="2OqwBi" id="4btN1w5KbjH" role="3gCZO6">
-                              <node concept="37vLTw" id="4btN1w5Kbb0" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4btN1w5K8Wk" resolve="tyArg" />
-                              </node>
-                              <node concept="2bSWHS" id="4btN1w5Kbty" role="2OqNvi" />
-                            </node>
-                          </node>
-                          <node concept="37vLTw" id="4btN1w5KbHv" role="1imXSf">
-                            <ref role="3cqZAo" node="4btN1w5K8Wk" resolve="tyArg" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3cpWsn" id="4btN1w5K8Wk" role="1Duv9x">
-                      <property role="TrG5h" value="tyArg" />
-                      <node concept="3Tqbb2" id="4btN1w5K920" role="1tU5fm">
-                        <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
-                      </node>
-                    </node>
-                    <node concept="3tDTZT" id="4btN1w5K9wJ" role="1DdaDG">
-                      <ref role="3tDTNw" node="4btN1w5K05d" resolve="tyArgs" />
-                    </node>
-                  </node>
-                  <node concept="3Aqczg" id="4btN1w5K5qK" role="3cqZAp">
-                    <node concept="3A8Hvi" id="4btN1w5K5qH" role="3Aqpz8">
-                      <node concept="aZ4PW" id="4btN1w5K5yr" role="3A8wtg">
-                        <node concept="3txIi4" id="4btN1w5K5Ak" role="aZ4eD" />
-                      </node>
-                      <node concept="ns1u0" id="4btN1w5K5Ed" role="3A8w4Q">
-                        <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifierType" />
-                        <node concept="nsMwS" id="4btN1w5K5I2" role="ns1xD">
-                          <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                          <node concept="2OqwBi" id="4btN1w5K6dV" role="nsMwV">
-                            <node concept="3tDTZT" id="4btN1w5K5Xi" role="2Oq$k0">
-                              <ref role="3tDTNw" node="4btN1w5K2NJ" resolve="cls" />
-                            </node>
-                            <node concept="iZEcu" id="4btN1w5K6L5" role="2OqNvi" />
-                          </node>
-                        </node>
-                        <node concept="nsMwS" id="4btN1w5K79k" role="ns1xD">
-                          <ref role="nsMwP" node="JOGAOsVt2e" resolve="parameter" />
-                          <node concept="1nq8_$" id="4btN1w5K7oE" role="nsMwV">
-                            <node concept="a7P8L" id="4btN1w5K7oC" role="1nq8_t">
-                              <ref role="a7OzE" node="4btN1w5K1tx" resolve="TyArgs" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbH" id="5Oz70LKc9ir" role="3cqZAp" />
-                </node>
-                <node concept="3y3z36" id="5Oz70LKc6L$" role="3clFbw">
-                  <node concept="3cmrfG" id="5Oz70LKc7$X" role="3uHU7w">
-                    <property role="3cmrfH" value="0" />
-                  </node>
-                  <node concept="2OqwBi" id="5Oz70LKc5_t" role="3uHU7B">
-                    <node concept="3tDTZT" id="5Oz70LKc5nO" role="2Oq$k0">
-                      <ref role="3tDTNw" node="4btN1w5K05d" resolve="tyArgs" />
-                    </node>
-                    <node concept="34oBXx" id="5Oz70LKc5Hd" role="2OqNvi" />
-                  </node>
-                </node>
                 <node concept="9aQIb" id="5Oz70LKc8fa" role="9aQIa">
                   <node concept="3clFbS" id="5Oz70LKc8fb" role="9aQI4">
                     <node concept="3SKdUt" id="5Oz70LKca9b" role="3cqZAp">
@@ -35319,7 +35248,7 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="3clFbH" id="5Oz70LKca9f" role="3cqZAp" />
+                    <node concept="3clFbH" id="5Oz70LKt$L9" role="3cqZAp" />
                     <node concept="3cpWs8" id="5Oz70LKca9g" role="3cqZAp">
                       <node concept="3cpWsn" id="5Oz70LKca9h" role="3cpWs9">
                         <property role="TrG5h" value="allowUnchecked" />
@@ -35453,6 +35382,209 @@
                     </node>
                   </node>
                 </node>
+                <node concept="3eNFk2" id="5Oz70LKtmL5" role="3eNLev">
+                  <node concept="3y3z36" id="5Oz70LKc6L$" role="3eO9$A">
+                    <node concept="3cmrfG" id="5Oz70LKc7$X" role="3uHU7w">
+                      <property role="3cmrfH" value="0" />
+                    </node>
+                    <node concept="2OqwBi" id="5Oz70LKc5_t" role="3uHU7B">
+                      <node concept="3tDTZT" id="5Oz70LKc5nO" role="2Oq$k0">
+                        <ref role="3tDTNw" node="4btN1w5K05d" resolve="tyArgs" />
+                      </node>
+                      <node concept="34oBXx" id="5Oz70LKc5Hd" role="2OqNvi" />
+                    </node>
+                  </node>
+                  <node concept="3clFbS" id="5Oz70LKc5fl" role="3eOfB_">
+                    <node concept="3SKdUt" id="5Oz70LKt$kO" role="3cqZAp">
+                      <node concept="1PaTwC" id="5Oz70LKt$kP" role="3ndbpf">
+                        <node concept="3oM_SD" id="5Oz70LKt$kR" role="1PaTwD">
+                          <property role="3oM_SC" value="usual" />
+                        </node>
+                        <node concept="3oM_SD" id="5Oz70LKt$sW" role="1PaTwD">
+                          <property role="3oM_SC" value="expansion" />
+                        </node>
+                        <node concept="3oM_SD" id="5Oz70LKt$wM" role="1PaTwD">
+                          <property role="3oM_SC" value="with" />
+                        </node>
+                        <node concept="3oM_SD" id="5Oz70LKt$wQ" role="1PaTwD">
+                          <property role="3oM_SC" value="type" />
+                        </node>
+                        <node concept="3oM_SD" id="5Oz70LKt$Cx" role="1PaTwD">
+                          <property role="3oM_SC" value="arguments" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbH" id="5Oz70LKt$TH" role="3cqZAp" />
+                    <node concept="1DcWWT" id="4btN1w5K8Wh" role="3cqZAp">
+                      <node concept="3clFbS" id="4btN1w5K8Wj" role="2LFqv$">
+                        <node concept="3Aqczg" id="4btN1w5KaFE" role="3cqZAp">
+                          <node concept="1imXTs" id="4btN1w5KaF$" role="3Aqpz8">
+                            <node concept="a7P8L" id="4btN1w5KaZh" role="1imXu6">
+                              <ref role="a7OzE" node="4btN1w5K1tx" resolve="TyArgs" />
+                              <node concept="2OqwBi" id="4btN1w5KbjH" role="3gCZO6">
+                                <node concept="37vLTw" id="4btN1w5Kbb0" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="4btN1w5K8Wk" resolve="tyArg" />
+                                </node>
+                                <node concept="2bSWHS" id="4btN1w5Kbty" role="2OqNvi" />
+                              </node>
+                            </node>
+                            <node concept="37vLTw" id="4btN1w5KbHv" role="1imXSf">
+                              <ref role="3cqZAo" node="4btN1w5K8Wk" resolve="tyArg" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3cpWsn" id="4btN1w5K8Wk" role="1Duv9x">
+                        <property role="TrG5h" value="tyArg" />
+                        <node concept="3Tqbb2" id="4btN1w5K920" role="1tU5fm">
+                          <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
+                        </node>
+                      </node>
+                      <node concept="3tDTZT" id="4btN1w5K9wJ" role="1DdaDG">
+                        <ref role="3tDTNw" node="4btN1w5K05d" resolve="tyArgs" />
+                      </node>
+                    </node>
+                    <node concept="3Aqczg" id="4btN1w5K5qK" role="3cqZAp">
+                      <node concept="3A8Hvi" id="4btN1w5K5qH" role="3Aqpz8">
+                        <node concept="aZ4PW" id="4btN1w5K5yr" role="3A8wtg">
+                          <node concept="3txIi4" id="4btN1w5K5Ak" role="aZ4eD" />
+                        </node>
+                        <node concept="ns1u0" id="4btN1w5K5Ed" role="3A8w4Q">
+                          <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifierType" />
+                          <node concept="nsMwS" id="4btN1w5K5I2" role="ns1xD">
+                            <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
+                            <node concept="2OqwBi" id="4btN1w5K6dV" role="nsMwV">
+                              <node concept="3tDTZT" id="4btN1w5K5Xi" role="2Oq$k0">
+                                <ref role="3tDTNw" node="4btN1w5K2NJ" resolve="cls" />
+                              </node>
+                              <node concept="iZEcu" id="4btN1w5K6L5" role="2OqNvi" />
+                            </node>
+                          </node>
+                          <node concept="nsMwS" id="4btN1w5K79k" role="ns1xD">
+                            <ref role="nsMwP" node="JOGAOsVt2e" resolve="parameter" />
+                            <node concept="1nq8_$" id="4btN1w5K7oE" role="nsMwV">
+                              <node concept="a7P8L" id="4btN1w5K7oC" role="1nq8_t">
+                                <ref role="a7OzE" node="4btN1w5K1tx" resolve="TyArgs" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbH" id="5Oz70LKc9ir" role="3cqZAp" />
+                  </node>
+                </node>
+                <node concept="3clFbC" id="5Oz70LKtoxH" role="3clFbw">
+                  <node concept="10Nm6u" id="5Oz70LKtp3z" role="3uHU7w" />
+                  <node concept="3tDTZT" id="5Oz70LKtofL" role="3uHU7B">
+                    <ref role="3tDTNw" node="4btN1w5K05d" resolve="tyArgs" />
+                  </node>
+                </node>
+                <node concept="3clFbS" id="5Oz70LKtmL7" role="3clFbx">
+                  <node concept="3SKdUt" id="5Oz70LKtze7" role="3cqZAp">
+                    <node concept="1PaTwC" id="5Oz70LKtze8" role="3ndbpf">
+                      <node concept="3oM_SD" id="5Oz70LKtzea" role="1PaTwD">
+                        <property role="3oM_SC" value="default" />
+                      </node>
+                      <node concept="3oM_SD" id="5Oz70LKtziw" role="1PaTwD">
+                        <property role="3oM_SC" value="expansion" />
+                      </node>
+                      <node concept="3oM_SD" id="5Oz70LKtzq9" role="1PaTwD">
+                        <property role="3oM_SC" value="with" />
+                      </node>
+                      <node concept="3oM_SD" id="5Oz70LKtzu0" role="1PaTwD">
+                        <property role="3oM_SC" value="type" />
+                      </node>
+                      <node concept="3oM_SD" id="5Oz70LKtzxS" role="1PaTwD">
+                        <property role="3oM_SC" value="variables" />
+                      </node>
+                      <node concept="3oM_SD" id="5Oz70LKtz_L" role="1PaTwD">
+                        <property role="3oM_SC" value="is" />
+                      </node>
+                      <node concept="3oM_SD" id="5Oz70LKtzDF" role="1PaTwD">
+                        <property role="3oM_SC" value="needed" />
+                      </node>
+                      <node concept="3oM_SD" id="5Oz70LKtzDN" role="1PaTwD">
+                        <property role="3oM_SC" value="(e.g." />
+                      </node>
+                      <node concept="3oM_SD" id="5Oz70LKtzHJ" role="1PaTwD">
+                        <property role="3oM_SC" value="for" />
+                      </node>
+                      <node concept="3oM_SD" id="5Oz70LKtzTD" role="1PaTwD">
+                        <property role="3oM_SC" value="ThisExpression)" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbH" id="5Oz70LKt$Y2" role="3cqZAp" />
+                  <node concept="1DcWWT" id="5Oz70LKtpT3" role="3cqZAp">
+                    <node concept="3clFbS" id="5Oz70LKtpT4" role="2LFqv$">
+                      <node concept="3Aqczg" id="5Oz70LKtpT5" role="3cqZAp">
+                        <node concept="B_ONY" id="5Oz70LKtxLd" role="3Aqpz8">
+                          <ref role="17QRF" node="4btN1w5KdUp" resolve="typeVariable" />
+                          <node concept="a7P8L" id="5Oz70LKtxP7" role="B_OMz">
+                            <ref role="a7OzE" node="4btN1w5K1tx" resolve="TyArgs" />
+                            <node concept="2OqwBi" id="5Oz70LKty7l" role="3gCZO6">
+                              <node concept="37vLTw" id="5Oz70LKtxXw" role="2Oq$k0">
+                                <ref role="3cqZAo" node="5Oz70LKtpTc" resolve="tvd" />
+                              </node>
+                              <node concept="2bSWHS" id="5Oz70LKtyrn" role="2OqNvi" />
+                            </node>
+                          </node>
+                          <node concept="1Q7qz5" id="5Oz70LKtyOj" role="150vd">
+                            <node concept="1Q7q5z" id="5Oz70LKtyS8" role="1Q7qz4">
+                              <ref role="1Q7tcy" node="4btN1w5KevB" resolve="tvd" />
+                              <node concept="37vLTw" id="5Oz70LKtyVZ" role="1KxKwY">
+                                <ref role="3cqZAo" node="5Oz70LKtpTc" resolve="tvd" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3cpWsn" id="5Oz70LKtpTc" role="1Duv9x">
+                      <property role="TrG5h" value="tvd" />
+                      <node concept="3Tqbb2" id="5Oz70LKtpTd" role="1tU5fm">
+                        <ref role="ehGHo" to="tpee:g96euPO" resolve="TypeVariableDeclaration" />
+                      </node>
+                    </node>
+                    <node concept="2OqwBi" id="5Oz70LKtsiv" role="1DdaDG">
+                      <node concept="3tDTZT" id="5Oz70LKtrIe" role="2Oq$k0">
+                        <ref role="3tDTNw" node="4btN1w5K2NJ" resolve="cls" />
+                      </node>
+                      <node concept="3Tsc0h" id="5Oz70LKtsSl" role="2OqNvi">
+                        <ref role="3TtcxE" to="tpee:g96eVAe" resolve="typeVariableDeclaration" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3Aqczg" id="5Oz70LKtpTf" role="3cqZAp">
+                    <node concept="3A8Hvi" id="5Oz70LKtpTg" role="3Aqpz8">
+                      <node concept="aZ4PW" id="5Oz70LKtpTh" role="3A8wtg">
+                        <node concept="3txIi4" id="5Oz70LKtpTi" role="aZ4eD" />
+                      </node>
+                      <node concept="ns1u0" id="5Oz70LKtpTj" role="3A8w4Q">
+                        <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifierType" />
+                        <node concept="nsMwS" id="5Oz70LKtpTk" role="ns1xD">
+                          <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
+                          <node concept="2OqwBi" id="5Oz70LKtpTl" role="nsMwV">
+                            <node concept="3tDTZT" id="5Oz70LKtpTm" role="2Oq$k0">
+                              <ref role="3tDTNw" node="4btN1w5K2NJ" resolve="cls" />
+                            </node>
+                            <node concept="iZEcu" id="5Oz70LKtpTn" role="2OqNvi" />
+                          </node>
+                        </node>
+                        <node concept="nsMwS" id="5Oz70LKtpTo" role="ns1xD">
+                          <ref role="nsMwP" node="JOGAOsVt2e" resolve="parameter" />
+                          <node concept="1nq8_$" id="5Oz70LKtpTp" role="nsMwV">
+                            <node concept="a7P8L" id="5Oz70LKtpTq" role="1nq8_t">
+                              <ref role="a7OzE" node="4btN1w5K1tx" resolve="TyArgs" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbH" id="5Oz70LKto0y" role="3cqZAp" />
+                </node>
               </node>
               <node concept="3clFbH" id="5Oz70LKcbFo" role="3cqZAp" />
             </node>