diff options
| author | Daniel Jasper <djasper@google.com> | 2014-10-31 17:50:40 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2014-10-31 17:50:40 +0000 |
| commit | f739b0dbfa14492f0fec76bc46bc651529a0eae8 (patch) | |
| tree | 8f9b51bc3668ccab9746fd5dbedee4cadf8cfa9d /clang/lib/Format/ContinuationIndenter.cpp | |
| parent | 8a020310b8b2a9d33b327ca9ae2483da8df59876 (diff) | |
| download | bcm5719-llvm-f739b0dbfa14492f0fec76bc46bc651529a0eae8.tar.gz bcm5719-llvm-f739b0dbfa14492f0fec76bc46bc651529a0eae8.zip | |
clang-format: [js] Updates to Google's JavaScript style.
The style guide is changing..
llvm-svn: 220977
Diffstat (limited to 'clang/lib/Format/ContinuationIndenter.cpp')
| -rw-r--r-- | clang/lib/Format/ContinuationIndenter.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/clang/lib/Format/ContinuationIndenter.cpp b/clang/lib/Format/ContinuationIndenter.cpp index 41dc09b11dc..0920137870a 100644 --- a/clang/lib/Format/ContinuationIndenter.cpp +++ b/clang/lib/Format/ContinuationIndenter.cpp @@ -664,6 +664,7 @@ unsigned ContinuationIndenter::moveStateToNextToken(LineState &State, if (Current.TokenText == "function") State.Stack.back().JSFunctionInlined = !Newline && Previous && Previous->Type != TT_DictLiteral && + Previous->Type != TT_ConditionalExpr && // If the unnamed function is the only parameter to another function, // we can likely inline it and come up with a good format. (Previous->isNot(tok::l_paren) || Previous->ParameterCount > 1); |
