summaryrefslogtreecommitdiffstats
path: root/clang/lib/Format/Format.cpp
diff options
context:
space:
mode:
authorDaniel Jasper <djasper@google.com>2014-11-14 08:22:46 +0000
committerDaniel Jasper <djasper@google.com>2014-11-14 08:22:46 +0000
commit61d81973c16131e3b9298c4931eb59bbe73dbed2 (patch)
treea8cca91f0e06412b46362bfa5824cd84a4e6b20e /clang/lib/Format/Format.cpp
parentf69b0585c1aa802a496737fa93443d4a215ae641 (diff)
downloadbcm5719-llvm-61d81973c16131e3b9298c4931eb59bbe73dbed2.tar.gz
bcm5719-llvm-61d81973c16131e3b9298c4931eb59bbe73dbed2.zip
clang-format: [Java] Improve formatting of generics.
Before: Function < F, ? extends T > function; After: Function<F, ? extends T> function; llvm-svn: 221976
Diffstat (limited to 'clang/lib/Format/Format.cpp')
-rw-r--r--clang/lib/Format/Format.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp
index 74adaf76056..740adb2b126 100644
--- a/clang/lib/Format/Format.cpp
+++ b/clang/lib/Format/Format.cpp
@@ -415,6 +415,7 @@ FormatStyle getGoogleStyle(FormatStyle::LanguageKind Language) {
GoogleStyle.BreakBeforeBinaryOperators = FormatStyle::BOS_NonAssignment;
GoogleStyle.ColumnLimit = 100;
GoogleStyle.SpaceAfterCStyleCast = true;
+ GoogleStyle.SpacesBeforeTrailingComments = 1;
} else if (Language == FormatStyle::LK_JavaScript) {
GoogleStyle.BreakBeforeTernaryOperators = false;
GoogleStyle.MaxEmptyLinesToKeep = 3;
OpenPOWER on IntegriCloud