From d9bd3fba6010bf6677c0d5c0412b7dcb34972f4a Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Mon, 6 Oct 2014 09:07:49 +0200
Subject: [PATCH] type annotations in generics brace matching
 (IDEA-COMMUNITY-CR-664)

---
 .../codeInsight/highlighting/JavaPairedBraceMatcher.java      | 3 ++-
 .../codeInsight/highlighting/JavaBraceMatcherTest.java        | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/highlighting/JavaPairedBraceMatcher.java b/java/java-impl/src/com/intellij/codeInsight/highlighting/JavaPairedBraceMatcher.java
index e0ba601a07cf..82d5ddb07997 100644
--- a/java/java-impl/src/com/intellij/codeInsight/highlighting/JavaPairedBraceMatcher.java
+++ b/java/java-impl/src/com/intellij/codeInsight/highlighting/JavaPairedBraceMatcher.java
@@ -28,7 +28,8 @@ import com.intellij.psi.tree.TokenSet;
 public class JavaPairedBraceMatcher extends PairedBraceMatcherAdapter {
   private static final TokenSet TYPE_TOKENS = 
     TokenSet.orSet(StdTokenSets.WHITE_SPACE_OR_COMMENT_BIT_SET, 
-                   TokenSet.create(JavaTokenType.IDENTIFIER, JavaTokenType.COMMA, 
+                   TokenSet.create(JavaTokenType.IDENTIFIER, JavaTokenType.COMMA,
+                                   JavaTokenType.AT,//anno
                                    JavaTokenType.RBRACKET, JavaTokenType.LBRACKET, //arrays
                                    JavaTokenType.QUEST, JavaTokenType.EXTENDS_KEYWORD, JavaTokenType.SUPER_KEYWORD));//wildcards
   
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/highlighting/JavaBraceMatcherTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/highlighting/JavaBraceMatcherTest.java
index d90b336cff4d..30188c16f0cf 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/highlighting/JavaBraceMatcherTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/highlighting/JavaBraceMatcherTest.java
@@ -24,10 +24,10 @@ public class JavaBraceMatcherTest extends LightCodeInsightFixtureTestCase {
   public void testGenerics() {
     myFixture.configureByText("a.java", "import java.util.ArrayList;" +
                                         "class A {" +
-                                        "  ArrayList<caret><? extends String[]> f;" +
+                                        "  ArrayList<caret><? extends @Anno String[]> f;" +
                                         "}");
     final int offset = BraceMatchingUtil.getMatchedBraceOffset(myFixture.getEditor(), true, myFixture.getFile());
-    assertEquals(66, offset);
+    assertEquals(72, offset);
   }
 
   public void testBrokenText() {