aboutsummaryrefslogtreecommitdiff
path: root/lib/Format/TokenAnnotator.cpp
diff options
context:
space:
mode:
authorDaniel Jasper <djasper@google.com>2013-02-05 09:34:14 +0000
committerDaniel Jasper <djasper@google.com>2013-02-05 09:34:14 +0000
commit5b7e7b0ec77f49c1b24deffc9b7032ca16ca9f0d (patch)
tree49c95610ac2906102d42d9c68551dd62c32fb9b3 /lib/Format/TokenAnnotator.cpp
parent8fcbb8dfbc28b6279d22144e10ade401a6c03e9e (diff)
Fix formatting regression introduced by r174307.
In preprocessor definitions, we would not parse all the tokens and thus not annotate them anymore. This led to a wrong formatting of comments in google style: #endif // HEADER_GUARD -- requires two spaces git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@174361 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Format/TokenAnnotator.cpp')
-rw-r--r--lib/Format/TokenAnnotator.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/Format/TokenAnnotator.cpp b/lib/Format/TokenAnnotator.cpp
index 34bccb978e..f34bc89cfb 100644
--- a/lib/Format/TokenAnnotator.cpp
+++ b/lib/Format/TokenAnnotator.cpp
@@ -423,6 +423,8 @@ public:
default:
break;
}
+ while (CurrentToken != NULL)
+ next();
}
LineType parseLine() {