This is an archive of the discontinued LLVM Phabricator instance.

clang-format: [JS] support non-null assertions after all identifiers.
ClosedPublic

Authored by mprobst on May 11 2017, 6:22 PM.

Reviewers

Commits

Summary

Previously:

x = namespace !;

Now:

x = namespace!;

Build Status

Buildable 6374
Build 6374: arc lint + arc unit

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

This revision was automatically updated to reflect the committed changes.

Path

Size

lib/

Format/

3 lines

unittests/

Format/

1 line

Show First 20 Lines • Show All 1,028 Lines • ▼ Show 20 Lines	private:
void determineTokenType(FormatToken &Current) {		void determineTokenType(FormatToken &Current) {
if (!Current.is(TT_Unknown))		if (!Current.is(TT_Unknown))
// The token type is already known.		// The token type is already known.
return;		return;

if (Style.Language == FormatStyle::LK_JavaScript) {		if (Style.Language == FormatStyle::LK_JavaScript) {
if (Current.is(tok::exclaim)) {		if (Current.is(tok::exclaim)) {
if (Current.Previous &&		if (Current.Previous &&
(Current.Previous->isOneOf(tok::identifier, tok::r_paren,		(Current.Previous->Tok.getIdentifierInfo() \|\|
		Current.Previous->isOneOf(tok::identifier, tok::r_paren,
tok::r_square, tok::r_brace) \|\|		tok::r_square, tok::r_brace) \|\|
Current.Previous->Tok.isLiteral())) {		Current.Previous->Tok.isLiteral())) {
Current.Type = TT_JsNonNullAssertion;		Current.Type = TT_JsNonNullAssertion;
return;		return;
}		}
if (Current.Next &&		if (Current.Next &&
Current.Next->isOneOf(TT_BinaryOperator, Keywords.kw_as)) {		Current.Next->isOneOf(TT_BinaryOperator, Keywords.kw_as)) {
Current.Type = TT_JsNonNullAssertion;		Current.Type = TT_JsNonNullAssertion;
▲ Show 20 Lines • Show All 1,700 Lines • Show Last 20 Lines

Show First 20 Lines • Show All 1,793 Lines • ▼ Show 20 Lines	TEST_F(FormatTestJS, NonNullAssertionOperator) {
verifyFormat("let x = foo! - 1;\n");		verifyFormat("let x = foo! - 1;\n");
verifyFormat("let x = {foo: 1}!;\n");		verifyFormat("let x = {foo: 1}!;\n");
verifyFormat(		verifyFormat(
"let x = hello.foo()!\n"		"let x = hello.foo()!\n"
" .foo()!\n"		" .foo()!\n"
" .foo()!\n"		" .foo()!\n"
" .foo()!;\n",		" .foo()!;\n",
getGoogleJSStyleWithColumns(20));		getGoogleJSStyleWithColumns(20));
		verifyFormat("let x = namespace!;\n");
}		}

TEST_F(FormatTestJS, Conditional) {		TEST_F(FormatTestJS, Conditional) {
verifyFormat("y = x ? 1 : 2;");		verifyFormat("y = x ? 1 : 2;");
verifyFormat("x ? 1 : 2;");		verifyFormat("x ? 1 : 2;");
verifyFormat("class Foo {\n"		verifyFormat("class Foo {\n"
" field = true ? 1 : 2;\n"		" field = true ? 1 : 2;\n"
" method(a = true ? 1 : 2) {}\n"		" method(a = true ? 1 : 2) {}\n"
Show All 17 Lines