diff options
| author | Daniel Jasper <djasper@google.com> | 2014-11-05 17:22:31 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2014-11-05 17:22:31 +0000 |
| commit | e551bb70a34ab3be4f0f9146b6ffc6c6dd61fcfe (patch) | |
| tree | 6bc5e99921f1cb4510ab9dddbacfcb88df1ec261 /clang/lib/Format/ContinuationIndenter.cpp | |
| parent | f20091118cde5ef85d281a252846e06f748d6353 (diff) | |
| download | bcm5719-llvm-e551bb70a34ab3be4f0f9146b6ffc6c6dd61fcfe.tar.gz bcm5719-llvm-e551bb70a34ab3be4f0f9146b6ffc6c6dd61fcfe.zip | |
Revert "clang-format: [js] Updates to Google's JavaScript style."
This reverts commit eefd2eaad43c5c2b17953ae7ed1e72b28e696f7b.
Apparently, this change was a bit premature.
llvm-svn: 221365
Diffstat (limited to 'clang/lib/Format/ContinuationIndenter.cpp')
| -rw-r--r-- | clang/lib/Format/ContinuationIndenter.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/clang/lib/Format/ContinuationIndenter.cpp b/clang/lib/Format/ContinuationIndenter.cpp index adbd8a3d1d0..9e6014a6837 100644 --- a/clang/lib/Format/ContinuationIndenter.cpp +++ b/clang/lib/Format/ContinuationIndenter.cpp @@ -677,7 +677,6 @@ unsigned ContinuationIndenter::moveStateToNextToken(LineState &State, if (Current.is(Keywords.kw_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); |
