summaryrefslogtreecommitdiffstats
path: root/clang/lib/Format
diff options
context:
space:
mode:
authorDaniel Jasper <djasper@google.com>2016-01-14 13:36:46 +0000
committerDaniel Jasper <djasper@google.com>2016-01-14 13:36:46 +0000
commita3cd2164830a7f1d3d7993d53e52dc88be97d781 (patch)
tree616f331279742417371dc4c52ab0806942ec0905 /clang/lib/Format
parentb67d4690a897cae50cfe28a7b0401ffb7e729c07 (diff)
downloadbcm5719-llvm-a3cd2164830a7f1d3d7993d53e52dc88be97d781.tar.gz
bcm5719-llvm-a3cd2164830a7f1d3d7993d53e52dc88be97d781.zip
clang-format: Fix incorrectly enforced linebreak with ColumnLimit 0.
Before: aaaa[bbbb] .cccc(); After: aaaa[bbbb].cccc(); llvm-svn: 257763
Diffstat (limited to 'clang/lib/Format')
-rw-r--r--clang/lib/Format/ContinuationIndenter.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Format/ContinuationIndenter.cpp b/clang/lib/Format/ContinuationIndenter.cpp
index 11183355f73..b820f53db52 100644
--- a/clang/lib/Format/ContinuationIndenter.cpp
+++ b/clang/lib/Format/ContinuationIndenter.cpp
@@ -182,7 +182,7 @@ bool ContinuationIndenter::mustBreak(const LineState &State) {
return true;
unsigned NewLineColumn = getNewLineColumn(State);
- if (Current.isMemberAccess() &&
+ if (Current.isMemberAccess() && Style.ColumnLimit != 0 &&
State.Column + getLengthToNextOperator(Current) > Style.ColumnLimit &&
(State.Column > NewLineColumn ||
Current.NestingLevel < State.StartOfLineLevel))
OpenPOWER on IntegriCloud