summaryrefslogtreecommitdiffstats
path: root/clang/lib/Format
diff options
context:
space:
mode:
authorDaniel Jasper <djasper@google.com>2015-01-14 10:02:49 +0000
committerDaniel Jasper <djasper@google.com>2015-01-14 10:02:49 +0000
commit16dbe0bc4427e7b92b34d156603e60a89fd5f6ff (patch)
tree95e83bb4b4aa731578d23ab31f7674f1f859192e /clang/lib/Format
parent404658aeded17d753efdb508f850a8af3c7f5f5a (diff)
downloadbcm5719-llvm-16dbe0bc4427e7b92b34d156603e60a89fd5f6ff.tar.gz
bcm5719-llvm-16dbe0bc4427e7b92b34d156603e60a89fd5f6ff.zip
clang-format: [Java] Understand "import static".
llvm-svn: 225965
Diffstat (limited to 'clang/lib/Format')
-rw-r--r--clang/lib/Format/TokenAnnotator.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp
index b2f9bd2cc51..34d8835c763 100644
--- a/clang/lib/Format/TokenAnnotator.cpp
+++ b/clang/lib/Format/TokenAnnotator.cpp
@@ -621,7 +621,8 @@ public:
CurrentToken->is(Keywords.kw_package)) ||
(Info && Info->getPPKeywordID() == tok::pp_import &&
CurrentToken->Next &&
- CurrentToken->Next->isOneOf(tok::string_literal, tok::identifier))) {
+ CurrentToken->Next->isOneOf(tok::string_literal, tok::identifier,
+ tok::kw_static))) {
next();
parseIncludeDirective();
return LT_ImportStatement;
OpenPOWER on IntegriCloud