Skip to content

Commit

Permalink
re-add clobbered merge lines
Browse files Browse the repository at this point in the history
  • Loading branch information
jessetrinity committed May 19, 2021
1 parent fbb2f79 commit f537aef
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion src/compiler/parser.ts
Expand Up @@ -5608,7 +5608,13 @@ namespace ts {
);
}
}
return finishNode(factory.createBlock(statements, multiLine), pos);
const result = withJSDoc(finishNode(factory.createBlock(statements, multiLine), pos), hasJSDoc);
if (token() === SyntaxKind.EqualsToken) {
parseErrorAtCurrentToken(Diagnostics.Declaration_or_statement_expected_This_follows_a_block_of_statements_so_if_you_intended_to_write_a_destructuring_assignment_you_might_need_to_wrap_the_the_whole_assignment_in_parentheses);
nextToken();
}

return result;
}
else {
const statements = createMissingList<Statement>();
Expand Down

0 comments on commit f537aef

Please sign in to comment.