MyDeveloperDay created this revision.
MyDeveloperDay added reviewers: krasimir, curdeius, JakeMerdichAMD, jbcoe.
MyDeveloperDay added projects: clang, clang-format.
MyDeveloperDay requested review of this revision.
https://bugs.llvm.org/show_bug.cgi?id=48569
This is a tentative fix which addresses a PR raise regarding Case indentation
when working with Whitesmiths Indentation
I could not find online any reference sources as to what the case indentation
for Whitesmith's should be (or be allowed to be)
But according to the documentation, we don't obey the rules for Whitesmith's
In particular, the documentation states that this option is to "indent case
labels one level from the switch statement. When false, use the same
indentation level as for the switch statement."
The behaviour we add here is actually as the TODO in the tests used to state in
D67627: Clang-format: Add Whitesmiths indentation style
<https://reviews.llvm.org/D67627>, but when D82016: [clang-format] [PR462254]
fix indentation of default and break correctly in whitesmiths style
<https://reviews.llvm.org/D82016> was added and I brought these tests out from
being TODO I realized I changed the indentation.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D93806
Files:
clang/lib/Format/UnwrappedLineParser.cpp
clang/unittests/Format/FormatTest.cpp
Index: clang/unittests/Format/FormatTest.cpp
===================================================================
--- clang/unittests/Format/FormatTest.cpp
+++ clang/unittests/Format/FormatTest.cpp
@@ -13538,7 +13538,7 @@
" {\n"
" switch (a)\n"
" {\n"
- " case 2:\n"
+ " case 2:\n"
" {\n"
" }\n"
" break;\n"
@@ -13550,18 +13550,18 @@
" {\n"
" switch (a)\n"
" {\n"
- " case 0:\n"
+ " case 0:\n"
" break;\n"
- " case 1:\n"
+ " case 1:\n"
" {\n"
" foo();\n"
" break;\n"
" }\n"
- " case 2:\n"
+ " case 2:\n"
" {\n"
" }\n"
" break;\n"
- " default:\n"
+ " default:\n"
" break;\n"
" }\n"
" }\n",
@@ -13571,12 +13571,12 @@
" {\n"
" switch (a)\n"
" {\n"
- " case 0:\n"
+ " case 0:\n"
" {\n"
" foo(x);\n"
" }\n"
" break;\n"
- " default:\n"
+ " default:\n"
" {\n"
" foo(1);\n"
" }\n"
Index: clang/lib/Format/UnwrappedLineParser.cpp
===================================================================
--- clang/lib/Format/UnwrappedLineParser.cpp
+++ clang/lib/Format/UnwrappedLineParser.cpp
@@ -2244,18 +2244,26 @@
--Line->Level;
if (LeftAlignLabel)
Line->Level = 0;
+
+ bool RemoveWhiteSmithCaseIndent =
+ (!Style.IndentCaseBlocks &&
+ Style.BreakBeforeBraces == FormatStyle::BS_Whitesmiths);
+
+ if (RemoveWhiteSmithCaseIndent)
+ --Line->Level;
+
if (!Style.IndentCaseBlocks && CommentsBeforeNextToken.empty() &&
FormatTok->Tok.is(tok::l_brace)) {
- CompoundStatementIndenter Indenter(this, Line->Level,
- Style.BraceWrapping.AfterCaseLabel,
- Style.BraceWrapping.IndentBraces);
+
+ CompoundStatementIndenter Indenter(
+ this, Line->Level, Style.BraceWrapping.AfterCaseLabel,
+ Style.BraceWrapping.IndentBraces || RemoveWhiteSmithCaseIndent);
parseBlock(/*MustBeDeclaration=*/false);
if (FormatTok->Tok.is(tok::kw_break)) {
if (Style.BraceWrapping.AfterControlStatement ==
FormatStyle::BWACS_Always) {
addUnwrappedLine();
- if (!Style.IndentCaseBlocks &&
- Style.BreakBeforeBraces == FormatStyle::BS_Whitesmiths) {
+ if (RemoveWhiteSmithCaseIndent) {
Line->Level++;
}
}
@@ -2276,6 +2284,7 @@
void UnwrappedLineParser::parseCaseLabel() {
assert(FormatTok->Tok.is(tok::kw_case) && "'case' expected");
+
// FIXME: fix handling of complex expressions here.
do {
nextToken();
Index: clang/unittests/Format/FormatTest.cpp
===================================================================
--- clang/unittests/Format/FormatTest.cpp
+++ clang/unittests/Format/FormatTest.cpp
@@ -13538,7 +13538,7 @@
" {\n"
" switch (a)\n"
" {\n"
- " case 2:\n"
+ " case 2:\n"
" {\n"
" }\n"
" break;\n"
@@ -13550,18 +13550,18 @@
" {\n"
" switch (a)\n"
" {\n"
- " case 0:\n"
+ " case 0:\n"
" break;\n"
- " case 1:\n"
+ " case 1:\n"
" {\n"
" foo();\n"
" break;\n"
" }\n"
- " case 2:\n"
+ " case 2:\n"
" {\n"
" }\n"
" break;\n"
- " default:\n"
+ " default:\n"
" break;\n"
" }\n"
" }\n",
@@ -13571,12 +13571,12 @@
" {\n"
" switch (a)\n"
" {\n"
- " case 0:\n"
+ " case 0:\n"
" {\n"
" foo(x);\n"
" }\n"
" break;\n"
- " default:\n"
+ " default:\n"
" {\n"
" foo(1);\n"
" }\n"
Index: clang/lib/Format/UnwrappedLineParser.cpp
===================================================================
--- clang/lib/Format/UnwrappedLineParser.cpp
+++ clang/lib/Format/UnwrappedLineParser.cpp
@@ -2244,18 +2244,26 @@
--Line->Level;
if (LeftAlignLabel)
Line->Level = 0;
+
+ bool RemoveWhiteSmithCaseIndent =
+ (!Style.IndentCaseBlocks &&
+ Style.BreakBeforeBraces == FormatStyle::BS_Whitesmiths);
+
+ if (RemoveWhiteSmithCaseIndent)
+ --Line->Level;
+
if (!Style.IndentCaseBlocks && CommentsBeforeNextToken.empty() &&
FormatTok->Tok.is(tok::l_brace)) {
- CompoundStatementIndenter Indenter(this, Line->Level,
- Style.BraceWrapping.AfterCaseLabel,
- Style.BraceWrapping.IndentBraces);
+
+ CompoundStatementIndenter Indenter(
+ this, Line->Level, Style.BraceWrapping.AfterCaseLabel,
+ Style.BraceWrapping.IndentBraces || RemoveWhiteSmithCaseIndent);
parseBlock(/*MustBeDeclaration=*/false);
if (FormatTok->Tok.is(tok::kw_break)) {
if (Style.BraceWrapping.AfterControlStatement ==
FormatStyle::BWACS_Always) {
addUnwrappedLine();
- if (!Style.IndentCaseBlocks &&
- Style.BreakBeforeBraces == FormatStyle::BS_Whitesmiths) {
+ if (RemoveWhiteSmithCaseIndent) {
Line->Level++;
}
}
@@ -2276,6 +2284,7 @@
void UnwrappedLineParser::parseCaseLabel() {
assert(FormatTok->Tok.is(tok::kw_case) && "'case' expected");
+
// FIXME: fix handling of complex expressions here.
do {
nextToken();
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
