summaryrefslogtreecommitdiffstats
path: root/clang/lib/Format
diff options
context:
space:
mode:
authorDaniel Jasper <djasper@google.com>2014-05-05 08:08:07 +0000
committerDaniel Jasper <djasper@google.com>2014-05-05 08:08:07 +0000
commit9509f18836479f70467337f64bffabe0dab6179e (patch)
treeabfb479b41a901d1d3d1f77717d06cfd455a11ff /clang/lib/Format
parent3089608172d0c74225e01928c3c4fa4dd97fd750 (diff)
downloadbcm5719-llvm-9509f18836479f70467337f64bffabe0dab6179e.tar.gz
bcm5719-llvm-9509f18836479f70467337f64bffabe0dab6179e.zip
clang-format: Fix import statements with ColumnLimit: 0
These used to interact badly with AlwaysBreakBeforeMultilineStrings. llvm-svn: 207955
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 e3088a0f945..f18984bb15b 100644
--- a/clang/lib/Format/ContinuationIndenter.cpp
+++ b/clang/lib/Format/ContinuationIndenter.cpp
@@ -1012,7 +1012,7 @@ unsigned ContinuationIndenter::getColumnLimit(const LineState &State) const {
bool ContinuationIndenter::nextIsMultilineString(const LineState &State) {
const FormatToken &Current = *State.NextToken;
- if (!Current.isStringLiteral())
+ if (!Current.isStringLiteral() || Current.Type == TT_ImplicitStringLiteral)
return false;
// We never consider raw string literals "multiline" for the purpose of
// AlwaysBreakBeforeMultilineStrings implementation as they are special-cased
OpenPOWER on IntegriCloud