This is an archive of the discontinued LLVM Phabricator instance.

clang-format: [JS] support trailing commas in imports.
ClosedPublic

Authored by mprobst on Jul 8 2016, 11:41 AM.

Reviewers

Commits

mprobst retitled this revision from to clang-format: [JS] support trailing commas in imports..

mprobst updated this object.

mprobst added a reviewer: djasper.

mprobst added a subscriber: cfe-commits.

Looks Good.

This revision is now accepted and ready to land.Jul 8 2016, 11:09 PM

This revision was automatically updated to reflect the committed changes.

Path

Size

cfe/

trunk/

lib/

Format/

2 lines

unittests/

Format/

4 lines

Show First 20 Lines • Show All 390 Lines • ▼ Show 20 Lines	private:
bool parseNamedBindings(const AdditionalKeywords &Keywords,		bool parseNamedBindings(const AdditionalKeywords &Keywords,
JsModuleReference &Reference) {		JsModuleReference &Reference) {
if (Current->isNot(tok::l_brace))		if (Current->isNot(tok::l_brace))
return false;		return false;

// {sym as alias, sym2 as ...} from '...';		// {sym as alias, sym2 as ...} from '...';
nextToken();		nextToken();
while (true) {		while (true) {
		if (Current->is(tok::r_brace))
		return true;
if (Current->isNot(tok::identifier))		if (Current->isNot(tok::identifier))
return false;		return false;

JsImportedSymbol Symbol;		JsImportedSymbol Symbol;
Symbol.Symbol = Current->TokenText;		Symbol.Symbol = Current->TokenText;
// Make sure to include any preceding comments.		// Make sure to include any preceding comments.
Symbol.Range.setBegin(		Symbol.Range.setBegin(
Current->getPreviousNonComment()->Next->WhitespaceRange.getBegin());		Current->getPreviousNonComment()->Next->WhitespaceRange.getBegin());
Show All 34 Lines

Show First 20 Lines • Show All 230 Lines • ▼ Show 20 Lines	verifySort("import {B} from 'a';\n"
"1;",		"1;",
"import {A} from 'b';\n"		"import {A} from 'b';\n"
"\n"		"\n"
"import {B} from 'a';\n"		"import {B} from 'a';\n"
"\n"		"\n"
"1;");		"1;");
}		}

		TEST_F(SortImportsTestJS, TrailingComma) {
		verifySort("import {A, B,} from 'aa';\n", "import {B, A,} from 'aa';\n");
		}

} // end namespace		} // end namespace
} // end namespace format		} // end namespace format
} // end namespace clang		} // end namespace clang