@zzzen/pyright-internal 1.2.0-dev.20241103 → 1.2.0-dev.20241117

package/dist/parser/parser.js

@@ -77,7 +77,7 @@ class Parser {
         this._diagSink = new diagnosticSink_1.DiagnosticSink();
         this._isInLoop = false;
         this._isInFunction = false;
-        this._isInFinally = false;
+        this._isInExceptionGroup = false;
         this._isParsingTypeAnnotation = false;
         this._isParsingIndexTrailer = false;
         this._isParsingQuotedText = false;
@@ -1045,11 +1045,18 @@ class Parser {
         }
         return ifNode;
     }
+    _parseExceptSuite(isExceptionGroup, callback) {
+        const wasInExceptionGroup = this._isInExceptionGroup;
+        if (isExceptionGroup) {
+            this._isInExceptionGroup = true;
+        }
+        const result = callback();
+        this._isInExceptionGroup = wasInExceptionGroup;
+        return result;
+    }
     _parseLoopSuite() {
         const wasInLoop = this._isInLoop;
-        const wasInFinally = this._isInFinally;
         this._isInLoop = true;
-        this._isInFinally = false;
         let typeComment;
         const suite = this._parseSuite(this._isInFunction, /* skipBody */ false, () => {
             const comment = this._getTypeAnnotationCommentText();
@@ -1058,7 +1065,6 @@ class Parser {
             }
         });
         this._isInLoop = wasInLoop;
-        this._isInFinally = wasInFinally;
         if (typeComment) {
             suite.d.typeComment = typeComment;
         }
@@ -1354,6 +1360,7 @@ class Parser {
         const trySuite = this._parseSuite(this._isInFunction);
         const tryNode = parseNodes_1.TryNode.create(tryToken, trySuite);
         let sawCatchAllExcept = false;
+        let reportedExceptGroupMismatch = false;
         while (true) {
             const exceptToken = this._peekToken();
             if (!this._consumeTokenIfKeyword(14 /* KeywordType.Except */)) {
@@ -1368,6 +1375,16 @@ class Parser {
                     this._addSyntaxError(localize_1.LocMessage.exceptionGroupIncompatible(), possibleStarToken);
                 }
                 isExceptGroup = true;
+                if (!reportedExceptGroupMismatch && tryNode.d.exceptClauses.some((clause) => !clause.d.isExceptGroup)) {
+                    this._addSyntaxError(localize_1.LocMessage.exceptGroupMismatch(), possibleStarToken);
+                    reportedExceptGroupMismatch = true;
+                }
+            }
+            else {
+                if (!reportedExceptGroupMismatch && tryNode.d.exceptClauses.some((clause) => clause.d.isExceptGroup)) {
+                    this._addSyntaxError(localize_1.LocMessage.exceptGroupMismatch(), possibleStarToken);
+                    reportedExceptGroupMismatch = true;
+                }
             }
             let typeExpr;
             let symbolName;
@@ -1389,6 +1406,9 @@ class Parser {
                     }
                 }
             }
+            else if (isExceptGroup) {
+                this._addSyntaxError(localize_1.LocMessage.exceptGroupRequiresType(), this._peekToken());
+            }
             if (!typeExpr) {
                 if (sawCatchAllExcept) {
                     this._addSyntaxError(localize_1.LocMessage.duplicateCatchAll(), exceptToken);
@@ -1400,7 +1420,7 @@ class Parser {
                     this._addSyntaxError(localize_1.LocMessage.namedExceptAfterCatchAll(), typeExpr);
                 }
             }
-            const exceptSuite = this._parseSuite(this._isInFunction);
+            const exceptSuite = this._parseExceptSuite(isExceptGroup, () => this._parseSuite(this._isInFunction));
             const exceptNode = parseNodes_1.ExceptNode.create(exceptToken, exceptSuite, isExceptGroup);
             if (typeExpr) {
                 exceptNode.d.typeExpr = typeExpr;
@@ -1464,11 +1484,14 @@ class Parser {
             returnType = this._parseTypeAnnotation();
         }
         let functionTypeAnnotationToken;
+        const wasInExceptionGroup = this._isInExceptionGroup;
+        this._isInExceptionGroup = false;
         const suite = this._parseSuite(/* isFunction */ true, this._parseOptions.skipFunctionAndClassBody, () => {
             if (!functionTypeAnnotationToken) {
                 functionTypeAnnotationToken = this._getTypeAnnotationCommentText();
             }
         });
+        this._isInExceptionGroup = wasInExceptionGroup;
         const functionNode = parseNodes_1.FunctionNode.create(defToken, parseNodes_1.NameNode.create(nameToken), suite, typeParameters);
         if (asyncToken) {
             functionNode.d.isAsync = true;
@@ -1900,6 +1923,9 @@ class Parser {
         if (!this._isInLoop) {
             this._addSyntaxError(localize_1.LocMessage.breakOutsideLoop(), breakToken);
         }
+        else if (this._isInExceptionGroup) {
+            this._addSyntaxError(localize_1.LocMessage.breakInExceptionGroup(), breakToken);
+        }
         return parseNodes_1.BreakNode.create(breakToken);
     }
     _parseContinueStatement() {
@@ -1907,8 +1933,8 @@ class Parser {
         if (!this._isInLoop) {
             this._addSyntaxError(localize_1.LocMessage.continueOutsideLoop(), continueToken);
         }
-        else if (this._isInFinally) {
-            this._addSyntaxError(localize_1.LocMessage.continueInFinally(), continueToken);
+        else if (this._isInExceptionGroup) {
+            this._addSyntaxError(localize_1.LocMessage.continueInExceptionGroup(), continueToken);
         }
         return parseNodes_1.ContinueNode.create(continueToken);
     }
@@ -1919,6 +1945,9 @@ class Parser {
         if (!this._isInFunction) {
             this._addSyntaxError(localize_1.LocMessage.returnOutsideFunction(), returnToken);
         }
+        else if (this._isInExceptionGroup) {
+            this._addSyntaxError(localize_1.LocMessage.returnInExceptionGroup(), returnToken);
+        }
         if (!this._isNextTokenNeverExpression()) {
             const returnExpr = this._parseTestOrStarListAsExpression(
             /* allowAssignmentExpression */ true,