Fix the regression caused by r196378
llvm-svn: 196380
diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp
index 156ff64..26a320b 100644
--- a/clang/lib/Format/Format.cpp
+++ b/clang/lib/Format/Format.cpp
@@ -469,6 +469,9 @@
if (TheLine->Last->Type == TT_LineComment)
return 0;
+ if (Style.ColumnLimit > 0 && Indent > Style.ColumnLimit)
+ return 0;
+
unsigned Limit =
Style.ColumnLimit == 0 ? UINT_MAX : Style.ColumnLimit - Indent;
// If we already exceed the column limit, we set 'Limit' to 0. The different
@@ -477,9 +480,6 @@
? 0
: Limit - TheLine->Last->TotalLength;
- if (Indent > Limit)
- return 0;
-
if (I + 1 == E || I[1]->Type == LT_Invalid)
return 0;