replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix comment indentation before labels. 

Before:
switch (x) {
  // if 1, do f()
case 1:
  f();
}

After:
switch (x) {
// if 1, do f()
case 1:
  f();
}

llvm-svn: 176953
This commit is contained in:
Daniel Jasper 2013-03-13 15:53:12 +00:00
parent 8f6ae19129
commit 0f8ed9e4e1
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clang/lib/Format/Format.cpp
View File

@ -1135,6 +1135,13 @@ public:
deriveLocalStyle();
for (unsigned i = 0, e = AnnotatedLines.size(); i != e; ++i) {
Annotator.calculateFormattingInformation(AnnotatedLines[i]);
// Adapt level to the next line if this is a comment.
// FIXME: Can/should this be done in the UnwrappedLineParser?
if (i + 1 != e && AnnotatedLines[i].First.is(tok::comment) &&
AnnotatedLines[i].First.Children.empty() &&
AnnotatedLines[i + 1].First.isNot(tok::r_brace))
AnnotatedLines[i].Level = AnnotatedLines[i + 1].Level;
}
std::vector<int> IndentForLevel;
bool PreviousLineWasTouched = false;

5
clang/unittests/Format/FormatTest.cpp
View File

@ -427,6 +427,11 @@ TEST_F(FormatTest, FormatsSwitchStatement) {
"default: {\n"
" // Do nothing.\n"
"}");
verifyFormat("switch (x) {\n"
"// if 1, do f()\n"
"case 1:\n"
" f();\n"
"}");
verifyGoogleFormat("switch (x) {\n"
" case 1:\n"