maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[clang-format] [PR52228] clang-format csharp inconsistant nested namespace indentation 

https://bugs.llvm.org/show_bug.cgi?id=52228

For multilevel namespaces in C# get their content indented when NamespaceIndentation: None is set, where as single level namespaces are formatted correctly.

Reviewed By: HazardyKnusperkeks, jbcoe

Differential Revision: https://reviews.llvm.org/D112887
This commit is contained in:
mydeveloperday 2021-11-13 14:13:51 +00:00
parent a310cbae02
commit 6e58d14e5b
2 changed files with 56 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/lib/Format/UnwrappedLineParser.cpp
View File

@ -2216,7 +2216,7 @@ void UnwrappedLineParser::parseNamespace() {
parseParens();
} else {
while (FormatTok->isOneOf(tok::identifier, tok::coloncolon, tok::kw_inline,
tok::l_square)) {
tok::l_square, tok::period)) {
if (FormatTok->is(tok::l_square))
parseSquare();
else

55
clang/unittests/Format/FormatTestCSharp.cpp
View File

@ -1314,5 +1314,60 @@ TEST_F(FormatTestCSharp, CSharpAfterClass) {
Style);
}
TEST_F(FormatTestCSharp, NamespaceIndentation) {
FormatStyle Style = getMicrosoftStyle(FormatStyle::LK_CSharp);
Style.NamespaceIndentation = FormatStyle::NI_None;
verifyFormat("namespace A\n"
"{\n"
"public interface Name1\n"
"{\n"
"}\n"
"}\n",
Style);
verifyFormat("namespace A.B\n"
"{\n"
"public interface Name1\n"
"{\n"
"}\n"
"}\n",
Style);
Style.NamespaceIndentation = FormatStyle::NI_Inner;
verifyFormat("namespace A\n"
"{\n"
"namespace B\n"
"{\n"
" public interface Name1\n"
" {\n"
" }\n"
"}\n"
"}\n",
Style);
Style.NamespaceIndentation = FormatStyle::NI_All;
verifyFormat("namespace A.B\n"
"{\n"
" public interface Name1\n"
" {\n"
" }\n"
"}\n",
Style);
verifyFormat("namespace A\n"
"{\n"
" namespace B\n"
" {\n"
" public interface Name1\n"
" {\n"
" }\n"
" }\n"
"}\n",
Style);
}
} // namespace format
} // end namespace clang