From e92bf6f14178e24c2be4812ddb772b01995f9c79 Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Wed, 6 May 2015 14:23:38 +0000 Subject: clang-format: Consider operator precedence as penalty when breaking before operators. This fixes llvm.org/23382. llvm-svn: 236602 --- clang/lib/Format/TokenAnnotator.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'clang/lib/Format/TokenAnnotator.cpp') 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 @@ -1684,6 +1684,9 @@ unsigned TokenAnnotator::splitPenalty(const AnnotatedLine &Line, if (Left.is(TT_ConditionalExpr)) return prec::Conditional; prec::Level Level = Left.getPrecedence(); + if (Level != prec::Unknown) + return Level; + Level = Right.getPrecedence(); if (Level != prec::Unknown) return Level; -- cgit v1.2.3