@zzzen/pyright-internal 1.2.0-dev.20240114 → 1.2.0-dev.20240121

package/dist/parser/parser.js

@@ -102,10 +102,10 @@ class Parser {
                         this._getNextToken();
                         const indentToken = nextToken;
                         if (indentToken.isIndentAmbiguous) {
-                            this._addError(localize_1.Localizer.Diagnostic.inconsistentTabs(), indentToken);
+                            this._addSyntaxError(localize_1.LocMessage.inconsistentTabs(), indentToken);
                         }
                         else {
-                            this._addError(localize_1.Localizer.Diagnostic.unexpectedIndent(), nextToken);
+                            this._addSyntaxError(localize_1.LocMessage.unexpectedIndent(), nextToken);
                         }
                     }
                     const statement = this._parseStatement();
@@ -155,7 +155,7 @@ class Parser {
             }
             else {
                 if (exprListResult.list.length === 0) {
-                    this._addError(localize_1.Localizer.Diagnostic.expectedExpr(), this._peekToken());
+                    this._addSyntaxError(localize_1.LocMessage.expectedExpr(), this._peekToken());
                 }
                 parseTree = this._makeExpressionOrTuple(exprListResult, /* enclosedInParens */ false);
             }
@@ -164,7 +164,7 @@ class Parser {
             this._getNextToken();
         }
         if (!this._atEof()) {
-            this._addError(localize_1.Localizer.Diagnostic.unexpectedExprToken(), this._peekToken());
+            this._addSyntaxError(localize_1.LocMessage.unexpectedExprToken(), this._peekToken());
         }
         return {
             parseTree,
@@ -188,7 +188,7 @@ class Parser {
         // Handle the errant condition of a dedent token here to provide
         // better recovery.
         if (this._consumeTokenIfType(4 /* TokenType.Dedent */)) {
-            this._addError(localize_1.Localizer.Diagnostic.unexpectedUnindent(), this._peekToken());
+            this._addSyntaxError(localize_1.LocMessage.unexpectedUnindent(), this._peekToken());
         }
         switch (this._peekKeywordType()) {
             case 20 /* KeywordType.If */:
@@ -257,14 +257,14 @@ class Parser {
             case 17 /* KeywordType.For */:
                 return this._parseForStatement(asyncToken);
         }
-        this._addError(localize_1.Localizer.Diagnostic.unexpectedAsyncToken(), asyncToken);
+        this._addSyntaxError(localize_1.LocMessage.unexpectedAsyncToken(), asyncToken);
         return undefined;
     }
     // 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) {
-            this._addError(localize_1.Localizer.Diagnostic.typeAliasStatementIllegal(), typeToken);
+            this._addSyntaxError(localize_1.LocMessage.typeAliasStatementIllegal(), typeToken);
         }
         const nameToken = this._getTokenIfIdentifier();
         (0, debug_1.assert)(nameToken !== undefined);
@@ -276,7 +276,7 @@ class Parser {
         const assignToken = this._peekToken();
         if (assignToken.type !== 9 /* TokenType.Operator */ ||
             assignToken.operatorType !== 2 /* OperatorType.Assign */) {
-            this._addError(localize_1.Localizer.Diagnostic.expectedEquals(), assignToken);
+            this._addSyntaxError(localize_1.LocMessage.expectedEquals(), assignToken);
         }
         else {
             this._getNextToken();
@@ -293,7 +293,7 @@ class Parser {
             const firstToken = this._peekToken();
             if (firstToken.type === 16 /* TokenType.CloseBracket */) {
                 if (typeVariableNodes.length === 0) {
-                    this._addError(localize_1.Localizer.Diagnostic.typeParametersMissing(), this._peekToken());
+                    this._addSyntaxError(localize_1.LocMessage.typeParametersMissing(), this._peekToken());
                 }
                 break;
             }
@@ -308,7 +308,7 @@ class Parser {
         }
         const closingToken = this._peekToken();
         if (closingToken.type !== 16 /* TokenType.CloseBracket */) {
-            this._addError(localize_1.Localizer.Diagnostic.expectedCloseBracket(), this._peekToken());
+            this._addSyntaxError(localize_1.LocMessage.expectedCloseBracket(), this._peekToken());
             this._consumeTokensUntilType([2 /* TokenType.NewLine */, 16 /* TokenType.CloseBracket */, 10 /* TokenType.Colon */]);
         }
         else {
@@ -327,7 +327,7 @@ class Parser {
         }
         const nameToken = this._getTokenIfIdentifier();
         if (!nameToken) {
-            this._addError(localize_1.Localizer.Diagnostic.expectedTypeParameterName(), this._peekToken());
+            this._addSyntaxError(localize_1.LocMessage.expectedTypeParameterName(), this._peekToken());
             return undefined;
         }
         const name = parseNodes_1.NameNode.create(nameToken);
@@ -335,7 +335,7 @@ class Parser {
         if (this._consumeTokenIfType(10 /* TokenType.Colon */)) {
             boundExpression = this._parseExpression(/* allowUnpack */ false);
             if (typeParamCategory !== parseNodes_1.TypeParameterCategory.TypeVar) {
-                this._addError(localize_1.Localizer.Diagnostic.typeParameterBoundNotAllowed(), boundExpression);
+                this._addSyntaxError(localize_1.LocMessage.typeParameterBoundNotAllowed(), boundExpression);
             }
         }
         let defaultExpression;
@@ -343,7 +343,7 @@ class Parser {
             defaultExpression = this._parseExpression(
             /* allowUnpack */ typeParamCategory === parseNodes_1.TypeParameterCategory.TypeVarTuple);
             if (!this._parseOptions.isStubFile && this._getLanguageVersion() < pythonVersion_1.PythonVersion.V3_13) {
-                this._addError(localize_1.Localizer.Diagnostic.typeVarDefaultIllegal(), defaultExpression);
+                this._addSyntaxError(localize_1.LocMessage.typeVarDefaultIllegal(), defaultExpression);
             }
         }
         return parseNodes_1.TypeParameterNode.create(name, typeParamCategory, boundExpression, defaultExpression);
@@ -364,7 +364,7 @@ class Parser {
             this._getKeywordToken(25 /* KeywordType.Match */);
             const expression = this._parseTestOrStarListAsExpression(
             /* allowAssignmentExpression */ true, 
-            /* allowMultipleUnpack */ true, 12 /* ErrorExpressionCategory.MissingPatternSubject */, () => localize_1.Localizer.Diagnostic.expectedReturnExpr());
+            /* allowMultipleUnpack */ true, 12 /* ErrorExpressionCategory.MissingPatternSubject */, () => localize_1.LocMessage.expectedReturnExpr());
             smellsLikeMatchStatement =
                 expression.nodeType !== 0 /* ParseNodeType.Error */ && this._peekToken().type === 10 /* TokenType.Colon */;
             // Set the token index back to the start.
@@ -376,11 +376,11 @@ class Parser {
         const matchToken = this._getKeywordToken(25 /* KeywordType.Match */);
         const subjectExpression = this._parseTestOrStarListAsExpression(
         /* allowAssignmentExpression */ true, 
-        /* allowMultipleUnpack */ true, 12 /* ErrorExpressionCategory.MissingPatternSubject */, () => localize_1.Localizer.Diagnostic.expectedReturnExpr());
+        /* allowMultipleUnpack */ true, 12 /* ErrorExpressionCategory.MissingPatternSubject */, () => localize_1.LocMessage.expectedReturnExpr());
         const matchNode = parseNodes_1.MatchNode.create(matchToken, subjectExpression);
         const nextToken = this._peekToken();
         if (!this._consumeTokenIfType(10 /* TokenType.Colon */)) {
-            this._addError(localize_1.Localizer.Diagnostic.expectedColon(), nextToken);
+            this._addSyntaxError(localize_1.LocMessage.expectedColon(), nextToken);
             // Try to perform parse recovery by consuming tokens until
             // we find the end of the line.
             if (this._consumeTokensUntilType([2 /* TokenType.NewLine */, 10 /* TokenType.Colon */])) {
@@ -390,17 +390,17 @@ class Parser {
         else {
             (0, parseNodes_1.extendRange)(matchNode, nextToken);
             if (!this._consumeTokenIfType(2 /* TokenType.NewLine */)) {
-                this._addError(localize_1.Localizer.Diagnostic.expectedNewline(), nextToken);
+                this._addSyntaxError(localize_1.LocMessage.expectedNewline(), nextToken);
             }
             else {
                 const possibleIndent = this._peekToken();
                 if (!this._consumeTokenIfType(3 /* TokenType.Indent */)) {
-                    this._addError(localize_1.Localizer.Diagnostic.expectedIndentedBlock(), this._peekToken());
+                    this._addSyntaxError(localize_1.LocMessage.expectedIndentedBlock(), this._peekToken());
                 }
                 else {
                     const indentToken = possibleIndent;
                     if (indentToken.isIndentAmbiguous) {
-                        this._addError(localize_1.Localizer.Diagnostic.inconsistentTabs(), indentToken);
+                        this._addSyntaxError(localize_1.LocMessage.inconsistentTabs(), indentToken);
                     }
                 }
                 while (true) {
@@ -410,10 +410,10 @@ class Parser {
                         this._getNextToken();
                         const indentToken = possibleUnexpectedIndent;
                         if (indentToken.isIndentAmbiguous) {
-                            this._addError(localize_1.Localizer.Diagnostic.inconsistentTabs(), indentToken);
+                            this._addSyntaxError(localize_1.LocMessage.inconsistentTabs(), indentToken);
                         }
                         else {
-                            this._addError(localize_1.Localizer.Diagnostic.unexpectedIndent(), possibleUnexpectedIndent);
+                            this._addSyntaxError(localize_1.LocMessage.unexpectedIndent(), possibleUnexpectedIndent);
                         }
                     }
                     const caseStatement = this._parseCaseStatement();
@@ -430,10 +430,10 @@ class Parser {
                     const dedentToken = this._peekToken();
                     if (this._consumeTokenIfType(4 /* TokenType.Dedent */)) {
                         if (!dedentToken.matchesIndent) {
-                            this._addError(localize_1.Localizer.Diagnostic.inconsistentIndent(), dedentToken);
+                            this._addSyntaxError(localize_1.LocMessage.inconsistentIndent(), dedentToken);
                         }
                         if (dedentToken.isDedentAmbiguous) {
-                            this._addError(localize_1.Localizer.Diagnostic.inconsistentTabs(), dedentToken);
+                            this._addSyntaxError(localize_1.LocMessage.inconsistentTabs(), dedentToken);
                         }
                         break;
                     }
@@ -446,18 +446,18 @@ class Parser {
                 (0, parseNodes_1.extendRange)(matchNode, matchNode.cases[matchNode.cases.length - 1]);
             }
             else {
-                this._addError(localize_1.Localizer.Diagnostic.zeroCaseStatementsFound(), matchToken);
+                this._addSyntaxError(localize_1.LocMessage.zeroCaseStatementsFound(), matchToken);
             }
         }
         // This feature requires Python 3.10.
         if (this._getLanguageVersion() < pythonVersion_1.PythonVersion.V3_10) {
-            this._addError(localize_1.Localizer.Diagnostic.matchIncompatible(), matchToken);
+            this._addSyntaxError(localize_1.LocMessage.matchIncompatible(), matchToken);
         }
         // Validate that only the last entry uses an irrefutable pattern.
         for (let i = 0; i < matchNode.cases.length - 1; i++) {
             const caseNode = matchNode.cases[i];
             if (!caseNode.guardExpression && caseNode.isIrrefutable) {
-                this._addError(localize_1.Localizer.Diagnostic.casePatternIsIrrefutable(), caseNode.pattern);
+                this._addSyntaxError(localize_1.LocMessage.casePatternIsIrrefutable(), caseNode.pattern);
             }
         }
         return matchNode;
@@ -468,7 +468,7 @@ class Parser {
     _parseCaseStatement() {
         const caseToken = this._peekToken();
         if (!this._consumeTokenIfKeyword(6 /* KeywordType.Case */)) {
-            this._addError(localize_1.Localizer.Diagnostic.expectedCase(), caseToken);
+            this._addSyntaxError(localize_1.LocMessage.expectedCase(), caseToken);
             return undefined;
         }
         const patternList = this._parsePatternSequence();
@@ -477,7 +477,7 @@ class Parser {
             casePattern = patternList.parseError;
         }
         else if (patternList.list.length === 0) {
-            this._addError(localize_1.Localizer.Diagnostic.expectedPatternExpr(), this._peekToken());
+            this._addSyntaxError(localize_1.LocMessage.expectedPatternExpr(), this._peekToken());
             casePattern = parseNodes_1.ErrorNode.create(caseToken, 11 /* ErrorExpressionCategory.MissingPattern */);
         }
         else if (patternList.list.length === 1 && !patternList.trailingComma) {
@@ -522,7 +522,7 @@ class Parser {
     _reportDuplicatePatternCaptureTargets(node, globalNameMap, localNameMap) {
         const reportTargetIfDuplicate = (nameNode) => {
             if (globalNameMap.has(nameNode.value) || localNameMap.has(nameNode.value)) {
-                this._addError(localize_1.Localizer.Diagnostic.duplicateCapturePatternTarget().format({
+                this._addSyntaxError(localize_1.LocMessage.duplicateCapturePatternTarget().format({
                     name: nameNode.value,
                 }), nameNode);
             }
@@ -643,7 +643,7 @@ class Parser {
             entry.orPatterns[0].nodeType === 69 /* ParseNodeType.PatternCapture */ &&
             entry.orPatterns[0].isStar);
         if (starEntries.length > 1) {
-            this._addError(localize_1.Localizer.Diagnostic.duplicateStarPattern(), starEntries[1].orPatterns[0]);
+            this._addSyntaxError(localize_1.LocMessage.duplicateStarPattern(), starEntries[1].orPatterns[0]);
         }
         return patternList;
     }
@@ -662,7 +662,7 @@ class Parser {
             // Star patterns cannot be ORed with other patterns.
             orPatterns.forEach((patternAtom) => {
                 if (patternAtom.nodeType === 69 /* ParseNodeType.PatternCapture */ && patternAtom.isStar) {
-                    this._addError(localize_1.Localizer.Diagnostic.starPatternInOrPattern(), patternAtom);
+                    this._addSyntaxError(localize_1.LocMessage.starPatternInOrPattern(), patternAtom);
                 }
             });
         }
@@ -673,7 +673,7 @@ class Parser {
                 target = parseNodes_1.NameNode.create(nameToken);
             }
             else {
-                this._addError(localize_1.Localizer.Diagnostic.expectedNameAfterAs(), this._peekToken());
+                this._addSyntaxError(localize_1.LocMessage.expectedNameAfterAs(), this._peekToken());
             }
         }
         // Star patterns cannot be used with AS pattern.
@@ -681,12 +681,12 @@ class Parser {
             orPatterns.length === 1 &&
             orPatterns[0].nodeType === 69 /* ParseNodeType.PatternCapture */ &&
             orPatterns[0].isStar) {
-            this._addError(localize_1.Localizer.Diagnostic.starPatternInAsPattern(), orPatterns[0]);
+            this._addSyntaxError(localize_1.LocMessage.starPatternInAsPattern(), orPatterns[0]);
         }
         // Validate that irrefutable patterns are not in any entries other than the last.
         orPatterns.forEach((orPattern, index) => {
             if (index < orPatterns.length - 1 && this._isPatternIrrefutable(orPattern)) {
-                this._addError(localize_1.Localizer.Diagnostic.orPatternIrrefutable(), orPattern);
+                this._addSyntaxError(localize_1.LocMessage.orPatternIrrefutable(), orPattern);
             }
         });
         // Validate that all bound variables are the same within all or patterns.
@@ -700,10 +700,10 @@ class Parser {
             if (localNameSet.size < fullNameSet.size) {
                 const missingNames = Array.from(fullNameSet.keys()).filter((name) => !localNameSet.has(name));
                 const diag = new diagnostic_1.DiagnosticAddendum();
-                diag.addMessage(localize_1.Localizer.DiagnosticAddendum.orPatternMissingName().format({
+                diag.addMessage(localize_1.LocAddendum.orPatternMissingName().format({
                     name: missingNames.map((name) => `"${name}"`).join(', '),
                 }));
-                this._addError(localize_1.Localizer.Diagnostic.orPatternMissingName() + diag.getString(), orPattern);
+                this._addSyntaxError(localize_1.LocMessage.orPatternMissingName() + diag.getString(), orPattern);
             }
         });
         return parseNodes_1.PatternAsNode.create(orPatterns, target);
@@ -739,7 +739,7 @@ class Parser {
                 : patternCaptureOrValue.expression;
             const classPattern = parseNodes_1.PatternClassNode.create(classNameExpr, args);
             if (!this._consumeTokenIfType(14 /* TokenType.CloseParenthesis */)) {
-                this._addError(localize_1.Localizer.Diagnostic.expectedCloseParen(), openParenToken);
+                this._addSyntaxError(localize_1.LocMessage.expectedCloseParen(), openParenToken);
                 // Consume the remainder of tokens on the line for error
                 // recovery.
                 this._consumeTokensUntilType([2 /* TokenType.NewLine */]);
@@ -755,7 +755,7 @@ class Parser {
             const starToken = this._getNextToken();
             const identifierToken = this._getTokenIfIdentifier();
             if (!identifierToken) {
-                this._addError(localize_1.Localizer.Diagnostic.expectedIdentifier(), this._peekToken());
+                this._addSyntaxError(localize_1.LocMessage.expectedIdentifier(), this._peekToken());
                 return parseNodes_1.ErrorNode.create(starToken, 2 /* ErrorExpressionCategory.MissingExpression */);
             }
             else {
@@ -789,9 +789,9 @@ class Parser {
                 (0, parseNodes_1.extendRange)(casePattern, endToken);
             }
             else {
-                this._addError(nextToken.type === 13 /* TokenType.OpenParenthesis */
-                    ? localize_1.Localizer.Diagnostic.expectedCloseParen()
-                    : localize_1.Localizer.Diagnostic.expectedCloseBracket(), nextToken);
+                this._addSyntaxError(nextToken.type === 13 /* TokenType.OpenParenthesis */
+                    ? localize_1.LocMessage.expectedCloseParen()
+                    : localize_1.LocMessage.expectedCloseBracket(), nextToken);
                 this._consumeTokensUntilType([
                     10 /* TokenType.Colon */,
                     nextToken.type === 13 /* TokenType.OpenParenthesis */ ? 14 /* TokenType.CloseParenthesis */ : 16 /* TokenType.CloseBracket */,
@@ -807,12 +807,12 @@ class Parser {
                 (0, parseNodes_1.extendRange)(mappingPattern, lastToken);
             }
             else {
-                this._addError(localize_1.Localizer.Diagnostic.expectedCloseBrace(), nextToken);
+                this._addSyntaxError(localize_1.LocMessage.expectedCloseBrace(), nextToken);
                 this._consumeTokensUntilType([10 /* TokenType.Colon */, 18 /* TokenType.CloseCurlyBrace */]);
             }
             return mappingPattern;
         }
-        return this._handleExpressionParseError(11 /* ErrorExpressionCategory.MissingPattern */, localize_1.Localizer.Diagnostic.expectedPatternExpr());
+        return this._handleExpressionParseError(11 /* ErrorExpressionCategory.MissingPattern */, localize_1.LocMessage.expectedPatternExpr());
     }
     // pattern_arguments:
     //     | positional_patterns [',' keyword_patterns]
@@ -834,7 +834,7 @@ class Parser {
                 sawKeywordArg = true;
             }
             else if (sawKeywordArg && !arg.name) {
-                this._addError(localize_1.Localizer.Diagnostic.positionArgAfterNamedArg(), arg);
+                this._addSyntaxError(localize_1.LocMessage.positionArgAfterNamedArg(), arg);
             }
             argList.push(arg);
             if (!this._consumeTokenIfType(12 /* TokenType.Comma */)) {
@@ -880,7 +880,7 @@ class Parser {
             // Check for f-strings, which are not allowed.
             stringList.strings.forEach((stringAtom) => {
                 if (stringAtom.nodeType === 27 /* ParseNodeType.FormatString */) {
-                    this._addError(localize_1.Localizer.Diagnostic.formatStringInPattern(), stringAtom);
+                    this._addSyntaxError(localize_1.LocMessage.formatStringInPattern(), stringAtom);
                 }
             });
             return parseNodes_1.PatternLiteralNode.create(stringList);
@@ -914,7 +914,7 @@ class Parser {
                 realValue = realValue.expression;
             }
             if (realValue.nodeType !== 40 /* ParseNodeType.Number */ || (imagValue !== undefined && realValue.isImaginary)) {
-                this._addError(localize_1.Localizer.Diagnostic.expectedComplexNumberLiteral(), expression);
+                this._addSyntaxError(localize_1.LocMessage.expectedComplexNumberLiteral(), expression);
                 imagValue = undefined;
             }
         }
@@ -923,7 +923,7 @@ class Parser {
                 imagValue = imagValue.expression;
             }
             if (imagValue.nodeType !== 40 /* ParseNodeType.Number */ || !imagValue.isImaginary) {
-                this._addError(localize_1.Localizer.Diagnostic.expectedComplexNumberLiteral(), expression);
+                this._addSyntaxError(localize_1.LocMessage.expectedComplexNumberLiteral(), expression);
             }
         }
         return parseNodes_1.PatternLiteralNode.create(expression);
@@ -934,7 +934,7 @@ class Parser {
             // Verify there's at most one ** entry.
             const starStarEntries = itemList.list.filter((entry) => entry.nodeType === 72 /* ParseNodeType.PatternMappingExpandEntry */);
             if (starStarEntries.length > 1) {
-                this._addError(localize_1.Localizer.Diagnostic.duplicateStarStarPattern(), starStarEntries[1]);
+                this._addSyntaxError(localize_1.LocMessage.duplicateStarStarPattern(), starStarEntries[1]);
             }
             return parseNodes_1.PatternMappingNode.create(firstToken, itemList.list);
         }
@@ -949,12 +949,12 @@ class Parser {
         if (this._consumeTokenIfOperator(29 /* OperatorType.Power */)) {
             const identifierToken = this._getTokenIfIdentifier();
             if (!identifierToken) {
-                this._addError(localize_1.Localizer.Diagnostic.expectedIdentifier(), this._peekToken());
+                this._addSyntaxError(localize_1.LocMessage.expectedIdentifier(), this._peekToken());
                 return parseNodes_1.ErrorNode.create(this._peekToken(), 11 /* ErrorExpressionCategory.MissingPattern */);
             }
             const nameNode = parseNodes_1.NameNode.create(identifierToken);
             if (identifierToken.value === '_') {
-                this._addError(localize_1.Localizer.Diagnostic.starStarWildcardNotAllowed(), nameNode);
+                this._addSyntaxError(localize_1.LocMessage.starStarWildcardNotAllowed(), nameNode);
             }
             return parseNodes_1.PatternMappingExpandEntryNode.create(doubleStar, nameNode);
         }
@@ -969,18 +969,18 @@ class Parser {
                     keyExpression = patternCaptureOrValue;
                 }
                 else {
-                    this._addError(localize_1.Localizer.Diagnostic.expectedPatternValue(), patternCaptureOrValue);
+                    this._addSyntaxError(localize_1.LocMessage.expectedPatternValue(), patternCaptureOrValue);
                     keyExpression = parseNodes_1.ErrorNode.create(this._peekToken(), 11 /* ErrorExpressionCategory.MissingPattern */);
                 }
             }
         }
         if (!keyExpression) {
-            this._addError(localize_1.Localizer.Diagnostic.expectedPatternExpr(), this._peekToken());
+            this._addSyntaxError(localize_1.LocMessage.expectedPatternExpr(), this._peekToken());
             keyExpression = parseNodes_1.ErrorNode.create(this._peekToken(), 11 /* ErrorExpressionCategory.MissingPattern */);
         }
         let valuePattern;
         if (!this._consumeTokenIfType(10 /* TokenType.Colon */)) {
-            this._addError(localize_1.Localizer.Diagnostic.expectedColon(), this._peekToken());
+            this._addSyntaxError(localize_1.LocMessage.expectedColon(), this._peekToken());
             valuePattern = parseNodes_1.ErrorNode.create(this._peekToken(), 11 /* ErrorExpressionCategory.MissingPattern */);
         }
         else {
@@ -999,7 +999,7 @@ class Parser {
                     nameOrMember = nameOrMember ? parseNodes_1.MemberAccessNode.create(nameOrMember, nameNode) : nameNode;
                 }
                 else {
-                    this._addError(localize_1.Localizer.Diagnostic.expectedIdentifier(), this._peekToken());
+                    this._addSyntaxError(localize_1.LocMessage.expectedIdentifier(), this._peekToken());
                     break;
                 }
                 if (!this._consumeTokenIfType(20 /* TokenType.Dot */)) {
@@ -1007,7 +1007,7 @@ class Parser {
                 }
             }
             if (!nameOrMember) {
-                this._addError(localize_1.Localizer.Diagnostic.expectedIdentifier(), this._peekToken());
+                this._addSyntaxError(localize_1.LocMessage.expectedIdentifier(), this._peekToken());
                 return parseNodes_1.ErrorNode.create(this._peekToken(), 11 /* ErrorExpressionCategory.MissingPattern */);
             }
             if (nameOrMember.nodeType === 35 /* ParseNodeType.MemberAccess */) {
@@ -1062,7 +1062,7 @@ class Parser {
         const nextToken = this._peekToken();
         const suite = parseNodes_1.SuiteNode.create(nextToken);
         if (!this._consumeTokenIfType(10 /* TokenType.Colon */)) {
-            this._addError(localize_1.Localizer.Diagnostic.expectedColon(), nextToken);
+            this._addSyntaxError(localize_1.LocMessage.expectedColon(), nextToken);
             // Try to perform parse recovery by consuming tokens.
             if (this._consumeTokensUntilType([2 /* TokenType.NewLine */, 10 /* TokenType.Colon */])) {
                 if (this._peekTokenType() === 10 /* TokenType.Colon */) {
@@ -1086,7 +1086,7 @@ class Parser {
                     }
                     if (nextToken.type === 4 /* TokenType.Dedent */) {
                         if (nextToken.isDedentAmbiguous) {
-                            this._addError(localize_1.Localizer.Diagnostic.inconsistentTabs(), nextToken);
+                            this._addSyntaxError(localize_1.LocMessage.inconsistentTabs(), nextToken);
                         }
                         indent--;
                         if (indent === 0) {
@@ -1118,12 +1118,12 @@ class Parser {
             }
             const possibleIndent = this._peekToken();
             if (!this._consumeTokenIfType(3 /* TokenType.Indent */)) {
-                this._addError(localize_1.Localizer.Diagnostic.expectedIndentedBlock(), this._peekToken());
+                this._addSyntaxError(localize_1.LocMessage.expectedIndentedBlock(), this._peekToken());
                 return suite;
             }
             const bodyIndentToken = possibleIndent;
             if (bodyIndentToken.isIndentAmbiguous) {
-                this._addError(localize_1.Localizer.Diagnostic.inconsistentTabs(), bodyIndentToken);
+                this._addSyntaxError(localize_1.LocMessage.inconsistentTabs(), bodyIndentToken);
             }
             while (true) {
                 // Handle a common error here and see if we can recover.
@@ -1132,20 +1132,20 @@ class Parser {
                     this._getNextToken();
                     const indentToken = nextToken;
                     if (indentToken.isIndentAmbiguous) {
-                        this._addError(localize_1.Localizer.Diagnostic.inconsistentTabs(), indentToken);
+                        this._addSyntaxError(localize_1.LocMessage.inconsistentTabs(), indentToken);
                     }
                     else {
-                        this._addError(localize_1.Localizer.Diagnostic.unexpectedIndent(), nextToken);
+                        this._addSyntaxError(localize_1.LocMessage.unexpectedIndent(), nextToken);
                     }
                 }
                 else if (nextToken.type === 4 /* TokenType.Dedent */) {
                     // When we see a dedent, stop before parsing the dedented statement.
                     const dedentToken = nextToken;
                     if (!dedentToken.matchesIndent) {
-                        this._addError(localize_1.Localizer.Diagnostic.inconsistentIndent(), dedentToken);
+                        this._addSyntaxError(localize_1.LocMessage.inconsistentIndent(), dedentToken);
                     }
                     if (dedentToken.isDedentAmbiguous) {
-                        this._addError(localize_1.Localizer.Diagnostic.inconsistentTabs(), dedentToken);
+                        this._addSyntaxError(localize_1.LocMessage.inconsistentTabs(), dedentToken);
                     }
                     // When the suite is incomplete (no statements), leave the dedent token for
                     // recovery. This allows a single dedent token to cause us to break out of
@@ -1201,18 +1201,18 @@ class Parser {
     // for_stmt: [async] 'for' exprlist 'in' testlist suite ['else' suite]
     _parseForStatement(asyncToken) {
         const forToken = this._getKeywordToken(17 /* KeywordType.For */);
-        const targetExpr = this._parseExpressionListAsPossibleTuple(2 /* ErrorExpressionCategory.MissingExpression */, () => localize_1.Localizer.Diagnostic.expectedExpr(), forToken);
+        const targetExpr = this._parseExpressionListAsPossibleTuple(2 /* ErrorExpressionCategory.MissingExpression */, () => localize_1.LocMessage.expectedExpr(), forToken);
         let seqExpr;
         let forSuite;
         let elseSuite;
         if (!this._consumeTokenIfKeyword(22 /* KeywordType.In */)) {
-            seqExpr = this._handleExpressionParseError(0 /* ErrorExpressionCategory.MissingIn */, localize_1.Localizer.Diagnostic.expectedIn());
+            seqExpr = this._handleExpressionParseError(0 /* ErrorExpressionCategory.MissingIn */, localize_1.LocMessage.expectedIn());
             forSuite = parseNodes_1.SuiteNode.create(this._peekToken());
         }
         else {
             seqExpr = this._parseTestOrStarListAsExpression(
             /* allowAssignmentExpression */ false, 
-            /* allowMultipleUnpack */ true, 2 /* ErrorExpressionCategory.MissingExpression */, () => localize_1.Localizer.Diagnostic.expectedInExpr());
+            /* allowMultipleUnpack */ true, 2 /* ErrorExpressionCategory.MissingExpression */, () => localize_1.LocMessage.expectedInExpr());
             forSuite = this._parseLoopSuite();
             // Versions of Python earlier than 3.9 didn't allow unpack operators if the
             // tuple wasn't enclosed in parentheses.
@@ -1221,7 +1221,7 @@ class Parser {
                     let sawStar = false;
                     seqExpr.expressions.forEach((expr) => {
                         if (expr.nodeType === 56 /* ParseNodeType.Unpack */ && !sawStar) {
-                            this._addError(localize_1.Localizer.Diagnostic.unpackOperatorNotAllowed(), expr);
+                            this._addSyntaxError(localize_1.LocMessage.unpackOperatorNotAllowed(), expr);
                             sawStar = true;
                         }
                     });
@@ -1254,10 +1254,10 @@ class Parser {
             return undefined;
         }
         if (target.nodeType === 56 /* ParseNodeType.Unpack */) {
-            this._addError(localize_1.Localizer.Diagnostic.unpackIllegalInComprehension(), target);
+            this._addSyntaxError(localize_1.LocMessage.unpackIllegalInComprehension(), target);
         }
         else if (target.nodeType === 16 /* ParseNodeType.DictionaryExpandEntry */) {
-            this._addError(localize_1.Localizer.Diagnostic.dictExpandIllegalInComprehension(), target);
+            this._addSyntaxError(localize_1.LocMessage.dictExpandIllegalInComprehension(), target);
         }
         const listCompNode = parseNodes_1.ListComprehensionNode.create(target, isGenerator);
         const forIfList = [compFor];
@@ -1295,10 +1295,10 @@ class Parser {
             asyncToken = this._getKeywordToken(3 /* KeywordType.Async */);
         }
         const forToken = this._getKeywordToken(17 /* KeywordType.For */);
-        const targetExpr = this._parseExpressionListAsPossibleTuple(2 /* ErrorExpressionCategory.MissingExpression */, () => localize_1.Localizer.Diagnostic.expectedExpr(), forToken);
+        const targetExpr = this._parseExpressionListAsPossibleTuple(2 /* ErrorExpressionCategory.MissingExpression */, () => localize_1.LocMessage.expectedExpr(), forToken);
         let seqExpr;
         if (!this._consumeTokenIfKeyword(22 /* KeywordType.In */)) {
-            seqExpr = this._handleExpressionParseError(0 /* ErrorExpressionCategory.MissingIn */, localize_1.Localizer.Diagnostic.expectedIn());
+            seqExpr = this._handleExpressionParseError(0 /* ErrorExpressionCategory.MissingIn */, localize_1.LocMessage.expectedIn());
         }
         else {
             this._disallowAssignmentExpression(() => {
@@ -1356,7 +1356,7 @@ class Parser {
             let isExceptGroup = false;
             if (this._consumeTokenIfOperator(26 /* OperatorType.Multiply */)) {
                 if (this._getLanguageVersion() < pythonVersion_1.PythonVersion.V3_11 && !this._parseOptions.isStubFile) {
-                    this._addError(localize_1.Localizer.Diagnostic.exceptionGroupIncompatible(), possibleStarToken);
+                    this._addSyntaxError(localize_1.LocMessage.exceptionGroupIncompatible(), possibleStarToken);
                 }
                 isExceptGroup = true;
             }
@@ -1367,14 +1367,14 @@ class Parser {
                 if (this._consumeTokenIfKeyword(1 /* KeywordType.As */)) {
                     symbolName = this._getTokenIfIdentifier();
                     if (!symbolName) {
-                        this._addError(localize_1.Localizer.Diagnostic.expectedNameAfterAs(), this._peekToken());
+                        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._addError(localize_1.Localizer.Diagnostic.expectedAsAfterException(), peekToken);
+                        this._addSyntaxError(localize_1.LocMessage.expectedAsAfterException(), peekToken);
                         // Parse the expression expected in python 2.x, but discard it.
                         this._parseTestExpression(/* allowAssignmentExpression */ false);
                     }
@@ -1382,13 +1382,13 @@ class Parser {
             }
             if (!typeExpr) {
                 if (sawCatchAllExcept) {
-                    this._addError(localize_1.Localizer.Diagnostic.duplicateCatchAll(), exceptToken);
+                    this._addSyntaxError(localize_1.LocMessage.duplicateCatchAll(), exceptToken);
                 }
                 sawCatchAllExcept = true;
             }
             else {
                 if (sawCatchAllExcept) {
-                    this._addError(localize_1.Localizer.Diagnostic.namedExceptAfterCatchAll(), typeExpr);
+                    this._addSyntaxError(localize_1.LocMessage.namedExceptAfterCatchAll(), typeExpr);
                 }
             }
             const exceptSuite = this._parseSuite(this._isInFunction);
@@ -1418,7 +1418,7 @@ class Parser {
             (0, parseNodes_1.extendRange)(tryNode, tryNode.finallySuite);
         }
         if (!tryNode.finallySuite && tryNode.exceptClauses.length === 0) {
-            this._addError(localize_1.Localizer.Diagnostic.tryWithoutExcept(), tryToken);
+            this._addSyntaxError(localize_1.LocMessage.tryWithoutExcept(), tryToken);
         }
         return tryNode;
     }
@@ -1428,7 +1428,7 @@ class Parser {
         const defToken = this._getKeywordToken(10 /* KeywordType.Def */);
         const nameToken = this._getTokenIfIdentifier();
         if (!nameToken) {
-            this._addError(localize_1.Localizer.Diagnostic.expectedFunctionName(), defToken);
+            this._addSyntaxError(localize_1.LocMessage.expectedFunctionName(), defToken);
             return parseNodes_1.ErrorNode.create(defToken, 10 /* ErrorExpressionCategory.MissingFunctionParameterList */, undefined, decorators);
         }
         let typeParameters;
@@ -1436,17 +1436,17 @@ class Parser {
         if (possibleOpenBracket.type === 15 /* TokenType.OpenBracket */) {
             typeParameters = this._parseTypeParameterList();
             if (!this._parseOptions.isStubFile && this._getLanguageVersion() < pythonVersion_1.PythonVersion.V3_12) {
-                this._addError(localize_1.Localizer.Diagnostic.functionTypeParametersIllegal(), typeParameters);
+                this._addSyntaxError(localize_1.LocMessage.functionTypeParametersIllegal(), typeParameters);
             }
         }
         const openParenToken = this._peekToken();
         if (!this._consumeTokenIfType(13 /* TokenType.OpenParenthesis */)) {
-            this._addError(localize_1.Localizer.Diagnostic.expectedOpenParen(), this._peekToken());
+            this._addSyntaxError(localize_1.LocMessage.expectedOpenParen(), this._peekToken());
             return parseNodes_1.ErrorNode.create(nameToken, 10 /* ErrorExpressionCategory.MissingFunctionParameterList */, parseNodes_1.NameNode.create(nameToken), decorators);
         }
         const paramList = this._parseVarArgsList(14 /* TokenType.CloseParenthesis */, /* allowAnnotations */ true);
         if (!this._consumeTokenIfType(14 /* TokenType.CloseParenthesis */)) {
-            this._addError(localize_1.Localizer.Diagnostic.expectedCloseParen(), openParenToken);
+            this._addSyntaxError(localize_1.LocMessage.expectedCloseParen(), openParenToken);
             this._consumeTokensUntilType([10 /* TokenType.Colon */]);
         }
         let returnType;
@@ -1523,7 +1523,7 @@ class Parser {
             if (param.name) {
                 const name = param.name.value;
                 if (paramMap.has(name)) {
-                    this._addError(localize_1.Localizer.Diagnostic.duplicateParam().format({ name }), param.name);
+                    this._addSyntaxError(localize_1.LocMessage.duplicateParam().format({ name }), param.name);
                 }
                 else {
                     paramMap.set(name, name);
@@ -1531,19 +1531,19 @@ class Parser {
             }
             else if (param.category === 0 /* ParameterCategory.Simple */) {
                 if (paramList.length === 0) {
-                    this._addError(localize_1.Localizer.Diagnostic.positionOnlyFirstParam(), param);
+                    this._addSyntaxError(localize_1.LocMessage.positionOnlyFirstParam(), param);
                 }
             }
             if (param.category === 0 /* ParameterCategory.Simple */) {
                 if (!param.name) {
                     if (sawPositionOnlySeparator) {
-                        this._addError(localize_1.Localizer.Diagnostic.duplicatePositionOnly(), param);
+                        this._addSyntaxError(localize_1.LocMessage.duplicatePositionOnly(), param);
                     }
                     else if (sawKeywordOnlySeparator) {
-                        this._addError(localize_1.Localizer.Diagnostic.positionOnlyAfterKeywordOnly(), param);
+                        this._addSyntaxError(localize_1.LocMessage.positionOnlyAfterKeywordOnly(), param);
                     }
                     else if (sawArgs) {
-                        this._addError(localize_1.Localizer.Diagnostic.positionOnlyAfterArgs(), param);
+                        this._addSyntaxError(localize_1.LocMessage.positionOnlyAfterArgs(), param);
                     }
                     sawPositionOnlySeparator = true;
                 }
@@ -1557,7 +1557,7 @@ class Parser {
                     else if (sawDefaultParam && !sawKeywordOnlySeparator && !sawArgs) {
                         // Report this error only once.
                         if (!reportedNonDefaultParamErr) {
-                            this._addError(localize_1.Localizer.Diagnostic.nonDefaultAfterDefault(), param);
+                            this._addSyntaxError(localize_1.LocMessage.nonDefaultAfterDefault(), param);
                             reportedNonDefaultParamErr = true;
                         }
                     }
@@ -1567,32 +1567,32 @@ class Parser {
             if (param.category === 1 /* ParameterCategory.ArgsList */) {
                 if (!param.name) {
                     if (sawKeywordOnlySeparator) {
-                        this._addError(localize_1.Localizer.Diagnostic.duplicateKeywordOnly(), param);
+                        this._addSyntaxError(localize_1.LocMessage.duplicateKeywordOnly(), param);
                     }
                     else if (sawArgs) {
-                        this._addError(localize_1.Localizer.Diagnostic.keywordOnlyAfterArgs(), param);
+                        this._addSyntaxError(localize_1.LocMessage.keywordOnlyAfterArgs(), param);
                     }
                     sawKeywordOnlySeparator = true;
                 }
                 else {
                     if (sawKeywordOnlySeparator || sawArgs) {
-                        this._addError(localize_1.Localizer.Diagnostic.duplicateArgsParam(), param);
+                        this._addSyntaxError(localize_1.LocMessage.duplicateArgsParam(), param);
                     }
                     sawArgs = true;
                 }
             }
             if (param.category === 2 /* ParameterCategory.KwargsDict */) {
                 if (sawKwArgs) {
-                    this._addError(localize_1.Localizer.Diagnostic.duplicateKwargsParam(), param);
+                    this._addSyntaxError(localize_1.LocMessage.duplicateKwargsParam(), param);
                 }
                 sawKwArgs = true;
                 // A **kwargs cannot immediately follow a keyword-only separator ("*").
                 if (sawKeywordOnlySeparator && !sawKeywordOnlyParamAfterSeparator) {
-                    this._addError(localize_1.Localizer.Diagnostic.keywordParameterMissing(), param);
+                    this._addSyntaxError(localize_1.LocMessage.keywordParameterMissing(), param);
                 }
             }
             else if (sawKwArgs) {
-                this._addError(localize_1.Localizer.Diagnostic.paramAfterKwargsParam(), param);
+                this._addSyntaxError(localize_1.LocMessage.paramAfterKwargsParam(), param);
             }
             const foundComma = this._consumeTokenIfType(12 /* TokenType.Comma */);
             if (allowAnnotations && !param.typeAnnotation) {
@@ -1611,7 +1611,7 @@ class Parser {
         if (paramList.length > 0) {
             const lastParam = paramList[paramList.length - 1];
             if (lastParam.category === 1 /* ParameterCategory.ArgsList */ && !lastParam.name) {
-                this._addError(localize_1.Localizer.Diagnostic.expectedNamedParameter(), lastParam);
+                this._addSyntaxError(localize_1.LocMessage.expectedNamedParameter(), lastParam);
             }
         }
         return paramList;
@@ -1628,7 +1628,7 @@ class Parser {
         }
         else if (this._consumeTokenIfOperator(10 /* OperatorType.Divide */)) {
             if (this._getLanguageVersion() < pythonVersion_1.PythonVersion.V3_8 && !this._parseOptions.isStubFile) {
-                this._addError(localize_1.Localizer.Diagnostic.positionOnlyIncompatible(), firstToken);
+                this._addSyntaxError(localize_1.LocMessage.positionOnlyIncompatible(), firstToken);
             }
             slashCount = 1;
         }
@@ -1648,10 +1648,10 @@ class Parser {
                 if (this._consumeTokensUntilType([14 /* TokenType.CloseParenthesis */])) {
                     this._getNextToken();
                 }
-                this._addError(localize_1.Localizer.Diagnostic.sublistParamsIncompatible(), sublistStart);
+                this._addSyntaxError(localize_1.LocMessage.sublistParamsIncompatible(), sublistStart);
             }
             else {
-                this._addError(localize_1.Localizer.Diagnostic.expectedParamName(), this._peekToken());
+                this._addSyntaxError(localize_1.LocMessage.expectedParamName(), this._peekToken());
             }
         }
         let paramType = 0 /* ParameterCategory.Simple */;
@@ -1677,7 +1677,7 @@ class Parser {
             paramNode.defaultValue.parent = paramNode;
             (0, parseNodes_1.extendRange)(paramNode, paramNode.defaultValue);
             if (starCount > 0) {
-                this._addError(localize_1.Localizer.Diagnostic.defaultValueNotAllowed(), paramNode.defaultValue);
+                this._addSyntaxError(localize_1.LocMessage.defaultValueNotAllowed(), paramNode.defaultValue);
             }
         }
         return paramNode;
@@ -1718,7 +1718,7 @@ class Parser {
         if (isParenthesizedWithItemList) {
             this._consumeTokenIfType(13 /* TokenType.OpenParenthesis */);
             if (this._getLanguageVersion() < pythonVersion_1.PythonVersion.V3_9) {
-                this._addError(localize_1.Localizer.Diagnostic.parenthesizedContextManagerIllegal(), possibleParen);
+                this._addSyntaxError(localize_1.LocMessage.parenthesizedContextManagerIllegal(), possibleParen);
             }
         }
         while (true) {
@@ -1732,7 +1732,7 @@ class Parser {
         }
         if (isParenthesizedWithItemList) {
             if (!this._consumeTokenIfType(14 /* TokenType.CloseParenthesis */)) {
-                this._addError(localize_1.Localizer.Diagnostic.expectedCloseParen(), possibleParen);
+                this._addSyntaxError(localize_1.LocMessage.expectedCloseParen(), possibleParen);
             }
         }
         let typeComment;
@@ -1785,7 +1785,7 @@ class Parser {
             if (nextToken.keywordType === 3 /* KeywordType.Async */) {
                 this._getNextToken();
                 if (this._peekKeywordType() !== 10 /* KeywordType.Def */) {
-                    this._addError(localize_1.Localizer.Diagnostic.expectedFunctionAfterAsync(), this._peekToken());
+                    this._addSyntaxError(localize_1.LocMessage.expectedFunctionAfterAsync(), this._peekToken());
                 }
                 else {
                     return this._parseFunctionDef(nextToken, decoratorList);
@@ -1798,7 +1798,7 @@ class Parser {
                 return this._parseClassDef(decoratorList);
             }
         }
-        this._addError(localize_1.Localizer.Diagnostic.expectedAfterDecorator(), this._peekToken());
+        this._addSyntaxError(localize_1.LocMessage.expectedAfterDecorator(), this._peekToken());
         // Return a dummy class declaration so the completion provider has
         // some parse nodes to work with.
         return parseNodes_1.ClassNode.createDummyForDecorators(decoratorList);
@@ -1820,12 +1820,12 @@ class Parser {
                 isSupportedExpressionForm = true;
             }
             if (!isSupportedExpressionForm) {
-                this._addError(localize_1.Localizer.Diagnostic.expectedDecoratorExpr(), expression);
+                this._addSyntaxError(localize_1.LocMessage.expectedDecoratorExpr(), expression);
             }
         }
         const decoratorNode = parseNodes_1.DecoratorNode.create(atOperator, expression);
         if (!this._consumeTokenIfType(2 /* TokenType.NewLine */)) {
-            this._addError(localize_1.Localizer.Diagnostic.expectedDecoratorNewline(), this._peekToken());
+            this._addSyntaxError(localize_1.LocMessage.expectedDecoratorNewline(), this._peekToken());
             this._consumeTokensUntilType([2 /* TokenType.NewLine */]);
         }
         return decoratorNode;
@@ -1844,7 +1844,7 @@ class Parser {
         const classToken = this._getKeywordToken(7 /* KeywordType.Class */);
         let nameToken = this._getTokenIfIdentifier();
         if (!nameToken) {
-            this._addError(localize_1.Localizer.Diagnostic.expectedClassName(), this._peekToken());
+            this._addSyntaxError(localize_1.LocMessage.expectedClassName(), this._peekToken());
             nameToken = tokenizerTypes_1.IdentifierToken.create(0, 0, '', /* comments */ undefined);
         }
         let typeParameters;
@@ -1852,7 +1852,7 @@ class Parser {
         if (possibleOpenBracket.type === 15 /* TokenType.OpenBracket */) {
             typeParameters = this._parseTypeParameterList();
             if (!this._parseOptions.isStubFile && this._getLanguageVersion() < pythonVersion_1.PythonVersion.V3_12) {
-                this._addError(localize_1.Localizer.Diagnostic.classTypeParametersIllegal(), typeParameters);
+                this._addSyntaxError(localize_1.LocMessage.classTypeParametersIllegal(), typeParameters);
             }
         }
         let argList = [];
@@ -1860,7 +1860,7 @@ class Parser {
         if (this._consumeTokenIfType(13 /* TokenType.OpenParenthesis */)) {
             argList = this._parseArgList().args;
             if (!this._consumeTokenIfType(14 /* TokenType.CloseParenthesis */)) {
-                this._addError(localize_1.Localizer.Diagnostic.expectedCloseParen(), openParenToken);
+                this._addSyntaxError(localize_1.LocMessage.expectedCloseParen(), openParenToken);
             }
         }
         const suite = this._parseSuite(/* isFunction */ false, this._parseOptions.skipFunctionAndClassBody);
@@ -1886,17 +1886,17 @@ class Parser {
     _parseBreakStatement() {
         const breakToken = this._getKeywordToken(5 /* KeywordType.Break */);
         if (!this._isInLoop) {
-            this._addError(localize_1.Localizer.Diagnostic.breakOutsideLoop(), breakToken);
+            this._addSyntaxError(localize_1.LocMessage.breakOutsideLoop(), breakToken);
         }
         return parseNodes_1.BreakNode.create(breakToken);
     }
     _parseContinueStatement() {
         const continueToken = this._getKeywordToken(8 /* KeywordType.Continue */);
         if (!this._isInLoop) {
-            this._addError(localize_1.Localizer.Diagnostic.continueOutsideLoop(), continueToken);
+            this._addSyntaxError(localize_1.LocMessage.continueOutsideLoop(), continueToken);
         }
         else if (this._isInFinally) {
-            this._addError(localize_1.Localizer.Diagnostic.continueInFinally(), continueToken);
+            this._addSyntaxError(localize_1.LocMessage.continueInFinally(), continueToken);
         }
         return parseNodes_1.ContinueNode.create(continueToken);
     }
@@ -1905,12 +1905,12 @@ class Parser {
         const returnToken = this._getKeywordToken(32 /* KeywordType.Return */);
         const returnNode = parseNodes_1.ReturnNode.create(returnToken);
         if (!this._isInFunction) {
-            this._addError(localize_1.Localizer.Diagnostic.returnOutsideFunction(), returnToken);
+            this._addSyntaxError(localize_1.LocMessage.returnOutsideFunction(), returnToken);
         }
         if (!this._isNextTokenNeverExpression()) {
             const returnExpr = this._parseTestOrStarListAsExpression(
             /* allowAssignmentExpression */ true, 
-            /* allowMultipleUnpack */ true, 2 /* ErrorExpressionCategory.MissingExpression */, () => localize_1.Localizer.Diagnostic.expectedReturnExpr());
+            /* allowMultipleUnpack */ true, 2 /* ErrorExpressionCategory.MissingExpression */, () => localize_1.LocMessage.expectedReturnExpr());
             this._reportConditionalErrorForStarTupleElement(returnExpr);
             returnNode.returnExpression = returnExpr;
             returnNode.returnExpression.parent = returnNode;
@@ -1931,7 +1931,7 @@ class Parser {
         const isFutureImport = modName.leadingDots === 0 && modName.nameParts.length === 1 && modName.nameParts[0].value === '__future__';
         const possibleInputToken = this._peekToken();
         if (!this._consumeTokenIfKeyword(21 /* KeywordType.Import */)) {
-            this._addError(localize_1.Localizer.Diagnostic.expectedImport(), this._peekToken());
+            this._addSyntaxError(localize_1.LocMessage.expectedImport(), this._peekToken());
             if (!modName.hasTrailingDot) {
                 importFromNode.missingImportKeyword = true;
             }
@@ -1960,7 +1960,7 @@ class Parser {
                     if (this._consumeTokenIfKeyword(1 /* KeywordType.As */)) {
                         const aliasName = this._getTokenIfIdentifier();
                         if (!aliasName) {
-                            this._addError(localize_1.Localizer.Diagnostic.expectedImportAlias(), this._peekToken());
+                            this._addSyntaxError(localize_1.LocMessage.expectedImportAlias(), this._peekToken());
                         }
                         else {
                             importFromAsNode.alias = parseNodes_1.NameNode.create(aliasName);
@@ -1982,20 +1982,20 @@ class Parser {
                     trailingCommaToken = nextToken;
                 }
                 if (importFromNode.imports.length === 0) {
-                    this._addError(localize_1.Localizer.Diagnostic.expectedImportSymbols(), this._peekToken());
+                    this._addSyntaxError(localize_1.LocMessage.expectedImportSymbols(), this._peekToken());
                 }
                 if (inParen) {
                     importFromNode.usesParens = true;
                     const nextToken = this._peekToken();
                     if (!this._consumeTokenIfType(14 /* TokenType.CloseParenthesis */)) {
-                        this._addError(localize_1.Localizer.Diagnostic.expectedCloseParen(), openParenToken);
+                        this._addSyntaxError(localize_1.LocMessage.expectedCloseParen(), openParenToken);
                     }
                     else {
                         (0, parseNodes_1.extendRange)(importFromNode, nextToken);
                     }
                 }
                 else if (trailingCommaToken) {
-                    this._addError(localize_1.Localizer.Diagnostic.trailingCommaInFromImport(), trailingCommaToken);
+                    this._addSyntaxError(localize_1.LocMessage.trailingCommaInFromImport(), trailingCommaToken);
                 }
             }
         }
@@ -2048,11 +2048,11 @@ class Parser {
                     (0, parseNodes_1.extendRange)(importAsNode, importAsNode.alias);
                 }
                 else {
-                    this._addError(localize_1.Localizer.Diagnostic.expectedImportAlias(), this._peekToken());
+                    this._addSyntaxError(localize_1.LocMessage.expectedImportAlias(), this._peekToken());
                 }
             }
             if (importAsNode.module.leadingDots > 0) {
-                this._addError(localize_1.Localizer.Diagnostic.relativeImportNotAllowed(), importAsNode.module);
+                this._addSyntaxError(localize_1.LocMessage.relativeImportNotAllowed(), importAsNode.module);
             }
             importNode.list.push(importAsNode);
             importAsNode.parent = importNode;
@@ -2118,7 +2118,7 @@ class Parser {
             const identifier = this._getTokenIfIdentifier();
             if (!identifier) {
                 if (!allowJustDots || moduleNameNode.leadingDots === 0 || moduleNameNode.nameParts.length > 0) {
-                    this._addError(localize_1.Localizer.Diagnostic.expectedModuleName(), this._peekToken());
+                    this._addSyntaxError(localize_1.LocMessage.expectedModuleName(), this._peekToken());
                     moduleNameNode.hasTrailingDot = true;
                 }
                 break;
@@ -2165,7 +2165,7 @@ class Parser {
         while (true) {
             const name = this._getTokenIfIdentifier();
             if (!name) {
-                this._addError(localize_1.Localizer.Diagnostic.expectedIdentifier(), this._peekToken());
+                this._addSyntaxError(localize_1.LocMessage.expectedIdentifier(), this._peekToken());
                 break;
             }
             nameList.push(parseNodes_1.NameNode.create(name));
@@ -2223,7 +2223,7 @@ class Parser {
         const delToken = this._getKeywordToken(11 /* KeywordType.Del */);
         const exprListResult = this._parseExpressionList(/* allowStar */ true);
         if (!exprListResult.parseError && exprListResult.list.length === 0) {
-            this._addError(localize_1.Localizer.Diagnostic.expectedDelExpr(), this._peekToken());
+            this._addSyntaxError(localize_1.LocMessage.expectedDelExpr(), this._peekToken());
         }
         const delNode = parseNodes_1.DelNode.create(delToken);
         delNode.expressions = exprListResult.list;
@@ -2242,7 +2242,7 @@ class Parser {
         const nextToken = this._peekToken();
         if (this._consumeTokenIfKeyword(18 /* KeywordType.From */)) {
             if (this._getLanguageVersion() < pythonVersion_1.PythonVersion.V3_3) {
-                this._addError(localize_1.Localizer.Diagnostic.yieldFromIllegal(), nextToken);
+                this._addSyntaxError(localize_1.LocMessage.yieldFromIllegal(), nextToken);
             }
             return parseNodes_1.YieldFromNode.create(yieldToken, this._parseTestExpression(/* allowAssignmentExpression */ false));
         }
@@ -2250,7 +2250,7 @@ class Parser {
         if (!this._isNextTokenNeverExpression()) {
             exprList = this._parseTestOrStarListAsExpression(
             /* allowAssignmentExpression */ false, 
-            /* allowMultipleUnpack */ true, 2 /* ErrorExpressionCategory.MissingExpression */, () => localize_1.Localizer.Diagnostic.expectedYieldExpr());
+            /* allowMultipleUnpack */ true, 2 /* ErrorExpressionCategory.MissingExpression */, () => localize_1.LocMessage.expectedYieldExpr());
             this._reportConditionalErrorForStarTupleElement(exprList);
         }
         return parseNodes_1.YieldNode.create(yieldToken, exprList);
@@ -2271,7 +2271,7 @@ class Parser {
                 const text = this._fileContents.substr(invalidToken.start, invalidToken.length);
                 const firstCharCode = text.charCodeAt(0);
                 // Remove any non-printable characters.
-                this._addError(localize_1.Localizer.Diagnostic.invalidTokenChars().format({ text: `\\u${firstCharCode.toString(16)}` }), invalidToken);
+                this._addSyntaxError(localize_1.LocMessage.invalidTokenChars().format({ text: `\\u${firstCharCode.toString(16)}` }), invalidToken);
                 this._consumeTokensUntilType([2 /* TokenType.NewLine */]);
                 break;
             }
@@ -2294,7 +2294,7 @@ class Parser {
             }
         }
         if (!this._consumeTokenIfType(2 /* TokenType.NewLine */)) {
-            this._addError(localize_1.Localizer.Diagnostic.expectedNewlineOrSemicolon(), this._peekToken());
+            this._addSyntaxError(localize_1.LocMessage.expectedNewlineOrSemicolon(), this._peekToken());
         }
         return statement;
     }
@@ -2356,7 +2356,7 @@ class Parser {
         // that's surrounded by parens.
         if (exprListResult.list.length === 1 && !exprListResult.trailingComma) {
             if (exprListResult.list[0].nodeType === 56 /* ParseNodeType.Unpack */) {
-                this._addError(localize_1.Localizer.Diagnostic.unpackOperatorNotAllowed(), exprListResult.list[0]);
+                this._addSyntaxError(localize_1.LocMessage.unpackOperatorNotAllowed(), exprListResult.list[0]);
             }
             return exprListResult.list[0];
         }
@@ -2375,7 +2375,7 @@ class Parser {
     }
     _parseExpressionListAsPossibleTuple(errorCategory, getErrorString, errorToken) {
         if (this._isNextTokenNeverExpression()) {
-            this._addError(getErrorString(), errorToken);
+            this._addSyntaxError(getErrorString(), errorToken);
             return parseNodes_1.ErrorNode.create(errorToken, errorCategory);
         }
         const exprListResult = this._parseExpressionList(/* allowStar */ true);
@@ -2418,7 +2418,7 @@ class Parser {
             for (const expr of exprListResult.list) {
                 if (expr.nodeType === 56 /* ParseNodeType.Unpack */) {
                     if (sawStar) {
-                        this._addError(localize_1.Localizer.Diagnostic.duplicateUnpack(), expr);
+                        this._addSyntaxError(localize_1.LocMessage.duplicateUnpack(), expr);
                         break;
                     }
                     sawStar = true;
@@ -2461,7 +2461,7 @@ class Parser {
             return testExpr;
         }
         if (!this._consumeTokenIfKeyword(13 /* KeywordType.Else */)) {
-            return parseNodes_1.TernaryNode.create(ifExpr, testExpr, this._handleExpressionParseError(1 /* ErrorExpressionCategory.MissingElse */, localize_1.Localizer.Diagnostic.expectedElse()));
+            return parseNodes_1.TernaryNode.create(ifExpr, testExpr, this._handleExpressionParseError(1 /* ErrorExpressionCategory.MissingElse */, localize_1.LocMessage.expectedElse()));
         }
         const elseExpr = this._parseTestExpression(/* allowAssignmentExpression */ true);
         return parseNodes_1.TernaryNode.create(ifExpr, testExpr, elseExpr);
@@ -2480,10 +2480,10 @@ class Parser {
             return leftExpr;
         }
         if (!this._assignmentExpressionsAllowed || disallowAssignmentExpression) {
-            this._addError(localize_1.Localizer.Diagnostic.walrusNotAllowed(), walrusToken);
+            this._addSyntaxError(localize_1.LocMessage.walrusNotAllowed(), walrusToken);
         }
         if (this._getLanguageVersion() < pythonVersion_1.PythonVersion.V3_8) {
-            this._addError(localize_1.Localizer.Diagnostic.walrusIllegal(), walrusToken);
+            this._addSyntaxError(localize_1.LocMessage.walrusIllegal(), walrusToken);
         }
         const rightExpr = this._parseTestExpression(/* allowAssignmentExpression */ false);
         return parseNodes_1.AssignmentExpressionNode.create(leftExpr, rightExpr);
@@ -2542,7 +2542,7 @@ class Parser {
             if (tokenizer_1.Tokenizer.isOperatorComparison(this._peekOperatorType())) {
                 comparisonOperator = this._peekOperatorType();
                 if (comparisonOperator === 19 /* OperatorType.LessOrGreaterThan */) {
-                    this._addError(localize_1.Localizer.Diagnostic.operatorLessOrGreaterDeprecated(), peekToken);
+                    this._addSyntaxError(localize_1.LocMessage.operatorLessOrGreaterDeprecated(), peekToken);
                     comparisonOperator = 28 /* OperatorType.NotEquals */;
                 }
                 this._getNextToken();
@@ -2731,7 +2731,7 @@ class Parser {
         if (this._peekKeywordType() === 4 /* KeywordType.Await */) {
             awaitToken = this._getKeywordToken(4 /* KeywordType.Await */);
             if (this._getLanguageVersion() < pythonVersion_1.PythonVersion.V3_5) {
-                this._addError(localize_1.Localizer.Diagnostic.awaitIllegal(), awaitToken);
+                this._addSyntaxError(localize_1.LocMessage.awaitIllegal(), awaitToken);
             }
         }
         let atomExpression = this._parseAtom();
@@ -2753,7 +2753,7 @@ class Parser {
                     argListResult.args.forEach((arg) => {
                         if (arg.valueExpression.nodeType === 32 /* ParseNodeType.ListComprehension */) {
                             if (!arg.valueExpression.isParenthesized) {
-                                this._addError(localize_1.Localizer.Diagnostic.generatorNotParenthesized(), arg.valueExpression);
+                                this._addSyntaxError(localize_1.LocMessage.generatorNotParenthesized(), arg.valueExpression);
                             }
                         }
                     });
@@ -2761,7 +2761,7 @@ class Parser {
                 const nextToken = this._peekToken();
                 let isArgListTerminated = false;
                 if (!this._consumeTokenIfType(14 /* TokenType.CloseParenthesis */)) {
-                    this._addError(localize_1.Localizer.Diagnostic.expectedCloseParen(), startOfTrailerToken);
+                    this._addSyntaxError(localize_1.LocMessage.expectedCloseParen(), startOfTrailerToken);
                     // Consume the remainder of tokens on the line for error
                     // recovery.
                     this._consumeTokensUntilType([2 /* TokenType.NewLine */]);
@@ -2777,7 +2777,7 @@ class Parser {
                 atomExpression = callNode;
                 if (atomExpression.maxChildDepth !== undefined && atomExpression.maxChildDepth >= maxChildNodeDepth) {
                     atomExpression = parseNodes_1.ErrorNode.create(atomExpression, 14 /* ErrorExpressionCategory.MaxDepthExceeded */);
-                    this._addError(localize_1.Localizer.Diagnostic.maxParseDepthExceeded(), atomExpression);
+                    this._addSyntaxError(localize_1.LocMessage.maxParseDepthExceeded(), atomExpression);
                 }
                 // If the argument list wasn't terminated, break out of the loop
                 if (!isArgListTerminated) {
@@ -2805,24 +2805,24 @@ class Parser {
                 if (!this._consumeTokenIfType(16 /* TokenType.CloseBracket */)) {
                     // Handle the error case, but don't use the error node in this
                     // case because it creates problems for the completion provider.
-                    this._handleExpressionParseError(6 /* ErrorExpressionCategory.MissingIndexCloseBracket */, localize_1.Localizer.Diagnostic.expectedCloseBracket(), startOfTrailerToken, indexNode);
+                    this._handleExpressionParseError(6 /* ErrorExpressionCategory.MissingIndexCloseBracket */, localize_1.LocMessage.expectedCloseBracket(), startOfTrailerToken, indexNode);
                 }
                 atomExpression = indexNode;
                 if (atomExpression.maxChildDepth !== undefined && atomExpression.maxChildDepth >= maxChildNodeDepth) {
                     atomExpression = parseNodes_1.ErrorNode.create(atomExpression, 14 /* ErrorExpressionCategory.MaxDepthExceeded */);
-                    this._addError(localize_1.Localizer.Diagnostic.maxParseDepthExceeded(), atomExpression);
+                    this._addSyntaxError(localize_1.LocMessage.maxParseDepthExceeded(), atomExpression);
                 }
             }
             else if (this._consumeTokenIfType(20 /* TokenType.Dot */)) {
                 // Is it a member access?
                 const memberName = this._getTokenIfIdentifier();
                 if (!memberName) {
-                    return this._handleExpressionParseError(7 /* ErrorExpressionCategory.MissingMemberAccessName */, localize_1.Localizer.Diagnostic.expectedMemberName(), startOfTrailerToken, atomExpression, [8 /* TokenType.Keyword */]);
+                    return this._handleExpressionParseError(7 /* ErrorExpressionCategory.MissingMemberAccessName */, localize_1.LocMessage.expectedMemberName(), startOfTrailerToken, atomExpression, [8 /* TokenType.Keyword */]);
                 }
                 atomExpression = parseNodes_1.MemberAccessNode.create(atomExpression, parseNodes_1.NameNode.create(memberName));
                 if (atomExpression.maxChildDepth !== undefined && atomExpression.maxChildDepth >= maxChildNodeDepth) {
                     atomExpression = parseNodes_1.ErrorNode.create(atomExpression, 14 /* ErrorExpressionCategory.MaxDepthExceeded */);
-                    this._addError(localize_1.Localizer.Diagnostic.maxParseDepthExceeded(), atomExpression);
+                    this._addSyntaxError(localize_1.LocMessage.maxParseDepthExceeded(), atomExpression);
                 }
             }
             else {
@@ -2863,7 +2863,7 @@ class Parser {
                         nameIdentifier = nameExpr.token;
                     }
                     else {
-                        this._addError(localize_1.Localizer.Diagnostic.expectedParamName(), nameExpr);
+                        this._addSyntaxError(localize_1.LocMessage.expectedParamName(), nameExpr);
                     }
                 }
                 else if (valueExpr.nodeType === 38 /* ParseNodeType.Name */ &&
@@ -2872,7 +2872,7 @@ class Parser {
                     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) {
-                        this._addError(localize_1.Localizer.Diagnostic.assignmentExprInSubscript(), valueExpr);
+                        this._addSyntaxError(localize_1.LocMessage.assignmentExprInSubscript(), valueExpr);
                     }
                 }
             }
@@ -2885,21 +2885,21 @@ class Parser {
                 sawKeywordArg = true;
             }
             else if (sawKeywordArg && argNode.argumentCategory === 0 /* ArgumentCategory.Simple */) {
-                this._addError(localize_1.Localizer.Diagnostic.positionArgAfterNamedArg(), argNode);
+                this._addSyntaxError(localize_1.LocMessage.positionArgAfterNamedArg(), argNode);
             }
             argList.push(argNode);
             if (argNode.name) {
-                this._addError(localize_1.Localizer.Diagnostic.keywordSubscriptIllegal(), argNode.name);
+                this._addSyntaxError(localize_1.LocMessage.keywordSubscriptIllegal(), argNode.name);
             }
             if (argType !== 0 /* ArgumentCategory.Simple */) {
                 const unpackListAllowed = this._parseOptions.isStubFile ||
                     this._isParsingQuotedText ||
                     this._getLanguageVersion() >= pythonVersion_1.PythonVersion.V3_11;
                 if (argType === 1 /* ArgumentCategory.UnpackedList */ && !unpackListAllowed) {
-                    this._addError(localize_1.Localizer.Diagnostic.unpackedSubscriptIllegal(), argNode);
+                    this._addSyntaxError(localize_1.LocMessage.unpackedSubscriptIllegal(), argNode);
                 }
                 if (argType === 2 /* ArgumentCategory.UnpackedDictionary */) {
-                    this._addError(localize_1.Localizer.Diagnostic.unpackedDictSubscriptIllegal(), argNode);
+                    this._addSyntaxError(localize_1.LocMessage.unpackedDictSubscriptIllegal(), argNode);
                 }
             }
             if (!this._consumeTokenIfType(12 /* TokenType.Comma */)) {
@@ -2910,7 +2910,7 @@ class Parser {
         }
         // An empty subscript list is illegal.
         if (argList.length === 0) {
-            const errorNode = this._handleExpressionParseError(3 /* ErrorExpressionCategory.MissingIndexOrSlice */, localize_1.Localizer.Diagnostic.expectedSliceIndex(), 
+            const errorNode = this._handleExpressionParseError(3 /* ErrorExpressionCategory.MissingIndexOrSlice */, localize_1.LocMessage.expectedSliceIndex(), 
             /* targetToken */ undefined, 
             /* childNode */ undefined, [16 /* TokenType.CloseBracket */]);
             argList.push(parseNodes_1.ArgumentNode.create(this._peekToken(), errorNode, 0 /* ArgumentCategory.Simple */));
@@ -2987,7 +2987,7 @@ class Parser {
                 sawKeywordArg = true;
             }
             else if (sawKeywordArg && arg.argumentCategory === 0 /* ArgumentCategory.Simple */) {
-                this._addError(localize_1.Localizer.Diagnostic.positionArgAfterNamedArg(), arg);
+                this._addSyntaxError(localize_1.LocMessage.positionArgAfterNamedArg(), arg);
             }
             argList.push(arg);
             if (!this._consumeTokenIfType(12 /* TokenType.Comma */)) {
@@ -3020,7 +3020,7 @@ class Parser {
                     nameIdentifier = nameExpr.token;
                 }
                 else {
-                    this._addError(localize_1.Localizer.Diagnostic.expectedParamName(), nameExpr);
+                    this._addSyntaxError(localize_1.LocMessage.expectedParamName(), nameExpr);
                 }
             }
             else {
@@ -3060,8 +3060,8 @@ class Parser {
             // Atoms with backticks are no longer allowed in Python 3.x, but they
             // 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 /* ErrorExpressionCategory.MissingExpression */, () => localize_1.Localizer.Diagnostic.expectedExpr());
+            this._addSyntaxError(localize_1.LocMessage.backticksIllegal(), nextToken);
+            const expressionNode = this._parseTestListAsExpression(2 /* ErrorExpressionCategory.MissingExpression */, () => localize_1.LocMessage.expectedExpr());
             this._consumeTokenIfType(22 /* TokenType.Backtick */);
             return expressionNode;
         }
@@ -3104,7 +3104,7 @@ class Parser {
                 return parseNodes_1.NameNode.create(keywordAsIdentifier);
             }
         }
-        return this._handleExpressionParseError(2 /* ErrorExpressionCategory.MissingExpression */, localize_1.Localizer.Diagnostic.expectedExpr());
+        return this._handleExpressionParseError(2 /* ErrorExpressionCategory.MissingExpression */, localize_1.LocMessage.expectedExpr());
     }
     // Allocates a dummy "error expression" and consumes the remainder
     // of the tokens on the line for error recovery. A partially-completed
@@ -3112,7 +3112,7 @@ class Parser {
     // what to do.
     _handleExpressionParseError(category, errorMsg, targetToken, childNode, additionalStopTokens) {
         var _a;
-        this._addError(errorMsg, targetToken !== null && targetToken !== void 0 ? targetToken : this._peekToken());
+        this._addSyntaxError(errorMsg, targetToken !== null && targetToken !== void 0 ? targetToken : this._peekToken());
         const stopTokens = [2 /* TokenType.NewLine */];
         if (additionalStopTokens) {
             (0, collectionUtils_1.appendArray)(stopTokens, additionalStopTokens);
@@ -3132,7 +3132,7 @@ class Parser {
         const lambdaToken = this._getKeywordToken(24 /* KeywordType.Lambda */);
         const argList = this._parseVarArgsList(10 /* TokenType.Colon */, /* allowAnnotations */ false);
         if (!this._consumeTokenIfType(10 /* TokenType.Colon */)) {
-            this._addError(localize_1.Localizer.Diagnostic.expectedColon(), this._peekToken());
+            this._addSyntaxError(localize_1.LocMessage.expectedColon(), this._peekToken());
         }
         let testExpr;
         if (allowConditional) {
@@ -3163,7 +3163,7 @@ class Parser {
         const yieldExpr = this._tryParseYieldExpression();
         if (yieldExpr) {
             if (this._peekTokenType() !== 14 /* TokenType.CloseParenthesis */) {
-                return this._handleExpressionParseError(8 /* ErrorExpressionCategory.MissingTupleCloseParen */, localize_1.Localizer.Diagnostic.expectedCloseParen(), startParen, yieldExpr);
+                return this._handleExpressionParseError(8 /* ErrorExpressionCategory.MissingTupleCloseParen */, localize_1.LocMessage.expectedCloseParen(), startParen, yieldExpr);
             }
             else {
                 (0, parseNodes_1.extendRange)(yieldExpr, this._getNextToken());
@@ -3174,7 +3174,7 @@ class Parser {
         const tupleOrExpression = this._makeExpressionOrTuple(exprListResult, /* enclosedInParens */ true);
         (0, parseNodes_1.extendRange)(tupleOrExpression, startParen);
         if (this._peekTokenType() !== 14 /* TokenType.CloseParenthesis */) {
-            return this._handleExpressionParseError(8 /* ErrorExpressionCategory.MissingTupleCloseParen */, localize_1.Localizer.Diagnostic.expectedCloseParen(), startParen, (_a = exprListResult.parseError) !== null && _a !== void 0 ? _a : tupleOrExpression);
+            return this._handleExpressionParseError(8 /* ErrorExpressionCategory.MissingTupleCloseParen */, localize_1.LocMessage.expectedCloseParen(), startParen, (_a = exprListResult.parseError) !== null && _a !== void 0 ? _a : tupleOrExpression);
         }
         else {
             (0, parseNodes_1.extendRange)(tupleOrExpression, this._getNextToken());
@@ -3190,7 +3190,7 @@ class Parser {
         const exprListResult = this._parseTestListWithComprehension(/* isGenerator */ false);
         const closeBracket = this._peekToken();
         if (!this._consumeTokenIfType(16 /* TokenType.CloseBracket */)) {
-            return this._handleExpressionParseError(9 /* ErrorExpressionCategory.MissingListCloseBracket */, localize_1.Localizer.Diagnostic.expectedCloseBracket(), startBracket, (_a = exprListResult.parseError) !== null && _a !== void 0 ? _a : _createList());
+            return this._handleExpressionParseError(9 /* ErrorExpressionCategory.MissingListCloseBracket */, localize_1.LocMessage.expectedCloseBracket(), startBracket, (_a = exprListResult.parseError) !== null && _a !== void 0 ? _a : _createList());
         }
         return _createList();
         function _createList() {
@@ -3257,10 +3257,10 @@ class Parser {
             }
             if (keyExpression && valueExpression) {
                 if (keyExpression.nodeType === 56 /* ParseNodeType.Unpack */) {
-                    this._addError(localize_1.Localizer.Diagnostic.unpackInDict(), keyExpression);
+                    this._addSyntaxError(localize_1.LocMessage.unpackInDict(), keyExpression);
                 }
                 if (isSet) {
-                    this._addError(localize_1.Localizer.Diagnostic.keyValueInSet(), valueExpression);
+                    this._addSyntaxError(localize_1.LocMessage.keyValueInSet(), valueExpression);
                 }
                 else {
                     const keyEntryNode = parseNodes_1.DictionaryKeyEntryNode.create(keyExpression, valueExpression);
@@ -3270,7 +3270,7 @@ class Parser {
                         dictEntry = listComp;
                         sawListComprehension = true;
                         if (!isFirstEntry) {
-                            this._addError(localize_1.Localizer.Diagnostic.comprehensionInDict(), dictEntry);
+                            this._addSyntaxError(localize_1.LocMessage.comprehensionInDict(), dictEntry);
                         }
                     }
                     dictionaryEntries.push(dictEntry);
@@ -3279,7 +3279,7 @@ class Parser {
             }
             else if (doubleStarExpression) {
                 if (isSet) {
-                    this._addError(localize_1.Localizer.Diagnostic.unpackInSet(), doubleStarExpression);
+                    this._addSyntaxError(localize_1.LocMessage.unpackInSet(), doubleStarExpression);
                 }
                 else {
                     const listEntryNode = parseNodes_1.DictionaryExpandEntryNode.create(doubleStarExpression);
@@ -3290,7 +3290,7 @@ class Parser {
                         expandEntryNode = listComp;
                         sawListComprehension = true;
                         if (!isFirstEntry) {
-                            this._addError(localize_1.Localizer.Diagnostic.comprehensionInDict(), doubleStarExpression);
+                            this._addSyntaxError(localize_1.LocMessage.comprehensionInDict(), doubleStarExpression);
                         }
                     }
                     dictionaryEntries.push(expandEntryNode);
@@ -3304,7 +3304,7 @@ class Parser {
                         const missingValueErrorNode = parseNodes_1.ErrorNode.create(this._peekToken(), 13 /* ErrorExpressionCategory.MissingDictValue */);
                         const keyEntryNode = parseNodes_1.DictionaryKeyEntryNode.create(keyExpression, missingValueErrorNode);
                         dictionaryEntries.push(keyEntryNode);
-                        this._addError(localize_1.Localizer.Diagnostic.dictKeyValuePairs(), keyExpression);
+                        this._addSyntaxError(localize_1.LocMessage.dictKeyValuePairs(), keyExpression);
                     }
                     else {
                         const listComp = this._tryParseListComprehension(keyExpression, /* isGenerator */ false);
@@ -3312,7 +3312,7 @@ class Parser {
                             keyExpression = listComp;
                             sawListComprehension = true;
                             if (!isFirstEntry) {
-                                this._addError(localize_1.Localizer.Diagnostic.comprehensionInSet(), keyExpression);
+                                this._addSyntaxError(localize_1.LocMessage.comprehensionInSet(), keyExpression);
                             }
                         }
                         setEntries.push(keyExpression);
@@ -3332,7 +3332,7 @@ class Parser {
         }
         let closeCurlyBrace = this._peekToken();
         if (!this._consumeTokenIfType(18 /* TokenType.CloseCurlyBrace */)) {
-            this._addError(localize_1.Localizer.Diagnostic.expectedCloseBrace(), startBrace);
+            this._addSyntaxError(localize_1.LocMessage.expectedCloseBrace(), startBrace);
             closeCurlyBrace = undefined;
         }
         if (isSet) {
@@ -3402,7 +3402,7 @@ class Parser {
         var _a, _b;
         let leftExpr = this._parseTestOrStarListAsExpression(
         /* allowAssignmentExpression */ false, 
-        /* allowMultipleUnpack */ false, 2 /* ErrorExpressionCategory.MissingExpression */, () => localize_1.Localizer.Diagnostic.expectedExpr());
+        /* allowMultipleUnpack */ false, 2 /* ErrorExpressionCategory.MissingExpression */, () => localize_1.LocMessage.expectedExpr());
         let annotationExpr;
         if (leftExpr.nodeType === 0 /* ParseNodeType.Error */) {
             return leftExpr;
@@ -3412,7 +3412,7 @@ class Parser {
             annotationExpr = this._parseTypeAnnotation();
             leftExpr = parseNodes_1.TypeAnnotationNode.create(leftExpr, annotationExpr);
             if (!this._parseOptions.isStubFile && this._getLanguageVersion() < pythonVersion_1.PythonVersion.V3_6) {
-                this._addError(localize_1.Localizer.Diagnostic.varAnnotationIllegal(), annotationExpr);
+                this._addSyntaxError(localize_1.LocMessage.varAnnotationIllegal(), annotationExpr);
             }
             if (!this._consumeTokenIfOperator(2 /* OperatorType.Assign */)) {
                 return leftExpr;
@@ -3428,7 +3428,7 @@ class Parser {
             }
             const rightExpr = (_a = this._tryParseYieldExpression()) !== null && _a !== void 0 ? _a : this._parseTestOrStarListAsExpression(
             /* allowAssignmentExpression */ false, 
-            /* allowMultipleUnpack */ true, 2 /* ErrorExpressionCategory.MissingExpression */, () => localize_1.Localizer.Diagnostic.expectedAssignRightHandExpr());
+            /* allowMultipleUnpack */ true, 2 /* ErrorExpressionCategory.MissingExpression */, () => localize_1.LocMessage.expectedAssignRightHandExpr());
             this._isParsingTypeAnnotation = wasParsingTypeAnnotation;
             return parseNodes_1.AssignmentNode.create(leftExpr, rightExpr);
         }
@@ -3438,7 +3438,7 @@ class Parser {
         }
         if (tokenizer_1.Tokenizer.isOperatorAssignment(this._peekOperatorType())) {
             const operatorToken = this._getNextToken();
-            const rightExpr = (_b = this._tryParseYieldExpression()) !== null && _b !== void 0 ? _b : this._parseTestListAsExpression(2 /* ErrorExpressionCategory.MissingExpression */, () => localize_1.Localizer.Diagnostic.expectedBinaryRightHandExpr());
+            const rightExpr = (_b = this._tryParseYieldExpression()) !== null && _b !== void 0 ? _b : this._parseTestListAsExpression(2 /* ErrorExpressionCategory.MissingExpression */, () => localize_1.LocMessage.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)();
@@ -3455,7 +3455,7 @@ class Parser {
             rightExpr =
                 (_a = this._tryParseYieldExpression()) !== null && _a !== void 0 ? _a : this._parseTestOrStarListAsExpression(
                 /* allowAssignmentExpression */ false, 
-                /* allowMultipleUnpack */ true, 2 /* ErrorExpressionCategory.MissingExpression */, () => localize_1.Localizer.Diagnostic.expectedAssignRightHandExpr());
+                /* allowMultipleUnpack */ true, 2 /* ErrorExpressionCategory.MissingExpression */, () => localize_1.LocMessage.expectedAssignRightHandExpr());
             if (rightExpr.nodeType === 0 /* ParseNodeType.Error */) {
                 break;
             }
@@ -3494,7 +3494,7 @@ class Parser {
     _parseFunctionTypeAnnotation() {
         const openParenToken = this._peekToken();
         if (!this._consumeTokenIfType(13 /* TokenType.OpenParenthesis */)) {
-            this._addError(localize_1.Localizer.Diagnostic.expectedOpenParen(), this._peekToken());
+            this._addSyntaxError(localize_1.LocMessage.expectedOpenParen(), this._peekToken());
             return undefined;
         }
         let paramAnnotations = [];
@@ -3516,11 +3516,11 @@ class Parser {
             }
         }
         if (!this._consumeTokenIfType(14 /* TokenType.CloseParenthesis */)) {
-            this._addError(localize_1.Localizer.Diagnostic.expectedCloseParen(), openParenToken);
+            this._addSyntaxError(localize_1.LocMessage.expectedCloseParen(), openParenToken);
             this._consumeTokensUntilType([10 /* TokenType.Colon */]);
         }
         if (!this._consumeTokenIfType(21 /* TokenType.Arrow */)) {
-            this._addError(localize_1.Localizer.Diagnostic.expectedArrow(), this._peekToken());
+            this._addSyntaxError(localize_1.LocMessage.expectedArrow(), this._peekToken());
             return undefined;
         }
         const returnType = this._parseTypeAnnotation();
@@ -3543,7 +3543,7 @@ class Parser {
             !this._parseOptions.isStubFile &&
             !this._isParsingQuotedText &&
             this._getLanguageVersion() < pythonVersion_1.PythonVersion.V3_11) {
-            this._addError(localize_1.Localizer.Diagnostic.unpackedSubscriptIllegal(), startToken);
+            this._addSyntaxError(localize_1.LocMessage.unpackedSubscriptIllegal(), startToken);
         }
         let result = this._parseTestExpression(/* allowAssignmentExpression */ false);
         if (isUnpack) {
@@ -3554,20 +3554,20 @@ class Parser {
     }
     _reportStringTokenErrors(stringToken, unescapedResult) {
         if (stringToken.flags & 65536 /* StringTokenFlags.Unterminated */) {
-            this._addError(localize_1.Localizer.Diagnostic.stringUnterminated(), stringToken);
+            this._addSyntaxError(localize_1.LocMessage.stringUnterminated(), stringToken);
         }
         if (unescapedResult === null || unescapedResult === void 0 ? void 0 : unescapedResult.nonAsciiInBytes) {
-            this._addError(localize_1.Localizer.Diagnostic.stringNonAsciiBytes(), stringToken);
+            this._addSyntaxError(localize_1.LocMessage.stringNonAsciiBytes(), stringToken);
         }
         if (stringToken.flags & 64 /* StringTokenFlags.Format */) {
             if (this._getLanguageVersion() < pythonVersion_1.PythonVersion.V3_6) {
-                this._addError(localize_1.Localizer.Diagnostic.formatStringIllegal(), stringToken);
+                this._addSyntaxError(localize_1.LocMessage.formatStringIllegal(), stringToken);
             }
             if (stringToken.flags & 32 /* StringTokenFlags.Bytes */) {
-                this._addError(localize_1.Localizer.Diagnostic.formatStringBytes(), stringToken);
+                this._addSyntaxError(localize_1.LocMessage.formatStringBytes(), stringToken);
             }
             if (stringToken.flags & 16 /* StringTokenFlags.Unicode */) {
-                this._addError(localize_1.Localizer.Diagnostic.formatStringUnicode(), stringToken);
+                this._addSyntaxError(localize_1.LocMessage.formatStringUnicode(), stringToken);
             }
         }
     }
@@ -3615,7 +3615,7 @@ class Parser {
         const parseResults = parser.parseTextExpression(this._fileContents, stringToken.start, stringToken.length, this._parseOptions, 1 /* ParseTextMode.VariableAnnotation */, 
         /* initialParenDepth */ undefined, this._typingSymbolAliases);
         parseResults.diagnostics.forEach((diag) => {
-            this._addError(diag.message, stringListNode);
+            this._addSyntaxError(diag.message, stringListNode);
         });
         if (!parseResults.parseTree) {
             return undefined;
@@ -3630,7 +3630,7 @@ class Parser {
         const parseResults = parser.parseTextExpression(this._fileContents, stringToken.start, stringToken.length, this._parseOptions, 2 /* ParseTextMode.FunctionAnnotation */, 
         /* initialParenDepth */ undefined, this._typingSymbolAliases);
         parseResults.diagnostics.forEach((diag) => {
-            this._addError(diag.message, stringListNode);
+            this._addSyntaxError(diag.message, stringListNode);
         });
         if (!parseResults.parseTree || parseResults.parseTree.nodeType !== 62 /* ParseNodeType.FunctionAnnotation */) {
             return;
@@ -3648,7 +3648,7 @@ class Parser {
         // Consume the expression.
         const expr = (_a = this._tryParseYieldExpression()) !== null && _a !== void 0 ? _a : this._parseTestOrStarListAsExpression(
         /* allowAssignmentExpression */ true, 
-        /* allowMultipleUnpack */ true, 2 /* ErrorExpressionCategory.MissingExpression */, () => localize_1.Localizer.Diagnostic.expectedExpr());
+        /* allowMultipleUnpack */ true, 2 /* ErrorExpressionCategory.MissingExpression */, () => localize_1.LocMessage.expectedExpr());
         fieldExpressions.push(expr);
         if (expr.nodeType === 0 /* ParseNodeType.Error */) {
             return false;
@@ -3659,7 +3659,7 @@ class Parser {
             nextToken.operatorType === 2 /* OperatorType.Assign */) {
             // This feature requires Python 3.8 or newer.
             if (this._parseOptions.pythonVersion < pythonVersion_1.PythonVersion.V3_8) {
-                this._addError(localize_1.Localizer.Diagnostic.formatStringDebuggingIllegal(), nextToken);
+                this._addSyntaxError(localize_1.LocMessage.formatStringDebuggingIllegal(), nextToken);
             }
             this._getNextToken();
             nextToken = this._peekToken();
@@ -3669,7 +3669,7 @@ class Parser {
             this._getNextToken();
             nextToken = this._peekToken();
             if (nextToken.type !== 7 /* TokenType.Identifier */) {
-                this._addError(localize_1.Localizer.Diagnostic.formatStringExpectedConversion(), nextToken);
+                this._addSyntaxError(localize_1.LocMessage.formatStringExpectedConversion(), nextToken);
             }
             else {
                 this._getNextToken();
@@ -3682,7 +3682,7 @@ class Parser {
             nextToken = this._peekToken();
         }
         if (nextToken.type !== 18 /* TokenType.CloseCurlyBrace */) {
-            this._addError(localize_1.Localizer.Diagnostic.formatStringUnterminated(), nextToken);
+            this._addSyntaxError(localize_1.LocMessage.formatStringUnterminated(), nextToken);
             return false;
         }
         else {
@@ -3705,7 +3705,7 @@ class Parser {
                 // The Python interpreter reports an error at the point where the
                 // nesting level exceeds 1. Don't report the error again for deeper nestings.
                 if (nestingDepth === 2) {
-                    this._addError(localize_1.Localizer.Diagnostic.formatStringNestedFormatSpecifier(), nextToken);
+                    this._addSyntaxError(localize_1.LocMessage.formatStringNestedFormatSpecifier(), nextToken);
                 }
                 this._parseFStringReplacementField(fieldExpressions, middleTokens, formatExpressions, nestingDepth + 1);
                 continue;
@@ -3724,7 +3724,7 @@ class Parser {
             if (nextToken.type === 26 /* TokenType.FStringEnd */) {
                 endToken = nextToken;
                 if ((endToken.flags & 65536 /* StringTokenFlags.Unterminated */) !== 0) {
-                    this._addError(localize_1.Localizer.Diagnostic.stringUnterminated(), startToken);
+                    this._addSyntaxError(localize_1.LocMessage.stringUnterminated(), startToken);
                 }
                 this._getNextToken();
                 break;
@@ -3750,9 +3750,9 @@ class Parser {
             if (this._consumeTokensUntilType([26 /* TokenType.FStringEnd */])) {
                 this._getNextToken();
             }
-            this._addError(nextToken.type === 18 /* TokenType.CloseCurlyBrace */
-                ? localize_1.Localizer.Diagnostic.formatStringBrace()
-                : localize_1.Localizer.Diagnostic.stringUnterminated(), nextToken);
+            this._addSyntaxError(nextToken.type === 18 /* TokenType.CloseCurlyBrace */
+                ? localize_1.LocMessage.formatStringBrace()
+                : localize_1.LocMessage.stringUnterminated(), nextToken);
             break;
         }
         this._reportStringTokenErrors(startToken);
@@ -3764,11 +3764,11 @@ class Parser {
         // or type evaluator.
         if (leftExpression.maxChildDepth !== undefined && leftExpression.maxChildDepth >= maxChildNodeDepth) {
             leftExpression = parseNodes_1.ErrorNode.create(leftExpression, 14 /* ErrorExpressionCategory.MaxDepthExceeded */);
-            this._addError(localize_1.Localizer.Diagnostic.maxParseDepthExceeded(), leftExpression);
+            this._addSyntaxError(localize_1.LocMessage.maxParseDepthExceeded(), leftExpression);
         }
         if (rightExpression.maxChildDepth !== undefined && rightExpression.maxChildDepth >= maxChildNodeDepth) {
             rightExpression = parseNodes_1.ErrorNode.create(rightExpression, 14 /* ErrorExpressionCategory.MaxDepthExceeded */);
-            this._addError(localize_1.Localizer.Diagnostic.maxParseDepthExceeded(), rightExpression);
+            this._addSyntaxError(localize_1.LocMessage.maxParseDepthExceeded(), rightExpression);
         }
         return parseNodes_1.BinaryOperationNode.create(leftExpression, rightExpression, operatorToken, operator);
     }
@@ -3778,7 +3778,7 @@ class Parser {
         // or type evaluator.
         if (expression.maxChildDepth !== undefined && expression.maxChildDepth >= maxChildNodeDepth) {
             expression = parseNodes_1.ErrorNode.create(expression, 14 /* ErrorExpressionCategory.MaxDepthExceeded */);
-            this._addError(localize_1.Localizer.Diagnostic.maxParseDepthExceeded(), expression);
+            this._addSyntaxError(localize_1.LocMessage.maxParseDepthExceeded(), expression);
         }
         return parseNodes_1.UnaryOperationNode.create(operatorToken, expression, operator);
     }
@@ -3803,12 +3803,12 @@ class Parser {
             // parse errors that span strings.
             if (stringNode.strings.length > 1) {
                 if (this._isParsingQuotedText) {
-                    this._addError(localize_1.Localizer.Diagnostic.annotationSpansStrings(), stringNode);
+                    this._addSyntaxError(localize_1.LocMessage.annotationSpansStrings(), stringNode);
                 }
             }
             else if (stringNode.strings[0].nodeType === 27 /* ParseNodeType.FormatString */) {
                 if (this._isParsingQuotedText) {
-                    this._addError(localize_1.Localizer.Diagnostic.annotationFormatString(), stringNode);
+                    this._addSyntaxError(localize_1.LocMessage.annotationFormatString(), stringNode);
                 }
             }
             else {
@@ -3821,7 +3821,7 @@ class Parser {
                 // error ranges back to the escaped text.
                 if (unescapedString.length !== stringToken.length - prefixLength - stringToken.quoteMarkLength) {
                     if (this._isParsingQuotedText) {
-                        this._addError(localize_1.Localizer.Diagnostic.annotationStringEscape(), stringNode);
+                        this._addSyntaxError(localize_1.LocMessage.annotationStringEscape(), stringNode);
                     }
                 }
                 else {
@@ -3830,7 +3830,7 @@ class Parser {
                     if (parseResults.diagnostics.length === 0 ||
                         this._parseOptions.reportErrorsForParsedStringContents) {
                         parseResults.diagnostics.forEach((diag) => {
-                            this._addError(diag.message, stringNode);
+                            this._addSyntaxError(diag.message, stringNode);
                         });
                         if (parseResults.parseTree) {
                             (0, debug_1.assert)(parseResults.parseTree.nodeType !== 62 /* ParseNodeType.FunctionAnnotation */);
@@ -3858,7 +3858,7 @@ class Parser {
         }
         for (const expr of possibleTupleExpr.expressions) {
             if (expr.nodeType === 56 /* ParseNodeType.Unpack */) {
-                this._addError(localize_1.Localizer.Diagnostic.unpackTuplesIllegal(), expr);
+                this._addSyntaxError(localize_1.LocMessage.unpackTuplesIllegal(), expr);
                 return;
             }
         }
@@ -3965,7 +3965,7 @@ class Parser {
         // If the next token is invalid, treat it as an identifier.
         if (nextToken.type === 0 /* TokenType.Invalid */) {
             this._getNextToken();
-            this._addError(localize_1.Localizer.Diagnostic.invalidIdentifierChar(), nextToken);
+            this._addSyntaxError(localize_1.LocMessage.invalidIdentifierChar(), nextToken);
             return tokenizerTypes_1.IdentifierToken.create(nextToken.start, nextToken.length, '', nextToken.comments);
         }
         // If this is a "soft keyword", it can be converted into an identifier.
@@ -4036,7 +4036,7 @@ class Parser {
             this._areErrorsSuppressed = errorsWereSuppressed;
         }
     }
-    _addError(message, range) {
+    _addSyntaxError(message, range) {
         (0, debug_1.assert)(range !== undefined);
         if (!this._areErrorsSuppressed) {
             this._diagSink.addError(message, (0, positionUtils_1.convertOffsetsToRange)(range.start, range.start + range.length, this._tokenizerOutput.lines));