From 5541224288b8b0f821cddbb0125ed6095db18f82 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 27 Apr 2015 15:53:58 +0300 Subject: [PATCH] Minor, add test on annotation on type argument --- .../compiledKotlin/annotations/types/TypeArgument.kt | 8 ++++++++ .../compiledKotlin/annotations/types/TypeArgument.txt | 7 +++++++ .../kotlin/jvm/compiler/LoadJavaTestGenerated.java | 6 ++++++ .../compiler/LoadKotlinWithTypeTableTestGenerated.java | 6 ++++++ .../runtime/JvmRuntimeDescriptorLoaderTestGenerated.java | 6 ++++++ .../kotlin/idea/stubs/ResolveByStubTestGenerated.java | 6 ++++++ 6 files changed, 39 insertions(+) create mode 100644 compiler/testData/loadJava/compiledKotlin/annotations/types/TypeArgument.kt create mode 100644 compiler/testData/loadJava/compiledKotlin/annotations/types/TypeArgument.txt diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeArgument.kt b/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeArgument.kt new file mode 100644 index 00000000000..16cb36a66b6 --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeArgument.kt @@ -0,0 +1,8 @@ +// ALLOW_AST_ACCESS + +package test + +@Target(AnnotationTarget.TYPE) +annotation class A + +fun foo(bar: Map<@A String, List<@A Int>>) {} diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeArgument.txt b/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeArgument.txt new file mode 100644 index 00000000000..3093bc1dbd5 --- /dev/null +++ b/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeArgument.txt @@ -0,0 +1,7 @@ +package test + +public fun foo(/*0*/ bar: kotlin.Map<@test.A() kotlin.String, kotlin.List<@test.A() kotlin.Int>>): kotlin.Unit + +@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) public final annotation class A : kotlin.Annotation { + /*primary*/ public constructor A() +} diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaTestGenerated.java index c7a3f4d2847..c198dd600bd 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaTestGenerated.java @@ -2205,6 +2205,12 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { doTestCompiledKotlin(fileName); } + @TestMetadata("TypeArgument.kt") + public void testTypeArgument() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/TypeArgument.kt"); + doTestCompiledKotlin(fileName); + } + @TestMetadata("TypeParameterAnnotation.kt") public void testTypeParameterAnnotation() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/TypeParameterAnnotation.kt"); diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadKotlinWithTypeTableTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadKotlinWithTypeTableTestGenerated.java index 4871f767acd..71a119a87cb 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadKotlinWithTypeTableTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadKotlinWithTypeTableTestGenerated.java @@ -468,6 +468,12 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith doTest(fileName); } + @TestMetadata("TypeArgument.kt") + public void testTypeArgument() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/TypeArgument.kt"); + doTest(fileName); + } + @TestMetadata("TypeParameterAnnotation.kt") public void testTypeParameterAnnotation() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/TypeParameterAnnotation.kt"); diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/runtime/JvmRuntimeDescriptorLoaderTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/jvm/runtime/JvmRuntimeDescriptorLoaderTestGenerated.java index 83f7104dd21..338fd3fa174 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/runtime/JvmRuntimeDescriptorLoaderTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/runtime/JvmRuntimeDescriptorLoaderTestGenerated.java @@ -470,6 +470,12 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD doTest(fileName); } + @TestMetadata("TypeArgument.kt") + public void testTypeArgument() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/TypeArgument.kt"); + doTest(fileName); + } + @TestMetadata("TypeParameterAnnotation.kt") public void testTypeParameterAnnotation() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/TypeParameterAnnotation.kt"); diff --git a/idea/tests/org/jetbrains/kotlin/idea/stubs/ResolveByStubTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/stubs/ResolveByStubTestGenerated.java index 4c1ca232000..e06f3831691 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/stubs/ResolveByStubTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/stubs/ResolveByStubTestGenerated.java @@ -468,6 +468,12 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { doTest(fileName); } + @TestMetadata("TypeArgument.kt") + public void testTypeArgument() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/TypeArgument.kt"); + doTest(fileName); + } + @TestMetadata("TypeParameterAnnotation.kt") public void testTypeParameterAnnotation() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/TypeParameterAnnotation.kt");