Skip to content

[clang-format] Stop aligning the to continuation lines #76378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 15, 2024
Merged

[clang-format] Stop aligning the to continuation lines #76378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a8939b
[clang-format] Stop aligning the to continuation lines
sstwcw Dec 26, 2023
1fc9d9a
Update comment
sstwcw Jan 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion clang/lib/Format/UnwrappedLineFormatter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ class LevelIndentTracker {
/// level to the same indent.
/// Note that \c nextLine must have been called before this method.
void adjustToUnmodifiedLine(const AnnotatedLine &Line) {
if (Line.InPPDirective)
if (Line.InPPDirective || Line.IsContinuation)
return;
assert(Line.Level < IndentForLevel.size());
if (Line.First->is(tok::comment) && IndentForLevel[Line.Level] != -1)
Expand Down
12 changes: 12 additions & 0 deletions clang/unittests/Format/FormatTestCSharp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1304,6 +1304,18 @@ TEST_F(FormatTestCSharp, CSharpGenericTypeConstraints) {
"}",
Style);

// When the "where" line is not to be formatted, following lines should not
// take on its indentation.
verifyFormat("class ItemFactory<T>\n"
" where T : new() {\n"
" int f() {}\n"
"}",
"class ItemFactory<T>\n"
" where T : new() {\n"
" int f() {}\n"
"}",
Style, {tooling::Range(43, 13)});

verifyFormat("class Dictionary<TKey, TVal>\n"
" where TKey : IComparable<TKey>\n"
" where TVal : IMyInterface {\n"
Expand Down
11 changes: 11 additions & 0 deletions clang/unittests/Format/FormatTestVerilog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,6 +613,17 @@ TEST_F(FormatTestVerilog, Headers) {
" (input var x aaaaaaaaaaaaaaa``x, \\\n"
" b);",
Style);
// When the ports line is not to be formatted, following lines should not take
// on its indentation.
verifyFormat("module x\n"
" (output x);\n"
" assign x = 0;\n"
"endmodule",
"module x\n"
" (output x);\n"
" assign x = 0;\n"
"endmodule",
getDefaultStyle(), {tooling::Range(25, 18)});
}

TEST_F(FormatTestVerilog, Hierarchy) {
Expand Down