diff options
| author | Daniel Jasper <djasper@google.com> | 2014-09-05 08:42:27 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2014-09-05 08:42:27 +0000 |
| commit | 3f69ba107515e95a0f21affca5a5159b274d448a (patch) | |
| tree | e9bf7e7a6601e65f316cdba802f8d1fba45a58fc /clang | |
| parent | 97bfb7b1ba5dfc5c0d71e8e9bea3e23e9666ba17 (diff) | |
| download | bcm5719-llvm-3f69ba107515e95a0f21affca5a5159b274d448a.tar.gz bcm5719-llvm-3f69ba107515e95a0f21affca5a5159b274d448a.zip | |
clang-format: [JS] Better support for empty function literals.
Before:
SomeFunction(function(){});
After:
SomeFunction(function() {});
llvm-svn: 217236
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Format/UnwrappedLineParser.cpp | 7 | ||||
| -rw-r--r-- | clang/unittests/Format/FormatTestJS.cpp | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/clang/lib/Format/UnwrappedLineParser.cpp b/clang/lib/Format/UnwrappedLineParser.cpp index 56cad19277d..edb68a3d79c 100644 --- a/clang/lib/Format/UnwrappedLineParser.cpp +++ b/clang/lib/Format/UnwrappedLineParser.cpp @@ -1041,6 +1041,13 @@ void UnwrappedLineParser::parseParens() { if (FormatTok->Tok.is(tok::l_brace)) parseBracedList(); break; + case tok::identifier: + if (Style.Language == FormatStyle::LK_JavaScript && + FormatTok->TokenText == "function") + tryToParseJSFunction(); + else + nextToken(); + break; default: nextToken(); break; diff --git a/clang/unittests/Format/FormatTestJS.cpp b/clang/unittests/Format/FormatTestJS.cpp index 55e7cc6fe19..a4bd84a3242 100644 --- a/clang/unittests/Format/FormatTestJS.cpp +++ b/clang/unittests/Format/FormatTestJS.cpp @@ -167,6 +167,7 @@ TEST_F(FormatTestJS, FormatsFreestandingFunctions) { } TEST_F(FormatTestJS, FunctionLiterals) { + verifyFormat("doFoo(function() {});"); verifyFormat("doFoo(function() { return 1; });"); verifyFormat("var func = function() { return 1; };"); verifyFormat("return {\n" |
