This is an archive of the discontinued LLVM Phabricator instance.

clang-format: [JS] detect ASI after closing parens.
ClosedPublic

Authored by mprobst on Aug 8 2017, 3:16 PM.

Reviewers

Commits

Summary

A closing parenthesis followed by a declaration or statement should always terminate the current statement.

This revision is now accepted and ready to land.Aug 8 2017, 10:11 PM

This revision was automatically updated to reflect the committed changes.

Path

Size

cfe/

trunk/

lib/

Format/

3 lines

unittests/

Format/

4 lines

Show First 20 Lines • Show All 847 Lines • ▼ Show 20 Lines	void UnwrappedLineParser::readTokenWithJavaScriptASI() {
bool NextMustBeValue = mustBeJSIdentOrValue(Keywords, Next);		bool NextMustBeValue = mustBeJSIdentOrValue(Keywords, Next);
bool NextEndsTemplateExpr =		bool NextEndsTemplateExpr =
Next->is(TT_TemplateString) && Next->TokenText.startswith("}");		Next->is(TT_TemplateString) && Next->TokenText.startswith("}");
if (NextMustBeValue && !NextEndsTemplateExpr && !PreviousStartsTemplateExpr &&		if (NextMustBeValue && !NextEndsTemplateExpr && !PreviousStartsTemplateExpr &&
(PreviousMustBeValue \|\|		(PreviousMustBeValue \|\|
Previous->isOneOf(tok::r_square, tok::r_paren, tok::plusplus,		Previous->isOneOf(tok::r_square, tok::r_paren, tok::plusplus,
tok::minusminus)))		tok::minusminus)))
return addUnwrappedLine();		return addUnwrappedLine();
if (PreviousMustBeValue && isJSDeclOrStmt(Keywords, Next))		if ((PreviousMustBeValue \|\| Previous->is(tok::r_paren)) &&
		isJSDeclOrStmt(Keywords, Next))
return addUnwrappedLine();		return addUnwrappedLine();
}		}

void UnwrappedLineParser::parseStructuralElement() {		void UnwrappedLineParser::parseStructuralElement() {
assert(!FormatTok->is(tok::l_brace));		assert(!FormatTok->is(tok::l_brace));
if (Style.Language == FormatStyle::LK_TableGen &&		if (Style.Language == FormatStyle::LK_TableGen &&
FormatTok->is(tok::pp_include)) {		FormatTok->is(tok::pp_include)) {
nextToken();		nextToken();
▲ Show 20 Lines • Show All 1,630 Lines • Show Last 20 Lines

Show First 20 Lines • Show All 1,100 Lines • ▼ Show 20 Lines	TEST_F(FormatTestJS, WrapRespectsAutomaticSemicolonInsertion) {
verifyFormat("class X {\n"		verifyFormat("class X {\n"
" readonly ratherLongField =\n"		" readonly ratherLongField =\n"
" 1;\n"		" 1;\n"
"}",		"}",
"class X {\n"		"class X {\n"
" readonly ratherLongField = 1;\n"		" readonly ratherLongField = 1;\n"
"}",		"}",
getGoogleJSStyleWithColumns(20));		getGoogleJSStyleWithColumns(20));
		verifyFormat("const x = (5 + 9)\n"
		"const y = 3\n",
		"const x = ( 5 + 9)\n"
		"const y = 3\n");
}		}

TEST_F(FormatTestJS, AutomaticSemicolonInsertionHeuristic) {		TEST_F(FormatTestJS, AutomaticSemicolonInsertionHeuristic) {
verifyFormat("a\n"		verifyFormat("a\n"
"b;",		"b;",
" a \n"		" a \n"
" b ;");		" b ;");
verifyFormat("a()\n"		verifyFormat("a()\n"
▲ Show 20 Lines • Show All 1,043 Lines • Show Last 20 Lines