curdeius created this revision.
curdeius added reviewers: MyDeveloperDay, HazardyKnusperkeks.
curdeius requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
This fixes a bug reported on Discord #clang-format
<https://reviews.llvm.org/tag/clang-format/>. I'll update the summary as soon
as I have the bugzilla ticket number.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D100727
Files:
clang/lib/Format/UnwrappedLineFormatter.cpp
clang/unittests/Format/FormatTest.cpp
Index: clang/unittests/Format/FormatTest.cpp
===================================================================
--- clang/unittests/Format/FormatTest.cpp
+++ clang/unittests/Format/FormatTest.cpp
@@ -510,6 +510,60 @@
AllowsMergedIf.ColumnLimit = 13;
verifyFormat("if (a)\n return;", AllowsMergedIf);
+
+ FormatStyle AllowsMergedIfElse = getLLVMStyle();
+ AllowsMergedIfElse.AllowShortIfStatementsOnASingleLine =
+ FormatStyle::SIS_Always;
+ verifyFormat("if (a)\n"
+ " // comment\n"
+ " f();\n"
+ "else\n"
+ " // comment\n"
+ " f();",
+ AllowsMergedIfElse);
+ verifyFormat("{\n"
+ " if (a)\n"
+ " label:\n"
+ " f();\n"
+ " else\n"
+ " label:\n"
+ " f();\n"
+ "}",
+ AllowsMergedIfElse);
+ // Hum?
+ verifyFormat("if (a)\n"
+ " ;\n"
+ "else\n"
+ " ;",
+ AllowsMergedIfElse);
+ verifyFormat("if (a) {\n"
+ "} else {\n"
+ "}",
+ AllowsMergedIfElse);
+ verifyFormat("if (a) return;\n"
+ "else if (b) return;\n"
+ "else return;",
+ AllowsMergedIfElse);
+ verifyFormat("if (a) {\n"
+ "} else return;",
+ AllowsMergedIfElse);
+ verifyFormat("if (a) {\n"
+ "} else if (b) return;\n"
+ "else return;",
+ AllowsMergedIfElse);
+ verifyFormat("if (a) return;\n"
+ "else if (b) {\n"
+ "} else return;",
+ AllowsMergedIfElse);
+ verifyFormat("if (a)\n"
+ " if (b) return;\n"
+ " else return;",
+ AllowsMergedIfElse);
+ verifyFormat("if constexpr (a)\n"
+ " if constexpr (b) return;\n"
+ " else if constexpr (c) return;\n"
+ " else return;",
+ AllowsMergedIfElse);
}
TEST_F(FormatTest, FormatIfWithoutCompoundStatementButElseWith) {
Index: clang/lib/Format/UnwrappedLineFormatter.cpp
===================================================================
--- clang/lib/Format/UnwrappedLineFormatter.cpp
+++ clang/lib/Format/UnwrappedLineFormatter.cpp
@@ -421,7 +421,13 @@
}
return MergedLines;
}
- if (TheLine->First->is(tok::kw_if)) {
+ bool IsElseLine =
+ TheLine->First->is(tok::kw_else) ||
+ (TheLine->First->is(tok::r_brace) && TheLine->First->Next &&
+ TheLine->First->Next->is(tok::kw_else));
+ if (TheLine->First->is(tok::kw_if) ||
+ (IsElseLine && (Style.AllowShortIfStatementsOnASingleLine ==
+ FormatStyle::SIS_Always))) {
return Style.AllowShortIfStatementsOnASingleLine
? tryMergeSimpleControlStatement(I, E, Limit)
: 0;
@@ -471,7 +477,8 @@
return 0;
Limit = limitConsideringMacros(I + 1, E, Limit);
AnnotatedLine &Line = **I;
- if (!Line.First->is(tok::kw_do) && Line.Last->isNot(tok::r_paren))
+ if (!Line.First->is(tok::kw_do) && !Line.First->is(tok::kw_else) &&
+ !Line.Last->is(tok::kw_else) && Line.Last->isNot(tok::r_paren))
return 0;
// Only merge do while if do is the only statement on the line.
if (Line.First->is(tok::kw_do) && !Line.Last->is(tok::kw_do))
Index: clang/unittests/Format/FormatTest.cpp
===================================================================
--- clang/unittests/Format/FormatTest.cpp
+++ clang/unittests/Format/FormatTest.cpp
@@ -510,6 +510,60 @@
AllowsMergedIf.ColumnLimit = 13;
verifyFormat("if (a)\n return;", AllowsMergedIf);
+
+ FormatStyle AllowsMergedIfElse = getLLVMStyle();
+ AllowsMergedIfElse.AllowShortIfStatementsOnASingleLine =
+ FormatStyle::SIS_Always;
+ verifyFormat("if (a)\n"
+ " // comment\n"
+ " f();\n"
+ "else\n"
+ " // comment\n"
+ " f();",
+ AllowsMergedIfElse);
+ verifyFormat("{\n"
+ " if (a)\n"
+ " label:\n"
+ " f();\n"
+ " else\n"
+ " label:\n"
+ " f();\n"
+ "}",
+ AllowsMergedIfElse);
+ // Hum?
+ verifyFormat("if (a)\n"
+ " ;\n"
+ "else\n"
+ " ;",
+ AllowsMergedIfElse);
+ verifyFormat("if (a) {\n"
+ "} else {\n"
+ "}",
+ AllowsMergedIfElse);
+ verifyFormat("if (a) return;\n"
+ "else if (b) return;\n"
+ "else return;",
+ AllowsMergedIfElse);
+ verifyFormat("if (a) {\n"
+ "} else return;",
+ AllowsMergedIfElse);
+ verifyFormat("if (a) {\n"
+ "} else if (b) return;\n"
+ "else return;",
+ AllowsMergedIfElse);
+ verifyFormat("if (a) return;\n"
+ "else if (b) {\n"
+ "} else return;",
+ AllowsMergedIfElse);
+ verifyFormat("if (a)\n"
+ " if (b) return;\n"
+ " else return;",
+ AllowsMergedIfElse);
+ verifyFormat("if constexpr (a)\n"
+ " if constexpr (b) return;\n"
+ " else if constexpr (c) return;\n"
+ " else return;",
+ AllowsMergedIfElse);
}
TEST_F(FormatTest, FormatIfWithoutCompoundStatementButElseWith) {
Index: clang/lib/Format/UnwrappedLineFormatter.cpp
===================================================================
--- clang/lib/Format/UnwrappedLineFormatter.cpp
+++ clang/lib/Format/UnwrappedLineFormatter.cpp
@@ -421,7 +421,13 @@
}
return MergedLines;
}
- if (TheLine->First->is(tok::kw_if)) {
+ bool IsElseLine =
+ TheLine->First->is(tok::kw_else) ||
+ (TheLine->First->is(tok::r_brace) && TheLine->First->Next &&
+ TheLine->First->Next->is(tok::kw_else));
+ if (TheLine->First->is(tok::kw_if) ||
+ (IsElseLine && (Style.AllowShortIfStatementsOnASingleLine ==
+ FormatStyle::SIS_Always))) {
return Style.AllowShortIfStatementsOnASingleLine
? tryMergeSimpleControlStatement(I, E, Limit)
: 0;
@@ -471,7 +477,8 @@
return 0;
Limit = limitConsideringMacros(I + 1, E, Limit);
AnnotatedLine &Line = **I;
- if (!Line.First->is(tok::kw_do) && Line.Last->isNot(tok::r_paren))
+ if (!Line.First->is(tok::kw_do) && !Line.First->is(tok::kw_else) &&
+ !Line.Last->is(tok::kw_else) && Line.Last->isNot(tok::r_paren))
return 0;
// Only merge do while if do is the only statement on the line.
if (Line.First->is(tok::kw_do) && !Line.Last->is(tok::kw_do))
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
