@zzzen/pyright-internal 1.2.0-dev.20230219 → 1.2.0-dev.20230305

package/dist/parser/parser.js

@@ -355,7 +355,7 @@ class Parser {
             this._getKeywordToken(25 /* Match */);
             const expression = this._parseTestOrStarListAsExpression(
             /* allowAssignmentExpression */ true, 
-            /* allowMultipleUnpack */ true, 12 /* MissingPatternSubject */, localize_1.Localizer.Diagnostic.expectedReturnExpr());
+            /* allowMultipleUnpack */ true, 12 /* MissingPatternSubject */, () => localize_1.Localizer.Diagnostic.expectedReturnExpr());
             smellsLikeMatchStatement =
                 expression.nodeType !== 0 /* Error */ && this._peekToken().type === 10 /* Colon */;
             // Set the token index back to the start.
@@ -367,7 +367,7 @@ class Parser {
         const matchToken = this._getKeywordToken(25 /* Match */);
         const subjectExpression = this._parseTestOrStarListAsExpression(
         /* allowAssignmentExpression */ true, 
-        /* allowMultipleUnpack */ true, 12 /* MissingPatternSubject */, localize_1.Localizer.Diagnostic.expectedReturnExpr());
+        /* allowMultipleUnpack */ true, 12 /* MissingPatternSubject */, () => localize_1.Localizer.Diagnostic.expectedReturnExpr());
         const matchNode = parseNodes_1.MatchNode.create(matchToken, subjectExpression);
         const nextToken = this._peekToken();
         if (!this._consumeTokenIfType(10 /* Colon */)) {
@@ -1132,7 +1132,7 @@ class Parser {
     // for_stmt: [async] 'for' exprlist 'in' testlist suite ['else' suite]
     _parseForStatement(asyncToken) {
         const forToken = this._getKeywordToken(17 /* For */);
-        const targetExpr = this._parseExpressionListAsPossibleTuple(2 /* MissingExpression */, localize_1.Localizer.Diagnostic.expectedExpr(), forToken);
+        const targetExpr = this._parseExpressionListAsPossibleTuple(2 /* MissingExpression */, () => localize_1.Localizer.Diagnostic.expectedExpr(), forToken);
         let seqExpr;
         let forSuite;
         let elseSuite;
@@ -1143,7 +1143,7 @@ class Parser {
         else {
             seqExpr = this._parseTestOrStarListAsExpression(
             /* allowAssignmentExpression */ false, 
-            /* allowMultipleUnpack */ true, 2 /* MissingExpression */, localize_1.Localizer.Diagnostic.expectedInExpr());
+            /* allowMultipleUnpack */ true, 2 /* MissingExpression */, () => localize_1.Localizer.Diagnostic.expectedInExpr());
             forSuite = this._parseLoopSuite();
             // Versions of Python earlier than 3.9 didn't allow unpack operators if the
             // tuple wasn't enclosed in parentheses.
@@ -1226,7 +1226,7 @@ class Parser {
             asyncToken = this._getKeywordToken(3 /* Async */);
         }
         const forToken = this._getKeywordToken(17 /* For */);
-        const targetExpr = this._parseExpressionListAsPossibleTuple(2 /* MissingExpression */, localize_1.Localizer.Diagnostic.expectedExpr(), forToken);
+        const targetExpr = this._parseExpressionListAsPossibleTuple(2 /* MissingExpression */, () => localize_1.Localizer.Diagnostic.expectedExpr(), forToken);
         let seqExpr;
         if (!this._consumeTokenIfKeyword(22 /* In */)) {
             seqExpr = this._handleExpressionParseError(0 /* MissingIn */, localize_1.Localizer.Diagnostic.expectedIn());
@@ -1841,7 +1841,7 @@ class Parser {
         if (!this._isNextTokenNeverExpression()) {
             const returnExpr = this._parseTestOrStarListAsExpression(
             /* allowAssignmentExpression */ true, 
-            /* allowMultipleUnpack */ true, 2 /* MissingExpression */, localize_1.Localizer.Diagnostic.expectedReturnExpr());
+            /* allowMultipleUnpack */ true, 2 /* MissingExpression */, () => localize_1.Localizer.Diagnostic.expectedReturnExpr());
             this._reportConditionalErrorForStarTupleElement(returnExpr);
             returnNode.returnExpression = returnExpr;
             returnNode.returnExpression.parent = returnNode;
@@ -2164,7 +2164,7 @@ class Parser {
         if (!this._isNextTokenNeverExpression()) {
             exprList = this._parseTestOrStarListAsExpression(
             /* allowAssignmentExpression */ true, 
-            /* allowMultipleUnpack */ true, 2 /* MissingExpression */, localize_1.Localizer.Diagnostic.expectedYieldExpr());
+            /* allowMultipleUnpack */ true, 2 /* MissingExpression */, () => localize_1.Localizer.Diagnostic.expectedYieldExpr());
             this._reportConditionalErrorForStarTupleElement(exprList);
         }
         return parseNodes_1.YieldNode.create(yieldToken, exprList);
@@ -2287,9 +2287,9 @@ class Parser {
         }
         return tupleNode;
     }
-    _parseExpressionListAsPossibleTuple(errorCategory, errorString, errorToken) {
+    _parseExpressionListAsPossibleTuple(errorCategory, getErrorString, errorToken) {
         if (this._isNextTokenNeverExpression()) {
-            this._addError(errorString, errorToken);
+            this._addError(getErrorString(), errorToken);
             return parseNodes_1.ErrorNode.create(errorToken, errorCategory);
         }
         const exprListResult = this._parseExpressionList(/* allowStar */ true);
@@ -2298,9 +2298,9 @@ class Parser {
         }
         return this._makeExpressionOrTuple(exprListResult, /* enclosedInParens */ false);
     }
-    _parseTestListAsExpression(errorCategory, errorString) {
+    _parseTestListAsExpression(errorCategory, getErrorString) {
         if (this._isNextTokenNeverExpression()) {
-            return this._handleExpressionParseError(errorCategory, errorString);
+            return this._handleExpressionParseError(errorCategory, getErrorString());
         }
         const exprListResult = this._parseTestExpressionList();
         if (exprListResult.parseError) {
@@ -2308,9 +2308,9 @@ class Parser {
         }
         return this._makeExpressionOrTuple(exprListResult, /* enclosedInParens */ false);
     }
-    _parseTestOrStarListAsExpression(allowAssignmentExpression, allowMultipleUnpack, errorCategory, errorString) {
+    _parseTestOrStarListAsExpression(allowAssignmentExpression, allowMultipleUnpack, errorCategory, getErrorString) {
         if (this._isNextTokenNeverExpression()) {
-            return this._handleExpressionParseError(errorCategory, errorString);
+            return this._handleExpressionParseError(errorCategory, getErrorString());
         }
         const exprListResult = this._parseTestOrStarExpressionList(allowAssignmentExpression, allowMultipleUnpack);
         if (exprListResult.parseError) {
@@ -2979,7 +2979,7 @@ class Parser {
             // were a thing in Python 2.x. We'll parse them to improve parse recovery
             // and emit an error.
             this._addError(localize_1.Localizer.Diagnostic.backticksIllegal(), nextToken);
-            const expressionNode = this._parseTestListAsExpression(2 /* MissingExpression */, localize_1.Localizer.Diagnostic.expectedExpr());
+            const expressionNode = this._parseTestListAsExpression(2 /* MissingExpression */, () => localize_1.Localizer.Diagnostic.expectedExpr());
             this._consumeTokenIfType(22 /* Backtick */);
             return expressionNode;
         }
@@ -3338,7 +3338,7 @@ class Parser {
     _parseExpressionStatement() {
         let leftExpr = this._parseTestOrStarListAsExpression(
         /* allowAssignmentExpression */ false, 
-        /* allowMultipleUnpack */ false, 2 /* MissingExpression */, localize_1.Localizer.Diagnostic.expectedExpr());
+        /* allowMultipleUnpack */ false, 2 /* MissingExpression */, () => localize_1.Localizer.Diagnostic.expectedExpr());
         let annotationExpr;
         if (leftExpr.nodeType === 0 /* Error */) {
             return leftExpr;
@@ -3365,7 +3365,7 @@ class Parser {
             const rightExpr = this._tryParseYieldExpression() ||
                 this._parseTestOrStarListAsExpression(
                 /* allowAssignmentExpression */ false, 
-                /* allowMultipleUnpack */ true, 2 /* MissingExpression */, localize_1.Localizer.Diagnostic.expectedAssignRightHandExpr());
+                /* allowMultipleUnpack */ true, 2 /* MissingExpression */, () => localize_1.Localizer.Diagnostic.expectedAssignRightHandExpr());
             this._isParsingTypeAnnotation = wasParsingTypeAnnotation;
             return parseNodes_1.AssignmentNode.create(leftExpr, rightExpr);
         }
@@ -3376,7 +3376,7 @@ class Parser {
         if (tokenizer_1.Tokenizer.isOperatorAssignment(this._peekOperatorType())) {
             const operatorToken = this._getNextToken();
             const rightExpr = this._tryParseYieldExpression() ||
-                this._parseTestListAsExpression(2 /* MissingExpression */, localize_1.Localizer.Diagnostic.expectedBinaryRightHandExpr());
+                this._parseTestListAsExpression(2 /* MissingExpression */, () => localize_1.Localizer.Diagnostic.expectedBinaryRightHandExpr());
             // Make a shallow copy of the dest expression but give it a new ID.
             const destExpr = Object.assign({}, leftExpr);
             destExpr.id = (0, parseNodes_1.getNextNodeId)();
@@ -3393,7 +3393,7 @@ class Parser {
                 this._tryParseYieldExpression() ||
                     this._parseTestOrStarListAsExpression(
                     /* allowAssignmentExpression */ false, 
-                    /* allowMultipleUnpack */ true, 2 /* MissingExpression */, localize_1.Localizer.Diagnostic.expectedAssignRightHandExpr());
+                    /* allowMultipleUnpack */ true, 2 /* MissingExpression */, () => localize_1.Localizer.Diagnostic.expectedAssignRightHandExpr());
             if (rightExpr.nodeType === 0 /* Error */) {
                 break;
             }