More tests

#KT-1670 Fixed
 #KT-2690 Fixed

idea/testData/completion/basic/common/annotations/FunctionAnnotation1.kt

@@ -0,0 +1,11 @@
+annotation class Hello
+val v = 1
+
+<caret>
+fun some() {}
+
+// INVOCATION_COUNT: 0
+// EXIST: Hello
+// EXIST: inlineOptions
+// ABSENT: String
+// ABSENT: v

idea/testData/completion/basic/common/annotations/FunctionAnnotation2.kt

@@ -0,0 +1,10 @@
+annotation class Hello
+val v = 1
+
+[<caret>] fun some() {}
+
+// INVOCATION_COUNT: 0
+// EXIST: Hello
+// EXIST: inlineOptions
+// ABSENT: String
+// ABSENT: v

idea/testData/completion/basic/common/annotations/TopLevelAnnotation1.kt

@@ -0,0 +1,10 @@
+annotation class Hello
+val v = 1
+
+<caret>
+
+// INVOCATION_COUNT: 0
+// EXIST: Hello
+// EXIST: inlineOptions
+// ABSENT: String
+// ABSENT: v

idea/testData/completion/basic/common/annotations/TopLevelAnnotation2.kt

@@ -0,0 +1,10 @@
+annotation class Hello
+val v = 1
+
+[<caret>]
+
+// INVOCATION_COUNT: 0
+// EXIST: Hello
+// EXIST: inlineOptions
+// ABSENT: String
+// ABSENT: v

idea/testData/completion/basic/common/annotations/TopLevelAnnotation3.kt

@@ -0,0 +1,11 @@
+annotation class Hello
+val v = 1
+
+<caret>
+class C
+
+// INVOCATION_COUNT: 0
+// EXIST: Hello
+// EXIST: inlineOptions
+// ABSENT: String
+// ABSENT: v

idea/testData/completion/basic/common/annotations/TopLevelAnnotation4.kt

@@ -0,0 +1,11 @@
+annotation class Hello
+val v = 1
+
+[<caret>]
+class C
+
+// INVOCATION_COUNT: 0
+// EXIST: Hello
+// EXIST: inlineOptions
+// ABSENT: String
+// ABSENT: v

idea/testData/completion/basic/common/annotations/TopLevelAnnotationArg1.kt

@@ -0,0 +1,6 @@
+import java.lang.annotation.*
+
+Retention(<caret>
+
+// INVOCATION_COUNT: 0
+// EXIST_JAVA_ONLY: RetentionPolicy

idea/testData/completion/basic/common/annotations/TopLevelAnnotationArg2.kt

@@ -0,0 +1,7 @@
+import java.lang.annotation.*
+
+Retention(RetentionPolicy.<caret>
+
+// INVOCATION_COUNT: 0
+// EXIST_JAVA_ONLY: SOURCE
+// EXIST_JAVA_ONLY: CLASS

idea/tests/org/jetbrains/kotlin/completion/JSBasicCompletionTestGenerated.java

@@ -900,6 +900,18 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/completion/basic/common/annotations"), Pattern.compile("^(.+)\\.kt$"), true);
             }
 
+            @TestMetadata("FunctionAnnotation1.kt")
+            public void testFunctionAnnotation1() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/FunctionAnnotation1.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("FunctionAnnotation2.kt")
+            public void testFunctionAnnotation2() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/FunctionAnnotation2.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("NoParameterAnnotationAutoPopup1.kt")
             public void testNoParameterAnnotationAutoPopup1() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/NoParameterAnnotationAutoPopup1.kt");
@@ -948,6 +960,12 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes
                 doTest(fileName);
             }
 
+            @TestMetadata("ParameterAnnotation7.kt")
+            public void testParameterAnnotation7() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/ParameterAnnotation7.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("ParameterAnnotation8.kt")
             public void testParameterAnnotation8() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/ParameterAnnotation8.kt");
@@ -977,6 +995,42 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes
                 String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/ParameterAnnotationAutoPopup2.kt");
                 doTest(fileName);
             }
+
+            @TestMetadata("TopLevelAnnotation1.kt")
+            public void testTopLevelAnnotation1() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/TopLevelAnnotation1.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("TopLevelAnnotation2.kt")
+            public void testTopLevelAnnotation2() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/TopLevelAnnotation2.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("TopLevelAnnotation3.kt")
+            public void testTopLevelAnnotation3() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/TopLevelAnnotation3.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("TopLevelAnnotation4.kt")
+            public void testTopLevelAnnotation4() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/TopLevelAnnotation4.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("TopLevelAnnotationArg1.kt")
+            public void testTopLevelAnnotationArg1() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/TopLevelAnnotationArg1.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("TopLevelAnnotationArg2.kt")
+            public void testTopLevelAnnotationArg2() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/TopLevelAnnotationArg2.kt");
+                doTest(fileName);
+            }
         }
 
         @TestMetadata("idea/testData/completion/basic/common/extensions")

idea/tests/org/jetbrains/kotlin/completion/JvmBasicCompletionTestGenerated.java

@@ -900,6 +900,18 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/completion/basic/common/annotations"), Pattern.compile("^(.+)\\.kt$"), true);
             }
 
+            @TestMetadata("FunctionAnnotation1.kt")
+            public void testFunctionAnnotation1() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/FunctionAnnotation1.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("FunctionAnnotation2.kt")
+            public void testFunctionAnnotation2() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/FunctionAnnotation2.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("NoParameterAnnotationAutoPopup1.kt")
             public void testNoParameterAnnotationAutoPopup1() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/NoParameterAnnotationAutoPopup1.kt");
@@ -948,6 +960,12 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT
                 doTest(fileName);
             }
 
+            @TestMetadata("ParameterAnnotation7.kt")
+            public void testParameterAnnotation7() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/ParameterAnnotation7.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("ParameterAnnotation8.kt")
             public void testParameterAnnotation8() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/ParameterAnnotation8.kt");
@@ -977,6 +995,42 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT
                 String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/ParameterAnnotationAutoPopup2.kt");
                 doTest(fileName);
             }
+
+            @TestMetadata("TopLevelAnnotation1.kt")
+            public void testTopLevelAnnotation1() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/TopLevelAnnotation1.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("TopLevelAnnotation2.kt")
+            public void testTopLevelAnnotation2() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/TopLevelAnnotation2.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("TopLevelAnnotation3.kt")
+            public void testTopLevelAnnotation3() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/TopLevelAnnotation3.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("TopLevelAnnotation4.kt")
+            public void testTopLevelAnnotation4() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/TopLevelAnnotation4.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("TopLevelAnnotationArg1.kt")
+            public void testTopLevelAnnotationArg1() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/TopLevelAnnotationArg1.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("TopLevelAnnotationArg2.kt")
+            public void testTopLevelAnnotationArg2() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/TopLevelAnnotationArg2.kt");
+                doTest(fileName);
+            }
         }
 
         @TestMetadata("idea/testData/completion/basic/common/extensions")