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

package/dist/parser/parser.js

@@ -36,13 +36,13 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Parser = exports.ParseTextMode = exports.ParseOptions = void 0;
-const sourceFile_1 = require("../analyzer/sourceFile");
 const collectionUtils_1 = require("../common/collectionUtils");
 const debug_1 = require("../common/debug");
 const diagnostic_1 = require("../common/diagnostic");
 const diagnosticSink_1 = require("../common/diagnosticSink");
 const positionUtils_1 = require("../common/positionUtils");
 const pythonVersion_1 = require("../common/pythonVersion");
+const stringUtils_1 = require("../common/stringUtils");
 const textRange_1 = require("../common/textRange");
 const timing_1 = require("../common/timing");
 const localize_1 = require("../localization/localize");
@@ -50,13 +50,15 @@ const parseNodes_1 = require("./parseNodes");
 const StringTokenUtils = __importStar(require("./stringTokenUtils"));
 const tokenizer_1 = require("./tokenizer");
 const tokenizerTypes_1 = require("./tokenizerTypes");
+const commentRegEx = /^(\s*#\s*type:\s*)([^\r\n]*)/;
+const ignoreCommentRegEx = /^ignore(\s|\[|$)/;
 class ParseOptions {
     constructor() {
         this.isStubFile = false;
         this.pythonVersion = pythonVersion_1.latestStablePythonVersion;
         this.reportInvalidStringEscapeSequence = false;
         this.skipFunctionAndClassBody = false;
-        this.ipythonMode = sourceFile_1.IPythonMode.None;
+        this.useNotebookMode = false;
         this.reportErrorsForParsedStringContents = false;
     }
 }
@@ -128,6 +130,7 @@ class Parser {
         (0, debug_1.assert)(this._tokenizerOutput !== undefined);
         return {
             text: fileContents,
+            contentHash: (0, stringUtils_1.hashString)(fileContents),
             parserOutput: {
                 parseTree: moduleNode,
                 importedModules: this._importedModules,
@@ -137,6 +140,7 @@ class Parser {
                 hasTypeAnnotations: this._hasTypeAnnotations,
             },
             tokenizerOutput: this._tokenizerOutput,
+            lines: this._tokenizerOutput.lines,
         };
     }
     parseTextExpression(fileContents, textOffset, textLength, parseOptions, parseTextMode = 0 /* ParseTextMode.Expression */, initialParenDepth = 0, typingSymbolAliases) {
@@ -186,7 +190,7 @@ class Parser {
         this._diagSink = diagSink;
         // Tokenize the file contents.
         const tokenizer = new tokenizer_1.Tokenizer();
-        this._tokenizerOutput = tokenizer.tokenize(fileContents, textOffset, textLength, initialParenDepth, this._parseOptions.ipythonMode);
+        this._tokenizerOutput = tokenizer.tokenize(fileContents, textOffset, textLength, initialParenDepth, this._parseOptions.useNotebookMode);
         this._tokenIndex = 0;
     }
     // stmt: simple_stmt | compound_stmt
@@ -1399,23 +1403,32 @@ class Parser {
             }
             let typeExpr;
             let symbolName;
+            let isAsKeywordAllowed = true;
             if (this._peekTokenType() !== 10 /* TokenType.Colon */) {
-                typeExpr = this._parseTestExpression(/* allowAssignmentExpression */ true);
+                const listResult = this._parseExpressionListGeneric(() => this._parseTestExpression(/* allowAssignmentExpression */ true));
+                if (listResult.parseError) {
+                    typeExpr = listResult.parseError;
+                }
+                else {
+                    typeExpr = this._makeExpressionOrTuple(listResult, /* enclosedInParens */ false);
+                    // Python 3.14 allows more than one exception type to be provided in
+                    // an except clause.
+                    if (listResult.list.length > 1) {
+                        if (pythonVersion_1.PythonVersion.isLessThan(this._getLanguageVersion(), pythonVersion_1.pythonVersion3_14)) {
+                            this._addSyntaxError(localize_1.LocMessage.exceptRequiresParens(), typeExpr);
+                        }
+                        isAsKeywordAllowed = false;
+                    }
+                }
                 if (this._consumeTokenIfKeyword(1 /* KeywordType.As */)) {
+                    if (!isAsKeywordAllowed) {
+                        this._addSyntaxError(localize_1.LocMessage.exceptWithAsRequiresParens(), typeExpr);
+                    }
                     symbolName = this._getTokenIfIdentifier();
                     if (!symbolName) {
                         this._addSyntaxError(localize_1.LocMessage.expectedNameAfterAs(), this._peekToken());
                     }
                 }
-                else {
-                    // Handle the python 2.x syntax in a graceful manner.
-                    const peekToken = this._peekToken();
-                    if (this._consumeTokenIfType(12 /* TokenType.Comma */)) {
-                        this._addSyntaxError(localize_1.LocMessage.expectedAsAfterException(), peekToken);
-                        // Parse the expression expected in python 2.x, but discard it.
-                        this._parseTestExpression(/* allowAssignmentExpression */ false);
-                    }
-                }
             }
             else if (isExceptGroup) {
                 this._addSyntaxError(localize_1.LocMessage.exceptGroupRequiresType(), this._peekToken());
@@ -3081,8 +3094,7 @@ class Parser {
         return { args: argList, trailingComma };
     }
     // argument: ( test [comp_for] |
-    //             name '=' test |
-    //             name '=' |
+    //             test '=' test |
     //             '**' test |
     //             '*' test )
     _parseArgument() {
@@ -3095,34 +3107,16 @@ class Parser {
             argType = 2 /* ArgCategory.UnpackedDictionary */;
         }
         let valueExpr = this._parseTestExpression(/* allowAssignmentExpression */ true);
-        let nameNode;
-        let isNameSameAsValue = false;
-        let assignmentToken;
+        let nameIdentifier;
         if (argType === 0 /* ArgCategory.Simple */) {
-            const nextToken = this._peekToken();
             if (this._consumeTokenIfOperator(2 /* OperatorType.Assign */)) {
-                assignmentToken = nextToken;
                 const nameExpr = valueExpr;
-                if (nameExpr.nodeType === 38 /* ParseNodeType.Name */ &&
-                    (this._peekTokenType() === 12 /* TokenType.Comma */ || this._peekTokenType() === 14 /* TokenType.CloseParenthesis */)) {
-                    nameNode = parseNodes_1.NameNode.create(nameExpr.d.token);
-                    if (pythonVersion_1.PythonVersion.isLessThan(this._getLanguageVersion(), pythonVersion_1.pythonVersion3_14)) {
-                        this._addSyntaxError(localize_1.LocMessage.keywordArgShortcutIllegal(), assignmentToken);
-                        valueExpr = parseNodes_1.ErrorNode.create(assignmentToken, 14 /* ErrorExpressionCategory.MissingKeywordArgValue */);
-                    }
-                    else {
-                        valueExpr = parseNodes_1.NameNode.create(nameExpr.d.token);
-                        isNameSameAsValue = true;
-                    }
+                valueExpr = this._parseTestExpression(/* allowAssignmentExpression */ false);
+                if (nameExpr.nodeType === 38 /* ParseNodeType.Name */) {
+                    nameIdentifier = nameExpr.d.token;
                 }
                 else {
-                    valueExpr = this._parseTestExpression(/* allowAssignmentExpression */ false);
-                    if (nameExpr.nodeType === 38 /* ParseNodeType.Name */) {
-                        nameNode = parseNodes_1.NameNode.create(nameExpr.d.token);
-                    }
-                    else {
-                        this._addSyntaxError(localize_1.LocMessage.expectedParamName(), nameExpr);
-                    }
+                    this._addSyntaxError(localize_1.LocMessage.expectedParamName(), nameExpr);
                 }
             }
             else {
@@ -3133,13 +3127,9 @@ class Parser {
             }
         }
         const argNode = parseNodes_1.ArgumentNode.create(firstToken, valueExpr, argType);
-        if (nameNode) {
-            argNode.d.name = nameNode;
-            argNode.d.isNameSameAsValue = isNameSameAsValue;
+        if (nameIdentifier) {
+            argNode.d.name = parseNodes_1.NameNode.create(nameIdentifier);
             argNode.d.name.parent = argNode;
-            if (assignmentToken) {
-                (0, parseNodes_1.extendRange)(argNode, assignmentToken);
-            }
         }
         return argNode;
     }
@@ -3686,6 +3676,20 @@ class Parser {
             if (stringToken.flags & 16 /* StringTokenFlags.Unicode */) {
                 this._addSyntaxError(localize_1.LocMessage.formatStringUnicode(), stringToken);
             }
+            if (stringToken.flags & 128 /* StringTokenFlags.Template */) {
+                this._addSyntaxError(localize_1.LocMessage.formatStringTemplate(), stringToken);
+            }
+        }
+        if (stringToken.flags & 128 /* StringTokenFlags.Template */) {
+            if (pythonVersion_1.PythonVersion.isLessThan(this._getLanguageVersion(), pythonVersion_1.pythonVersion3_14)) {
+                this._addSyntaxError(localize_1.LocMessage.templateStringIllegal(), stringToken);
+            }
+            if (stringToken.flags & 32 /* StringTokenFlags.Bytes */) {
+                this._addSyntaxError(localize_1.LocMessage.templateStringBytes(), stringToken);
+            }
+            if (stringToken.flags & 16 /* StringTokenFlags.Unicode */) {
+                this._addSyntaxError(localize_1.LocMessage.templateStringUnicode(), stringToken);
+            }
         }
     }
     _makeStringNode(stringToken) {
@@ -3703,7 +3707,6 @@ class Parser {
             return undefined;
         }
         const interTokenContents = this._fileContents.slice(curToken.start + curToken.length, nextToken.start);
-        const commentRegEx = /^(\s*#\s*type:\s*)([^\r\n]*)/;
         const match = interTokenContents.match(commentRegEx);
         if (!match) {
             return undefined;
@@ -3714,7 +3717,7 @@ class Parser {
         // expression because mypy supports ignore comments of the
         // form ignore[errorCode, ...]. We'll treat these as regular
         // ignore statements (as though no errorCodes were included).
-        if (typeString.trim().match(/^ignore(\s|\[|$)/)) {
+        if (typeString.trim().match(ignoreCommentRegEx)) {
             return undefined;
         }
         const tokenOffset = curToken.start + curToken.length + match[1].length;
@@ -3947,7 +3950,11 @@ class Parser {
                         this._addSyntaxError(localize_1.LocMessage.annotationStringEscape(), stringNode);
                     }
                 }
-                else if ((stringToken.flags & (8 /* StringTokenFlags.Raw */ | 32 /* StringTokenFlags.Bytes */ | 64 /* StringTokenFlags.Format */)) ===
+                else if ((stringToken.flags &
+                    (8 /* StringTokenFlags.Raw */ |
+                        32 /* StringTokenFlags.Bytes */ |
+                        64 /* StringTokenFlags.Format */ |
+                        128 /* StringTokenFlags.Template */)) ===
                     0) {
                     const parser = new Parser();
                     const parseResults = parser.parseTextExpression(this._fileContents, tokenOffset + prefixLength, unescapedString.length, this._parseOptions, 1 /* ParseTextMode.VariableAnnotation */, (stringNode.d.strings[0].d.token.flags & 4 /* StringTokenFlags.Triplicate */) !== 0 ? 1 : 0, this._typingSymbolAliases);