summaryrefslogtreecommitdiffstats
path: root/clang/lib/Format
diff options
context:
space:
mode:
authorDaniel Jasper <djasper@google.com>2014-11-26 08:17:08 +0000
committerDaniel Jasper <djasper@google.com>2014-11-26 08:17:08 +0000
commite5d74867aa1793171d9edea09fb92be7eae3be89 (patch)
tree8926d1777125bd7434b53ce2614fd2d1e4fb0049 /clang/lib/Format
parent7cacb9b54057f7a368ed9788799c06264baddb20 (diff)
downloadbcm5719-llvm-e5d74867aa1793171d9edea09fb92be7eae3be89.tar.gz
bcm5719-llvm-e5d74867aa1793171d9edea09fb92be7eae3be89.zip
clang-format: [Java] Support Foo.class;
Before: SomeClass. class.getName(); After: SomeClass.class.getName(); This fixes llvm.org/PR21665. llvm-svn: 222813
Diffstat (limited to 'clang/lib/Format')
-rw-r--r--clang/lib/Format/UnwrappedLineParser.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/clang/lib/Format/UnwrappedLineParser.cpp b/clang/lib/Format/UnwrappedLineParser.cpp
index ba492aae029..21f0e7bad1b 100644
--- a/clang/lib/Format/UnwrappedLineParser.cpp
+++ b/clang/lib/Format/UnwrappedLineParser.cpp
@@ -757,6 +757,13 @@ void UnwrappedLineParser::parseStructuralElement() {
// A record declaration or definition is always the start of a structural
// element.
break;
+ case tok::period:
+ nextToken();
+ // In Java, classes have an implicit static member "class".
+ if (Style.Language == FormatStyle::LK_Java && FormatTok &&
+ FormatTok->is(tok::kw_class))
+ nextToken();
+ break;
case tok::semi:
nextToken();
addUnwrappedLine();
OpenPOWER on IntegriCloud