diff options
Diffstat (limited to 'lib/Format/Format.cpp')
| -rw-r--r-- | lib/Format/Format.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp index 030e35e38d..6494c3d389 100644 --- a/lib/Format/Format.cpp +++ b/lib/Format/Format.cpp @@ -509,11 +509,8 @@ public: canBreakBetween(Line.Tokens[i - 1], Line.Tokens[i]); if (Line.Tokens[i].Tok.is(tok::colon)) { - if (Line.Tokens[0].Tok.is(tok::kw_case) || i == e - 1) { - Annotation.SpaceRequiredBefore = false; - } else { - Annotation.SpaceRequiredBefore = TokenAnnotation::TT_ConditionalExpr; - } + Annotation.SpaceRequiredBefore = + Line.Tokens[0].Tok.isNot(tok::kw_case) && i != e - 1; } else if (Annotations[i - 1].Type == TokenAnnotation::TT_UnaryOperator) { Annotation.SpaceRequiredBefore = false; } else if (Annotation.Type == TokenAnnotation::TT_UnaryOperator) { |