summaryrefslogtreecommitdiffstats
path: root/clang/lib/Format/ContinuationIndenter.cpp
diff options
context:
space:
mode:
authorDaniel Jasper <djasper@google.com>2016-02-05 14:17:16 +0000
committerDaniel Jasper <djasper@google.com>2016-02-05 14:17:16 +0000
commit0c9772e8742645f65b6e657e9ec77d1c3b27798f (patch)
treed4846f402e8d53bdf4002a74b35ec5d2f9740195 /clang/lib/Format/ContinuationIndenter.cpp
parent85c824f131e92aac16fc0e29ec60cc3ccfe6e286 (diff)
downloadbcm5719-llvm-0c9772e8742645f65b6e657e9ec77d1c3b27798f.tar.gz
bcm5719-llvm-0c9772e8742645f65b6e657e9ec77d1c3b27798f.zip
clang-format: Fix corner case in template detection.
Before: f(a.operator() < A > ()); After: f(a.operator()<A>()); llvm-svn: 259884
Diffstat (limited to 'clang/lib/Format/ContinuationIndenter.cpp')
-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 b65c0e0664c..1e2946f0b01 100644
--- a/clang/lib/Format/ContinuationIndenter.cpp
+++ b/clang/lib/Format/ContinuationIndenter.cpp
@@ -250,7 +250,7 @@ bool ContinuationIndenter::mustBreak(const LineState &State) {
// If the return type spans multiple lines, wrap before the function name.
if ((Current.is(TT_FunctionDeclarationName) ||
(Current.is(tok::kw_operator) && !Previous.is(tok::coloncolon))) &&
- State.Stack.back().BreakBeforeParameter)
+ !Previous.is(tok::kw_template) && State.Stack.back().BreakBeforeParameter)
return true;
if (startsSegmentOfBuilderTypeCall(Current) &&
OpenPOWER on IntegriCloud