type annotations in generics brace matching (IDEA-COMMUNITY-CR-664)

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
   

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() {