@zzzen/pyright-internal 1.2.0-dev.2022-07-02 → 1.2.0-dev.20220703

package/dist/analyzer/constraintSolver.js

@@ -532,6 +532,7 @@ function populateTypeVarContextBasedOnExpectedType(evaluator, type, expectedType
         /* diag */ undefined, typeVarContext, 
         /* srcTypeVarContext */ undefined, 1024 /* PopulatingExpectedType */);
     }
+    evaluator.inferTypeParameterVarianceForClass(type);
     // If the expected type is the same as the target type (commonly the case),
     // we can use a faster method.
     if (types_1.ClassType.isSameGenericClass(expectedType, type)) {
@@ -542,7 +543,7 @@ function populateTypeVarContextBasedOnExpectedType(evaluator, type, expectedType
                 // Skip this if the type argument is a TypeVar defined by the class scope because
                 // we're potentially solving for these TypeVars.
                 if (!(0, types_1.isTypeVar)(typeVarType) || typeVarType.scopeId !== type.details.typeVarScopeId) {
-                    typeVarContext.setTypeVarType(entry.typeVar, entry.typeVar.details.variance === 1 /* Covariant */ ? undefined : typeVarType, entry.typeVar.details.variance === 2 /* Contravariant */ ? undefined : typeVarType, entry.retainLiteral);
+                    typeVarContext.setTypeVarType(entry.typeVar, types_1.TypeVarType.getVariance(entry.typeVar) === 2 /* Covariant */ ? undefined : typeVarType, types_1.TypeVarType.getVariance(entry.typeVar) === 3 /* Contravariant */ ? undefined : typeVarType, entry.retainLiteral);
                 }
             }
         });
@@ -554,7 +555,7 @@ function populateTypeVarContextBasedOnExpectedType(evaluator, type, expectedType
         const typeVar = types_1.TypeVarType.createInstance(`__dest${index}`);
         typeVar.details.isSynthesized = true;
         // Use invariance here so we set the narrow and wide values on the TypeVar.
-        typeVar.details.variance = 0 /* Invariant */;
+        typeVar.details.declaredVariance = 1 /* Invariant */;
         typeVar.scopeId = expectedTypeScopeId;
         return typeVar;
     });
