[clang-format] Align different categories together #172242
Merged
+9
−0
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
How the program figured out which lines to move along the aligned lines in 75c85ba. Aligning the lines caused the information to be out of date for aligning different categories later on. It caused a regression. Fixes llvm#171021. new, with the options `AlignConsecutiveAssignments` and `AlignConsecutiveDeclarations` enabled ```C++ const char *const MatHtoolCompressorTypes[] = {"sympartialACA", "fullACA", "SVD"}; const char HtoolCitation[] = "@Article{marchand2020two,\n" " " " " " " "}\n"; ``` old ```C++ const char *const MatHtoolCompressorTypes[] = {"sympartialACA", "fullACA"}; const char HtoolCitation[] = "@Article{marchand2020two,\n" " " " " " " "}\n"; ```
Member
|
@llvm/pr-subscribers-clang-format Author: None (sstwcw) ChangesHow the program figured out which lines to move along the aligned lines in 75c85ba. Aligning the lines caused the information to be out of date for aligning different categories later on. It caused a regression. Fixes #171021. new, with the options const char *const MatHtoolCompressorTypes[] = {"sympartialACA", "fullACA",
"SVD"};
const char HtoolCitation[] = "@<!-- -->article{marchand2020two,\n"
" "
" "
" "
"}\n";old const char *const MatHtoolCompressorTypes[] = {"sympartialACA", "fullACA"};
const char HtoolCitation[] = "@<!-- -->article{marchand2020two,\n"
" "
" "
" "
"}\n";Full diff: https://github.com/llvm/llvm-project/pull/172242.diff 2 Files Affected:
diff --git a/clang/lib/Format/WhitespaceManager.cpp b/clang/lib/Format/WhitespaceManager.cpp
index 805bb78f5c90e..6bfcebe73a165 100644
--- a/clang/lib/Format/WhitespaceManager.cpp
+++ b/clang/lib/Format/WhitespaceManager.cpp
@@ -372,6 +372,7 @@ AlignTokenSequence(const FormatStyle &Style, unsigned Start, unsigned End,
(ScopeStack.size() == 1u && CurrentChange.NewlinesBefore > 0 &&
InsideNestedScope)) {
LineShifted = true;
+ CurrentChange.IndentedFromColumn += Shift;
CurrentChange.Spaces += Shift;
}
diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp
index 3ff784035dd44..bf69d0a56ebfc 100644
--- a/clang/unittests/Format/FormatTest.cpp
+++ b/clang/unittests/Format/FormatTest.cpp
@@ -20879,6 +20879,14 @@ TEST_F(FormatTest, AlignWithLineBreaks) {
" };",
Style);
+ verifyFormat("const char *const MatHtool[] = {};\n"
+ "const char Htool[] = \"@article{m,\\n\"\n"
+ " \" \"\n"
+ " \" \"\n"
+ " \" \"\n"
+ " \"}\\n\";",
+ Style);
+
Style.ColumnLimit = 15;
verifyFormat("int i1 = 1;\n"
"k = bar(\n"
|
HazardyKnusperkeks
approved these changes
Dec 15, 2025
Collaborator
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/157/builds/43032 Here is the relevant piece of the build log for the reference |
Collaborator
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/66/builds/23727 Here is the relevant piece of the build log for the reference |
Collaborator
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/110/builds/6820 Here is the relevant piece of the build log for the reference |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
How the program figured out which lines to move along the aligned lines in 75c85ba. Aligning the lines caused the information to be out of date for aligning different categories later on. It caused a regression.
Fixes #171021.
new, with the options
AlignConsecutiveAssignmentsandAlignConsecutiveDeclarationsenabledold