Do not ever allow using the full line in preprocessor directives.

We would format:
  #define A \
    int f(a); int i;
as
  #define A \
    int f(a);\
    int i

The fix will break up macro definitions that could fit a line, but hit
the last column; fixing that is more involved, though, as it requires
looking at the following line.

llvm-svn: 171715

1 files changed, 1 insertions, 1 deletions

diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp
index 35c1e403c6d..7b3c575d0b1 100644
--- a/clang/lib/Format/Format.cpp
+++ b/clang/lib/Format/Format.cpp
@@ -137,7 +137,7 @@ public:
       // FIXME: We need to check whether we're in a preprocessor directive, even
       // if all tokens fit - the next line might be a preprocessor directive,
       // too, in which case we need to account for the possible escaped newline.
-      if (Columns > Style.ColumnLimit ||
+      if (Columns > Style.ColumnLimit - (Line.InPPDirective ? 1 : 0) ||
           (Annotations[i].MustBreakBefore &&
            Annotations[i].Type != TokenAnnotation::TT_CtorInitializerColon)) {
         FitsOnALine = false;