From fae0f611a04d665239b63b46741de36aba758224 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Tue, 27 Feb 2018 18:09:16 +0100 Subject: [PATCH] Test java resolve against kotlin file with JvmPackageName annotation --- .../javaWithKotlin/JvmPackageNameFileFacade.java | 5 +++++ .../javaWithKotlin/JvmPackageNameFileFacade.kt | 7 +++++++ .../JavaAgainstKotlinSourceCheckerTestGenerated.java | 6 ++++++ 3 files changed, 18 insertions(+) create mode 100644 idea/testData/kotlinAndJavaChecker/javaWithKotlin/JvmPackageNameFileFacade.java create mode 100644 idea/testData/kotlinAndJavaChecker/javaWithKotlin/JvmPackageNameFileFacade.kt diff --git a/idea/testData/kotlinAndJavaChecker/javaWithKotlin/JvmPackageNameFileFacade.java b/idea/testData/kotlinAndJavaChecker/javaWithKotlin/JvmPackageNameFileFacade.java new file mode 100644 index 00000000000..4684eab8031 --- /dev/null +++ b/idea/testData/kotlinAndJavaChecker/javaWithKotlin/JvmPackageNameFileFacade.java @@ -0,0 +1,5 @@ +class JvmPackageNameFileFacade { + public static void main() { + a.b.c.Foo.bar(); + } +} \ No newline at end of file diff --git a/idea/testData/kotlinAndJavaChecker/javaWithKotlin/JvmPackageNameFileFacade.kt b/idea/testData/kotlinAndJavaChecker/javaWithKotlin/JvmPackageNameFileFacade.kt new file mode 100644 index 00000000000..69b7bc2de71 --- /dev/null +++ b/idea/testData/kotlinAndJavaChecker/javaWithKotlin/JvmPackageNameFileFacade.kt @@ -0,0 +1,7 @@ +@file: JvmPackageName("a.b.c") +@file: JvmName("Foo") +package foo + +fun bar() { + +} diff --git a/idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinSourceCheckerTestGenerated.java b/idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinSourceCheckerTestGenerated.java index ae2675f2ed3..b729520c921 100644 --- a/idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinSourceCheckerTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinSourceCheckerTestGenerated.java @@ -210,6 +210,12 @@ public class JavaAgainstKotlinSourceCheckerTestGenerated extends AbstractJavaAga doTest(fileName); } + @TestMetadata("JvmPackageNameFileFacade.kt") + public void testJvmPackageNameFileFacade() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaWithKotlin/JvmPackageNameFileFacade.kt"); + doTest(fileName); + } + @TestMetadata("NoNotNullOnParameterInOverride.kt") public void testNoNotNullOnParameterInOverride() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaWithKotlin/NoNotNullOnParameterInOverride.kt");