diff --git a/clang/lib/Format/WhitespaceManager.cpp b/clang/lib/Format/WhitespaceManager.cpp --- a/clang/lib/Format/WhitespaceManager.cpp +++ b/clang/lib/Format/WhitespaceManager.cpp @@ -347,7 +347,7 @@ if (ScopeStart > Start + 1 && Changes[ScopeStart - 2].Tok->is(tok::identifier) && Changes[ScopeStart - 1].Tok->is(tok::l_paren)) - return true; + return Style.BinPackArguments; // Ternary operator if (Changes[i].Tok->is(TT_ConditionalExpr)) diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -16419,6 +16419,37 @@ "}", Style); // clang-format on + + Style = getLLVMStyleWithColumns(120); + Style.AlignConsecutiveAssignments = FormatStyle::ACS_Consecutive; + Style.ContinuationIndentWidth = 4; + Style.IndentWidth = 4; + + // clang-format off + verifyFormat("void SomeFunc() {\n" + " newWatcher.maxAgeUsec = ToLegacyTimestamp(GetMaxAge(FromLegacyTimestamp(monitorFrequencyUsec),\n" + " seconds(std::uint64_t(maxSampleAge)), maxKeepSamples));\n" + " newWatcher.maxAge = ToLegacyTimestamp(GetMaxAge(FromLegacyTimestamp(monitorFrequencyUsec),\n" + " seconds(std::uint64_t(maxSampleAge)), maxKeepSamples));\n" + " newWatcher.max = ToLegacyTimestamp(GetMaxAge(FromLegacyTimestamp(monitorFrequencyUsec),\n" + " seconds(std::uint64_t(maxSampleAge)), maxKeepSamples));\n" + "}", + Style); + // clang-format on + + Style.BinPackArguments = false; + + // clang-format off + verifyFormat("void SomeFunc() {\n" + " newWatcher.maxAgeUsec = ToLegacyTimestamp(GetMaxAge(\n" + " FromLegacyTimestamp(monitorFrequencyUsec), seconds(std::uint64_t(maxSampleAge)), maxKeepSamples));\n" + " newWatcher.maxAge = ToLegacyTimestamp(GetMaxAge(\n" + " FromLegacyTimestamp(monitorFrequencyUsec), seconds(std::uint64_t(maxSampleAge)), maxKeepSamples));\n" + " newWatcher.max = ToLegacyTimestamp(GetMaxAge(\n" + " FromLegacyTimestamp(monitorFrequencyUsec), seconds(std::uint64_t(maxSampleAge)), maxKeepSamples));\n" + "}", + Style); + // clang-format on } TEST_F(FormatTest, AlignWithInitializerPeriods) {