@zzzen/pyright-internal 1.2.0-dev.20250406 → 1.2.0-dev.20250420

package/dist/parser/parser.js

@@ -81,6 +81,8 @@ class Parser {
         this._isParsingTypeAnnotation = false;
         this._isParsingIndexTrailer = false;
         this._isParsingQuotedText = false;
+        this._isInFinallyBlock = false;
+        this._isInFinallyLoop = false;
         this._futureImports = new Set();
         this._importedModules = [];
         this._containsWildcardImport = false;
@@ -88,8 +90,10 @@ class Parser {
         this._typingImportAliases = [];
         this._typingSymbolAliases = new Map();
         this._maxChildDepthMap = new Map();
+        this._hasTypeAnnotations = false;
     }
     parseSourceFile(fileContents, parseOptions, diagSink) {
+        this._hasTypeAnnotations = false;
         timing_1.timingStats.tokenizeFileTime.timeOperation(() => {
             this._startNewParse(fileContents, 0, fileContents.length, parseOptions, diagSink);
         });
@@ -130,6 +134,7 @@ class Parser {
                 futureImports: this._futureImports,
                 containsWildcardImport: this._containsWildcardImport,
                 typingSymbolAliases: this._typingSymbolAliases,
+                hasTypeAnnotations: this._hasTypeAnnotations,
             },
             tokenizerOutput: this._tokenizerOutput,
         };
@@ -1057,6 +1062,11 @@ class Parser {
     _parseLoopSuite() {
         const wasInLoop = this._isInLoop;
         this._isInLoop = true;
+        // Record the fact that we are no longer in a finally block
+        // that is contained within a loop. A loop within the finally
+        // block resets this. See PEP 765 for details.
+        const wasInFinallyLoop = this._isInFinallyLoop;
+        this._isInFinallyLoop = false;
         let typeComment;
         const suite = this._parseSuite(this._isInFunction, /* skipBody */ false, () => {
             const comment = this._getTypeAnnotationCommentText();
@@ -1065,6 +1075,7 @@ class Parser {
             }
         });
         this._isInLoop = wasInLoop;
+        this._isInFinallyLoop = wasInFinallyLoop;
         if (typeComment) {
             suite.d.typeComment = typeComment;
         }
@@ -1442,7 +1453,13 @@ class Parser {
             }
         }
         if (this._consumeTokenIfKeyword(16 /* KeywordType.Finally */)) {
+            const wasInFinallyBlock = this._isInFinallyBlock;
+            const wasInFinallyLoop = this._isInFinallyLoop;
+            this._isInFinallyBlock = true;
+            this._isInFinallyLoop = this._isInLoop;
             tryNode.d.finallySuite = this._parseSuite(this._isInFunction);
+            this._isInFinallyBlock = wasInFinallyBlock;
+            this._isInFinallyLoop = wasInFinallyLoop;
             tryNode.d.finallySuite.parent = tryNode;
             (0, parseNodes_1.extendRange)(tryNode, tryNode.d.finallySuite);
         }
@@ -1486,12 +1503,18 @@ class Parser {
         let functionTypeAnnotationToken;
         const wasInExceptionGroup = this._isInExceptionGroup;
         this._isInExceptionGroup = false;
+        const wasInFinallyBlock = this._isInFinallyBlock;
+        const wasInFinallyLoop = this._isInFinallyLoop;
+        this._isInFinallyBlock = false;
+        this._isInFinallyLoop = false;
         const suite = this._parseSuite(/* isFunction */ true, this._parseOptions.skipFunctionAndClassBody, () => {
             if (!functionTypeAnnotationToken) {
                 functionTypeAnnotationToken = this._getTypeAnnotationCommentText();
             }
         });
         this._isInExceptionGroup = wasInExceptionGroup;
+        this._isInFinallyBlock = wasInFinallyBlock;
+        this._isInFinallyLoop = wasInFinallyLoop;
         const functionNode = parseNodes_1.FunctionNode.create(defToken, parseNodes_1.NameNode.create(nameToken), suite, typeParameters);
         if (asyncToken) {
             functionNode.d.isAsync = true;
@@ -1926,6 +1949,9 @@ class Parser {
         else if (this._isInExceptionGroup) {
             this._addSyntaxError(localize_1.LocMessage.breakInExceptionGroup(), breakToken);
         }
+        if (this._isInFinallyLoop && pythonVersion_1.PythonVersion.isGreaterOrEqualTo(this._getLanguageVersion(), pythonVersion_1.pythonVersion3_14)) {
+            this._addSyntaxError(localize_1.LocMessage.finallyBreak(), breakToken);
+        }
         return parseNodes_1.BreakNode.create(breakToken);
     }
     _parseContinueStatement() {
@@ -1936,6 +1962,9 @@ class Parser {
         else if (this._isInExceptionGroup) {
             this._addSyntaxError(localize_1.LocMessage.continueInExceptionGroup(), continueToken);
         }
+        if (this._isInFinallyLoop && pythonVersion_1.PythonVersion.isGreaterOrEqualTo(this._getLanguageVersion(), pythonVersion_1.pythonVersion3_14)) {
+            this._addSyntaxError(localize_1.LocMessage.finallyContinue(), continueToken);
+        }
         return parseNodes_1.ContinueNode.create(continueToken);
     }
     // return_stmt: 'return' [testlist]
@@ -1948,6 +1977,9 @@ class Parser {
         else if (this._isInExceptionGroup) {
             this._addSyntaxError(localize_1.LocMessage.returnInExceptionGroup(), returnToken);
         }
+        if (this._isInFinallyBlock && pythonVersion_1.PythonVersion.isGreaterOrEqualTo(this._getLanguageVersion(), pythonVersion_1.pythonVersion3_14)) {
+            this._addSyntaxError(localize_1.LocMessage.finallyReturn(), returnToken);
+        }
         if (!this._isNextTokenNeverExpression()) {
             const returnExpr = this._parseTestOrStarListAsExpression(
             /* allowAssignmentExpression */ true, 
@@ -3634,6 +3666,7 @@ class Parser {
             result = parseNodes_1.UnpackNode.create(startToken, result);
         }
         this._isParsingTypeAnnotation = wasParsingTypeAnnotation;
+        this._hasTypeAnnotations = true;
         return result;
     }
     _reportStringTokenErrors(stringToken, unescapedResult) {