Author: Krasimir Georgiev Date: 2021-08-03T11:18:21+02:00 New Revision: 4f4f2783056fd01182740251b2ce8a77b12684b3
URL: https://github.com/llvm/llvm-project/commit/4f4f2783056fd01182740251b2ce8a77b12684b3 DIFF: https://github.com/llvm/llvm-project/commit/4f4f2783056fd01182740251b2ce8a77b12684b3.diff LOG: [clang-format] don't break between function and function name in JS The patch https://reviews.llvm.org/D105964 (https://github.com/llvm/llvm-project/commit/58494c856a15f5b0e886c7baf5d505ac6c05dfe5) updated detection of function declaration names. It had the unfortunate consequence that it started breaking between `function` and the function name in some cases in JavaScript code. This patch addresses this. Reviewed By: MyDeveloperDay, owenpan Differential Revision: https://reviews.llvm.org/D107267 Added: Modified: clang/lib/Format/ContinuationIndenter.cpp clang/unittests/Format/FormatTestJS.cpp Removed: ################################################################################ diff --git a/clang/lib/Format/ContinuationIndenter.cpp b/clang/lib/Format/ContinuationIndenter.cpp index 8fbc15f27922a..cdb112726b80d 100644 --- a/clang/lib/Format/ContinuationIndenter.cpp +++ b/clang/lib/Format/ContinuationIndenter.cpp @@ -495,7 +495,10 @@ bool ContinuationIndenter::mustBreak(const LineState &State) { if (((Current.is(TT_FunctionDeclarationName) && // Don't break before a C# function when no break after return type (!Style.isCSharp() || - Style.AlwaysBreakAfterReturnType != FormatStyle::RTBS_None)) || + Style.AlwaysBreakAfterReturnType != FormatStyle::RTBS_None) && + // Don't always break between a JavaScript `function` and the function + // name. + Style.Language != FormatStyle::LK_JavaScript) || (Current.is(tok::kw_operator) && !Previous.is(tok::coloncolon))) && !Previous.is(tok::kw_template) && State.Stack.back().BreakBeforeParameter) return true; diff --git a/clang/unittests/Format/FormatTestJS.cpp b/clang/unittests/Format/FormatTestJS.cpp index c92c81f66a870..1c174e9e5b170 100644 --- a/clang/unittests/Format/FormatTestJS.cpp +++ b/clang/unittests/Format/FormatTestJS.cpp @@ -692,6 +692,13 @@ TEST_F(FormatTestJS, FormatsFreestandingFunctions) { " let x = 1;\n" " console.log(x);\n" "}\n"); + EXPECT_EQ("a = function(x) {}\n" + "\n" + "function f(x) {}", + format("a = function(x) {}\n" + "\n" + "function f(x) {}", + getGoogleJSStyleWithColumns(20))); } TEST_F(FormatTestJS, GeneratorFunctions) { _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
