From 61d81973c16131e3b9298c4931eb59bbe73dbed2 Mon Sep 17 00:00:00 2001
From: Daniel Jasper <djasper@google.com>
Date: Fri, 14 Nov 2014 08:22:46 +0000
Subject: clang-format: [Java] Improve formatting of generics.

Before:
  Function < F, ? extends T > function;

After:
  Function<F, ? extends T> function;

llvm-svn: 221976
---
 clang/lib/Format/Format.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'clang/lib/Format/Format.cpp')

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;
-- 
cgit v1.2.3