From 8d7d555db7bd534c78942ff94cefd5d6f4576820 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 25 Jul 2013 15:23:05 +0400 Subject: [PATCH] Additional resolve for annotations in lazy resolve GitOrigin-RevId: 3e70dbf9fce1442f35ba08ffcb9ea42051aeacd8 --- .../ReferenceResolveTestGenerated.java | 20 +++++++++++++++++++ .../resolve/references/AnnotationForClass.kt | 7 +++++++ .../references/AnnotationInsideFunction.kt | 10 ++++++++++ .../resolve/references/AnnotationParameter.kt | 9 +++++++++ .../references/AnnotationTypeParameter.kt | 9 +++++++++ 5 files changed, 55 insertions(+) create mode 100644 plugins/kotlin/idea/tests/testData/resolve/references/AnnotationForClass.kt create mode 100644 plugins/kotlin/idea/tests/testData/resolve/references/AnnotationInsideFunction.kt create mode 100644 plugins/kotlin/idea/tests/testData/resolve/references/AnnotationParameter.kt create mode 100644 plugins/kotlin/idea/tests/testData/resolve/references/AnnotationTypeParameter.kt diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/jet/resolve/ReferenceResolveTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/jet/resolve/ReferenceResolveTestGenerated.java index 7a6ebec4a6f4..2b7d5d78ac8f 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/jet/resolve/ReferenceResolveTestGenerated.java +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/jet/resolve/ReferenceResolveTestGenerated.java @@ -36,6 +36,26 @@ public class ReferenceResolveTestGenerated extends AbstractResolveBaseTest { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/resolve/references"), Pattern.compile("^(.+)\\.kt$"), true); } + @TestMetadata("AnnotationForClass.kt") + public void testAnnotationForClass() throws Exception { + doTest("idea/testData/resolve/references/AnnotationForClass.kt"); + } + + @TestMetadata("AnnotationInsideFunction.kt") + public void testAnnotationInsideFunction() throws Exception { + doTest("idea/testData/resolve/references/AnnotationInsideFunction.kt"); + } + + @TestMetadata("AnnotationParameter.kt") + public void testAnnotationParameter() throws Exception { + doTest("idea/testData/resolve/references/AnnotationParameter.kt"); + } + + @TestMetadata("AnnotationTypeParameter.kt") + public void testAnnotationTypeParameter() throws Exception { + doTest("idea/testData/resolve/references/AnnotationTypeParameter.kt"); + } + @TestMetadata("ClassReferenceInImport.kt") public void testClassReferenceInImport() throws Exception { doTest("idea/testData/resolve/references/ClassReferenceInImport.kt"); diff --git a/plugins/kotlin/idea/tests/testData/resolve/references/AnnotationForClass.kt b/plugins/kotlin/idea/tests/testData/resolve/references/AnnotationForClass.kt new file mode 100644 index 000000000000..e3cf0f84c9ff --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/resolve/references/AnnotationForClass.kt @@ -0,0 +1,7 @@ +package test + +annotation class Annotation + +Annotation class Some + +// REF: (test).Annotation diff --git a/plugins/kotlin/idea/tests/testData/resolve/references/AnnotationInsideFunction.kt b/plugins/kotlin/idea/tests/testData/resolve/references/AnnotationInsideFunction.kt new file mode 100644 index 000000000000..2b008b6bb5b4 --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/resolve/references/AnnotationInsideFunction.kt @@ -0,0 +1,10 @@ +package test + +annotation class Annotation + +fun test() { + Annotation fun some() { + } +} + +// REF: (test).Annotation \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/resolve/references/AnnotationParameter.kt b/plugins/kotlin/idea/tests/testData/resolve/references/AnnotationParameter.kt new file mode 100644 index 000000000000..0d83eb9f0426 --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/resolve/references/AnnotationParameter.kt @@ -0,0 +1,9 @@ +package testing + +annotation class Annotation(val clazz: Class) +class ATest + +[Annotation(javaClass<ATest>())] +class BTest + +// REF: (testing).ATest \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/resolve/references/AnnotationTypeParameter.kt b/plugins/kotlin/idea/tests/testData/resolve/references/AnnotationTypeParameter.kt new file mode 100644 index 000000000000..687d6740c622 --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/resolve/references/AnnotationTypeParameter.kt @@ -0,0 +1,9 @@ +package testing + +annotation class Annotation(val clazz: Class) +class ATest + +[Annotation<ATest>(javaClass())] +class BTest + +// REF: (testing).ATest \ No newline at end of file