summaryrefslogtreecommitdiffstats
path: root/clang/lib
diff options
context:
space:
mode:
authorDaniel Jasper <djasper@google.com>2013-05-30 17:27:48 +0000
committerDaniel Jasper <djasper@google.com>2013-05-30 17:27:48 +0000
commitce257f296b78ffb3585a168db4f077004cf24c66 (patch)
tree879c0d8372e2af77f0659a2149ca4c6bfe6ab805 /clang/lib
parent219ef811ca74b84771d5a6e33ffa58eb5a9c6e4c (diff)
downloadbcm5719-llvm-ce257f296b78ffb3585a168db4f077004cf24c66.tar.gz
bcm5719-llvm-ce257f296b78ffb3585a168db4f077004cf24c66.zip
More fixes for clang-format's multiline comment breaking.
llvm-svn: 182940
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/Format/BreakableToken.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/clang/lib/Format/BreakableToken.cpp b/clang/lib/Format/BreakableToken.cpp
index 8672ece9b79..7d7fe3f032e 100644
--- a/clang/lib/Format/BreakableToken.cpp
+++ b/clang/lib/Format/BreakableToken.cpp
@@ -241,11 +241,9 @@ BreakableBlockComment::BreakableBlockComment(const FormatStyle &Style,
Lines[i] = Lines[i].substr(Offset);
LeadingWhitespace[i] += Offset;
}
- // Exclude empty lines from the calculation of the left-most column.
- if (Lines[i].empty())
- continue;
IndentAtLineBreak = std::min<int>(IndentAtLineBreak, StartOfLineColumn[i]);
}
+ IndentAtLineBreak = std::max<unsigned>(IndentAtLineBreak, Decoration.size());
DEBUG({
for (size_t i = 0; i < Lines.size(); ++i) {
llvm::dbgs() << i << " |" << Lines[i] << "| " << LeadingWhitespace[i]
OpenPOWER on IntegriCloud