@zzzen/pyright-internal 1.2.0-dev.20240317 → 1.2.0-dev.20240331

package/dist/parser/parser.js

@@ -263,7 +263,7 @@ class Parser {
     // type_alias_stmt: "type" name [type_param_seq] = expr
     _parseTypeAliasStatement() {
         const typeToken = this._getKeywordToken(35 /* KeywordType.Type */);
-        if (!this._parseOptions.isStubFile && this._getLanguageVersion() < pythonVersion_1.PythonVersion.V3_12) {
+        if (!this._parseOptions.isStubFile && this._getLanguageVersion().isLessThan(pythonVersion_1.pythonVersion3_12)) {
             this._addSyntaxError(localize_1.LocMessage.typeAliasStatementIllegal(), typeToken);
         }
         const nameToken = this._getTokenIfIdentifier();
@@ -281,7 +281,10 @@ class Parser {
         else {
             this._getNextToken();
         }
+        const wasParsingTypeAnnotation = this._isParsingTypeAnnotation;
+        this._isParsingTypeAnnotation = true;
         const expression = this._parseTestExpression(/* allowAssignmentExpression */ false);
+        this._isParsingTypeAnnotation = wasParsingTypeAnnotation;
         return parseNodes_1.TypeAliasNode.create(typeToken, name, expression, typeParameters);
     }
     // type_param_seq: '[' (type_param ',')+ ']'
@@ -342,7 +345,7 @@ class Parser {
         if (this._consumeTokenIfOperator(2 /* OperatorType.Assign */)) {
             defaultExpression = this._parseExpression(
             /* allowUnpack */ typeParamCategory === parseNodes_1.TypeParameterCategory.TypeVarTuple);
-            if (!this._parseOptions.isStubFile && this._getLanguageVersion() < pythonVersion_1.PythonVersion.V3_13) {
+            if (!this._parseOptions.isStubFile && this._getLanguageVersion().isLessThan(pythonVersion_1.pythonVersion3_13)) {
                 this._addSyntaxError(localize_1.LocMessage.typeVarDefaultIllegal(), defaultExpression);
             }
         }
@@ -450,7 +453,7 @@ class Parser {
             }
         }
         // This feature requires Python 3.10.
-        if (this._getLanguageVersion() < pythonVersion_1.PythonVersion.V3_10) {
+        if (this._getLanguageVersion().isLessThan(pythonVersion_1.pythonVersion3_10)) {
             this._addSyntaxError(localize_1.LocMessage.matchIncompatible(), matchToken);
         }
         // Validate that only the last entry uses an irrefutable pattern.
@@ -1216,7 +1219,7 @@ class Parser {
             forSuite = this._parseLoopSuite();
             // Versions of Python earlier than 3.9 didn't allow unpack operators if the
             // tuple wasn't enclosed in parentheses.
-            if (this._getLanguageVersion() < pythonVersion_1.PythonVersion.V3_9 && !this._parseOptions.isStubFile) {
+            if (this._getLanguageVersion().isLessThan(pythonVersion_1.pythonVersion3_9) && !this._parseOptions.isStubFile) {
                 if (seqExpr.nodeType === 52 /* ParseNodeType.Tuple */ && !seqExpr.enclosedInParens) {
                     let sawStar = false;
                     seqExpr.expressions.forEach((expr) => {
@@ -1355,7 +1358,7 @@ class Parser {
             const possibleStarToken = this._peekToken();
             let isExceptGroup = false;
             if (this._consumeTokenIfOperator(26 /* OperatorType.Multiply */)) {
-                if (this._getLanguageVersion() < pythonVersion_1.PythonVersion.V3_11 && !this._parseOptions.isStubFile) {
+                if (this._getLanguageVersion().isLessThan(pythonVersion_1.pythonVersion3_11) && !this._parseOptions.isStubFile) {
                     this._addSyntaxError(localize_1.LocMessage.exceptionGroupIncompatible(), possibleStarToken);
                 }
                 isExceptGroup = true;
@@ -1435,7 +1438,7 @@ class Parser {
         const possibleOpenBracket = this._peekToken();
         if (possibleOpenBracket.type === 15 /* TokenType.OpenBracket */) {
             typeParameters = this._parseTypeParameterList();
-            if (!this._parseOptions.isStubFile && this._getLanguageVersion() < pythonVersion_1.PythonVersion.V3_12) {
+            if (!this._parseOptions.isStubFile && this._getLanguageVersion().isLessThan(pythonVersion_1.pythonVersion3_12)) {
                 this._addSyntaxError(localize_1.LocMessage.functionTypeParametersIllegal(), typeParameters);
             }
         }
@@ -1627,7 +1630,7 @@ class Parser {
             starCount = 2;
         }
         else if (this._consumeTokenIfOperator(10 /* OperatorType.Divide */)) {
-            if (this._getLanguageVersion() < pythonVersion_1.PythonVersion.V3_8 && !this._parseOptions.isStubFile) {
+            if (this._getLanguageVersion().isLessThan(pythonVersion_1.pythonVersion3_8) && !this._parseOptions.isStubFile) {
                 this._addSyntaxError(localize_1.LocMessage.positionOnlyIncompatible(), firstToken);
             }
             slashCount = 1;
@@ -1717,7 +1720,7 @@ class Parser {
         }
         if (isParenthesizedWithItemList) {
             this._consumeTokenIfType(13 /* TokenType.OpenParenthesis */);
-            if (this._getLanguageVersion() < pythonVersion_1.PythonVersion.V3_9) {
+            if (this._getLanguageVersion().isLessThan(pythonVersion_1.pythonVersion3_9)) {
                 this._addSyntaxError(localize_1.LocMessage.parenthesizedContextManagerIllegal(), possibleParen);
             }
         }
@@ -1810,7 +1813,7 @@ class Parser {
         const expression = this._parseTestExpression(/* allowAssignmentExpression */ true);
         // Versions of Python prior to 3.9 support a limited set of
         // expression forms.
-        if (this._getLanguageVersion() < pythonVersion_1.PythonVersion.V3_9) {
+        if (this._getLanguageVersion().isLessThan(pythonVersion_1.pythonVersion3_9)) {
             let isSupportedExpressionForm = false;
             if (this._isNameOrMemberAccessExpression(expression)) {
                 isSupportedExpressionForm = true;
@@ -1851,7 +1854,7 @@ class Parser {
         const possibleOpenBracket = this._peekToken();
         if (possibleOpenBracket.type === 15 /* TokenType.OpenBracket */) {
             typeParameters = this._parseTypeParameterList();
-            if (!this._parseOptions.isStubFile && this._getLanguageVersion() < pythonVersion_1.PythonVersion.V3_12) {
+            if (!this._parseOptions.isStubFile && this._getLanguageVersion().isLessThan(pythonVersion_1.pythonVersion3_12)) {
                 this._addSyntaxError(localize_1.LocMessage.classTypeParametersIllegal(), typeParameters);
             }
         }
@@ -2241,7 +2244,7 @@ class Parser {
         const yieldToken = this._getKeywordToken(38 /* KeywordType.Yield */);
         const nextToken = this._peekToken();
         if (this._consumeTokenIfKeyword(18 /* KeywordType.From */)) {
-            if (this._getLanguageVersion() < pythonVersion_1.PythonVersion.V3_3) {
+            if (this._getLanguageVersion().isLessThan(pythonVersion_1.pythonVersion3_3)) {
                 this._addSyntaxError(localize_1.LocMessage.yieldFromIllegal(), nextToken);
             }
             return parseNodes_1.YieldFromNode.create(yieldToken, this._parseTestExpression(/* allowAssignmentExpression */ false));
@@ -2482,7 +2485,7 @@ class Parser {
         if (!this._assignmentExpressionsAllowed || disallowAssignmentExpression) {
             this._addSyntaxError(localize_1.LocMessage.walrusNotAllowed(), walrusToken);
         }
-        if (this._getLanguageVersion() < pythonVersion_1.PythonVersion.V3_8) {
+        if (this._getLanguageVersion().isLessThan(pythonVersion_1.pythonVersion3_8)) {
             this._addSyntaxError(localize_1.LocMessage.walrusIllegal(), walrusToken);
         }
         const rightExpr = this._parseTestExpression(/* allowAssignmentExpression */ false);
@@ -2730,7 +2733,7 @@ class Parser {
         let awaitToken;
         if (this._peekKeywordType() === 4 /* KeywordType.Await */) {
             awaitToken = this._getKeywordToken(4 /* KeywordType.Await */);
-            if (this._getLanguageVersion() < pythonVersion_1.PythonVersion.V3_5) {
+            if (this._getLanguageVersion().isLessThan(pythonVersion_1.pythonVersion3_5)) {
                 this._addSyntaxError(localize_1.LocMessage.awaitIllegal(), awaitToken);
             }
         }
@@ -2871,7 +2874,7 @@ class Parser {
                     this._tokenIndex = startOfSubscriptIndex;
                     valueExpr = this._parseTestExpression(/* allowAssignmentExpression */ true);
                     // Python 3.10 and newer allow assignment expressions to be used inside of a subscript.
-                    if (!this._parseOptions.isStubFile && this._getLanguageVersion() < pythonVersion_1.PythonVersion.V3_10) {
+                    if (!this._parseOptions.isStubFile && this._getLanguageVersion().isLessThan(pythonVersion_1.pythonVersion3_10)) {
                         this._addSyntaxError(localize_1.LocMessage.assignmentExprInSubscript(), valueExpr);
                     }
                 }
@@ -2894,7 +2897,7 @@ class Parser {
             if (argType !== 0 /* ArgumentCategory.Simple */) {
                 const unpackListAllowed = this._parseOptions.isStubFile ||
                     this._isParsingQuotedText ||
-                    this._getLanguageVersion() >= pythonVersion_1.PythonVersion.V3_11;
+                    this._getLanguageVersion().isGreaterOrEqualTo(pythonVersion_1.pythonVersion3_11);
                 if (argType === 1 /* ArgumentCategory.UnpackedList */ && !unpackListAllowed) {
                     this._addSyntaxError(localize_1.LocMessage.unpackedSubscriptIllegal(), argNode);
                 }
@@ -2934,7 +2937,7 @@ class Parser {
             }
             if (nextTokenType !== 10 /* TokenType.Colon */) {
                 // Python 3.10 and newer allow assignment expressions to be used inside of a subscript.
-                const allowAssignmentExpression = this._parseOptions.isStubFile || this._getLanguageVersion() >= pythonVersion_1.PythonVersion.V3_10;
+                const allowAssignmentExpression = this._parseOptions.isStubFile || this._getLanguageVersion().isGreaterOrEqualTo(pythonVersion_1.pythonVersion3_10);
                 sliceExpressions[sliceIndex] = this._parseTestExpression(allowAssignmentExpression);
             }
             sliceIndex++;
@@ -3411,7 +3414,7 @@ class Parser {
         if (this._consumeTokenIfType(10 /* TokenType.Colon */)) {
             annotationExpr = this._parseTypeAnnotation();
             leftExpr = parseNodes_1.TypeAnnotationNode.create(leftExpr, annotationExpr);
-            if (!this._parseOptions.isStubFile && this._getLanguageVersion() < pythonVersion_1.PythonVersion.V3_6) {
+            if (!this._parseOptions.isStubFile && this._getLanguageVersion().isLessThan(pythonVersion_1.pythonVersion3_6)) {
                 this._addSyntaxError(localize_1.LocMessage.varAnnotationIllegal(), annotationExpr);
             }
             if (!this._consumeTokenIfOperator(2 /* OperatorType.Assign */)) {
@@ -3542,7 +3545,7 @@ class Parser {
             allowUnpack &&
             !this._parseOptions.isStubFile &&
             !this._isParsingQuotedText &&
-            this._getLanguageVersion() < pythonVersion_1.PythonVersion.V3_11) {
+            this._getLanguageVersion().isLessThan(pythonVersion_1.pythonVersion3_11)) {
             this._addSyntaxError(localize_1.LocMessage.unpackedSubscriptIllegal(), startToken);
         }
         let result = this._parseTestExpression(/* allowAssignmentExpression */ false);
@@ -3560,7 +3563,7 @@ class Parser {
             this._addSyntaxError(localize_1.LocMessage.stringNonAsciiBytes(), stringToken);
         }
         if (stringToken.flags & 64 /* StringTokenFlags.Format */) {
-            if (this._getLanguageVersion() < pythonVersion_1.PythonVersion.V3_6) {
+            if (this._getLanguageVersion().isLessThan(pythonVersion_1.pythonVersion3_6)) {
                 this._addSyntaxError(localize_1.LocMessage.formatStringIllegal(), stringToken);
             }
             if (stringToken.flags & 32 /* StringTokenFlags.Bytes */) {
@@ -3658,7 +3661,7 @@ class Parser {
         if (nextToken.type === 9 /* TokenType.Operator */ &&
             nextToken.operatorType === 2 /* OperatorType.Assign */) {
             // This feature requires Python 3.8 or newer.
-            if (this._parseOptions.pythonVersion < pythonVersion_1.PythonVersion.V3_8) {
+            if (this._parseOptions.pythonVersion.isLessThan(pythonVersion_1.pythonVersion3_8)) {
                 this._addSyntaxError(localize_1.LocMessage.formatStringDebuggingIllegal(), nextToken);
             }
             this._getNextToken();
@@ -3853,7 +3856,7 @@ class Parser {
         if (possibleTupleExpr.enclosedInParens) {
             return;
         }
-        if (this._parseOptions.pythonVersion >= pythonVersion_1.PythonVersion.V3_8) {
+        if (this._parseOptions.pythonVersion.isGreaterOrEqualTo(pythonVersion_1.pythonVersion3_8)) {
             return;
         }
         for (const expr of possibleTupleExpr.expressions) {