summaryrefslogtreecommitdiffstats
path: root/clang/lib/Format/TokenAnnotator.cpp
diff options
context:
space:
mode:
authorDaniel Jasper <djasper@google.com>2015-05-06 14:23:38 +0000
committerDaniel Jasper <djasper@google.com>2015-05-06 14:23:38 +0000
commite92bf6f14178e24c2be4812ddb772b01995f9c79 (patch)
tree5dcf91f114d024a8a180764cb39aea0e2f583093 /clang/lib/Format/TokenAnnotator.cpp
parente452998b4bbda07a4ba22b034a109daa90d7519e (diff)
downloadbcm5719-llvm-e92bf6f14178e24c2be4812ddb772b01995f9c79.tar.gz
bcm5719-llvm-e92bf6f14178e24c2be4812ddb772b01995f9c79.zip
clang-format: Consider operator precedence as penalty when breaking
before operators. This fixes llvm.org/23382. llvm-svn: 236602
Diffstat (limited to 'clang/lib/Format/TokenAnnotator.cpp')
-rw-r--r--clang/lib/Format/TokenAnnotator.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp
index fa12d4dd7ab..be29239c062 100644
--- a/clang/lib/Format/TokenAnnotator.cpp
+++ b/clang/lib/Format/TokenAnnotator.cpp
@@ -1686,6 +1686,9 @@ unsigned TokenAnnotator::splitPenalty(const AnnotatedLine &Line,
prec::Level Level = Left.getPrecedence();
if (Level != prec::Unknown)
return Level;
+ Level = Right.getPrecedence();
+ if (Level != prec::Unknown)
+ return Level;
return 3;
}
OpenPOWER on IntegriCloud