clang-format: Fix comment formatting bugs in nested blocks.
This fixes two issues:
1) The indent of a line comment was not adapted to the subsequent
statement as it would be outside of a nested block.
2) A missing DryRun flag caused actualy breaks to be inserted in
overly long comments while trying to come up with the best line
breaking decisions.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@190123 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Format/ContinuationIndenter.cpp b/lib/Format/ContinuationIndenter.cpp
index 9e84ea7..d48cb23 100644
--- a/lib/Format/ContinuationIndenter.cpp
+++ b/lib/Format/ContinuationIndenter.cpp
@@ -63,7 +63,8 @@
BinPackInconclusiveFunctions(BinPackInconclusiveFunctions) {}
LineState ContinuationIndenter::getInitialState(unsigned FirstIndent,
- const AnnotatedLine *Line) {
+ const AnnotatedLine *Line,
+ bool DryRun) {
LineState State;
State.FirstIndent = FirstIndent;
State.Column = FirstIndent;
@@ -80,8 +81,7 @@
State.IgnoreStackForComparison = false;
// The first token has already been indented and thus consumed.
- moveStateToNextToken(State, /*DryRun=*/false,
- /*Newline=*/false);
+ moveStateToNextToken(State, DryRun, /*Newline=*/false);
return State;
}
diff --git a/lib/Format/ContinuationIndenter.h b/lib/Format/ContinuationIndenter.h
index 5d3da4c..ef698a7 100644
--- a/lib/Format/ContinuationIndenter.h
+++ b/lib/Format/ContinuationIndenter.h
@@ -41,7 +41,8 @@
/// \brief Get the initial state, i.e. the state after placing \p Line's
/// first token at \p FirstIndent.
- LineState getInitialState(unsigned FirstIndent, const AnnotatedLine *Line);
+ LineState getInitialState(unsigned FirstIndent, const AnnotatedLine *Line,
+ bool DryRun);
// FIXME: canBreak and mustBreak aren't strictly indentation-related. Find a
// better home.
diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp
index 02adc5a..7d4048f 100644
--- a/lib/Format/Format.cpp
+++ b/lib/Format/Format.cpp
@@ -328,7 +328,8 @@
/// \brief Formats the line starting at \p State, simply keeping all of the
/// input's line breaking decisions.
void format(unsigned FirstIndent, const AnnotatedLine *Line) {
- LineState State = Indenter->getInitialState(FirstIndent, Line);
+ LineState State =
+ Indenter->getInitialState(FirstIndent, Line, /*DryRun=*/false);
while (State.NextToken != NULL) {
bool Newline =
Indenter->mustBreak(State) ||
@@ -353,7 +354,7 @@
///
/// If \p DryRun is \c false, directly applies the changes.
unsigned format(unsigned FirstIndent, bool DryRun = false) {
- LineState State = Indenter->getInitialState(FirstIndent, &Line);
+ LineState State = Indenter->getInitialState(FirstIndent, &Line, DryRun);
// If the ObjC method declaration does not fit on a line, we should format
// it with one arg per line.
@@ -757,25 +758,14 @@
Annotator.calculateFormattingInformation(*AnnotatedLines[i]);
}
- // Adapt level to the next line if this is a comment.
- // FIXME: Can/should this be done in the UnwrappedLineParser?
- const AnnotatedLine *NextNonCommentLine = NULL;
- for (unsigned i = AnnotatedLines.size() - 1; i > 0; --i) {
- if (NextNonCommentLine && AnnotatedLines[i]->First->is(tok::comment) &&
- !AnnotatedLines[i]->First->Next)
- AnnotatedLines[i]->Level = NextNonCommentLine->Level;
- else
- NextNonCommentLine = AnnotatedLines[i]->First->isNot(tok::r_brace)
- ? AnnotatedLines[i]
- : NULL;
- }
+ Annotator.setCommentLineLevels(AnnotatedLines);
std::vector<int> IndentForLevel;
bool PreviousLineWasTouched = false;
const FormatToken *PreviousLineLastToken = 0;
bool FormatPPDirective = false;
- for (std::vector<AnnotatedLine *>::iterator I = AnnotatedLines.begin(),
- E = AnnotatedLines.end();
+ for (SmallVectorImpl<AnnotatedLine *>::iterator I = AnnotatedLines.begin(),
+ E = AnnotatedLines.end();
I != E; ++I) {
const AnnotatedLine &TheLine = **I;
const FormatToken *FirstTok = TheLine.First;
@@ -827,7 +817,8 @@
ColumnLimit = getColumnLimit(TheLine.InPPDirective);
if (TheLine.Last->TotalLength + Indent <= ColumnLimit) {
- LineState State = Indenter.getInitialState(Indent, &TheLine);
+ LineState State =
+ Indenter.getInitialState(Indent, &TheLine, /*DryRun=*/false);
while (State.NextToken != NULL)
Indenter.addTokenToState(State, false, false);
} else if (Style.ColumnLimit == 0) {
@@ -954,8 +945,8 @@
/// This will change \c Line and \c AnnotatedLine to contain the merged line,
/// if possible; note that \c I will be incremented when lines are merged.
void tryFitMultipleLinesInOne(unsigned Indent,
- std::vector<AnnotatedLine *>::iterator &I,
- std::vector<AnnotatedLine *>::iterator E) {
+ SmallVectorImpl<AnnotatedLine *>::iterator &I,
+ SmallVectorImpl<AnnotatedLine *>::iterator E) {
// We can never merge stuff if there are trailing line comments.
AnnotatedLine *TheLine = *I;
if (TheLine->Last->Type == TT_LineComment)
@@ -988,8 +979,8 @@
}
}
- void tryMergeSimplePPDirective(std::vector<AnnotatedLine *>::iterator &I,
- std::vector<AnnotatedLine *>::iterator E,
+ void tryMergeSimplePPDirective(SmallVectorImpl<AnnotatedLine *>::iterator &I,
+ SmallVectorImpl<AnnotatedLine *>::iterator E,
unsigned Limit) {
if (Limit == 0)
return;
@@ -1004,9 +995,10 @@
join(Line, **(++I));
}
- void tryMergeSimpleControlStatement(std::vector<AnnotatedLine *>::iterator &I,
- std::vector<AnnotatedLine *>::iterator E,
- unsigned Limit) {
+ void
+ tryMergeSimpleControlStatement(SmallVectorImpl<AnnotatedLine *>::iterator &I,
+ SmallVectorImpl<AnnotatedLine *>::iterator E,
+ unsigned Limit) {
if (Limit == 0)
return;
if (Style.BreakBeforeBraces == FormatStyle::BS_Allman &&
@@ -1031,8 +1023,8 @@
join(Line, **(++I));
}
- void tryMergeSimpleBlock(std::vector<AnnotatedLine *>::iterator &I,
- std::vector<AnnotatedLine *>::iterator E,
+ void tryMergeSimpleBlock(SmallVectorImpl<AnnotatedLine *>::iterator &I,
+ SmallVectorImpl<AnnotatedLine *>::iterator E,
unsigned Limit) {
// No merging if the brace already is on the next line.
if (Style.BreakBeforeBraces != FormatStyle::BS_Attach)
@@ -1086,7 +1078,7 @@
}
}
- bool nextTwoLinesFitInto(std::vector<AnnotatedLine *>::iterator I,
+ bool nextTwoLinesFitInto(SmallVectorImpl<AnnotatedLine *>::iterator I,
unsigned Limit) {
return 1 + (*(I + 1))->Last->TotalLength + 1 +
(*(I + 2))->Last->TotalLength <=
@@ -1126,8 +1118,8 @@
return touchesRanges(LineRange);
}
- bool touchesPPDirective(std::vector<AnnotatedLine *>::iterator I,
- std::vector<AnnotatedLine *>::iterator E) {
+ bool touchesPPDirective(SmallVectorImpl<AnnotatedLine *>::iterator I,
+ SmallVectorImpl<AnnotatedLine *>::iterator E) {
for (; I != E; ++I) {
if ((*I)->First->HasUnescapedNewline)
return false;
@@ -1186,7 +1178,7 @@
SourceManager &SourceMgr;
WhitespaceManager Whitespaces;
std::vector<CharSourceRange> Ranges;
- std::vector<AnnotatedLine *> AnnotatedLines;
+ SmallVector<AnnotatedLine *, 16> AnnotatedLines;
encoding::Encoding Encoding;
bool BinPackInconclusiveFunctions;
diff --git a/lib/Format/TokenAnnotator.cpp b/lib/Format/TokenAnnotator.cpp
index 46baab4..2f3be55 100644
--- a/lib/Format/TokenAnnotator.cpp
+++ b/lib/Format/TokenAnnotator.cpp
@@ -974,9 +974,26 @@
} // end anonymous namespace
+void
+TokenAnnotator::setCommentLineLevels(SmallVectorImpl<AnnotatedLine *> &Lines) {
+ if (Lines.empty())
+ return;
+
+ const AnnotatedLine *NextNonCommentLine = NULL;
+ for (unsigned i = Lines.size() - 1; i > 0; --i) {
+ if (NextNonCommentLine && Lines[i]->First->is(tok::comment) &&
+ !Lines[i]->First->Next)
+ Lines[i]->Level = NextNonCommentLine->Level;
+ else
+ NextNonCommentLine =
+ Lines[i]->First->isNot(tok::r_brace) ? Lines[i] : NULL;
+ }
+}
+
void TokenAnnotator::annotate(AnnotatedLine &Line) {
- for (std::vector<AnnotatedLine *>::iterator I = Line.Children.begin(),
- E = Line.Children.end();
+ setCommentLineLevels(Line.Children);
+ for (SmallVectorImpl<AnnotatedLine *>::iterator I = Line.Children.begin(),
+ E = Line.Children.end();
I != E; ++I) {
annotate(**I);
}
@@ -1056,8 +1073,8 @@
DEBUG({ printDebugInfo(Line); });
- for (std::vector<AnnotatedLine *>::iterator I = Line.Children.begin(),
- E = Line.Children.end();
+ for (SmallVectorImpl<AnnotatedLine *>::iterator I = Line.Children.begin(),
+ E = Line.Children.end();
I != E; ++I) {
calculateFormattingInformation(**I);
}
diff --git a/lib/Format/TokenAnnotator.h b/lib/Format/TokenAnnotator.h
index 5546cdc..06f3352 100644
--- a/lib/Format/TokenAnnotator.h
+++ b/lib/Format/TokenAnnotator.h
@@ -71,7 +71,7 @@
FormatToken *First;
FormatToken *Last;
- std::vector<AnnotatedLine *> Children;
+ SmallVector<AnnotatedLine *, 0> Children;
LineType Type;
unsigned Level;
@@ -93,6 +93,11 @@
TokenAnnotator(const FormatStyle &Style, IdentifierInfo &Ident_in)
: Style(Style), Ident_in(Ident_in) {}
+ /// \brief Adapts the indent levels of comment lines to the indent of the
+ /// subsequent line.
+ // FIXME: Can/should this be done in the UnwrappedLineParser?
+ void setCommentLineLevels(SmallVectorImpl<AnnotatedLine *> &Lines);
+
void annotate(AnnotatedLine &Line);
void calculateFormattingInformation(AnnotatedLine &Line);