summaryrefslogtreecommitdiffstats
path: root/clang/lib/Format/TokenAnnotator.cpp
diff options
context:
space:
mode:
authorDaniel Jasper <djasper@google.com>2014-05-07 09:23:05 +0000
committerDaniel Jasper <djasper@google.com>2014-05-07 09:23:05 +0000
commit8acf822b6fdebddc08d9f1b3614e83491a43b32c (patch)
tree908ea523c7f7b25bbc5ecf010a3fdf33f9cb0b4c /clang/lib/Format/TokenAnnotator.cpp
parent5d174547a9788ecb15ba33abbb4ef2e1abee0ba3 (diff)
downloadbcm5719-llvm-8acf822b6fdebddc08d9f1b3614e83491a43b32c.tar.gz
bcm5719-llvm-8acf822b6fdebddc08d9f1b3614e83491a43b32c.zip
clang-format: Fix corner cases for comments in if conditions.
Before: if ( // a x + 3) { .. After: if ( // a x + 3) { .. llvm-svn: 208175
Diffstat (limited to 'clang/lib/Format/TokenAnnotator.cpp')
-rw-r--r--clang/lib/Format/TokenAnnotator.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp
index a41992679ad..21cec905a8e 100644
--- a/clang/lib/Format/TokenAnnotator.cpp
+++ b/clang/lib/Format/TokenAnnotator.cpp
@@ -1667,7 +1667,7 @@ bool TokenAnnotator::canBreakBefore(const AnnotatedLine &Line,
return false;
if (Left.is(tok::l_paren) && Left.Previous &&
(Left.Previous->Type == TT_BinaryOperator ||
- Left.Previous->Type == TT_CastRParen))
+ Left.Previous->Type == TT_CastRParen || Left.Previous->is(tok::kw_if)))
return false;
if (Right.Type == TT_ImplicitStringLiteral)
return false;
OpenPOWER on IntegriCloud