From d5032e571a89921bac48bf6a6b2e4ba72c57224e Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Tue, 15 Jul 2014 17:44:46 +0200
Subject: [PATCH] java: parser changes temporarily reverted

---
 .../lang/java/parser/DeclarationParser.java   |  2 +-
 .../annotation/TypeAnnotations.java           |  7 ++-
 .../annotation/TypeAnnotations.txt            | 63 +++----------------
 3 files changed, 12 insertions(+), 60 deletions(-)

diff --git a/java/java-psi-impl/src/com/intellij/lang/java/parser/DeclarationParser.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/DeclarationParser.java
index bbd6ccefe080..54e493126c1c 100644
--- a/java/java-psi-impl/src/com/intellij/lang/java/parser/DeclarationParser.java
+++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/DeclarationParser.java
@@ -282,7 +282,7 @@ public class DeclarationParser {
     if (ElementType.PRIMITIVE_TYPE_BIT_SET.contains(builder.getTokenType())) {
       type = parseTypeNotNull(builder);
     }
-    else if (builder.getTokenType() == JavaTokenType.IDENTIFIER || builder.getTokenType() == JavaTokenType.AT) {
+    else if (builder.getTokenType() == JavaTokenType.IDENTIFIER /*|| builder.getTokenType() == JavaTokenType.AT*/) {
       PsiBuilder.Marker idPos = builder.mark();
       type = parseTypeNotNull(builder);
       if (builder.getTokenType() == JavaTokenType.LPARENTH) {  // constructor
diff --git a/java/java-tests/testData/psi/parser-full/annotationParsing/annotation/TypeAnnotations.java b/java/java-tests/testData/psi/parser-full/annotationParsing/annotation/TypeAnnotations.java
index e6841dbc1864..208e34387c56 100644
--- a/java/java-tests/testData/psi/parser-full/annotationParsing/annotation/TypeAnnotations.java
+++ b/java/java-tests/testData/psi/parser-full/annotationParsing/annotation/TypeAnnotations.java
@@ -47,9 +47,9 @@ class SpecSamples {
     try (@A Reader r = new @B FileReader("/dev/zero"); @A Writer w = new @B FileWriter("/dev/null")) { }
   }
 
-  interface TestClass {
-    <T> @Nullable List<T> test();
-  }
+  //interface TestClass {
+  //  <T> @Nullable List<T> test();
+  //}
 
   //
   // 2. An annotation on a wildcard type argument appears before the wildcard ...
@@ -76,6 +76,7 @@ class SpecSamples {
   //
 
   @Immutable SpecSamples() { }
+  //<T> @Immutable SpecSamples(T t) { }
 
   //
   // todo [r.sh] 5. It is permitted to explicitly declare the method receiver as the first formal parameter ...
diff --git a/java/java-tests/testData/psi/parser-full/annotationParsing/annotation/TypeAnnotations.txt b/java/java-tests/testData/psi/parser-full/annotationParsing/annotation/TypeAnnotations.txt
index 4723fc073926..d1a8022925f3 100644
--- a/java/java-tests/testData/psi/parser-full/annotationParsing/annotation/TypeAnnotations.txt
+++ b/java/java-tests/testData/psi/parser-full/annotationParsing/annotation/TypeAnnotations.txt
@@ -1045,62 +1045,11 @@ PsiJavaFile:TypeAnnotations.java
         PsiWhiteSpace('\n  ')
         PsiJavaToken:RBRACE('}')
     PsiWhiteSpace('\n\n  ')
-    PsiClass:TestClass
-      PsiModifierList:
-        <empty list>
-      PsiKeyword:interface('interface')
-      PsiWhiteSpace(' ')
-      PsiIdentifier:TestClass('TestClass')
-      PsiTypeParameterList
-        <empty list>
-      PsiReferenceList
-        <empty list>
-      PsiReferenceList
-        <empty list>
-      PsiWhiteSpace(' ')
-      PsiJavaToken:LBRACE('{')
-      PsiWhiteSpace('\n    ')
-      PsiMethod:test
-        PsiModifierList:
-          <empty list>
-        PsiTypeParameterList
-          PsiJavaToken:LT('<')
-          PsiTypeParameter:T
-            PsiIdentifier:T('T')
-            PsiElement(EXTENDS_BOUND_LIST)
-              <empty list>
-          PsiJavaToken:GT('>')
-        PsiWhiteSpace(' ')
-        PsiTypeElement:@Nullable List<T>
-          PsiAnnotation
-            PsiJavaToken:AT('@')
-            PsiJavaCodeReferenceElement:Nullable
-              PsiIdentifier:Nullable('Nullable')
-              PsiReferenceParameterList
-                <empty list>
-            PsiAnnotationParameterList
-              <empty list>
-          PsiWhiteSpace(' ')
-          PsiJavaCodeReferenceElement:List<T>
-            PsiIdentifier:List('List')
-            PsiReferenceParameterList
-              PsiJavaToken:LT('<')
-              PsiTypeElement:T
-                PsiJavaCodeReferenceElement:T
-                  PsiIdentifier:T('T')
-                  PsiReferenceParameterList
-                    <empty list>
-              PsiJavaToken:GT('>')
-        PsiWhiteSpace(' ')
-        PsiIdentifier:test('test')
-        PsiParameterList:()
-          PsiJavaToken:LPARENTH('(')
-          PsiJavaToken:RPARENTH(')')
-        PsiReferenceList
-          <empty list>
-        PsiJavaToken:SEMICOLON(';')
-      PsiWhiteSpace('\n  ')
-      PsiJavaToken:RBRACE('}')
+    PsiComment(END_OF_LINE_COMMENT)('//interface TestClass {')
+    PsiWhiteSpace('\n  ')
+    PsiComment(END_OF_LINE_COMMENT)('//  <T> @Nullable List<T> test();')
+    PsiWhiteSpace('\n  ')
+    PsiComment(END_OF_LINE_COMMENT)('//}')
     PsiWhiteSpace('\n\n  ')
     PsiComment(END_OF_LINE_COMMENT)('//')
     PsiWhiteSpace('\n  ')
@@ -1542,6 +1491,8 @@ PsiJavaFile:TypeAnnotations.java
         PsiJavaToken:LBRACE('{')
         PsiWhiteSpace(' ')
         PsiJavaToken:RBRACE('}')
+    PsiWhiteSpace('\n  ')
+    PsiComment(END_OF_LINE_COMMENT)('//<T> @Immutable SpecSamples(T t) { }')
     PsiWhiteSpace('\n\n  ')
     PsiComment(END_OF_LINE_COMMENT)('//')
     PsiWhiteSpace('\n  ')