diff options
Diffstat (limited to 'clang/lib/Format/DefinitionBlockSeparator.cpp')
| -rw-r--r-- | clang/lib/Format/DefinitionBlockSeparator.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/clang/lib/Format/DefinitionBlockSeparator.cpp b/clang/lib/Format/DefinitionBlockSeparator.cpp index 576c6597b27a..319236d3bd61 100644 --- a/clang/lib/Format/DefinitionBlockSeparator.cpp +++ b/clang/lib/Format/DefinitionBlockSeparator.cpp @@ -143,8 +143,10 @@ void DefinitionBlockSeparator::separateBlocks( if (LikelyDefinition(OperateLine)) return false; - if (OperateLine->First->is(tok::comment)) + if (const auto *Tok = OperateLine->First; + Tok->is(tok::comment) && !isClangFormatOn(Tok->TokenText)) { return true; + } // A single line identifier that is not in the last line. if (OperateLine->First->is(tok::identifier) && @@ -185,10 +187,10 @@ void DefinitionBlockSeparator::separateBlocks( InsertReplacement(OpeningLineIndex != 0); TargetLine = CurrentLine; TargetToken = TargetLine->First; - while (TargetToken && !TargetToken->is(tok::r_brace)) + while (TargetToken && TargetToken->isNot(tok::r_brace)) TargetToken = TargetToken->Next; if (!TargetToken) - while (I < Lines.size() && !Lines[I]->First->is(tok::r_brace)) + while (I < Lines.size() && Lines[I]->First->isNot(tok::r_brace)) ++I; } else if (CurrentLine->First->closesScope()) { if (OpeningLineIndex > Lines.size()) |