summaryrefslogtreecommitdiffstats
path: root/lib
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
commit8851201fa92d2ef972f1ba6d1e7ad423ba962225 (patch)
treea42a26195be475316a509df62a416f299c4af122 /lib
parentf836d0163117cf15d8dd03383b92b04dcbb1dc21 (diff)
clang-format: [Java] Understand "import static".
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@225965 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r--lib/Format/TokenAnnotator.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Format/TokenAnnotator.cpp b/lib/Format/TokenAnnotator.cpp
index b2f9bd2cc5..34d8835c76 100644
--- a/lib/Format/TokenAnnotator.cpp
+++ b/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;