Author: Björn Schäpers Date: 2023-10-04T22:20:33+02:00 New Revision: b6f29191adb26ee870e624c414683cb3e6e03a87
URL: https://github.com/llvm/llvm-project/commit/b6f29191adb26ee870e624c414683cb3e6e03a87 DIFF: https://github.com/llvm/llvm-project/commit/b6f29191adb26ee870e624c414683cb3e6e03a87.diff LOG: [clang-format][NFC] AlignTokenSequence: Skip loop iteration When Shift is 0 there does nothing happen in the remainder of the loop, express that directly. Added: Modified: clang/lib/Format/WhitespaceManager.cpp Removed: ################################################################################ diff --git a/clang/lib/Format/WhitespaceManager.cpp b/clang/lib/Format/WhitespaceManager.cpp index 4718c028cb5e44c..dc81060671c1712 100644 --- a/clang/lib/Format/WhitespaceManager.cpp +++ b/clang/lib/Format/WhitespaceManager.cpp @@ -354,6 +354,9 @@ AlignTokenSequence(const FormatStyle &Style, unsigned Start, unsigned End, } } + if (Shift == 0) + continue; + // This is for function parameters that are split across multiple lines, // as mentioned in the ScopeStack comment. if (InsideNestedScope && CurrentChange.NewlinesBefore > 0) { @@ -447,7 +450,7 @@ AlignTokenSequence(const FormatStyle &Style, unsigned Start, unsigned End, CurrentChange.Spaces += Shift; // We should not remove required spaces unless we break the line before. - assert(Shift >= 0 || Changes[i].NewlinesBefore > 0 || + assert(Shift > 0 || Changes[i].NewlinesBefore > 0 || CurrentChange.Spaces >= static_cast<int>(Changes[i].Tok->SpacesRequiredBefore) || CurrentChange.Tok->is(tok::eof)); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
