maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

clang-format: [JS] post-fix non-null assertion operator. 

Summary:
Do not insert whitespace preceding the "!" postfix operator. This is an
incomplete fix, but should cover common usage.

Reviewers: djasper

Subscribers: cfe-commits, klimek

Differential Revision: http://reviews.llvm.org/D21204

llvm-svn: 272524
This commit is contained in:
Martin Probst 2016-06-13 00:49:54 +00:00
parent 1e74fc564c
commit 0eb40cfa6f
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clang/lib/Format/TokenAnnotator.cpp
View File

@ -2126,6 +2126,11 @@ bool TokenAnnotator::spaceRequiredBefore(const AnnotatedLine &Line,
// locations that should have whitespace following are identified by the
// above set of follower tokens.
return false;
// Postfix non-null assertion operator, as in `foo!.bar()`.
if (Right.is(tok::exclaim) && (Left.isOneOf(tok::identifier, tok::r_paren,
tok::r_square, tok::r_brace) ||
Left.Tok.isLiteral()))
return false;
} else if (Style.Language == FormatStyle::LK_Java) {
if (Left.is(tok::r_square) && Right.is(tok::l_brace))
return true;

9
clang/unittests/Format/FormatTestJS.cpp
View File

@ -1293,5 +1293,14 @@ TEST_F(FormatTestJS, SupportShebangLines) {
"var x = hello();");
}
TEST_F(FormatTestJS, NonNullAssertionOperator) {
verifyFormat("let x = foo!.bar();\n");
verifyFormat("let x = foo ? bar! : baz;\n");
verifyFormat("let x = !foo;\n");
verifyFormat("let x = foo[0]!;\n");
verifyFormat("let x = (foo)!;\n");
verifyFormat("let x = {foo: 1}!;\n");
}
} // end namespace tooling
} // end namespace clang