diff options
| author | Daniel Jasper <djasper@google.com> | 2014-12-04 08:57:27 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2014-12-04 08:57:27 +0000 |
| commit | 86ee0b6daa7f3ef724a10bda93bf58840032d12a (patch) | |
| tree | fdd740c6be9ff86b9c6c138602f12f7e9ca56c68 /clang/lib/Format/TokenAnnotator.cpp | |
| parent | 56919ef10403c21a1db3d3f48349ff6280e22685 (diff) | |
| download | bcm5719-llvm-86ee0b6daa7f3ef724a10bda93bf58840032d12a.tar.gz bcm5719-llvm-86ee0b6daa7f3ef724a10bda93bf58840032d12a.zip | |
clang-format: More restrictively classify import declarations.
Before:
import::SomeFunction(aaaaaaaaaaaaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaaaaaaaaaaaaaa);
After:
import::SomeFunction(aaaaaaaaaaaaaaaaaaaaaaaaaaa,
aaaaaaaaaaaaaaaaaaaaaaaaaaaaa);
llvm-svn: 223345
Diffstat (limited to 'clang/lib/Format/TokenAnnotator.cpp')
| -rw-r--r-- | clang/lib/Format/TokenAnnotator.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 9b215dcd473..9f692437cad 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -615,7 +615,8 @@ public: if ((Style.Language == FormatStyle::LK_Java && CurrentToken->is(Keywords.kw_package)) || (Info && Info->getPPKeywordID() == tok::pp_import && - CurrentToken->Next)) { + CurrentToken->Next && + CurrentToken->Next->isOneOf(tok::string_literal, tok::identifier))) { next(); parseIncludeDirective(); return LT_ImportStatement; |