@@ -589,7 +590,9 @@ function populateTypeVarContextBasedOnExpectedType(evaluator, type, expectedType
                         expectedTypeArgValue = (0, typeUtils_1.transformExpectedTypeForConstructor)(expectedTypeArgValue, typeVarContext, liveTypeVarScopes);
                     }
                     if (expectedTypeArgValue) {
-                        typeVarContext.setTypeVarType(targetTypeVar, typeVar.details.variance === 1 /* Covariant */ ? undefined : expectedTypeArgValue, typeVar.details.variance === 2 /* Contravariant */ ? undefined : expectedTypeArgValue);
+                        typeVarContext.setTypeVarType(targetTypeVar, types_1.TypeVarType.getVariance(typeVar) === 2 /* Covariant */ ? undefined : expectedTypeArgValue, types_1.TypeVarType.getVariance(typeVar) === 3 /* Contravariant */
+                            ? undefined
+                            : expectedTypeArgValue);
                     }
                     else {
                         isResultValid = false;

package/dist/analyzer/constraintSolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"constraintSolver.js","sourceRoot":"","sources":["../../../src/analyzer/constraintSolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"constraintSolver.js","sourceRoot":"","sources":["../../../src/analyzer/constraintSolver.ts"],"names":[],"mappings":";AAAA;;;;;;;;;GASG;;;AAEH,qDAA0D;AAC1D,uDAAqD;AACrD,6DAAiF;AACjF,mCA0BiB;AACjB,2CAgBqB;AACrB,qDAAkD;AAElD,uFAAuF;AACvF,qFAAqF;AACrF,yFAAyF;AACzF,4FAA4F;AAC5F,yFAAyF;AACzF,uBAAuB;AACvB,SAAgB,mBAAmB,CAC/B,SAAwB,EACxB,QAAqB,EACrB,OAAa,EACb,IAAoC,EACpC,cAA8B,EAC9B,KAAK,kBAA0B,EAC/B,cAAc,GAAG,CAAC;;IAElB,IAAI,gBAAgB,GAAG,IAAI,CAAC;IAC5B,MAAM,eAAe,GAAG,CAAC,KAAK,iCAAyC,CAAC,KAAK,CAAC,CAAC;IAE/E,+DAA+D;IAC/D,+DAA+D;IAC/D,mEAAmE;IACnE,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE;QACnB,OAAO,IAAI,CAAC;KACf;IAED,gEAAgE;IAChE,iBAAiB;IACjB,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;QACpD,IAAI,IAAA,sBAAc,EAAC,OAAO,CAAC,IAAI,CAAC,IAAA,eAAO,EAAC,OAAO,CAAC,IAAI,iBAAS,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC,EAAE;YAC7F,OAAO,IAAI,CAAC;SACf;QAED,2DAA2D;QAC3D,yBAAyB;QACzB,IAAI,CAAC,KAAK,+BAAqC,CAAC,KAAK,CAAC,EAAE;YACpD,OAAO,IAAI,CAAC;SACf;QAED,6DAA6D;QAC7D,mCAAmC;QACnC,IAAI,eAAe,EAAE;YACjB,IACI,SAAS,CAAC,UAAU,CAChB,SAAS,CAAC,4BAA4B,CAAC,QAAQ,CAAC,EAChD,SAAS,CAAC,4BAA4B,CAAC,OAAO,CAAC;YAC/C,UAAU,CAAC,SAAS;YACpB,wBAAwB,CAAC,SAAS;YAClC,uBAAuB,CAAC,SAAS,EACjC,KAAK,EACL,cAAc,CACjB,EACH;gBACE,OAAO,IAAI,CAAC;aACf;SACJ;QAED,gBAAgB,GAAG,KAAK,CAAC;QACzB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,aAAa,EAAE;YACjC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU,CACZ,oBAAS,CAAC,kBAAkB,CAAC,sBAAsB,EAAE,CAAC,MAAM,CAAC;gBACzD,UAAU,EAAE,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC;gBACxC,QAAQ,EAAE,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC;aAC1C,CAAC,CACL,CAAC;YACF,OAAO,KAAK,CAAC;SAChB;KACJ;IAED,IAAI,CAAC,KAAK,4BAAoC,CAAC,KAAK,CAAC,EAAE;QACnD,OAAO,SAAS,CAAC,UAAU,CACvB,SAAS,CAAC,4BAA4B,CAAC,QAAQ,CAAC,EAChD,SAAS,CAAC,4BAA4B,CAAC,OAAO,CAAC,EAC/C,IAAI;QACJ,wBAAwB,CAAC,SAAS;QAClC,uBAAuB,CAAC,SAAS,EACjC,KAAK,EACL,cAAc,CACjB,CAAC;KACL;IAED,IAAI,QAAQ,CAAC,OAAO,CAAC,WAAW,EAAE;QAC9B,OAAO,qBAAqB,CAAC,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;KACpG;IAED,IAAI,QAAQ,CAAC,OAAO,CAAC,UAAU,EAAE;QAC7B,IAAI,CAAC,IAAA,kBAAU,EAAC,OAAO,CAAC,EAAE;YACtB,MAAM,cAAc,GAAG,SAAS,CAAC,iBAAiB,EAAE,CAAC;YACrD,IAAI,cAAc,IAAI,IAAA,2BAAmB,EAAC,cAAc,CAAC,EAAE;gBACvD,oCAAoC;gBACpC,OAAO,GAAG,IAAA,6BAAiB,EACvB,IAAA,gCAAoB,EAChB,cAAc,EACd,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;gBACvC,4BAA4B,CAAC,IAAI;gBACjC,mBAAmB,CAAC,IAAI;gBACxB,qBAAqB,CAAC,IAAI,CAC7B,CACJ,CAAC;aACL;iBAAM;gBACH,OAAO,GAAG,mBAAW,CAAC,MAAM,EAAE,CAAC;aAClC;SACJ;KACJ;IAED,sFAAsF;IACtF,IACI,gBAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC;QACjC,IAAA,uBAAe,EAAC,OAAO,CAAC;QACxB,iBAAS,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC;QACpC,CAAC,OAAO,CAAC,aAAa,EACxB;QACE,OAAO,GAAG,eAAO,CAAC,MAAM,EAAE,CAAC;KAC9B;IAED,MAAM,QAAQ,GAAG,cAAc,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACrD,MAAM,kBAAkB,GAAG,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,WAAW,CAAC;IACjD,MAAM,gBAAgB,GAAG,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,SAAS,mCAAI,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC;IAE3E,uEAAuE;IACvE,sEAAsE;IACtE,wEAAwE;IACxE,wCAAwC;IACxC,IAAI,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;QACzC,IAAI,eAAiC,CAAC;QACtC,MAAM,eAAe,GAAG,SAAS,CAAC,4BAA4B,CAAC,OAAO,CAAC,CAAC;QAExE,IAAI,IAAA,iBAAS,EAAC,OAAO,CAAC,EAAE;YACpB,IACI,SAAS,CAAC,UAAU,CAChB,QAAQ,EACR,eAAe;YACf,UAAU,CAAC,SAAS,EACpB,IAAI,+BAAc,CAAC,QAAQ,CAAC,OAAO,CAAC;YACpC,uBAAuB,CAAC,SAAS,mBAEjC,cAAc,CACjB,EACH;gBACE,eAAe,GAAG,OAAO,CAAC;gBAE1B,gEAAgE;gBAChE,gDAAgD;gBAChD,IAAI,gBAAQ,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE;oBAClC,eAAe,GAAG,IAAA,6BAAiB,EAAC,OAAO,CAAC,CAAC;iBAChD;aACJ;SACJ;aAAM;YACH,IAAI,YAAY,GAAG,IAAI,CAAC;YAExB,qEAAqE;YACrE,sEAAsE;YACtE,gCAAgC;YAChC,IAAI,4BAAgD,CAAC;YAErD,0DAA0D;YAC1D,eAAe,GAAG,IAAA,uBAAW,EAAC,eAAe,EAAE,CAAC,UAAU,EAAE,EAAE;gBAC1D,IAAI,kBAAoC,CAAC;gBAEzC,IAAI,IAAA,sBAAc,EAAC,UAAU,CAAC,EAAE;oBAC5B,OAAO,UAAU,CAAC;iBACrB;gBAED,IAAI,mBAAuC,CAAC;gBAC5C,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,CAAC,EAAE,EAAE;oBACnD,MAAM,kBAAkB,GAAG,gBAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC;wBACxD,CAAC,CAAC,IAAA,iCAAqB,EAAC,UAAU,CAAC;wBACnC,CAAC,CAAC,UAAU,CAAC;oBACjB,IACI,SAAS,CAAC,UAAU,CAChB,kBAAkB,EAClB,UAAU;oBACV,UAAU,CAAC,SAAS;oBACpB,wBAAwB,CAAC,SAAS;oBAClC,uBAAuB,CAAC,SAAS,mBAEjC,cAAc,CACjB,EACH;wBACE,IACI,CAAC,kBAAkB;4BACnB,SAAS,CAAC,UAAU,CAChB,gBAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC;gCAC7B,CAAC,CAAC,IAAA,iCAAqB,EAAC,kBAAkB,CAAC;gCAC3C,CAAC,CAAC,kBAAkB,EACxB,kBAAkB;4BAClB,UAAU,CAAC,SAAS;4BACpB,wBAAwB,CAAC,SAAS;4BAClC,uBAAuB,CAAC,SAAS,mBAEjC,cAAc,CACjB,EACH;4BACE,kBAAkB,GAAG,IAAA,8BAAkB,EAAC,UAAU,EAAE,IAAA,4BAAgB,EAAC,UAAU,CAAC,CAAC,CAAC;4BAClF,mBAAmB,GAAG,CAAC,CAAC;yBAC3B;qBACJ;gBACL,CAAC,CAAC,CAAC;gBAEH,IAAI,CAAC,kBAAkB,EAAE;oBACrB,kEAAkE;oBAClE,mEAAmE;oBACnE,mDAAmD;oBACnD,IAAI,CAAC,eAAe,EAAE;wBAClB,YAAY,GAAG,KAAK,CAAC;qBACxB;iBACJ;gBAED,mEAAmE;gBACnE,uDAAuD;gBACvD,IAAI,mBAAmB,KAAK,SAAS,IAAI,CAAC,IAAA,4BAAgB,EAAC,UAAU,CAAC,EAAE;oBACpE,IACI,4BAA4B,KAAK,SAAS;wBAC1C,4BAA4B,KAAK,mBAAmB,EACtD;wBACE,YAAY,GAAG,KAAK,CAAC;qBACxB;oBAED,4BAA4B,GAAG,mBAAmB,CAAC;iBACtD;gBAED,OAAO,kBAAkB,CAAC;YAC9B,CAAC,CAAC,CAAC;YAEH,IAAI,IAAA,eAAO,EAAC,eAAe,CAAC,IAAI,CAAC,YAAY,EAAE;gBAC3C,eAAe,GAAG,SAAS,CAAC;aAC/B;YAED,uEAAuE;YACvE,sBAAsB;YACtB,IAAI,CAAC,eAAe,IAAI,IAAA,eAAO,EAAC,eAAe,CAAC,EAAE;gBAC9C,eAAe,GAAG,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE;oBAC/D,MAAM,kBAAkB,GAAG,gBAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC;wBACxD,CAAC,CAAC,IAAA,iCAAqB,EAAC,UAAU,CAAC;wBACnC,CAAC,CAAC,UAAU,CAAC;oBACjB,OAAO,SAAS,CAAC,UAAU,CACvB,kBAAkB,EAClB,eAAe;oBACf,UAAU,CAAC,SAAS;oBACpB,wBAAwB,CAAC,SAAS;oBAClC,uBAAuB,CAAC,SAAS,mBAEjC,cAAc,CACjB,CAAC;gBACN,CAAC,CAAC,CAAC;aACN;SACJ;QAED,uDAAuD;QACvD,6DAA6D;QAC7D,sCAAsC;QACtC,IAAI,CAAC,eAAe,EAAE;YAClB,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU,CACZ,oBAAS,CAAC,kBAAkB,CAAC,sBAAsB,EAAE,CAAC,MAAM,CAAC;gBACzD,IAAI,EAAE,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC;gBAClC,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,IAAI;aAC9B,CAAC,CACL,CAAC;YACF,OAAO,KAAK,CAAC;SAChB;QAED,IAAI,kBAAkB,IAAI,CAAC,IAAA,sBAAc,EAAC,kBAAkB,CAAC,EAAE;YAC3D,IACI,CAAC,SAAS,CAAC,UAAU,CACjB,kBAAkB,EAClB,eAAe;YACf,UAAU,CAAC,SAAS;YACpB,wBAAwB,CAAC,SAAS;YAClC,uBAAuB,CAAC,SAAS,mBAEjC,cAAc,CACjB,EACH;gBACE,gEAAgE;gBAChE,mEAAmE;gBACnE,wBAAwB;gBACxB,IACI,SAAS,CAAC,UAAU,CAChB,eAAe,EACf,kBAAkB;gBAClB,UAAU,CAAC,SAAS;gBACpB,wBAAwB,CAAC,SAAS;gBAClC,uBAAuB,CAAC,SAAS,mBAEjC,cAAc,CACjB,EACH;oBACE,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,IAAI,gBAAgB,EAAE;wBAChD,cAAc,CAAC,cAAc,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;qBAC5D;iBACJ;qBAAM;oBACH,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU,CACZ,oBAAS,CAAC,kBAAkB,CAAC,sBAAsB,EAAE,CAAC,MAAM,CAAC;wBACzD,IAAI,EAAE,SAAS,CAAC,SAAS,CAAC,eAAe,CAAC;wBAC1C,IAAI,EAAE,SAAS,CAAC,SAAS,CAAC,kBAAkB,CAAC;qBAChD,CAAC,CACL,CAAC;oBACF,OAAO,KAAK,CAAC;iBAChB;aACJ;SACJ;aAAM;YACH,mCAAmC;YACnC,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,IAAI,gBAAgB,EAAE;gBAChD,cAAc,CAAC,cAAc,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;aAC5D;SACJ;QAED,OAAO,IAAI,CAAC;KACf;IAED,sDAAsD;IACtD,IAAI,kBAAkB,GAAG,kBAAkB,CAAC;IAC5C,IAAI,gBAAgB,GAAG,gBAAgB,CAAC;IACxC,MAAM,YAAY,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,+BAAkB,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IAEjE,yEAAyE;IACzE,4EAA4E;IAC5E,MAAM,cAAc,GAChB,CAAC,KAAK,qCAA2C,CAAC,KAAK,CAAC;QACxD,cAAc,CAAC,iBAAiB,CAAC,QAAQ,CAAC;QAC1C,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,IAAI,IAAA,+BAAmB,EAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC/E,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,+BAAmB,EAAC,CAAC,CAAC,CAAC,CAAC;IACrE,IAAI,UAAU,GAAG,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAA,6BAAiB,EAAC,OAAO,CAAC,CAAC;IAEvE,IAAI,gBAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE;QACnC,IAAI,IAAA,qCAAyB,EAAC,UAAU,CAAC,EAAE;YACvC,UAAU,GAAG,IAAA,6BAAiB,EAAC,UAAU,CAAC,CAAC;SAC9C;aAAM;YACH,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU,CACZ,oBAAS,CAAC,kBAAkB,CAAC,sBAAsB,EAAE,CAAC,MAAM,CAAC;gBACzD,UAAU,EAAE,SAAS,CAAC,SAAS,CAAC,UAAU,CAAC;gBAC3C,QAAQ,EAAE,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC;aAC1C,CAAC,CACL,CAAC;YACF,OAAO,KAAK,CAAC;SAChB;KACJ;IAED,IAAI,eAAe,IAAI,CAAC,KAAK,gCAAwC,CAAC,KAAK,CAAC,EAAE;QAC1E,8BAA8B;QAC9B,IAAI,CAAC,gBAAgB,EAAE;YACnB,gBAAgB,GAAG,UAAU,CAAC;SACjC;aAAM,IACH,CAAC,IAAA,kBAAU,EACP,gBAAgB,EAChB,UAAU;QACV,yBAAyB,CAAC,SAAS;QACnC,qBAAqB,CAAC,SAAS,EAC/B,cAAc,CACjB,EACH;YACE,IACI,SAAS,CAAC,UAAU,CAChB,gBAAgB,EAChB,SAAS,CAAC,4BAA4B,CAAC,UAAU,CAAC,EAClD,YAAY;YACZ,wBAAwB,CAAC,SAAS;YAClC,uBAAuB,CAAC,SAAS,EACjC,KAAK,+BAAqC,EAC1C,cAAc,CACjB,EACH;gBACE,yEAAyE;gBACzE,gBAAgB,GAAG,UAAU,CAAC;aACjC;iBAAM,IACH,CAAC,SAAS,CAAC,UAAU,CACjB,UAAU,EACV,gBAAgB,EAChB,YAAY;YACZ,wBAAwB,CAAC,SAAS;YAClC,uBAAuB,CAAC,SAAS,EACjC,KAAK,+BAAqC,EAC1C,cAAc,CACjB,EACH;gBACE,IAAI,IAAI,IAAI,YAAY,EAAE;oBACtB,IAAI,CAAC,UAAU,CACX,oBAAS,CAAC,kBAAkB,CAAC,sBAAsB,EAAE,CAAC,MAAM,CAAC;wBACzD,UAAU,EAAE,SAAS,CAAC,SAAS,CAAC,UAAU,CAAC;wBAC3C,QAAQ,EAAE,SAAS,CAAC,SAAS,CAAC,gBAAgB,CAAC;qBAClD,CAAC,CACL,CAAC;oBACF,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;iBAClC;gBACD,OAAO,KAAK,CAAC;aAChB;SACJ;QAED,oEAAoE;QACpE,IAAI,kBAAkB,EAAE;YACpB,IACI,CAAC,SAAS,CAAC,UAAU,CACjB,gBAAiB,EACjB,kBAAkB;YAClB,UAAU,CAAC,SAAS;YACpB,wBAAwB,CAAC,SAAS;YAClC,uBAAuB,CAAC,SAAS,EACjC,KAAK,+BAAqC,EAC1C,cAAc,CACjB,EACH;gBACE,IAAI,IAAI,IAAI,YAAY,EAAE;oBACtB,IAAI,CAAC,UAAU,CACX,oBAAS,CAAC,kBAAkB,CAAC,sBAAsB,EAAE,CAAC,MAAM,CAAC;wBACzD,UAAU,EAAE,SAAS,CAAC,SAAS,CAAC,UAAU,CAAC;wBAC3C,QAAQ,EAAE,SAAS,CAAC,SAAS,CAAC,kBAAkB,CAAC;qBACpD,CAAC,CACL,CAAC;oBACF,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;iBAClC;gBACD,OAAO,KAAK,CAAC;aAChB;SACJ;KACJ;SAAM;QACH,IAAI,CAAC,kBAAkB,EAAE;YACrB,mEAAmE;YACnE,kBAAkB,GAAG,UAAU,CAAC;SACnC;aAAM,IACH,CAAC,IAAA,kBAAU,EACP,kBAAkB,EAClB,UAAU;QACV,yBAAyB,CAAC,SAAS;QACnC,qBAAqB,CAAC,SAAS,EAC/B,cAAc,CACjB,EACH;YACE,IACI,SAAS,CAAC,UAAU,CAChB,kBAAkB,EAClB,UAAU,EACV,YAAY,EACZ,IAAI,+BAAc,CAAC,QAAQ,CAAC,OAAO,CAAC;YACpC,uBAAuB,CAAC,SAAS,EACjC,KAAK,EACL,cAAc,CACjB,EACH;gBACE,qEAAqE;gBACrE,sEAAsE;gBACtE,0DAA0D;gBAC1D,IACI,IAAA,2BAAe,EAAC,kBAAkB,CAAC;oBACnC,CAAC,IAAA,iBAAS,EAAC,UAAU,CAAC;oBACtB,SAAS,CAAC,UAAU,CAChB,UAAU,EACV,kBAAkB;oBAClB,UAAU,CAAC,SAAS,EACpB,IAAI,+BAAc,CAAC,QAAQ,CAAC,OAAO,CAAC;oBACpC,uBAAuB,CAAC,SAAS,EACjC,KAAK,+BAAqC,EAC1C,cAAc,CACjB,EACH;oBACE,kBAAkB,GAAG,UAAU,CAAC;iBACnC;qBAAM;oBACH,kBAAkB,GAAG,kBAAkB,CAAC;iBAC3C;aACJ;iBAAM;gBACH,6BAA6B;gBAC7B,IAAI,cAAc,CAAC,QAAQ,EAAE,IAAI,IAAA,iBAAS,EAAC,UAAU,CAAC,EAAE;oBACpD,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU,CACZ,oBAAS,CAAC,kBAAkB,CAAC,sBAAsB,EAAE,CAAC,MAAM,CAAC;wBACzD,UAAU,EAAE,SAAS,CAAC,SAAS,CAAC,kBAAkB,CAAC;wBACnD,QAAQ,EAAE,SAAS,CAAC,SAAS,CAAC,UAAU,CAAC;qBAC5C,CAAC,CACL,CAAC;oBACF,OAAO,KAAK,CAAC;iBAChB;gBAED,oDAAoD;gBACpD,MAAM,gBAAgB,GAAG,QAAQ,CAAC;gBAClC,IAAI,IAAA,yBAAiB,EAAC,gBAAgB,CAAC,EAAE;oBACrC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU,CACZ,oBAAS,CAAC,kBAAkB,CAAC,sBAAsB,EAAE,CAAC,MAAM,CAAC;wBACzD,UAAU,EAAE,SAAS,CAAC,SAAS,CAAC,kBAAkB,CAAC;wBACnD,QAAQ,EAAE,SAAS,CAAC,SAAS,CAAC,UAAU,CAAC;qBAC5C,CAAC,CACL,CAAC;oBACF,OAAO,KAAK,CAAC;iBAChB;gBAED,IACI,SAAS,CAAC,UAAU,CAChB,UAAU,EACV,kBAAkB;gBAClB,UAAU,CAAC,SAAS,EACpB,IAAI,+BAAc,CAAC,QAAQ,CAAC,OAAO,CAAC;gBACpC,uBAAuB,CAAC,SAAS,EACjC,KAAK,+BAAqC,EAC1C,cAAc,CACjB,EACH;oBACE,kBAAkB,GAAG,UAAU,CAAC;iBACnC;qBAAM;oBACH,MAAM,UAAU,GAAG,SAAS,CAAC,aAAa,EAAE,CAAC;oBAE7C,+DAA+D;oBAC/D,6DAA6D;oBAC7D,4DAA4D;oBAC5D,+DAA+D;oBAC/D,4CAA4C;oBAC5C,IACI,IAAA,eAAO,EAAC,kBAAkB,CAAC;wBAC3B,kBAAkB,CAAC,QAAQ,CAAC,MAAM,GAAG,+CAA0B;wBAC9D,QAAwB,CAAC,OAAO,CAAC,SAAS,KAAK,SAAS;wBACzD,UAAU;wBACV,IAAA,uBAAe,EAAC,UAAU,CAAC,EAC7B;wBACE,kBAAkB,GAAG,IAAA,oBAAY,EAAC,CAAC,kBAAkB,EAAE,UAAU,CAAC,CAAC,CAAC;qBACvE;yBAAM;wBACH,kBAAkB,GAAG,IAAA,oBAAY,EAAC,CAAC,kBAAkB,EAAE,UAAU,CAAC,CAAC,CAAC;qBACvE;iBACJ;aACJ;SACJ;QAED,iDAAiD;QACjD,IAAI,gBAAgB,IAAI,kBAAkB,EAAE;YACxC,IACI,CAAC,IAAA,kBAAU,EACP,gBAAgB,EAChB,kBAAkB;YAClB,yBAAyB,CAAC,SAAS;YACnC,qBAAqB,CAAC,SAAS,EAC/B,cAAc,CACjB,EACH;gBACE,IAAI,YAAY,GAAG,IAAI,CAAC;gBAExB,oEAAoE;gBACpE,+DAA+D;gBAC/D,mBAAmB;gBACnB,IAAI,IAAA,iBAAS,EAAC,gBAAgB,CAAC,EAAE;oBAC7B,IAAI,IAAA,kBAAU,EAAC,kBAAkB,EAAE,gBAAgB,CAAC,EAAE;wBAClD,YAAY,GAAG,KAAK,CAAC;qBACxB;yBAAM,IACH,IAAA,eAAO,EAAC,kBAAkB,CAAC;wBAC3B,kBAAkB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAA,kBAAU,EAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC,EACtF;wBACE,YAAY,GAAG,KAAK,CAAC;qBACxB;iBACJ;gBAED,IACI,CAAC,SAAS,CAAC,UAAU,CACjB,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC,4BAA4B,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,gBAAgB,EAC1F,kBAAkB,EAClB,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,cAAc,EAAE,EACtB,IAAI,+BAAc,CAAC,QAAQ,CAAC,OAAO,CAAC;gBACpC,uBAAuB,CAAC,SAAS,EACjC,KAAK,+BAAqC,EAC1C,cAAc,CACjB,EACH;oBACE,IAAI,IAAI,IAAI,YAAY,EAAE;wBACtB,IAAI,CAAC,UAAU,CACX,oBAAS,CAAC,kBAAkB,CAAC,sBAAsB,EAAE,CAAC,MAAM,CAAC;4BACzD,UAAU,EAAE,SAAS,CAAC,SAAS,CAAC,UAAU,CAAC;4BAC3C,QAAQ,EAAE,SAAS,CAAC,SAAS,CAAC,gBAAgB,CAAC;yBAClD,CAAC,CACL,CAAC;qBACL;oBACD,OAAO,KAAK,CAAC;iBAChB;aACJ;SACJ;KACJ;IAED,qEAAqE;IACrE,IAAI,QAAQ,CAAC,OAAO,CAAC,SAAS,EAAE;QAC5B,MAAM,WAAW,GAAG,CAAC,kBAAkB,IAAI,gBAAgB,CAAE,CAAC;QAE9D,+DAA+D;QAC/D,oEAAoE;QACpE,+BAA+B;QAC/B,IAAI,gBAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,gBAAQ,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE;YACxE,OAAO,KAAK,CAAC;SAChB;QAED,uEAAuE;QACvE,sEAAsE;QACtE,+DAA+D;QAC/D,MAAM,uBAAuB,GAAG,QAAQ,CAAC,OAAO,CAAC,iBAAiB;YAC9D,CAAC,CAAC,cAAc;YAChB,CAAC,CAAC,IAAI,+BAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAE3C,IACI,CAAC,SAAS,CAAC,UAAU,CACjB,QAAQ,CAAC,OAAO,CAAC,SAAS,EAC1B,SAAS,CAAC,4BAA4B,CAAC,WAAW,CAAC,EACnD,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,cAAc,EAAE,EACtB,uBAAuB;QACvB,uBAAuB,CAAC,SAAS,EACjC,KAAK,+BAAqC,EAC1C,cAAc,CACjB,EACH;YACE,oEAAoE;YACpE,qCAAqC;YACrC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,aAAa,EAAE;gBACjC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU,CACZ,oBAAS,CAAC,kBAAkB,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC;oBAC5C,UAAU,EAAE,SAAS,CAAC,SAAS,CAAC,WAAW,CAAC;oBAC5C,QAAQ,EAAE,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC;oBACzD,IAAI,EAAE,mBAAW,CAAC,eAAe,CAAC,QAAQ,CAAC;iBAC9C,CAAC,CACL,CAAC;aACL;YACD,OAAO,KAAK,CAAC;SAChB;KACJ;IAED,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,IAAI,gBAAgB,EAAE;QAChD,cAAc,CAAC,cAAc,CAAC,QAAQ,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,cAAc,CAAC,CAAC;KACjG;IAED,OAAO,IAAI,CAAC;AAChB,CAAC;AAlmBD,kDAkmBC;AAED,SAAS,qBAAqB,CAC1B,SAAwB,EACxB,QAAqB,EACrB,OAAa,EACb,IAAoC,EACpC,cAA8B,EAC9B,cAAc,GAAG,CAAC;IAElB,IAAI,IAAA,iBAAS,EAAC,OAAO,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE;QACnD,MAAM,aAAa,GAAG,cAAc,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC5D,IAAI,aAAa,EAAE;YACf,IAAI,aAAa,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,IAAI,aAAa,CAAC,SAAS,EAAE;gBAClE,0DAA0D;gBAC1D,IACI,IAAA,kBAAU,EACN,aAAa,CAAC,SAAS,EACvB,OAAO;gBACP,yBAAyB,CAAC,SAAS;gBACnC,qBAAqB,CAAC,SAAS,EAC/B,cAAc,CACjB,EACH;oBACE,OAAO,IAAI,CAAC;iBACf;aACJ;SACJ;aAAM;YACH,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,IAAI,cAAc,CAAC,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;gBACjF,cAAc,CAAC,YAAY,CAAC,QAAQ,EAAE;oBAClC,KAAK,cAAwB;oBAC7B,UAAU,EAAE,EAAE;oBACd,cAAc,EAAE,SAAS;oBACzB,SAAS,EAAE,SAAS;oBACpB,SAAS,EAAE,OAAO;iBACrB,CAAC,CAAC;aACN;YACD,OAAO,IAAI,CAAC;SACf;KACJ;SAAM,IAAI,IAAA,kBAAU,EAAC,OAAO,CAAC,EAAE;QAC5B,MAAM,eAAe,GAAG,OAAO,CAAC;QAChC,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;YAC3D,MAAM,cAAc,GAAmB;gBACnC,QAAQ,EAAE,CAAC,CAAC,QAAQ;gBACpB,IAAI,EAAE,CAAC,CAAC,IAAI;gBACZ,iBAAiB,EAAE,CAAC,CAAC,iBAAiB;gBACtC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU;gBAC1B,IAAI,EAAE,oBAAY,CAAC,yBAAyB,CAAC,eAAe,EAAE,KAAK,CAAC;aACvE,CAAC;YACF,OAAO,cAAc,CAAC;QAC1B,CAAC,CAAC,CAAC;QAEH,MAAM,aAAa,GAAG,cAAc,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC5D,IAAI,aAAa,EAAE;YACf,IAAI,aAAa,CAAC,SAAS,KAAK,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE;gBACvD,+DAA+D;gBAC/D,2BAA2B;gBAC3B,MAAM,gBAAgB,GAAG,IAAA,uCAA2B,EAAC,aAAa,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;gBAC9F,MAAM,gBAAgB,GAAG,IAAA,uCAA2B,EAChD;oBACI,UAAU;oBACV,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK;oBAC5B,cAAc,EAAE,OAAO,CAAC,OAAO,CAAC,cAAc;oBAC9C,SAAS,EAAE,SAAS;oBACpB,SAAS,EAAE,SAAS;iBACvB;gBACD,mBAAmB,CAAC,IAAI,CAC3B,CAAC;gBAEF,IACI,SAAS,CAAC,UAAU,CAChB,gBAAgB,EAChB,gBAAgB;gBAChB,UAAU,CAAC,SAAS;gBACpB,wBAAwB,CAAC,SAAS;gBAClC,uBAAuB,CAAC,SAAS,wCAEjC,cAAc,CACjB,EACH;oBACE,OAAO,IAAI,CAAC;iBACf;aACJ;SACJ;aAAM;YACH,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,IAAI,cAAc,CAAC,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;gBACjF,cAAc,CAAC,YAAY,CAAC,QAAQ,EAAE;oBAClC,UAAU;oBACV,cAAc,EAAE,OAAO,CAAC,OAAO,CAAC,cAAc;oBAC9C,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK;oBAC5B,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,SAAS;oBACpC,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,SAAS;iBACvC,CAAC,CAAC;aACN;YACD,OAAO,IAAI,CAAC;SACf;KACJ;SAAM,IAAI,IAAA,sBAAc,EAAC,OAAO,CAAC,EAAE;QAChC,OAAO,IAAI,CAAC;KACf;IAED,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU,CACZ,oBAAS,CAAC,kBAAkB,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC;QAChD,IAAI,EAAE,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC;QAClC,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,IAAI;KAC9B,CAAC,CACL,CAAC;IACF,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,sEAAsE;AACtE,wEAAwE;AACxE,6EAA6E;AAC7E,6EAA6E;AAC7E,+EAA+E;AAC/E,oBAAoB;AACpB,SAAgB,yCAAyC,CACrD,SAAwB,EACxB,IAAe,EACf,YAAkB,EAClB,cAA8B,EAC9B,iBAA+C;IAE/C,IAAI,IAAA,aAAK,EAAC,YAAY,CAAC,EAAE;QACrB,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;YAC9C,cAAc,CAAC,cAAc,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;KACf;IAED,IAAI,CAAC,IAAA,eAAO,EAAC,YAAY,CAAC,EAAE;QACxB,OAAO,KAAK,CAAC;KAChB;IAED,2EAA2E;IAC3E,MAAM,gBAAgB,GAAG,YAAY,CAAC,aAAa,CAAC;IACpD,IAAI,CAAC,gBAAgB,EAAE;QACnB,OAAO,SAAS,CAAC,UAAU,CACvB,IAAI,EACJ,YAAY;QACZ,UAAU,CAAC,SAAS,EACpB,cAAc;QACd,uBAAuB,CAAC,SAAS,oCAEpC,CAAC;KACL;IAED,SAAS,CAAC,kCAAkC,CAAC,IAAI,CAAC,CAAC;IAEnD,2EAA2E;IAC3E,8BAA8B;IAC9B,IAAI,iBAAS,CAAC,kBAAkB,CAAC,YAAY,EAAE,IAAI,CAAC,EAAE;QAClD,MAAM,uBAAuB,GAAG,IAAA,mDAAuC,EAAC,YAAY,CAAC,CAAC;QACtF,uBAAuB,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YACpD,MAAM,WAAW,GAAG,uBAAuB,CAAC,cAAc,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAE1E,IAAI,WAAW,EAAE;gBACb,iFAAiF;gBACjF,gDAAgD;gBAChD,IAAI,CAAC,IAAA,iBAAS,EAAC,WAAW,CAAC,IAAI,WAAW,CAAC,OAAO,KAAK,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE;oBAChF,cAAc,CAAC,cAAc,CACzB,KAAK,CAAC,OAAO,EACb,mBAAW,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,sBAAuB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,EACvF,mBAAW,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,0BAA2B,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,EAC3F,KAAK,CAAC,aAAa,CACtB,CAAC;iBACL;aACJ;QACL,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;KACf;IAED,iDAAiD;IACjD,MAAM,mBAAmB,GAAG,IAAA,6BAAiB,EAAC,YAAY,CAAC,CAAC;IAC5D,MAAM,qBAAqB,GAAG,iBAAS,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE;QAC7F,MAAM,OAAO,GAAG,mBAAW,CAAC,cAAc,CAAC,SAAS,KAAK,EAAE,CAAC,CAAC;QAC7D,OAAO,CAAC,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;QAErC,2EAA2E;QAC3E,OAAO,CAAC,OAAO,CAAC,gBAAgB,oBAAqB,CAAC;QACtD,OAAO,CAAC,OAAO,GAAG,mBAAmB,CAAC;QACtC,OAAO,OAAO,CAAC;IACnB,CAAC,CAAC,CAAC;IACH,MAAM,mBAAmB,GAAG,iBAAS,CAAC,sBAAsB,CACxD,YAAY,EACZ,qBAAqB;IACrB,4BAA4B,CAAC,IAAI,CACpC,CAAC;IAEF,8EAA8E;IAC9E,MAAM,QAAQ,GAAG,iBAAS,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;QAChE,MAAM,OAAO,GAAG,mBAAW,CAAC,cAAc,CAAC,WAAW,KAAK,EAAE,CAAC,CAAC;QAC/D,OAAO,CAAC,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;QACrC,OAAO,CAAC,OAAO,CAAC,gBAAgB,GAAG,KAAK,CAAC;QACzC,OAAO,CAAC,OAAO,CAAC,sBAAsB,GAAG,IAAI,CAAC;QAC9C,OAAO,OAAO,CAAC;IACnB,CAAC,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,iBAAS,CAAC,sBAAsB,CAAC,IAAI,EAAE,QAAQ,EAAE,4BAA4B,CAAC,IAAI,CAAC,CAAC;IAC5G,MAAM,uBAAuB,GAAG,IAAI,+BAAc,CAAC,mBAAmB,CAAC,CAAC;IACxE,IACI,SAAS,CAAC,UAAU,CAChB,mBAAmB,EACnB,eAAe;IACf,UAAU,CAAC,SAAS,EACpB,uBAAuB;IACvB,uBAAuB,CAAC,SAAS,oCAEpC,EACH;QACE,IAAI,aAAa,GAAG,IAAI,CAAC;QAEzB,qBAAqB,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;YAC7C,MAAM,YAAY,GAAG,uBAAuB,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;YAErE,sEAAsE;YACtE,+EAA+E;YAC/E,IACI,YAAY;gBACZ,IAAA,iBAAS,EAAC,YAAY,CAAC;gBACvB,YAAY,CAAC,OAAO,CAAC,aAAa;gBAClC,YAAY,CAAC,OAAO,CAAC,gBAAgB,KAAK,SAAS,EACrD;gBACE,MAAM,aAAa,GACf,iBAAS,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;gBACxF,IAAI,KAAK,GAAG,gBAAgB,CAAC,MAAM,EAAE;oBACjC,IAAI,oBAAoB,GAAqB,gBAAgB,CAAC,KAAK,CAAC,CAAC;oBAErE,IAAI,iBAAiB,EAAE;wBACnB,oBAAoB,GAAG,IAAA,+CAAmC,EACtD,oBAAoB,EACpB,cAAc,EACd,iBAAiB,CACpB,CAAC;qBACL;oBAED,IAAI,oBAAoB,EAAE;wBACtB,cAAc,CAAC,cAAc,CACzB,aAAa,EACb,mBAAW,CAAC,WAAW,CAAC,OAAO,CAAC,sBAAuB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,oBAAoB,EAC1F,mBAAW,CAAC,WAAW,CAAC,OAAO,CAAC,0BAA2B;4BACvD,CAAC,CAAC,SAAS;4BACX,CAAC,CAAC,oBAAoB,CAC7B,CAAC;qBACL;yBAAM;wBACH,aAAa,GAAG,KAAK,CAAC;qBACzB;iBACJ;aACJ;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,aAAa,CAAC;KACxB;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AA3ID,8FA2IC"}

package/dist/analyzer/declaration.d.ts

@@ -1,13 +1,15 @@
 import { Range } from '../common/textRange';
-import { ClassNode, ExpressionNode, FunctionNode, ImportAsNode, ImportFromAsNode, ImportFromNode, ModuleNode, NameNode, ParameterNode, ParseNode, RaiseNode, ReturnNode, StringListNode, TypeAnnotationNode, YieldFromNode, YieldNode } from '../parser/parseNodes';
+import { ClassNode, ExpressionNode, FunctionNode, ImportAsNode, ImportFromAsNode, ImportFromNode, ModuleNode, NameNode, ParameterNode, ParseNode, RaiseNode, ReturnNode, StringListNode, TypeAliasNode, TypeAnnotationNode, TypeParameterNode, YieldFromNode, YieldNode } from '../parser/parseNodes';
 export declare const enum DeclarationType {
     Intrinsic = 0,
     Variable = 1,
     Parameter = 2,
-    Function = 3,
-    Class = 4,
-    SpecialBuiltInClass = 5,
-    Alias = 6
+    TypeParameter = 3,
+    TypeAlias = 4,
+    Function = 5,
+    Class = 6,
+    SpecialBuiltInClass = 7,
+    Alias = 8
 }
 export declare type IntrinsicType = 'Any' | 'str' | 'str | None' | 'int' | 'Iterable[str]' | 'class' | 'Dict[str, Any]';
 export interface DeclarationBase {
@@ -44,6 +46,14 @@ export interface ParameterDeclaration extends DeclarationBase {
     type: DeclarationType.Parameter;
     node: ParameterNode;
 }
+export interface TypeParameterDeclaration extends DeclarationBase {
+    type: DeclarationType.TypeParameter;
+    node: TypeParameterNode;
+}
+export interface TypeAliasDeclaration extends DeclarationBase {
+    type: DeclarationType.TypeAlias;
+    node: TypeAliasNode;
+}
 export interface VariableDeclaration extends DeclarationBase {
     type: DeclarationType.Variable;
     node: NameNode | StringListNode;
@@ -80,10 +90,12 @@ export interface ModuleLoaderActions {
     loadSymbolsFromPath: boolean;
     implicitImports?: Map<string, ModuleLoaderActions>;
 }
-export declare type Declaration = IntrinsicDeclaration | ClassDeclaration | SpecialBuiltInClassDeclaration | FunctionDeclaration | ParameterDeclaration | VariableDeclaration | AliasDeclaration;
+export declare type Declaration = IntrinsicDeclaration | ClassDeclaration | SpecialBuiltInClassDeclaration | FunctionDeclaration | ParameterDeclaration | TypeParameterDeclaration | TypeAliasDeclaration | VariableDeclaration | AliasDeclaration;
 export declare function isFunctionDeclaration(decl: Declaration): decl is FunctionDeclaration;
 export declare function isClassDeclaration(decl: Declaration): decl is ClassDeclaration;
 export declare function isParameterDeclaration(decl: Declaration): decl is ParameterDeclaration;
+export declare function isTypeParameterDeclaration(decl: Declaration): decl is TypeParameterDeclaration;
+export declare function isTypeAliasDeclaration(decl: Declaration): decl is TypeAliasDeclaration;
 export declare function isVariableDeclaration(decl: Declaration): decl is VariableDeclaration;
 export declare function isAliasDeclaration(decl: Declaration): decl is AliasDeclaration;
 export declare function isSpecialBuiltInClassDeclaration(decl: Declaration): decl is SpecialBuiltInClassDeclaration;

package/dist/analyzer/declaration.js

@@ -10,39 +10,49 @@
  * is explicitly declared).
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isIntrinsicDeclaration = exports.isSpecialBuiltInClassDeclaration = exports.isAliasDeclaration = exports.isVariableDeclaration = exports.isParameterDeclaration = exports.isClassDeclaration = exports.isFunctionDeclaration = exports.DeclarationType = void 0;
+exports.isIntrinsicDeclaration = exports.isSpecialBuiltInClassDeclaration = exports.isAliasDeclaration = exports.isVariableDeclaration = exports.isTypeAliasDeclaration = exports.isTypeParameterDeclaration = exports.isParameterDeclaration = exports.isClassDeclaration = exports.isFunctionDeclaration = exports.DeclarationType = void 0;
 var DeclarationType;
 (function (DeclarationType) {
     DeclarationType[DeclarationType["Intrinsic"] = 0] = "Intrinsic";
     DeclarationType[DeclarationType["Variable"] = 1] = "Variable";
     DeclarationType[DeclarationType["Parameter"] = 2] = "Parameter";
-    DeclarationType[DeclarationType["Function"] = 3] = "Function";
-    DeclarationType[DeclarationType["Class"] = 4] = "Class";
-    DeclarationType[DeclarationType["SpecialBuiltInClass"] = 5] = "SpecialBuiltInClass";
-    DeclarationType[DeclarationType["Alias"] = 6] = "Alias";
+    DeclarationType[DeclarationType["TypeParameter"] = 3] = "TypeParameter";
+    DeclarationType[DeclarationType["TypeAlias"] = 4] = "TypeAlias";
+    DeclarationType[DeclarationType["Function"] = 5] = "Function";
+    DeclarationType[DeclarationType["Class"] = 6] = "Class";
+    DeclarationType[DeclarationType["SpecialBuiltInClass"] = 7] = "SpecialBuiltInClass";
+    DeclarationType[DeclarationType["Alias"] = 8] = "Alias";
 })(DeclarationType = exports.DeclarationType || (exports.DeclarationType = {}));
 function isFunctionDeclaration(decl) {
-    return decl.type === 3 /* Function */;
+    return decl.type === 5 /* Function */;
 }
 exports.isFunctionDeclaration = isFunctionDeclaration;
 function isClassDeclaration(decl) {
-    return decl.type === 4 /* Class */;
+    return decl.type === 6 /* Class */;
 }
 exports.isClassDeclaration = isClassDeclaration;
 function isParameterDeclaration(decl) {
     return decl.type === 2 /* Parameter */;
 }
 exports.isParameterDeclaration = isParameterDeclaration;
+function isTypeParameterDeclaration(decl) {
+    return decl.type === 3 /* TypeParameter */;
+}
+exports.isTypeParameterDeclaration = isTypeParameterDeclaration;
+function isTypeAliasDeclaration(decl) {
+    return decl.type === 4 /* TypeAlias */;
+}
+exports.isTypeAliasDeclaration = isTypeAliasDeclaration;
 function isVariableDeclaration(decl) {
     return decl.type === 1 /* Variable */;
 }
 exports.isVariableDeclaration = isVariableDeclaration;
 function isAliasDeclaration(decl) {
-    return decl.type === 6 /* Alias */;
+    return decl.type === 8 /* Alias */;
 }
 exports.isAliasDeclaration = isAliasDeclaration;
 function isSpecialBuiltInClassDeclaration(decl) {
-    return decl.type === 5 /* SpecialBuiltInClass */;
+    return decl.type === 7 /* SpecialBuiltInClass */;
 }
 exports.isSpecialBuiltInClassDeclaration = isSpecialBuiltInClassDeclaration;
 function isIntrinsicDeclaration(decl) {

package/dist/analyzer/declaration.js.map

@@ -1 +1 @@
-{"version":3,"file":"declaration.js","sourceRoot":"","sources":["../../../src/analyzer/declaration.ts"],"names":[],"mappings":";AAAA;;;;;;;;;GASG;;;AAsBH,IAAkB,eAQjB;AARD,WAAkB,eAAe;IAC7B,+DAAS,CAAA;IACT,6DAAQ,CAAA;IACR,+DAAS,CAAA;IACT,6DAAQ,CAAA;IACR,uDAAK,CAAA;IACL,mFAAmB,CAAA;IACnB,uDAAK,CAAA;AACT,CAAC,EARiB,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAQhC;AA0LD,SAAgB,qBAAqB,CAAC,IAAiB;IACnD,OAAO,IAAI,CAAC,IAAI,qBAA6B,CAAC;AAClD,CAAC;AAFD,sDAEC;AAED,SAAgB,kBAAkB,CAAC,IAAiB;IAChD,OAAO,IAAI,CAAC,IAAI,kBAA0B,CAAC;AAC/C,CAAC;AAFD,gDAEC;AAED,SAAgB,sBAAsB,CAAC,IAAiB;IACpD,OAAO,IAAI,CAAC,IAAI,sBAA8B,CAAC;AACnD,CAAC;AAFD,wDAEC;AAED,SAAgB,qBAAqB,CAAC,IAAiB;IACnD,OAAO,IAAI,CAAC,IAAI,qBAA6B,CAAC;AAClD,CAAC;AAFD,sDAEC;AAED,SAAgB,kBAAkB,CAAC,IAAiB;IAChD,OAAO,IAAI,CAAC,IAAI,kBAA0B,CAAC;AAC/C,CAAC;AAFD,gDAEC;AAED,SAAgB,gCAAgC,CAAC,IAAiB;IAC9D,OAAO,IAAI,CAAC,IAAI,gCAAwC,CAAC;AAC7D,CAAC;AAFD,4EAEC;AAED,SAAgB,sBAAsB,CAAC,IAAiB;IACpD,OAAO,IAAI,CAAC,IAAI,sBAA8B,CAAC;AACnD,CAAC;AAFD,wDAEC"}
+{"version":3,"file":"declaration.js","sourceRoot":"","sources":["../../../src/analyzer/declaration.ts"],"names":[],"mappings":";AAAA;;;;;;;;;GASG;;;AAwBH,IAAkB,eAUjB;AAVD,WAAkB,eAAe;IAC7B,+DAAS,CAAA;IACT,6DAAQ,CAAA;IACR,+DAAS,CAAA;IACT,uEAAa,CAAA;IACb,+DAAS,CAAA;IACT,6DAAQ,CAAA;IACR,uDAAK,CAAA;IACL,mFAAmB,CAAA;IACnB,uDAAK,CAAA;AACT,CAAC,EAViB,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAUhC;AAsMD,SAAgB,qBAAqB,CAAC,IAAiB;IACnD,OAAO,IAAI,CAAC,IAAI,qBAA6B,CAAC;AAClD,CAAC;AAFD,sDAEC;AAED,SAAgB,kBAAkB,CAAC,IAAiB;IAChD,OAAO,IAAI,CAAC,IAAI,kBAA0B,CAAC;AAC/C,CAAC;AAFD,gDAEC;AAED,SAAgB,sBAAsB,CAAC,IAAiB;IACpD,OAAO,IAAI,CAAC,IAAI,sBAA8B,CAAC;AACnD,CAAC;AAFD,wDAEC;AAED,SAAgB,0BAA0B,CAAC,IAAiB;IACxD,OAAO,IAAI,CAAC,IAAI,0BAAkC,CAAC;AACvD,CAAC;AAFD,gEAEC;AAED,SAAgB,sBAAsB,CAAC,IAAiB;IACpD,OAAO,IAAI,CAAC,IAAI,sBAA8B,CAAC;AACnD,CAAC;AAFD,wDAEC;AAED,SAAgB,qBAAqB,CAAC,IAAiB;IACnD,OAAO,IAAI,CAAC,IAAI,qBAA6B,CAAC;AAClD,CAAC;AAFD,sDAEC;AAED,SAAgB,kBAAkB,CAAC,IAAiB;IAChD,OAAO,IAAI,CAAC,IAAI,kBAA0B,CAAC;AAC/C,CAAC;AAFD,gDAEC;AAED,SAAgB,gCAAgC,CAAC,IAAiB;IAC9D,OAAO,IAAI,CAAC,IAAI,gCAAwC,CAAC;AAC7D,CAAC;AAFD,4EAEC;AAED,SAAgB,sBAAsB,CAAC,IAAiB;IACpD,OAAO,IAAI,CAAC,IAAI,sBAA8B,CAAC;AACnD,CAAC;AAFD,wDAEC"}

package/dist/analyzer/declarationUtils.d.ts

@@ -8,5 +8,5 @@ export declare function isPossibleTypeAliasDeclaration(decl: Declaration): boole
 export declare function getNameFromDeclaration(declaration: Declaration): string | undefined;
 export declare function getNameNodeForDeclaration(declaration: Declaration): NameNode | undefined;
 export declare function isDefinedInFile(decl: Declaration, filePath: string): boolean;
-export declare function getDeclarationsWithUsesLocalNameRemoved(decls: Declaration[]): (import("./declaration").IntrinsicDeclaration | import("./declaration").ClassDeclaration | import("./declaration").SpecialBuiltInClassDeclaration | import("./declaration").FunctionDeclaration | import("./declaration").ParameterDeclaration | import("./declaration").VariableDeclaration | AliasDeclaration)[];
+export declare function getDeclarationsWithUsesLocalNameRemoved(decls: Declaration[]): (import("./declaration").IntrinsicDeclaration | import("./declaration").ClassDeclaration | import("./declaration").SpecialBuiltInClassDeclaration | import("./declaration").FunctionDeclaration | import("./declaration").ParameterDeclaration | import("./declaration").TypeParameterDeclaration | import("./declaration").TypeAliasDeclaration | import("./declaration").VariableDeclaration | AliasDeclaration)[];
 export declare function createSynthesizedAliasDeclaration(path: string): AliasDeclaration;

package/dist/analyzer/declarationUtils.js

@@ -15,9 +15,11 @@ const parseTreeUtils_1 = require("./parseTreeUtils");
 function hasTypeForDeclaration(declaration) {
     switch (declaration.type) {
         case 0 /* Intrinsic */:
-        case 4 /* Class */:
-        case 5 /* SpecialBuiltInClass */:
-        case 3 /* Function */:
+        case 6 /* Class */:
+        case 7 /* SpecialBuiltInClass */:
+        case 5 /* Function */:
+        case 3 /* TypeParameter */:
+        case 4 /* TypeAlias */:
             return true;
         case 2 /* Parameter */: {
             if (declaration.node.typeAnnotation || declaration.node.typeAnnotationComment) {
@@ -41,7 +43,7 @@ function hasTypeForDeclaration(declaration) {
         }
         case 1 /* Variable */:
             return !!declaration.typeAnnotationNode;
-        case 6 /* Alias */:
+        case 8 /* Alias */:
             return false;
     }
 }
@@ -59,7 +61,7 @@ function areDeclarationsSame(decl1, decl2, treatModuleInImportAndFromImportSame
     }
     // Alias declarations refer to the entire import statement.
     // We need to further differentiate.
-    if (decl1.type === 6 /* Alias */ && decl2.type === 6 /* Alias */) {
+    if (decl1.type === 8 /* Alias */ && decl2.type === 8 /* Alias */) {
         if (decl1.symbolName !== decl2.symbolName || decl1.usesLocalName !== decl2.usesLocalName) {
             return false;
         }
@@ -126,17 +128,18 @@ exports.isPossibleTypeAliasDeclaration = isPossibleTypeAliasDeclaration;
 function getNameFromDeclaration(declaration) {
     var _a;
     switch (declaration.type) {
-        case 6 /* Alias */:
+        case 8 /* Alias */:
             return declaration.symbolName;
-        case 4 /* Class */:
-        case 3 /* Function */:
+        case 6 /* Class */:
+        case 5 /* Function */:
+        case 3 /* TypeParameter */:
             return declaration.node.name.value;
         case 2 /* Parameter */:
             return (_a = declaration.node.name) === null || _a === void 0 ? void 0 : _a.value;
         case 1 /* Variable */:
             return declaration.node.nodeType === 38 /* Name */ ? declaration.node.value : undefined;
         case 0 /* Intrinsic */:
-        case 5 /* SpecialBuiltInClass */:
+        case 7 /* SpecialBuiltInClass */:
             return undefined;
     }
     throw new Error(`Shouldn't reach here`);
@@ -145,7 +148,7 @@ exports.getNameFromDeclaration = getNameFromDeclaration;
 function getNameNodeForDeclaration(declaration) {
     var _a, _b;
     switch (declaration.type) {
-        case 6 /* Alias */:
+        case 8 /* Alias */:
             if (declaration.node.nodeType === 21 /* ImportAs */) {
                 return (_a = declaration.node.alias) !== null && _a !== void 0 ? _a : declaration.node.module.nameParts[0];
             }
@@ -155,15 +158,15 @@ function getNameNodeForDeclaration(declaration) {
             else {
                 return declaration.node.module.nameParts[0];
             }
-        case 4 /* Class */:
-        case 3 /* Function */:
-            return declaration.node.name;
+        case 6 /* Class */:
+        case 5 /* Function */:
+        case 3 /* TypeParameter */:
         case 2 /* Parameter */:
             return declaration.node.name;
         case 1 /* Variable */:
             return declaration.node.nodeType === 38 /* Name */ ? declaration.node : undefined;
         case 0 /* Intrinsic */:
-        case 5 /* SpecialBuiltInClass */:
+        case 7 /* SpecialBuiltInClass */:
             return undefined;
     }
     throw new Error(`Shouldn't reach here`);
@@ -184,7 +187,7 @@ exports.isDefinedInFile = isDefinedInFile;
 function getDeclarationsWithUsesLocalNameRemoved(decls) {
     // Make a shallow copy and clear the "usesLocalName" field.
     return decls.map((localDecl) => {
-        if (localDecl.type !== 6 /* Alias */) {
+        if (localDecl.type !== 8 /* Alias */) {
             return localDecl;
         }
         const nonLocalDecl = { ...localDecl };
@@ -197,7 +200,7 @@ function createSynthesizedAliasDeclaration(path) {
     // The only time this decl is used is for IDE services such as
     // the find all references, hover provider and etc.
     return {
-        type: 6 /* Alias */,
+        type: 8 /* Alias */,
         node: undefined,
         path,
         loadSymbolsFromPath: false,

package/dist/analyzer/declarationUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"declarationUtils.js","sourceRoot":"","sources":["../../../src/analyzer/declarationUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"declarationUtils.js","sourceRoot":"","sources":["../../../src/analyzer/declarationUtils.ts"],"names":[],"mappings":"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"}

package/dist/analyzer/packageTypeVerifier.js

@@ -160,7 +160,7 @@ class PackageTypeVerifier {
                     if (typedDecls.length > 0) {
                         // Is this a class declared within this module or class?
                         // If so, add the symbols declared within it.
-                        const classDecl = typedDecls.find((decl) => decl.type === 4 /* Class */);
+                        const classDecl = typedDecls.find((decl) => decl.type === 6 /* Class */);
                         if (classDecl) {
                             if ((0, types_1.isInstantiableClass)(symbolType)) {
                                 this._getPublicSymbolsInSymbolTable(symbolMap, alternateSymbolNames, module, fullName, symbolType.details.fields, 2 /* Class */);
@@ -168,8 +168,8 @@ class PackageTypeVerifier {
                         }
                     }
                     // Is this the re-export of an import? If so, record the alternate name.
-                    const importDecl = symbol.getDeclarations().find((decl) => decl.type === 6 /* Alias */);
-                    if (importDecl && importDecl.type === 6 /* Alias */) {
+                    const importDecl = symbol.getDeclarations().find((decl) => decl.type === 8 /* Alias */);
+                    if (importDecl && importDecl.type === 8 /* Alias */) {
                         const typeName = (0, typeUtils_1.getFullNameOfType)(this._program.getTypeOfSymbol(symbol));
                         if (typeName) {
                             this._addAlternateSymbolName(alternateSymbolNames, typeName, fullName);
@@ -326,10 +326,10 @@ class PackageTypeVerifier {
                 const typedDecls = symbol.getTypedDeclarations();
                 const primaryDecl = typedDecls.length > 0 ? typedDecls[typedDecls.length - 1] : undefined;
                 let symbolInfo;
-                if ((primaryDecl === null || primaryDecl === void 0 ? void 0 : primaryDecl.type) === 4 /* Class */ && (0, types_1.isInstantiableClass)(symbolType)) {
+                if ((primaryDecl === null || primaryDecl === void 0 ? void 0 : primaryDecl.type) === 6 /* Class */ && (0, types_1.isInstantiableClass)(symbolType)) {
                     symbolInfo = this._getSymbolForClass(report, symbolType, publicSymbolMap);
                 }
-                else if ((primaryDecl === null || primaryDecl === void 0 ? void 0 : primaryDecl.type) === 6 /* Alias */ && (0, types_1.isModule)(symbolType)) {
+                else if ((primaryDecl === null || primaryDecl === void 0 ? void 0 : primaryDecl.type) === 8 /* Alias */ && (0, types_1.isModule)(symbolType)) {
                     symbolInfo = this._getSymbolForModule(report, symbolType, publicSymbolMap);
                 }
                 else {
@@ -800,7 +800,7 @@ class PackageTypeVerifier {
             case 6 /* OverloadedFunction */: {
                 const funcDecl = symbol
                     .getDeclarations()
-                    .find((decl) => decl.type === 3 /* Function */);
+                    .find((decl) => decl.type === 5 /* Function */);
                 if (funcDecl && funcDecl.isMethod) {
                     return packageTypeReport_1.SymbolCategory.Method;
                 }

package/dist/analyzer/parseTreeUtils.d.ts

@@ -1,7 +1,7 @@
 import { Position, Range } from '../common/textRange';
 import { TextRange } from '../common/textRange';
 import { TextRangeCollection } from '../common/textRangeCollection';
-import { ArgumentNode, AssignmentExpressionNode, CallNode, ClassNode, EvaluationScopeNode, ExecutionScopeNode, ExpressionNode, FunctionNode, IndexNode, LambdaNode, MemberAccessNode, ModuleNode, NameNode, ParameterNode, ParseNode, ParseNodeType, StatementListNode, StatementNode, StringNode, SuiteNode, TypeAnnotationNode } from '../parser/parseNodes';
+import { ArgumentNode, AssignmentExpressionNode, CallNode, ClassNode, EvaluationScopeNode, ExecutionScopeNode, ExpressionNode, FunctionNode, IndexNode, LambdaNode, MemberAccessNode, ModuleNode, NameNode, ParameterNode, ParseNode, ParseNodeType, StatementListNode, StatementNode, StringNode, SuiteNode, TypeAnnotationNode, TypeParameterScopeNode } from '../parser/parseNodes';
 import { TokenizerOutput } from '../parser/tokenizer';
 import { OperatorType, StringToken, Token } from '../parser/tokenizerTypes';
 import { ParseTreeWalker } from './parseTreeWalker';
@@ -28,7 +28,7 @@ export declare function getEnclosingClassOrFunction(node: ParseNode): FunctionNo
 export declare function getEnclosingSuiteOrModule(node: ParseNode, stopAtFunction?: boolean, stopAtLambda?: boolean): SuiteNode | ModuleNode | undefined;
 export declare function getEvaluationNodeForAssignmentExpression(node: AssignmentExpressionNode): LambdaNode | FunctionNode | ModuleNode | ClassNode | undefined;
 export declare function getEvaluationScopeNode(node: ParseNode): EvaluationScopeNode;
-export declare function getTypeVarScopeNode(node: ParseNode, allowInFunctionSignature?: boolean): EvaluationScopeNode;
+export declare function getTypeVarScopeNode(node: ParseNode): TypeParameterScopeNode;
 export declare function getExecutionScopeNode(node: ParseNode): ExecutionScopeNode;
 export declare function getTypeAnnotationNode(node: ParseNode): TypeAnnotationNode | undefined;
 export declare function isFinalAllowedForAssignmentTarget(targetNode: ExpressionNode): boolean;
@@ -69,7 +69,7 @@ export declare function getCallNodeAndActiveParameterIndex(node: ParseNode, inse
 } | undefined;
 export declare function getTokenAt(tokens: TextRangeCollection<Token>, position: number): Token | undefined;
 export declare function getTokenOverlapping(tokens: TextRangeCollection<Token>, position: number): Token | undefined;
-export declare function printParseNodeType(type: ParseNodeType): "Error" | "Argument" | "Assert" | "Assignment" | "AssignmentExpression" | "AugmentedAssignment" | "Await" | "BinaryOperation" | "Break" | "Call" | "Class" | "Constant" | "Continue" | "Decorator" | "Del" | "Dictionary" | "DictionaryExpandEntry" | "DictionaryKeyEntry" | "Ellipsis" | "If" | "Import" | "ImportAs" | "ImportFrom" | "ImportFromAs" | "Index" | "Except" | "For" | "FormatString" | "Function" | "Global" | "Lambda" | "List" | "ListComprehension" | "ListComprehensionFor" | "ListComprehensionIf" | "MemberAccess" | "Module" | "ModuleName" | "Name" | "Nonlocal" | "Number" | "Parameter" | "Pass" | "Raise" | "Return" | "Set" | "Slice" | "StatementList" | "StringList" | "String" | "Suite" | "Ternary" | "Tuple" | "Try" | "TypeAnnotation" | "UnaryOperation" | "Unpack" | "While" | "With" | "WithItem" | "Yield" | "YieldFrom" | "FunctionAnnotation" | "Match" | "Case" | "PatternSequence" | "PatternAs" | "PatternLiteral" | "PatternClass" | "PatternCapture" | "PatternMapping" | "PatternMappingKeyEntry" | "PatternMappingExpandEntry" | "PatternValue" | "PatternClassArgument";
+export declare function printParseNodeType(type: ParseNodeType): "TypeAlias" | "Error" | "Argument" | "Assert" | "Assignment" | "AssignmentExpression" | "AugmentedAssignment" | "Await" | "BinaryOperation" | "Break" | "Call" | "Class" | "Constant" | "Continue" | "Decorator" | "Del" | "Dictionary" | "DictionaryExpandEntry" | "DictionaryKeyEntry" | "Ellipsis" | "If" | "Import" | "ImportAs" | "ImportFrom" | "ImportFromAs" | "Index" | "Except" | "For" | "FormatString" | "Function" | "Global" | "Lambda" | "List" | "ListComprehension" | "ListComprehensionFor" | "ListComprehensionIf" | "MemberAccess" | "Module" | "ModuleName" | "Name" | "Nonlocal" | "Number" | "Parameter" | "Pass" | "Raise" | "Return" | "Set" | "Slice" | "StatementList" | "StringList" | "String" | "Suite" | "Ternary" | "Tuple" | "Try" | "TypeAnnotation" | "UnaryOperation" | "Unpack" | "While" | "With" | "WithItem" | "Yield" | "YieldFrom" | "FunctionAnnotation" | "Match" | "Case" | "PatternSequence" | "PatternAs" | "PatternLiteral" | "PatternClass" | "PatternCapture" | "PatternMapping" | "PatternMappingKeyEntry" | "PatternMappingExpandEntry" | "PatternValue" | "PatternClassArgument" | "TypeParameter" | "TypeParameterList";
 export declare function isWriteAccess(node: NameNode): boolean;
 export declare function getModuleNode(node: ParseNode): ModuleNode | undefined;
 export declare function getFileInfoFromNode(node: ParseNode): import("./analyzerFileInfo").AnalyzerFileInfo | undefined;

package/dist/analyzer/parseTreeUtils.js

@@ -674,29 +674,28 @@ function getEvaluationScopeNode(node) {
     return undefined;
 }
 exports.getEvaluationScopeNode = getEvaluationScopeNode;
-// Returns the parse node corresponding to the function or class that
-// contains the specified typeVar reference.
-function getTypeVarScopeNode(node, allowInFunctionSignature = false) {
+// Returns the parse node corresponding to the function, class, or type alias
+// that contains the specified typeVar reference.
+function getTypeVarScopeNode(node) {
     let prevNode;
     let curNode = node;
     while (curNode) {
         switch (curNode.nodeType) {
             case 28 /* Function */: {
-                if (prevNode === curNode.suite || allowInFunctionSignature) {
-                    if (!curNode.decorators.some((decorator) => decorator === prevNode)) {
-                        return curNode;
-                    }
+                if (!curNode.decorators.some((decorator) => decorator === prevNode)) {
+                    return curNode;
                 }
                 break;
             }
             case 10 /* Class */: {
-                if (prevNode === curNode.suite) {
-                    if (!curNode.decorators.some((decorator) => decorator === prevNode)) {
-                        return curNode;
-                    }
+                if (!curNode.decorators.some((decorator) => decorator === prevNode)) {
+                    return curNode;
                 }
                 break;
             }
+            case 77 /* TypeAlias */: {
+                return curNode;
+            }
         }
         prevNode = curNode;
         curNode = curNode.parent;
@@ -1441,6 +1440,12 @@ function printParseNodeType(type) {
             return 'PatternValue';
         case 74 /* PatternClassArgument */:
             return 'PatternClassArgument';
+        case 75 /* TypeParameter */:
+            return 'TypeParameter';
+        case 76 /* TypeParameterList */:
+            return 'TypeParameterList';
+        case 77 /* TypeAlias */:
+            return 'TypeAlias';
     }
     (0, debug_1.assertNever)(type);
 }