summaryrefslogtreecommitdiffstats
path: root/clang/lib/Format
diff options
context:
space:
mode:
authorKrasimir Georgiev <krasimir@google.com>2019-04-12 10:11:34 +0000
committerKrasimir Georgiev <krasimir@google.com>2019-04-12 10:11:34 +0000
commit69150467b098322253627641f55ffeeafbcc32e4 (patch)
tree174db446c09a5b2fbd51bd08b9750463e6a65cad /clang/lib/Format
parent4f789e1b39324d00f0481528b8c958bf7755e835 (diff)
downloadbcm5719-llvm-69150467b098322253627641f55ffeeafbcc32e4.tar.gz
bcm5719-llvm-69150467b098322253627641f55ffeeafbcc32e4.zip
[clang-format] Use SpacesBeforeTrailingComments for "option" directive
Summary: AnnotatingParser::next() is needed to implicitly set TT_BlockComment versus TT_LineComment. On most other paths through AnnotatingParser::parseLine(), all tokens are consumed to achieve that. This change updates one place where this wasn't done. Contributed by @dchai! Reviewers: krasimir Reviewed By: krasimir Subscribers: cfe-commits Tags: #clang Differential Revision: https://reviews.llvm.org/D60541 llvm-svn: 358275
Diffstat (limited to 'clang/lib/Format')
-rw-r--r--clang/lib/Format/TokenAnnotator.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp
index 032be722b28..ddaacaab777 100644
--- a/clang/lib/Format/TokenAnnotator.cpp
+++ b/clang/lib/Format/TokenAnnotator.cpp
@@ -1124,8 +1124,11 @@ public:
if (Style.Language == FormatStyle::LK_Proto && Line.Level == 0 &&
CurrentToken->is(Keywords.kw_option)) {
next();
- if (CurrentToken && CurrentToken->is(tok::identifier))
+ if (CurrentToken && CurrentToken->is(tok::identifier)) {
+ while (CurrentToken)
+ next();
return LT_ImportStatement;
+ }
}
bool KeywordVirtualFound = false;
OpenPOWER on IntegriCloud