From: Daniel Jasper <djasper@google.com>
Date: Mon, 3 Nov 2014 02:45:58 +0000 (+0000)
Subject: clang-format: [Java] Fix more generics formatting.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6ee86df60f2175e185ec4f0d6333fe89d1c4922b;p=clang

clang-format: [Java] Fix more generics formatting.

Before:
  < T extends B > T getInstance(Class<T> type);

After:
  <T extends B> T getInstance(Class<T> type);

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@221124 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Format/TokenAnnotator.cpp b/lib/Format/TokenAnnotator.cpp
index 0b2b222094..4b8f80f377 100644
--- a/lib/Format/TokenAnnotator.cpp
+++ b/lib/Format/TokenAnnotator.cpp
@@ -472,7 +472,7 @@ private:
         return false;
       break;
     case tok::less:
-      if (Tok->Previous && !Tok->Previous->Tok.isLiteral() && parseAngle())
+      if ((!Tok->Previous || !Tok->Previous->Tok.isLiteral()) && parseAngle())
         Tok->Type = TT_TemplateOpener;
       else {
         Tok->Type = TT_BinaryOperator;
diff --git a/unittests/Format/FormatTestJava.cpp b/unittests/Format/FormatTestJava.cpp
index a47bfcaab8..591d1f3a32 100644
--- a/unittests/Format/FormatTestJava.cpp
+++ b/unittests/Format/FormatTestJava.cpp
@@ -143,6 +143,7 @@ TEST_F(FormatTestJava, Generics) {
                "public Map<String, ?> getAll() {\n}");
 
   verifyFormat("public static <R> ArrayList<R> get() {\n}");
+  verifyFormat("<T extends B> T getInstance(Class<T> type);");
 }
 
 TEST_F(FormatTestJava, StringConcatenation) {