diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/fileClasses/JvmFileClassUtil.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/fileClasses/JvmFileClassUtil.kt index b8c2a1c7a2a..2dd383bbbd1 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/fileClasses/JvmFileClassUtil.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/fileClasses/JvmFileClassUtil.kt @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.constants.StringValue public object JvmFileClassUtil { - public val JVM_NAME: FqName = FqName("kotlin.jvm.jvmName") + public val JVM_NAME: FqName = FqName("kotlin.jvm.JvmName") public val JVM_NAME_SHORT: String = JVM_NAME.shortName().asString() // TODO @JvmMultifileClass diff --git a/compiler/testData/cli/jvm/classAndFileClassClash.kt b/compiler/testData/cli/jvm/classAndFileClassClash.kt index 3bde0509d2d..ad6ac93d76c 100644 --- a/compiler/testData/cli/jvm/classAndFileClassClash.kt +++ b/compiler/testData/cli/jvm/classAndFileClassClash.kt @@ -1,4 +1,4 @@ -@file:jvmName("Foo") +@file:JvmName("Foo") package test public fun foo() {} diff --git a/compiler/testData/cli/jvm/classAndFileClassClash.out b/compiler/testData/cli/jvm/classAndFileClassClash.out index 250b2cf4d64..d4619b71659 100644 --- a/compiler/testData/cli/jvm/classAndFileClassClash.out +++ b/compiler/testData/cli/jvm/classAndFileClassClash.out @@ -1,5 +1,5 @@ compiler/testData/cli/jvm/classAndFileClassClash.kt:1:1: error: duplicate JVM class name 'test/Foo' generated from: package-fragment test, Foo -@file:jvmName("Foo") +@file:JvmName("Foo") ^ compiler/testData/cli/jvm/classAndFileClassClash.kt:6:1: error: duplicate JVM class name 'test/Foo' generated from: package-fragment test, Foo class Foo {} diff --git a/compiler/testData/cli/jvm/classAndOtherFileClassClash.out b/compiler/testData/cli/jvm/classAndOtherFileClassClash.out index a801ad260fe..e232f41cfba 100644 --- a/compiler/testData/cli/jvm/classAndOtherFileClassClash.out +++ b/compiler/testData/cli/jvm/classAndOtherFileClassClash.out @@ -1,5 +1,5 @@ compiler/testData/cli/jvm/classAndOtherFileClassClash1.kt:1:1: error: duplicate JVM class name 'test/Foo' generated from: Foo, package-fragment test -@file:jvmName("Foo") +@file:JvmName("Foo") ^ compiler/testData/cli/jvm/classAndOtherFileClassClash2.kt:3:1: error: duplicate JVM class name 'test/Foo' generated from: Foo, package-fragment test class Foo diff --git a/compiler/testData/cli/jvm/classAndOtherFileClassClash1.kt b/compiler/testData/cli/jvm/classAndOtherFileClassClash1.kt index 2f7d7627658..b3e0aa8ffdc 100644 --- a/compiler/testData/cli/jvm/classAndOtherFileClassClash1.kt +++ b/compiler/testData/cli/jvm/classAndOtherFileClassClash1.kt @@ -1,4 +1,4 @@ -@file:jvmName("Foo") +@file:JvmName("Foo") package test public fun foo() {} \ No newline at end of file diff --git a/compiler/testData/cli/jvm/fileClassAndFacadeClash.kt b/compiler/testData/cli/jvm/fileClassAndFacadeClash.kt index 55eb82fc98a..26faeb59b77 100644 --- a/compiler/testData/cli/jvm/fileClassAndFacadeClash.kt +++ b/compiler/testData/cli/jvm/fileClassAndFacadeClash.kt @@ -1,4 +1,4 @@ -@file:jvmName("TestPackage") +@file:JvmName("TestPackage") package test fun foo() {} \ No newline at end of file diff --git a/compiler/testData/cli/jvm/fileClassAndFacadeClash.out b/compiler/testData/cli/jvm/fileClassAndFacadeClash.out index 18b6c35f049..4cea603dff3 100644 --- a/compiler/testData/cli/jvm/fileClassAndFacadeClash.out +++ b/compiler/testData/cli/jvm/fileClassAndFacadeClash.out @@ -1,4 +1,4 @@ compiler/testData/cli/jvm/fileClassAndFacadeClash.kt:1:1: error: duplicate JVM class name 'test/TestPackage' generated from: package-fragment test, package-fragment test -@file:jvmName("TestPackage") +@file:JvmName("TestPackage") ^ COMPILATION_ERROR \ No newline at end of file diff --git a/compiler/testData/cli/jvm/fileClassAndTImplClash.kt b/compiler/testData/cli/jvm/fileClassAndTImplClash.kt index f07cfa07fc7..9b130c4e060 100644 --- a/compiler/testData/cli/jvm/fileClassAndTImplClash.kt +++ b/compiler/testData/cli/jvm/fileClassAndTImplClash.kt @@ -1,4 +1,4 @@ -@file:jvmName("XXX\$\$TImpl") +@file:JvmName("XXX\$\$TImpl") package test interface XXX \ No newline at end of file diff --git a/compiler/testData/cli/jvm/fileClassClashMultipleFiles.out b/compiler/testData/cli/jvm/fileClassClashMultipleFiles.out index fb86092613f..982ea3b5a52 100644 --- a/compiler/testData/cli/jvm/fileClassClashMultipleFiles.out +++ b/compiler/testData/cli/jvm/fileClassClashMultipleFiles.out @@ -1,7 +1,7 @@ compiler/testData/cli/jvm/fileClassClashMultipleFiles1.kt:1:1: error: duplicate JVM class name 'test/Util' generated from: package-fragment test, package-fragment test -@file:jvmName("Util") +@file:JvmName("Util") ^ compiler/testData/cli/jvm/fileClassClashMultipleFiles2.kt:1:1: error: duplicate JVM class name 'test/Util' generated from: package-fragment test, package-fragment test -@file:jvmName("Util") +@file:JvmName("Util") ^ COMPILATION_ERROR \ No newline at end of file diff --git a/compiler/testData/cli/jvm/fileClassClashMultipleFiles1.kt b/compiler/testData/cli/jvm/fileClassClashMultipleFiles1.kt index f687e591e21..1896a60ef1f 100644 --- a/compiler/testData/cli/jvm/fileClassClashMultipleFiles1.kt +++ b/compiler/testData/cli/jvm/fileClassClashMultipleFiles1.kt @@ -1,4 +1,4 @@ -@file:jvmName("Util") +@file:JvmName("Util") package test public fun foo() {} \ No newline at end of file diff --git a/compiler/testData/cli/jvm/fileClassClashMultipleFiles2.kt b/compiler/testData/cli/jvm/fileClassClashMultipleFiles2.kt index 4e4fda870f6..ae909d2a2f5 100644 --- a/compiler/testData/cli/jvm/fileClassClashMultipleFiles2.kt +++ b/compiler/testData/cli/jvm/fileClassClashMultipleFiles2.kt @@ -1,4 +1,4 @@ -@file:jvmName("Util") +@file:JvmName("Util") package test public fun bar() {} \ No newline at end of file diff --git a/compiler/testData/codegen/boxWithJava/fileClasses/differentFiles/bar.kt b/compiler/testData/codegen/boxWithJava/fileClasses/differentFiles/bar.kt index 8905df4ae01..82f819e335a 100644 --- a/compiler/testData/codegen/boxWithJava/fileClasses/differentFiles/bar.kt +++ b/compiler/testData/codegen/boxWithJava/fileClasses/differentFiles/bar.kt @@ -1,2 +1,2 @@ -@file:jvmName("Bar") +@file:JvmName("Bar") public fun bar(): String = "K" \ No newline at end of file diff --git a/compiler/testData/codegen/boxWithJava/fileClasses/differentFiles/foo.kt b/compiler/testData/codegen/boxWithJava/fileClasses/differentFiles/foo.kt index 0a8c401ca7a..ed0aecdce4d 100644 --- a/compiler/testData/codegen/boxWithJava/fileClasses/differentFiles/foo.kt +++ b/compiler/testData/codegen/boxWithJava/fileClasses/differentFiles/foo.kt @@ -1,2 +1,2 @@ -@file:jvmName("Foo") +@file:JvmName("Foo") public fun foo(): String = "O" \ No newline at end of file diff --git a/compiler/testData/codegen/boxWithJava/fileClasses/simple/foo.kt b/compiler/testData/codegen/boxWithJava/fileClasses/simple/foo.kt index 9d66ea22e85..5f19fc06f65 100644 --- a/compiler/testData/codegen/boxWithJava/fileClasses/simple/foo.kt +++ b/compiler/testData/codegen/boxWithJava/fileClasses/simple/foo.kt @@ -1,2 +1,2 @@ -@file:jvmName("Foo") +@file:JvmName("Foo") public fun foo(): String = "OK" \ No newline at end of file diff --git a/compiler/testData/codegen/boxWithStdlib/platformNames/renamedFileClass.kt b/compiler/testData/codegen/boxWithStdlib/platformNames/renamedFileClass.kt index 8cc4a00709e..55871f1f87d 100644 --- a/compiler/testData/codegen/boxWithStdlib/platformNames/renamedFileClass.kt +++ b/compiler/testData/codegen/boxWithStdlib/platformNames/renamedFileClass.kt @@ -1,4 +1,4 @@ -@file:jvmName("Util") +@file:JvmName("Util") package test fun foo(): String = bar()