Skip to content

Commit fa19d47

Browse files
committed
refactor parseExpectedMatchingBrackets
1 parent e38a0ce commit fa19d47

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/compiler/parser.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1555,15 +1555,15 @@ namespace ts {
15551555
return false;
15561556
}
15571557

1558-
function parseExpectedMatchingBrackets(openKind: SyntaxKind, closeKind: SyntaxKind, openParsed: boolean, openPosition: number) {
1559-
if (!openParsed) {
1560-
return parseExpected(closeKind);
1561-
}
1558+
function parseExpectedMatchingBrackets(openKind: SyntaxKind, closeKind: SyntaxKind, openParsed: boolean, openPosition: number) {
15621559
if (token() === closeKind) {
15631560
nextToken();
15641561
return;
15651562
}
15661563
const lastError = parseErrorAtCurrentToken(Diagnostics._0_expected, tokenToString(closeKind));
1564+
if (!openParsed) {
1565+
return;
1566+
}
15671567
if (lastError) {
15681568
addRelatedInfo(
15691569
lastError,
@@ -5657,7 +5657,7 @@ namespace ts {
56575657
const pos = getNodePos();
56585658
const hasJSDoc = hasPrecedingJSDocComment();
56595659
const openBracePosition = scanner.getTokenPos();
5660-
const openBraceParsed = parseExpected(SyntaxKind.OpenBraceToken, diagnosticMessage)
5660+
const openBraceParsed = parseExpected(SyntaxKind.OpenBraceToken, diagnosticMessage);
56615661
if (openBraceParsed || ignoreMissingOpenBrace) {
56625662
const multiLine = scanner.hasPrecedingLineBreak();
56635663
const statements = parseList(ParsingContext.BlockStatements, parseStatement);
@@ -5720,7 +5720,7 @@ namespace ts {
57205720
const openParenPosition = scanner.getTokenPos();
57215721
const openParenParsed = parseExpected(SyntaxKind.OpenParenToken);
57225722
const expression = allowInAnd(parseExpression);
5723-
parseExpectedMatchingBrackets(SyntaxKind.OpenParenToken, SyntaxKind.CloseParenToken, openParenParsed, openParenPosition)
5723+
parseExpectedMatchingBrackets(SyntaxKind.OpenParenToken, SyntaxKind.CloseParenToken, openParenParsed, openParenPosition);
57245724
const thenStatement = parseStatement();
57255725
const elseStatement = parseOptional(SyntaxKind.ElseKeyword) ? parseStatement() : undefined;
57265726
return withJSDoc(finishNode(factory.createIfStatement(expression, thenStatement, elseStatement), pos), hasJSDoc);
@@ -5735,7 +5735,7 @@ namespace ts {
57355735
const openParenPosition = scanner.getTokenPos();
57365736
const openParenParsed = parseExpected(SyntaxKind.OpenParenToken);
57375737
const expression = allowInAnd(parseExpression);
5738-
parseExpectedMatchingBrackets(SyntaxKind.OpenParenToken, SyntaxKind.CloseParenToken, openParenParsed, openParenPosition)
5738+
parseExpectedMatchingBrackets(SyntaxKind.OpenParenToken, SyntaxKind.CloseParenToken, openParenParsed, openParenPosition);
57395739

57405740
// From: https://mail.mozilla.org/pipermail/es-discuss/2011-August/016188.html
57415741
// 157 min --- All allen at wirfs-brock.com CONF --- "do{;}while(false)false" prohibited in

0 commit comments

Comments
 (0)