This is an archive of the discontinued LLVM Phabricator instance.

clang-format: [js] Do not fall through for JS structural elements.
ClosedPublic

Authored by mprobst on Feb 19 2015, 7:07 AM.

Reviewers

djasper

mprobst retitled this revision from to clang-format: [js] Do not fall through for JS structural elements..

mprobst updated this object.

mprobst edited the test plan for this revision. (Show Details)

mprobst added a reviewer: djasper.

mprobst added subscribers: Unknown Object (MLST), Unknown Object (MLST).

djasper edited edge metadata.

This revision is now accepted and ready to land.Feb 19 2015, 8:05 AM

Submitted as r229862.

Path

Size

lib/

Format/

3 lines

unittests/

Format/

2 lines

Show First 20 Lines • Show All 1,520 Lines • ▼ Show 20 Lines	if (FormatTok->Tok.is(tok::l_brace)) {

parseBlock(/MustBeDeclaration=/true, /AddLevel=/true,		parseBlock(/MustBeDeclaration=/true, /AddLevel=/true,
/MunchSemi=/false);		/MunchSemi=/false);
}		}
// We fall through to parsing a structural element afterwards, so		// We fall through to parsing a structural element afterwards, so
// class A {} n, m;		// class A {} n, m;
// will end up in one unwrapped line.		// will end up in one unwrapped line.
// This does not apply for Java.		// This does not apply for Java.
if (Style.Language == FormatStyle::LK_Java)		if (Style.Language == FormatStyle::LK_Java \|\|
		Style.Language == FormatStyle::LK_JavaScript)
addUnwrappedLine();		addUnwrappedLine();
}		}

void UnwrappedLineParser::parseObjCProtocolList() {		void UnwrappedLineParser::parseObjCProtocolList() {
assert(FormatTok->Tok.is(tok::less) && "'<' expected.");		assert(FormatTok->Tok.is(tok::less) && "'<' expected.");
do		do
nextToken();		nextToken();
while (!eof() && FormatTok->Tok.isNot(tok::greater));		while (!eof() && FormatTok->Tok.isNot(tok::greater));
▲ Show 20 Lines • Show All 228 Lines • Show Last 20 Lines

Show First 20 Lines • Show All 515 Lines • ▼ Show 20 Lines	TEST_F(FormatTestJS, MetadataAnnotations) {
verifyFormat("@A\n@B\nclass C {\n}");		verifyFormat("@A\n@B\nclass C {\n}");
verifyFormat("class C {\n @A x: string;\n}");		verifyFormat("class C {\n @A x: string;\n}");
verifyFormat("class C {\n"		verifyFormat("class C {\n"
" @A\n"		" @A\n"
" private x(): string {\n"		" private x(): string {\n"
" return 'y';\n"		" return 'y';\n"
" }\n"		" }\n"
"}");		"}");
		verifyFormat("class X {}\n"
		"class Y {}");
}		}

TEST_F(FormatTestJS, Modules) {		TEST_F(FormatTestJS, Modules) {
verifyFormat("import SomeThing from 'some/module.js';");		verifyFormat("import SomeThing from 'some/module.js';");
verifyFormat("import {X, Y} from 'some/module.js';");		verifyFormat("import {X, Y} from 'some/module.js';");
// TODO(martinprobst): +2 indent only, and handle lists w/o trailing comma.		// TODO(martinprobst): +2 indent only, and handle lists w/o trailing comma.
verifyFormat("import {\n"		verifyFormat("import {\n"
" VeryLongImportsAreAnnoying,\n"		" VeryLongImportsAreAnnoying,\n"
▲ Show 20 Lines • Show All 44 Lines • Show Last 20 Lines