Skip to content

Commit db15c10

Browse files
committed
fix lint errors
1 parent 257287b commit db15c10

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

src/compiler/parser.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -5158,7 +5158,7 @@ namespace ts {
51585158
tag,
51595159
typeArguments,
51605160
token() === SyntaxKind.NoSubstitutionTemplateLiteral ?
5161-
(reScanTemplateHeadOrNoSubstitutionTemplate(true), parseLiteralNode() as NoSubstitutionTemplateLiteral) :
5161+
(reScanTemplateHeadOrNoSubstitutionTemplate(/*isTaggedTemplate*/ true), parseLiteralNode() as NoSubstitutionTemplateLiteral) :
51625162
parseTemplateExpression(/*isTaggedTemplate*/ true, !!(scanner.getTokenFlags() & TokenFlags.ContainsInvalidEscape))
51635163
);
51645164
if (questionDotToken || tag.flags & NodeFlags.OptionalChain) {
@@ -5288,7 +5288,7 @@ namespace ts {
52885288
return parseLiteralNode();
52895289
case SyntaxKind.NoSubstitutionTemplateLiteral:
52905290
if (scanner.getTokenFlags() & TokenFlags.ContainsInvalidEscape) {
5291-
reScanTemplateHeadOrNoSubstitutionTemplate(/* isTaggedTemplate */ false)
5291+
reScanTemplateHeadOrNoSubstitutionTemplate(/* isTaggedTemplate */ false);
52925292
}
52935293
return parseLiteralNode();
52945294
case SyntaxKind.ThisKeyword:

src/compiler/scanner.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -1205,7 +1205,7 @@ namespace ts {
12051205
}
12061206
if (ch === CharacterCodes.backslash && !jsxAttributeString) {
12071207
result += text.substring(start, pos);
1208-
result += scanEscapeSequence(false, true);
1208+
result += scanEscapeSequence(/* isTaggedTemplate */ false, /* shouldEmitInvalidEscapeError */ true);
12091209
start = pos;
12101210
continue;
12111211
}
@@ -1501,7 +1501,7 @@ namespace ts {
15011501
if (ch >= 0 && isIdentifierPart(ch, languageVersion)) {
15021502
pos += 3;
15031503
tokenFlags |= TokenFlags.ExtendedUnicodeEscape;
1504-
result += scanExtendedUnicodeEscape(true);
1504+
result += scanExtendedUnicodeEscape(/* shouldEmitInvalidEscapeError */ true);
15051505
start = pos;
15061506
continue;
15071507
}
@@ -1686,7 +1686,7 @@ namespace ts {
16861686
tokenValue = scanString();
16871687
return token = SyntaxKind.StringLiteral;
16881688
case CharacterCodes.backtick:
1689-
return token = scanTemplateAndSetTokenValue(/* isTaggedTemplate */ false, false);
1689+
return token = scanTemplateAndSetTokenValue(/* isTaggedTemplate */ false, /* shouldEmitInvalidEscapeError */ false);
16901690
case CharacterCodes.percent:
16911691
if (text.charCodeAt(pos + 1) === CharacterCodes.equals) {
16921692
return pos += 2, token = SyntaxKind.PercentEqualsToken;
@@ -2021,7 +2021,7 @@ namespace ts {
20212021
if (extendedCookedChar >= 0 && isIdentifierStart(extendedCookedChar, languageVersion)) {
20222022
pos += 3;
20232023
tokenFlags |= TokenFlags.ExtendedUnicodeEscape;
2024-
tokenValue = scanExtendedUnicodeEscape(true) + scanIdentifierParts();
2024+
tokenValue = scanExtendedUnicodeEscape(/* shouldEmitInvalidEscapeError */ true) + scanIdentifierParts();
20252025
return token = getIdentifierToken();
20262026
}
20272027

@@ -2208,12 +2208,12 @@ namespace ts {
22082208
function reScanTemplateToken(isTaggedTemplate: boolean): SyntaxKind {
22092209
Debug.assert(token === SyntaxKind.CloseBraceToken, "'reScanTemplateToken' should only be called on a '}'");
22102210
pos = tokenPos;
2211-
return token = scanTemplateAndSetTokenValue(isTaggedTemplate, true);
2211+
return token = scanTemplateAndSetTokenValue(isTaggedTemplate, /* shouldEmitInvalidEscapeError */ true);
22122212
}
22132213

22142214
function reScanTemplateHeadOrNoSubstitutionTemplate(isTaggedTemplate?: boolean): SyntaxKind {
22152215
pos = tokenPos;
2216-
return token = scanTemplateAndSetTokenValue(isTaggedTemplate || false, true);
2216+
return token = scanTemplateAndSetTokenValue(isTaggedTemplate || false, /* shouldEmitInvalidEscapeError */ true);
22172217
}
22182218

22192219
function reScanJsxToken(): JsxTokenSyntaxKind {
@@ -2413,7 +2413,7 @@ namespace ts {
24132413
if (extendedCookedChar >= 0 && isIdentifierStart(extendedCookedChar, languageVersion)) {
24142414
pos += 3;
24152415
tokenFlags |= TokenFlags.ExtendedUnicodeEscape;
2416-
tokenValue = scanExtendedUnicodeEscape(true) + scanIdentifierParts();
2416+
tokenValue = scanExtendedUnicodeEscape(/* shouldEmitInvalidEscapeError */ true) + scanIdentifierParts();
24172417
return token = getIdentifierToken();
24182418
}
24192419

0 commit comments

Comments
 (0)