Skip to content

Commit f537aef

Browse files
committed
re-add clobbered merge lines
1 parent fbb2f79 commit f537aef

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

src/compiler/parser.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5608,7 +5608,13 @@ namespace ts {
56085608
);
56095609
}
56105610
}
5611-
return finishNode(factory.createBlock(statements, multiLine), pos);
5611+
const result = withJSDoc(finishNode(factory.createBlock(statements, multiLine), pos), hasJSDoc);
5612+
if (token() === SyntaxKind.EqualsToken) {
5613+
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);
5614+
nextToken();
5615+
}
5616+
5617+
return result;
56125618
}
56135619
else {
56145620
const statements = createMissingList<Statement>();

0 commit comments

Comments
 (0)