Minor in Parser: moved some annotation tests.

compiler/testData/psi/annotation/AnnotatedExpressions.txt

@@ -44,4 +44,4 @@ JetFile: AnnotatedExpressions.kt
           REFERENCE_EXPRESSION
             PsiElement(this)('this')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

compiler/testData/psi/annotation/Attributes.txt

@@ -327,4 +327,4 @@ JetFile: Attributes.kt
     CLASS_BODY
       PsiElement(LBRACE)('{')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

compiler/testData/psi/annotation/AttributesOnPatterns.txt

@@ -48,4 +48,4 @@ JetFile: AttributesOnPatterns.kt
         PsiWhiteSpace('\n    ')
         PsiElement(RBRACE)('}')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

compiler/testData/psi/annotation/Attributes_ERR.txt

@@ -283,4 +283,4 @@ JetFile: Attributes_ERR.kt
     CLASS_BODY
       PsiElement(LBRACE)('{')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

compiler/testData/psi/annotation/ShortAnnotations.kt

@@ -24,4 +24,4 @@ fun test() {
   when (foo bar(1) buzz<T>(1) zoo val a = 1) {
     1 -> 1
   }
-}
+}

compiler/testData/psi/annotation/ShortAnnotations.txt

@@ -992,4 +992,4 @@ JetFile: ShortAnnotations.kt
         PsiWhiteSpace('\n  ')
         PsiElement(RBRACE)('}')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

compiler/testData/psi/annotation/TypeAnnotations.txt

@@ -94,4 +94,4 @@ JetFile: TypeAnnotations.kt
               USER_TYPE
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('B')
-          PsiElement(GT)('>')
+          PsiElement(GT)('>')

compiler/tests/org/jetbrains/jet/parsing/JetParsingTestGenerated.java

@@ -48,12 +48,6 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi"), Pattern.compile("^(.*)\\.kts?$"), true);
         }
         
-        @TestMetadata("AnnotatedExpressions.kt")
-        public void testAnnotatedExpressions() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/AnnotatedExpressions.kt");
-            doParsingTest(fileName);
-        }
-        
         @TestMetadata("AnonymousInitializer.kt")
         public void testAnonymousInitializer() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/AnonymousInitializer.kt");
@@ -66,24 +60,6 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest {
             doParsingTest(fileName);
         }
         
-        @TestMetadata("Attributes.kt")
-        public void testAttributes() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/Attributes.kt");
-            doParsingTest(fileName);
-        }
-        
-        @TestMetadata("AttributesOnPatterns.kt")
-        public void testAttributesOnPatterns() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/AttributesOnPatterns.kt");
-            doParsingTest(fileName);
-        }
-        
-        @TestMetadata("Attributes_ERR.kt")
-        public void testAttributes_ERR() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/Attributes_ERR.kt");
-            doParsingTest(fileName);
-        }
-        
         @TestMetadata("BabySteps.kt")
         public void testBabySteps() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/BabySteps.kt");
@@ -432,12 +408,6 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest {
             doParsingTest(fileName);
         }
         
-        @TestMetadata("ShortAnnotations.kt")
-        public void testShortAnnotations() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/ShortAnnotations.kt");
-            doParsingTest(fileName);
-        }
-        
         @TestMetadata("SimpleClassMembers.kt")
         public void testSimpleClassMembers() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/SimpleClassMembers.kt");
@@ -498,12 +468,6 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest {
             doParsingTest(fileName);
         }
         
-        @TestMetadata("TypeAnnotations.kt")
-        public void testTypeAnnotations() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/TypeAnnotations.kt");
-            doParsingTest(fileName);
-        }
-        
         @TestMetadata("TypeConstraints.kt")
         public void testTypeConstraints() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/TypeConstraints.kt");
@@ -555,6 +519,42 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/annotation"), Pattern.compile("^(.*)\\.kts?$"), true);
             }
             
+            @TestMetadata("AnnotatedExpressions.kt")
+            public void testAnnotatedExpressions() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/AnnotatedExpressions.kt");
+                doParsingTest(fileName);
+            }
+            
+            @TestMetadata("Attributes.kt")
+            public void testAttributes() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/Attributes.kt");
+                doParsingTest(fileName);
+            }
+            
+            @TestMetadata("AttributesOnPatterns.kt")
+            public void testAttributesOnPatterns() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/AttributesOnPatterns.kt");
+                doParsingTest(fileName);
+            }
+            
+            @TestMetadata("Attributes_ERR.kt")
+            public void testAttributes_ERR() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/Attributes_ERR.kt");
+                doParsingTest(fileName);
+            }
+            
+            @TestMetadata("ShortAnnotations.kt")
+            public void testShortAnnotations() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/ShortAnnotations.kt");
+                doParsingTest(fileName);
+            }
+            
+            @TestMetadata("TypeAnnotations.kt")
+            public void testTypeAnnotations() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/TypeAnnotations.kt");
+                doParsingTest(fileName);
+            }
+            
             @TestMetadata("compiler/testData/psi/annotation/onFile")
             @TestDataPath("$PROJECT_ROOT")
             @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)