From 952d45dc8bf1c4a59be8a1a4af69f1a02c42f651 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Fri, 4 Sep 2015 14:46:46 +0300 Subject: [PATCH] Deprecate JVM platform annotations in favor of capitilized themselves --- .../DefaultParameterValueSubstitutor.kt | 4 +- .../kotlin/resolve/jvm/annotationUtil.kt | 24 +++++++++ .../diagnostics/DefaultErrorMessagesJvm.java | 12 ++--- .../jvm/platform/JvmPlatformConfigurator.kt | 4 +- .../kotlin/resolve/AnnotationUtil.kt | 2 +- .../nullabilityAnnotations/JvmOverloads.java | 6 +-- .../nullabilityAnnotations/JvmOverloads.kt | 2 +- .../jvmOverloads/generics/generics.kt | 2 +- .../boxWithJava/jvmOverloads/simple/simple.kt | 2 +- .../platformName/FakePlatformName.java | 4 +- .../annotations/simpleClassObject.kt | 6 +-- .../classObject/simpleClassObject.kt | 10 ++-- .../enumCompanion/enumCompanionObject.kt | 6 +-- .../platformStatic/object/simpleObject.kt | 10 ++-- .../jvmOverloads/companionObject.kt | 2 +- .../jvmOverloads/defaultsNotAtEnd.kt | 2 +- .../jvmOverloads/doubleParameters.kt | 2 +- .../jvmOverloads/extensionMethod.kt | 2 +- .../jvmOverloads/multipleDefaultParameters.kt | 2 +- .../jvmOverloads/nonDefaultParameter.kt | 2 +- .../jvmOverloads/primaryConstructor.kt | 2 +- .../jvmOverloads/secondaryConstructor.kt | 2 +- .../boxWithStdlib/jvmOverloads/simple.kt | 2 +- .../reflection/functions/platformName.kt | 2 +- .../platformStatic/companionObjectFunction.kt | 2 +- .../method/platformName/PlatformName.kt | 2 +- .../method/platformName/PlatformName.txt | 2 +- .../method/throws/DefaultArgs.kt | 2 +- .../method/throws/DefaultArgs.txt | 2 +- .../illegalPlatformName.kt | 8 +-- .../illegalPlatformName.txt | 8 +-- .../annotationApplicability/jvmName.kt | 52 +++++++++---------- .../annotationApplicability/jvmName.txt | 24 ++++----- .../jvmOverloads/JvmOverloadWithNoDefaults.kt | 4 +- .../JvmOverloadWithNoDefaults.txt | 4 +- .../jvmOverloadsOnAbstractMethods.kt | 4 +- .../jvmOverloadsOnAbstractMethods.txt | 4 +- .../jvmOverloads/jvmOverloadsOnPrivate.kt | 8 +-- .../jvmOverloads/jvmOverloadsOnPrivate.txt | 4 +- .../platformStatic/constructors.kt | 8 +-- .../platformStatic/constructors.txt | 6 +-- .../platformStatic/finalAndAbstract.kt | 18 +++---- .../platformStatic/finalAndAbstract.txt | 16 +++--- .../annotations/platformStatic/functions.kt | 18 +++---- .../annotations/platformStatic/functions.txt | 12 ++--- .../annotations/platformStatic/localFun.kt | 4 +- .../annotations/platformStatic/property.kt | 24 ++++----- .../annotations/platformStatic/property.txt | 12 ++--- .../duplicateJvmSignature/jvmOverloads.kt | 2 +- .../duplicateJvmSignature/jvmOverloads.txt | 2 +- .../duplicateJvmSignature/platformNames.kt | 10 ++-- .../duplicateJvmSignature/platformNames.txt | 6 +-- .../platformNamesDuplicate.kt | 12 ++--- .../platformNamesDuplicate.txt | 18 +++---- .../platformStaticInClassObject.kt | 4 +- .../platformStaticInClassObject.txt | 2 +- .../platformStaticInObject.kt | 4 +- .../platformStaticInObject.txt | 2 +- .../kotlin/resolve/DescriptorUtils.java | 2 +- .../JavaToKotlinPreconversionPullUpHelper.kt | 2 +- .../checker/PlatformStaticUsagesRuntime.kt | 26 +++++----- .../AddImportsWithExplicitImports.expected.kt | 2 +- .../FileWithNoPackageStatement.expected.kt | 2 +- .../pullUp/j2k/fromClassToClass.kt.after | 2 +- .../fromClassToClassAndMakeAbstract.kt.after | 2 +- .../pullUp/j2k/fromClassToInterface.kt.after | 2 +- .../j2k/fromClassToNestedClass.kt.after | 2 +- .../after/RenameKotlinStaticMethod.kt | 2 +- .../before/RenameKotlinStaticMethod.kt | 2 +- j2k/src/org/jetbrains/kotlin/j2k/Converter.kt | 4 +- .../classExpression/primitivesAndArrays.kt | 2 +- .../comments/commentsForConstructors.kt | 2 +- .../constructors/allCallsPrimary.kt | 2 +- .../fieldsInitializedFromParams9.kt | 2 +- .../nestedClassNameInParameterDefaults.kt | 2 +- .../nestedClassNameInParameterDefaults2.kt | 2 +- .../nestedClassNameInParameterDefaults3.kt | 2 +- .../nestedClassNameInParameterDefaults4.kt | 2 +- .../constructors/parameterDefaults1.kt | 2 +- .../constructors/parameterDefaults2.kt | 2 +- .../constructors/parameterDefaults3.kt | 2 +- .../constructors/parameterDefaults4.kt | 2 +- .../constructors/parameterDefaults5.kt | 2 +- .../constructors/parameterModification.kt | 2 +- .../secondaryConstructorWithDefaultValues.kt | 2 +- .../secondaryConstructorWithDefaultValues2.kt | 2 +- ...ferentFieldNameAndDefaultParameterValue.kt | 2 +- .../fileOrElement/for/withContinue1.kt | 2 +- .../fileOrElement/for/withContinue2.kt | 2 +- .../fileOrElement/for/withContinue3.kt | 2 +- .../for/withContinueAndLabels.kt | 2 +- j2k/testData/fileOrElement/function/main.kt | 2 +- j2k/testData/fileOrElement/function/main2.kt | 2 +- .../function/mainAndNullabilitySetting.kt | 2 +- j2k/testData/fileOrElement/issues/kt-638.kt | 2 +- j2k/testData/fileOrElement/issues/kt-807.kt | 2 +- j2k/testData/fileOrElement/issues/kt-871.kt | 2 +- .../fileOrElement/overloads/Annotations.kt | 2 +- .../fileOrElement/overloads/Simple.kt | 4 +- .../switch/comlicatedFallDown.kt | 2 +- .../fileOrElement/switch/emptySwitch.kt | 2 +- j2k/testData/fileOrElement/switch/fallDown.kt | 2 +- .../switch/fallDownWithBlocks.kt | 2 +- j2k/testData/fileOrElement/switch/kt-539.kt | 2 +- .../fileOrElement/switch/nondefault.kt | 2 +- .../src/kotlin/jvm/JvmPlatformAnnotations.kt | 6 +-- .../stdlib/src/kotlin/platform/annotations.kt | 4 +- 107 files changed, 290 insertions(+), 266 deletions(-) create mode 100644 compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/annotationUtil.kt diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueSubstitutor.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueSubstitutor.kt index 7d6a9e92f4b..f9f0150224f 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueSubstitutor.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueSubstitutor.kt @@ -20,13 +20,13 @@ import org.jetbrains.kotlin.codegen.binding.CodegenBinding import org.jetbrains.kotlin.codegen.context.CodegenContext import org.jetbrains.kotlin.codegen.state.GenerationState import org.jetbrains.kotlin.descriptors.* -import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.JetClass import org.jetbrains.kotlin.psi.JetClassOrObject import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.resolve.descriptorUtil.hasDefaultValue import org.jetbrains.kotlin.resolve.jvm.AsmTypes import org.jetbrains.kotlin.resolve.jvm.diagnostics.OtherOrigin +import org.jetbrains.kotlin.resolve.jvm.annotations.hasJvmOverloadsAnnotation import org.jetbrains.org.objectweb.asm.Opcodes import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter @@ -75,7 +75,7 @@ public class DefaultParameterValueSubstitutor(val state: GenerationState) { delegateFunctionDescriptor: FunctionDescriptor, owner: CodegenContext<*>, classBuilder: ClassBuilder): Boolean { - if (functionDescriptor.getAnnotations().findAnnotation(FqName("kotlin.jvm.jvmOverloads")) == null) { + if (!functionDescriptor.hasJvmOverloadsAnnotation()) { return false } diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/annotationUtil.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/annotationUtil.kt new file mode 100644 index 00000000000..f109415a5cb --- /dev/null +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/annotationUtil.kt @@ -0,0 +1,24 @@ +/* + * Copyright 2010-2015 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.kotlin.resolve.jvm.annotations + +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.name.FqName + +public fun DeclarationDescriptor.hasJvmOverloadsAnnotation(): Boolean { + return getAnnotations().findAnnotation(FqName("kotlin.jvm.JvmOverloads")) != null +} diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/DefaultErrorMessagesJvm.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/DefaultErrorMessagesJvm.java index 2369229e199..c4d53c63757 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/DefaultErrorMessagesJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/DefaultErrorMessagesJvm.java @@ -47,12 +47,12 @@ public class DefaultErrorMessagesJvm implements DefaultErrorMessages.Extension { static { MAP.put(ErrorsJvm.CONFLICTING_JVM_DECLARATIONS, "Platform declaration clash: {0}", CONFLICTING_JVM_DECLARATIONS_DATA); MAP.put(ErrorsJvm.ACCIDENTAL_OVERRIDE, "Accidental override: {0}", CONFLICTING_JVM_DECLARATIONS_DATA); - MAP.put(ErrorsJvm.JVM_STATIC_NOT_IN_OBJECT, "Only functions in named objects and companion objects of classes can be annotated with 'jvmStatic'"); - MAP.put(ErrorsJvm.OVERRIDE_CANNOT_BE_STATIC, "Override member cannot be 'jvmStatic' in object"); - MAP.put(ErrorsJvm.OVERLOADS_WITHOUT_DEFAULT_ARGUMENTS, "''jvmOverloads'' annotation has no effect for methods without default arguments"); - MAP.put(ErrorsJvm.OVERLOADS_ABSTRACT, "''jvmOverloads'' annotation cannot be used on abstract methods"); - MAP.put(ErrorsJvm.OVERLOADS_PRIVATE, "''jvmOverloads'' annotation has no effect on private and local declarations"); - MAP.put(ErrorsJvm.INAPPLICABLE_JVM_NAME, "''jvmName'' annotation is not applicable to this declaration"); + MAP.put(ErrorsJvm.JVM_STATIC_NOT_IN_OBJECT, "Only functions in named objects and companion objects of classes can be annotated with 'JvmStatic'"); + MAP.put(ErrorsJvm.OVERRIDE_CANNOT_BE_STATIC, "Override member cannot be 'JvmStatic' in object"); + MAP.put(ErrorsJvm.OVERLOADS_WITHOUT_DEFAULT_ARGUMENTS, "''JvmOverloads'' annotation has no effect for methods without default arguments"); + MAP.put(ErrorsJvm.OVERLOADS_ABSTRACT, "''JvmOverloads'' annotation cannot be used on abstract methods"); + MAP.put(ErrorsJvm.OVERLOADS_PRIVATE, "''JvmOverloads'' annotation has no effect on private and local declarations"); + MAP.put(ErrorsJvm.INAPPLICABLE_JVM_NAME, "''JvmName'' annotation is not applicable to this declaration"); MAP.put(ErrorsJvm.ILLEGAL_JVM_NAME, "Illegal JVM name: ''{0}''", STRING); MAP.put(ErrorsJvm.EXTERNAL_DECLARATION_CANNOT_BE_ABSTRACT, "External declaration can not be abstract"); MAP.put(ErrorsJvm.EXTERNAL_DECLARATION_CANNOT_HAVE_BODY, "External declaration can not have a body"); diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/platform/JvmPlatformConfigurator.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/platform/JvmPlatformConfigurator.kt index 39ecb20f586..70816f9364a 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/platform/JvmPlatformConfigurator.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/platform/JvmPlatformConfigurator.kt @@ -34,7 +34,6 @@ import org.jetbrains.kotlin.load.java.lazy.types.isMarkedNullable import org.jetbrains.kotlin.load.kotlin.JavaAnnotationCallChecker import org.jetbrains.kotlin.load.kotlin.JavaAnnotationMethodCallChecker import org.jetbrains.kotlin.load.kotlin.nativeDeclarations.NativeFunChecker -import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.resolve.* @@ -51,6 +50,7 @@ import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValueFactory import org.jetbrains.kotlin.resolve.calls.smartcasts.Nullability import org.jetbrains.kotlin.resolve.descriptorUtil.getAnnotationRetention import org.jetbrains.kotlin.resolve.descriptorUtil.isRepeatableAnnotation +import org.jetbrains.kotlin.resolve.jvm.annotations.hasJvmOverloadsAnnotation import org.jetbrains.kotlin.resolve.jvm.calls.checkers.JavaClassOnCompanionChecker import org.jetbrains.kotlin.resolve.jvm.calls.checkers.NeedSyntheticChecker import org.jetbrains.kotlin.resolve.jvm.calls.checkers.ReflectionAPICallChecker @@ -226,7 +226,7 @@ public class OverloadsAnnotationChecker: DeclarationChecker { diagnosticHolder: DiagnosticSink, bindingContext: BindingContext ) { - if (descriptor.getAnnotations().findAnnotation(FqName("kotlin.jvm.jvmOverloads")) != null) { + if (descriptor.hasJvmOverloadsAnnotation()) { checkDeclaration(declaration, descriptor, diagnosticHolder) } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationUtil.kt index de05a40c40c..0ad8c41647c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationUtil.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationUtil.kt @@ -29,7 +29,7 @@ public fun DeclarationDescriptor.hasInlineAnnotation(): Boolean { public fun DeclarationDescriptor.hasPlatformStaticAnnotation(): Boolean { return getAnnotations().findAnnotation(FqName("kotlin.platform.platformStatic")) != null || - getAnnotations().findAnnotation(FqName("kotlin.jvm.jvmStatic")) != null + getAnnotations().findAnnotation(FqName("kotlin.jvm.JvmStatic")) != null } public fun DeclarationDescriptor.findPublicFieldAnnotation(): AnnotationDescriptor? { diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/JvmOverloads.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/JvmOverloads.java index 4bf39a7f911..14d3ce8cfaf 100644 --- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/JvmOverloads.java +++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/JvmOverloads.java @@ -1,13 +1,13 @@ public final class C { - @kotlin.jvm.jvmOverloads + @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public final java.lang.String foo(@org.jetbrains.annotations.NotNull java.lang.String o, @org.jetbrains.annotations.NotNull java.lang.String s1, @org.jetbrains.annotations.NotNull java.lang.String k, @org.jetbrains.annotations.Nullable java.lang.String s2) { /* compiled code */ } - @kotlin.jvm.jvmOverloads + @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public java.lang.String foo(@org.jetbrains.annotations.NotNull java.lang.String p, @org.jetbrains.annotations.NotNull java.lang.String p1, @org.jetbrains.annotations.Nullable java.lang.String p2) { /* compiled code */ } - @kotlin.jvm.jvmOverloads + @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public java.lang.String foo(@org.jetbrains.annotations.NotNull java.lang.String p, @org.jetbrains.annotations.Nullable java.lang.String p1) { /* compiled code */ } diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/JvmOverloads.kt b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/JvmOverloads.kt index 66d2963eb02..09d2e4fb3c1 100644 --- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/JvmOverloads.kt +++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/JvmOverloads.kt @@ -1,7 +1,7 @@ // C class C { - @[kotlin.jvm.jvmOverloads] public fun foo(o: String = "O", s1: String, k: String = "K", s2: String?): String { + @[kotlin.jvm.JvmOverloads] public fun foo(o: String = "O", s1: String, k: String = "K", s2: String?): String { return o + k } } diff --git a/compiler/testData/codegen/boxWithJava/jvmOverloads/generics/generics.kt b/compiler/testData/codegen/boxWithJava/jvmOverloads/generics/generics.kt index 71adbb0e46e..a840a848e32 100644 --- a/compiler/testData/codegen/boxWithJava/jvmOverloads/generics/generics.kt +++ b/compiler/testData/codegen/boxWithJava/jvmOverloads/generics/generics.kt @@ -1,5 +1,5 @@ class C { - @kotlin.jvm.jvmOverloads public fun foo(o: T, k: String = "K"): String = o.toString() + k + @kotlin.jvm.JvmOverloads public fun foo(o: T, k: String = "K"): String = o.toString() + k } fun box(): String { diff --git a/compiler/testData/codegen/boxWithJava/jvmOverloads/simple/simple.kt b/compiler/testData/codegen/boxWithJava/jvmOverloads/simple/simple.kt index 1376f3849c5..f09c10e1223 100644 --- a/compiler/testData/codegen/boxWithJava/jvmOverloads/simple/simple.kt +++ b/compiler/testData/codegen/boxWithJava/jvmOverloads/simple/simple.kt @@ -1,5 +1,5 @@ class C { - @kotlin.jvm.jvmOverloads public fun foo(o: String = "O", k: String = "K"): String = o + k + @kotlin.jvm.JvmOverloads public fun foo(o: String = "O", k: String = "K"): String = o + k } fun box(): String { diff --git a/compiler/testData/codegen/boxWithJava/platformName/FakePlatformName.java b/compiler/testData/codegen/boxWithJava/platformName/FakePlatformName.java index 5c5d2f132d9..3fd27a352ee 100644 --- a/compiler/testData/codegen/boxWithJava/platformName/FakePlatformName.java +++ b/compiler/testData/codegen/boxWithJava/platformName/FakePlatformName.java @@ -1,7 +1,7 @@ -import kotlin.jvm.jvmName; +import kotlin.jvm.JvmName; public class FakePlatformName { - @jvmName(name = "fake") + @JvmName(name = "fake") public String foo() { return "foo"; } diff --git a/compiler/testData/codegen/boxWithJava/platformStatic/annotations/simpleClassObject.kt b/compiler/testData/codegen/boxWithJava/platformStatic/annotations/simpleClassObject.kt index dfb2b6baaf3..50de5103e0f 100644 --- a/compiler/testData/codegen/boxWithJava/platformStatic/annotations/simpleClassObject.kt +++ b/compiler/testData/codegen/boxWithJava/platformStatic/annotations/simpleClassObject.kt @@ -1,4 +1,4 @@ -import kotlin.jvm.jvmStatic +import kotlin.jvm.JvmStatic annotation(retention = AnnotationRetention.RUNTIME) class testAnnotation @@ -7,14 +7,14 @@ class A { companion object { val b: String = "OK" - jvmStatic testAnnotation fun test1() = b + JvmStatic testAnnotation fun test1() = b } } object B { val b: String = "OK" - jvmStatic testAnnotation fun test1() = b + JvmStatic testAnnotation fun test1() = b } fun box(): String { diff --git a/compiler/testData/codegen/boxWithJava/platformStatic/classObject/simpleClassObject.kt b/compiler/testData/codegen/boxWithJava/platformStatic/classObject/simpleClassObject.kt index 8362ee241f2..e5b3ca38ff1 100644 --- a/compiler/testData/codegen/boxWithJava/platformStatic/classObject/simpleClassObject.kt +++ b/compiler/testData/codegen/boxWithJava/platformStatic/classObject/simpleClassObject.kt @@ -1,17 +1,17 @@ -import kotlin.jvm.jvmStatic +import kotlin.jvm.JvmStatic class A { companion object { val b: String = "OK" - jvmStatic val c: String = "OK" + JvmStatic val c: String = "OK" - jvmStatic fun test1() = b + JvmStatic fun test1() = b - jvmStatic fun test2() = b + JvmStatic fun test2() = b - jvmStatic fun String.test3() = this + b + JvmStatic fun String.test3() = this + b } } diff --git a/compiler/testData/codegen/boxWithJava/platformStatic/enumCompanion/enumCompanionObject.kt b/compiler/testData/codegen/boxWithJava/platformStatic/enumCompanion/enumCompanionObject.kt index 04fcab60372..4719653fbcd 100644 --- a/compiler/testData/codegen/boxWithJava/platformStatic/enumCompanion/enumCompanionObject.kt +++ b/compiler/testData/codegen/boxWithJava/platformStatic/enumCompanion/enumCompanionObject.kt @@ -1,13 +1,13 @@ -import kotlin.jvm.jvmStatic +import kotlin.jvm.JvmStatic enum class A { ; companion object { val foo: String = "OK" - jvmStatic val bar: String = "OK" + JvmStatic val bar: String = "OK" - jvmStatic fun baz() = foo + JvmStatic fun baz() = foo } } diff --git a/compiler/testData/codegen/boxWithJava/platformStatic/object/simpleObject.kt b/compiler/testData/codegen/boxWithJava/platformStatic/object/simpleObject.kt index 540221b1ad5..2986f0b2e7e 100644 --- a/compiler/testData/codegen/boxWithJava/platformStatic/object/simpleObject.kt +++ b/compiler/testData/codegen/boxWithJava/platformStatic/object/simpleObject.kt @@ -1,16 +1,16 @@ -import kotlin.jvm.jvmStatic +import kotlin.jvm.JvmStatic object A { val b: String = "OK" - jvmStatic val c: String = "OK" + JvmStatic val c: String = "OK" - jvmStatic fun test1() = b + JvmStatic fun test1() = b - jvmStatic fun test2() = b + JvmStatic fun test2() = b - jvmStatic fun String.test3() = this + b + JvmStatic fun String.test3() = this + b } fun box(): String { diff --git a/compiler/testData/codegen/boxWithStdlib/jvmOverloads/companionObject.kt b/compiler/testData/codegen/boxWithStdlib/jvmOverloads/companionObject.kt index 7ba1c9fa456..2a2e97f8277 100644 --- a/compiler/testData/codegen/boxWithStdlib/jvmOverloads/companionObject.kt +++ b/compiler/testData/codegen/boxWithStdlib/jvmOverloads/companionObject.kt @@ -1,6 +1,6 @@ class C { companion object { - @kotlin.platform.platformStatic @kotlin.jvm.jvmOverloads public fun foo(o: String, k: String = "K"): String { + @kotlin.platform.platformStatic @kotlin.jvm.JvmOverloads public fun foo(o: String, k: String = "K"): String { return o + k } } diff --git a/compiler/testData/codegen/boxWithStdlib/jvmOverloads/defaultsNotAtEnd.kt b/compiler/testData/codegen/boxWithStdlib/jvmOverloads/defaultsNotAtEnd.kt index e1e0cd332ba..d48faedd73f 100644 --- a/compiler/testData/codegen/boxWithStdlib/jvmOverloads/defaultsNotAtEnd.kt +++ b/compiler/testData/codegen/boxWithStdlib/jvmOverloads/defaultsNotAtEnd.kt @@ -1,5 +1,5 @@ class C { - @kotlin.jvm.jvmOverloads public fun foo(o: String = "O", i1: Int, k: String = "K", i2: Int): String { + @kotlin.jvm.JvmOverloads public fun foo(o: String = "O", i1: Int, k: String = "K", i2: Int): String { return o + k } } diff --git a/compiler/testData/codegen/boxWithStdlib/jvmOverloads/doubleParameters.kt b/compiler/testData/codegen/boxWithStdlib/jvmOverloads/doubleParameters.kt index 50786da1b39..32ee1f4a9ec 100644 --- a/compiler/testData/codegen/boxWithStdlib/jvmOverloads/doubleParameters.kt +++ b/compiler/testData/codegen/boxWithStdlib/jvmOverloads/doubleParameters.kt @@ -1,5 +1,5 @@ class C { - @kotlin.jvm.jvmOverloads public fun foo(d1: Double, d2: Double, status: String = "OK"): String { + @kotlin.jvm.JvmOverloads public fun foo(d1: Double, d2: Double, status: String = "OK"): String { return if (d1 + d2 == 3.0) status else "fail" } } diff --git a/compiler/testData/codegen/boxWithStdlib/jvmOverloads/extensionMethod.kt b/compiler/testData/codegen/boxWithStdlib/jvmOverloads/extensionMethod.kt index f0ba749624f..7d6de9c32b3 100644 --- a/compiler/testData/codegen/boxWithStdlib/jvmOverloads/extensionMethod.kt +++ b/compiler/testData/codegen/boxWithStdlib/jvmOverloads/extensionMethod.kt @@ -1,7 +1,7 @@ class C { } -@kotlin.jvm.jvmOverloads fun C.foo(o: String, k: String = "K"): String { +@kotlin.jvm.JvmOverloads fun C.foo(o: String, k: String = "K"): String { return o + k } diff --git a/compiler/testData/codegen/boxWithStdlib/jvmOverloads/multipleDefaultParameters.kt b/compiler/testData/codegen/boxWithStdlib/jvmOverloads/multipleDefaultParameters.kt index 700fff6bdf1..66c076ca573 100644 --- a/compiler/testData/codegen/boxWithStdlib/jvmOverloads/multipleDefaultParameters.kt +++ b/compiler/testData/codegen/boxWithStdlib/jvmOverloads/multipleDefaultParameters.kt @@ -1,5 +1,5 @@ class C { - @kotlin.jvm.jvmOverloads public fun foo(o: String = "O", k: String = "K"): String { + @kotlin.jvm.JvmOverloads public fun foo(o: String = "O", k: String = "K"): String { return o + k } } diff --git a/compiler/testData/codegen/boxWithStdlib/jvmOverloads/nonDefaultParameter.kt b/compiler/testData/codegen/boxWithStdlib/jvmOverloads/nonDefaultParameter.kt index 26a69c6b1ed..650f14ba119 100644 --- a/compiler/testData/codegen/boxWithStdlib/jvmOverloads/nonDefaultParameter.kt +++ b/compiler/testData/codegen/boxWithStdlib/jvmOverloads/nonDefaultParameter.kt @@ -1,5 +1,5 @@ class C { - @kotlin.jvm.jvmOverloads public fun foo(o: String, k: String = "K"): String { + @kotlin.jvm.JvmOverloads public fun foo(o: String, k: String = "K"): String { return o + k } } diff --git a/compiler/testData/codegen/boxWithStdlib/jvmOverloads/primaryConstructor.kt b/compiler/testData/codegen/boxWithStdlib/jvmOverloads/primaryConstructor.kt index 2a404b1c323..26c6ea2239b 100644 --- a/compiler/testData/codegen/boxWithStdlib/jvmOverloads/primaryConstructor.kt +++ b/compiler/testData/codegen/boxWithStdlib/jvmOverloads/primaryConstructor.kt @@ -1,4 +1,4 @@ -class C @kotlin.jvm.jvmOverloads constructor(s1: String, s2: String = "K") { +class C @kotlin.jvm.JvmOverloads constructor(s1: String, s2: String = "K") { public val status: String = s1 + s2 } diff --git a/compiler/testData/codegen/boxWithStdlib/jvmOverloads/secondaryConstructor.kt b/compiler/testData/codegen/boxWithStdlib/jvmOverloads/secondaryConstructor.kt index a32423995e4..102dee57b11 100644 --- a/compiler/testData/codegen/boxWithStdlib/jvmOverloads/secondaryConstructor.kt +++ b/compiler/testData/codegen/boxWithStdlib/jvmOverloads/secondaryConstructor.kt @@ -1,7 +1,7 @@ class C(val i: Int) { var status = "fail" - @kotlin.jvm.jvmOverloads constructor(o: String, k: String = "K"): this(-1) { + @kotlin.jvm.JvmOverloads constructor(o: String, k: String = "K"): this(-1) { status = o + k } } diff --git a/compiler/testData/codegen/boxWithStdlib/jvmOverloads/simple.kt b/compiler/testData/codegen/boxWithStdlib/jvmOverloads/simple.kt index 15ef43d6ace..e85d5152e0b 100644 --- a/compiler/testData/codegen/boxWithStdlib/jvmOverloads/simple.kt +++ b/compiler/testData/codegen/boxWithStdlib/jvmOverloads/simple.kt @@ -1,5 +1,5 @@ class C { - @kotlin.jvm.jvmOverloads public fun foo(s: String = "OK"): String { + @kotlin.jvm.JvmOverloads public fun foo(s: String = "OK"): String { return s } } diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/functions/platformName.kt b/compiler/testData/codegen/boxWithStdlib/reflection/functions/platformName.kt index b5d2dfe5c44..9d84219d94e 100644 --- a/compiler/testData/codegen/boxWithStdlib/reflection/functions/platformName.kt +++ b/compiler/testData/codegen/boxWithStdlib/reflection/functions/platformName.kt @@ -1,4 +1,4 @@ -@jvmName("Fail") +@JvmName("Fail") fun OK() {} fun box() = ::OK.name diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/platformStatic/companionObjectFunction.kt b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/platformStatic/companionObjectFunction.kt index 2e7784ee1a4..75598404ef1 100644 --- a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/platformStatic/companionObjectFunction.kt +++ b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/platformStatic/companionObjectFunction.kt @@ -21,7 +21,7 @@ fun box(): String { val staticMethod = javaClass().getDeclaredMethod("foo", javaClass()) val k2 = staticMethod.kotlinFunction ?: - return "Fail: no Kotlin function found for static bridge for @jvmStatic method in companion object C::foo" + return "Fail: no Kotlin function found for static bridge for @JvmStatic method in companion object C::foo" assertEquals(3, k2.call(C, "ghi")) failsWith(javaClass()) { k2.call(null, "")!! } diff --git a/compiler/testData/compileJavaAgainstKotlin/method/platformName/PlatformName.kt b/compiler/testData/compileJavaAgainstKotlin/method/platformName/PlatformName.kt index 80a9395e861..68737284b5a 100644 --- a/compiler/testData/compileJavaAgainstKotlin/method/platformName/PlatformName.kt +++ b/compiler/testData/compileJavaAgainstKotlin/method/platformName/PlatformName.kt @@ -1,4 +1,4 @@ package test -@jvmName("bar") +@JvmName("bar") fun foo() {} \ No newline at end of file diff --git a/compiler/testData/compileJavaAgainstKotlin/method/platformName/PlatformName.txt b/compiler/testData/compileJavaAgainstKotlin/method/platformName/PlatformName.txt index be7eefd091f..8d053abdb46 100644 --- a/compiler/testData/compileJavaAgainstKotlin/method/platformName/PlatformName.txt +++ b/compiler/testData/compileJavaAgainstKotlin/method/platformName/PlatformName.txt @@ -1,6 +1,6 @@ package test -kotlin.jvm.jvmName(name = "bar") internal fun foo(): kotlin.Unit +kotlin.jvm.JvmName(name = "bar") internal fun foo(): kotlin.Unit public open class PlatformName { public constructor PlatformName() diff --git a/compiler/testData/compileJavaAgainstKotlin/method/throws/DefaultArgs.kt b/compiler/testData/compileJavaAgainstKotlin/method/throws/DefaultArgs.kt index b41adeac603..dabd56ef2a5 100644 --- a/compiler/testData/compileJavaAgainstKotlin/method/throws/DefaultArgs.kt +++ b/compiler/testData/compileJavaAgainstKotlin/method/throws/DefaultArgs.kt @@ -2,7 +2,7 @@ package test class E1: Exception() -Throws(E1::class) jvmOverloads +Throws(E1::class) JvmOverloads fun one(a: Int = 1) {} class One @Throws(E1::class) constructor(a: Int = 1) { diff --git a/compiler/testData/compileJavaAgainstKotlin/method/throws/DefaultArgs.txt b/compiler/testData/compileJavaAgainstKotlin/method/throws/DefaultArgs.txt index b03b911e2ae..8278d6e772a 100644 --- a/compiler/testData/compileJavaAgainstKotlin/method/throws/DefaultArgs.txt +++ b/compiler/testData/compileJavaAgainstKotlin/method/throws/DefaultArgs.txt @@ -1,6 +1,6 @@ package test -kotlin.jvm.jvmOverloads() internal fun one(/*0*/ kotlin.Int = ...): kotlin.Unit +kotlin.jvm.JvmOverloads() internal fun one(/*0*/ kotlin.Int = ...): kotlin.Unit internal final class E1 : java.lang.Exception { public constructor E1() diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/illegalPlatformName.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/illegalPlatformName.kt index ee5a5f46823..56e23129bc6 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/illegalPlatformName.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/illegalPlatformName.kt @@ -1,12 +1,12 @@ // !DIAGNOSTICS: -UNUSED_PARAMETER -@jvmName("") +@JvmName("") fun foo(a: Any) {} -@jvmName(".") +@JvmName(".") fun foo() {} -@jvmName("/") +@JvmName("/") fun fooSlash() {} -@jvmName("<") +@JvmName("<") fun fooLT() {} \ No newline at end of file diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/illegalPlatformName.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/illegalPlatformName.txt index c3572a7be80..f7fc0ea5921 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/illegalPlatformName.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/illegalPlatformName.txt @@ -1,6 +1,6 @@ package -kotlin.jvm.jvmName(name = ".") internal fun foo(): kotlin.Unit -kotlin.jvm.jvmName(name = "") internal fun foo(/*0*/ a: kotlin.Any): kotlin.Unit -kotlin.jvm.jvmName(name = "<") internal fun fooLT(): kotlin.Unit -kotlin.jvm.jvmName(name = "/") internal fun fooSlash(): kotlin.Unit +kotlin.jvm.JvmName(name = ".") internal fun foo(): kotlin.Unit +kotlin.jvm.JvmName(name = "") internal fun foo(/*0*/ a: kotlin.Any): kotlin.Unit +kotlin.jvm.JvmName(name = "<") internal fun fooLT(): kotlin.Unit +kotlin.jvm.JvmName(name = "/") internal fun fooSlash(): kotlin.Unit diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/jvmName.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/jvmName.kt index d291c892735..2e23bd44b77 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/jvmName.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/jvmName.kt @@ -1,89 +1,89 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER -@jvmName("a") +@JvmName("a") fun foo() {} -@jvmName("b") +@JvmName("b") fun Any.foo() {} -@jvmName("c") +@JvmName("c") val px = 1 -@jvmName("d") +@JvmName("d") val Any.px : Int get() = 1 val valx: Int - @jvmName("e") + @JvmName("e") get() = 1 var varx: Int - @jvmName("f") + @JvmName("f") get() = 1 - @jvmName("g") + @JvmName("g") set(v) {} var vardef: Int = 1 - @jvmName("h") + @JvmName("h") get - @jvmName("i") + @JvmName("i") set -@jvmName("C") -class C jvmName("primary") constructor() { - jvmName("ctr") constructor(x: Int): this() {} +@JvmName("C") +class C JvmName("primary") constructor() { + JvmName("ctr") constructor(x: Int): this() {} - @jvmName("a") + @JvmName("a") fun foo() {} - @jvmName("b") + @JvmName("b") fun Any.foo() {} - @jvmName("c") + @JvmName("c") val px = 1 - @jvmName("d") + @JvmName("d") val Any.px : Int get() = 1 val valx: Int - @jvmName("e") + @JvmName("e") get() = 1 var varx: Int - @jvmName("f") + @JvmName("f") get() = 1 - @jvmName("g") + @JvmName("g") set(v) {} } fun foo1() { - @jvmName("a") + @JvmName("a") fun foo() {} - @jvmName("a") + @JvmName("a") val x = 1 } abstract class AB { - @jvmName("AB_absFun1") + @JvmName("AB_absFun1") abstract fun absFun1() abstract fun absFun2() - @jvmName("AB_openFun") + @JvmName("AB_openFun") open fun openFun() {} } class D: AB() { override fun absFun1() {} - @jvmName("D_absFun2") + @JvmName("D_absFun2") override fun absFun2() {} - @jvmName("D_openFun") + @JvmName("D_openFun") final override fun openFun() {} - @jvmName("D_finalFun") + @JvmName("D_finalFun") fun finalFun() {} } \ No newline at end of file diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/jvmName.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/jvmName.txt index 573019eef05..9c851c74c13 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/jvmName.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/jvmName.txt @@ -5,41 +5,41 @@ internal val valx: kotlin.Int internal var vardef: kotlin.Int internal var varx: kotlin.Int internal val kotlin.Any.px: kotlin.Int -kotlin.jvm.jvmName(name = "a") internal fun foo(): kotlin.Unit +kotlin.jvm.JvmName(name = "a") internal fun foo(): kotlin.Unit internal fun foo1(): kotlin.Unit -kotlin.jvm.jvmName(name = "b") internal fun kotlin.Any.foo(): kotlin.Unit +kotlin.jvm.JvmName(name = "b") internal fun kotlin.Any.foo(): kotlin.Unit internal abstract class AB { public constructor AB() - kotlin.jvm.jvmName(name = "AB_absFun1") internal abstract fun absFun1(): kotlin.Unit + kotlin.jvm.JvmName(name = "AB_absFun1") internal abstract fun absFun1(): kotlin.Unit internal abstract fun absFun2(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - kotlin.jvm.jvmName(name = "AB_openFun") internal open fun openFun(): kotlin.Unit + kotlin.jvm.JvmName(name = "AB_openFun") internal open fun openFun(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -kotlin.jvm.jvmName(name = "C") internal final class C { - kotlin.jvm.jvmName(name = "primary") public constructor C() - kotlin.jvm.jvmName(name = "ctr") public constructor C(/*0*/ x: kotlin.Int) +kotlin.jvm.JvmName(name = "C") internal final class C { + kotlin.jvm.JvmName(name = "primary") public constructor C() + kotlin.jvm.JvmName(name = "ctr") public constructor C(/*0*/ x: kotlin.Int) internal final val px: kotlin.Int = 1 internal final val valx: kotlin.Int internal final var varx: kotlin.Int internal final val kotlin.Any.px: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - kotlin.jvm.jvmName(name = "a") internal final fun foo(): kotlin.Unit + kotlin.jvm.JvmName(name = "a") internal final fun foo(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - kotlin.jvm.jvmName(name = "b") internal final fun kotlin.Any.foo(): kotlin.Unit + kotlin.jvm.JvmName(name = "b") internal final fun kotlin.Any.foo(): kotlin.Unit } internal final class D : AB { public constructor D() internal open override /*1*/ fun absFun1(): kotlin.Unit - kotlin.jvm.jvmName(name = "D_absFun2") internal open override /*1*/ fun absFun2(): kotlin.Unit + kotlin.jvm.JvmName(name = "D_absFun2") internal open override /*1*/ fun absFun2(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - kotlin.jvm.jvmName(name = "D_finalFun") internal final fun finalFun(): kotlin.Unit + kotlin.jvm.JvmName(name = "D_finalFun") internal final fun finalFun(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - kotlin.jvm.jvmName(name = "D_openFun") internal final override /*1*/ fun openFun(): kotlin.Unit + kotlin.jvm.JvmName(name = "D_openFun") internal final override /*1*/ fun openFun(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/JvmOverloadWithNoDefaults.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/JvmOverloadWithNoDefaults.kt index b45f3096664..b5b1390eec1 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/JvmOverloadWithNoDefaults.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/JvmOverloadWithNoDefaults.kt @@ -1,7 +1,7 @@ // !DIAGNOSTICS: -UNUSED_PARAMETER class C { - @kotlin.jvm.jvmOverloads constructor() { + @kotlin.jvm.JvmOverloads constructor() { } - @kotlin.jvm.jvmOverloads fun foo(s: String) {} + @kotlin.jvm.JvmOverloads fun foo(s: String) {} } \ No newline at end of file diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/JvmOverloadWithNoDefaults.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/JvmOverloadWithNoDefaults.txt index c3db94d7b3a..98bb760138d 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/JvmOverloadWithNoDefaults.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/JvmOverloadWithNoDefaults.txt @@ -1,9 +1,9 @@ package internal final class C { - kotlin.jvm.jvmOverloads() public constructor C() + kotlin.jvm.JvmOverloads() public constructor C() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - kotlin.jvm.jvmOverloads() internal final fun foo(/*0*/ s: kotlin.String): kotlin.Unit + kotlin.jvm.JvmOverloads() internal final fun foo(/*0*/ s: kotlin.String): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/jvmOverloadsOnAbstractMethods.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/jvmOverloadsOnAbstractMethods.kt index dd5031bbd3b..e13adead1dd 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/jvmOverloadsOnAbstractMethods.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/jvmOverloadsOnAbstractMethods.kt @@ -1,8 +1,8 @@ interface T { - @kotlin.jvm.jvmOverloads fun foo(s: String = "OK") + @kotlin.jvm.JvmOverloads fun foo(s: String = "OK") } abstract class C { - @kotlin.jvm.jvmOverloads abstract fun foo(s: String = "OK") + @kotlin.jvm.JvmOverloads abstract fun foo(s: String = "OK") } \ No newline at end of file diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/jvmOverloadsOnAbstractMethods.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/jvmOverloadsOnAbstractMethods.txt index ae5ebc77d22..ee80ab43310 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/jvmOverloadsOnAbstractMethods.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/jvmOverloadsOnAbstractMethods.txt @@ -3,14 +3,14 @@ package internal abstract class C { public constructor C() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - kotlin.jvm.jvmOverloads() internal abstract fun foo(/*0*/ s: kotlin.String = ...): kotlin.Unit + kotlin.jvm.JvmOverloads() internal abstract fun foo(/*0*/ s: kotlin.String = ...): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } internal interface T { public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - kotlin.jvm.jvmOverloads() internal abstract fun foo(/*0*/ s: kotlin.String = ...): kotlin.Unit + kotlin.jvm.JvmOverloads() internal abstract fun foo(/*0*/ s: kotlin.String = ...): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/jvmOverloadsOnPrivate.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/jvmOverloadsOnPrivate.kt index 7c940c1cf02..5feabdafa57 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/jvmOverloadsOnPrivate.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/jvmOverloadsOnPrivate.kt @@ -1,20 +1,20 @@ // !DIAGNOSTICS: -UNUSED_PARAMETER class C { - @kotlin.jvm.jvmOverloads private fun foo(s: String = "OK") { + @kotlin.jvm.JvmOverloads private fun foo(s: String = "OK") { } - @kotlin.jvm.jvmOverloads fun bar(s: String = "OK") { + @kotlin.jvm.JvmOverloads fun bar(s: String = "OK") { } } fun foo() { class D { - @kotlin.jvm.jvmOverloads fun foo(s: String = "OK") { + @kotlin.jvm.JvmOverloads fun foo(s: String = "OK") { } } val x = object { - @kotlin.jvm.jvmOverloads fun foo(s: String = "OK") { + @kotlin.jvm.JvmOverloads fun foo(s: String = "OK") { } } } \ No newline at end of file diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/jvmOverloadsOnPrivate.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/jvmOverloadsOnPrivate.txt index 6afc1d5b9d2..7d04775c588 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/jvmOverloadsOnPrivate.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/jvmOverloadsOnPrivate.txt @@ -4,9 +4,9 @@ internal fun foo(): kotlin.Unit internal final class C { public constructor C() - kotlin.jvm.jvmOverloads() internal final fun bar(/*0*/ s: kotlin.String = ...): kotlin.Unit + kotlin.jvm.JvmOverloads() internal final fun bar(/*0*/ s: kotlin.String = ...): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - kotlin.jvm.jvmOverloads() private final fun foo(/*0*/ s: kotlin.String = ...): kotlin.Unit + kotlin.jvm.JvmOverloads() private final fun foo(/*0*/ s: kotlin.String = ...): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/constructors.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/constructors.kt index 380fb274b9a..5722ffa4d51 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/constructors.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/constructors.kt @@ -1,9 +1,9 @@ -import kotlin.jvm.jvmStatic +import kotlin.jvm.JvmStatic class A { - jvmStatic constructor() {} + JvmStatic constructor() {} inner class B { - jvmStatic constructor() {} + JvmStatic constructor() {} } } -class C jvmStatic constructor() \ No newline at end of file +class C JvmStatic constructor() \ No newline at end of file diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/constructors.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/constructors.txt index 6feff1dca20..b9f6d0c875a 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/constructors.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/constructors.txt @@ -1,13 +1,13 @@ package internal final class A { - kotlin.jvm.jvmStatic() public constructor A() + kotlin.jvm.JvmStatic() public constructor A() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String internal final inner class B { - kotlin.jvm.jvmStatic() public constructor B() + kotlin.jvm.JvmStatic() public constructor B() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -15,7 +15,7 @@ internal final class A { } internal final class C { - kotlin.jvm.jvmStatic() public constructor C() + kotlin.jvm.JvmStatic() public constructor C() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/finalAndAbstract.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/finalAndAbstract.kt index 1f107b1f27d..7a97f8c5caa 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/finalAndAbstract.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/finalAndAbstract.kt @@ -1,5 +1,5 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -import kotlin.jvm.jvmStatic +import kotlin.jvm.JvmStatic abstract class A { @@ -12,24 +12,24 @@ abstract class A { object B: A() { - @jvmStatic override fun a() {} + @JvmStatic override fun a() {} - @jvmStatic override fun b() {} + @JvmStatic override fun b() {} - @jvmStatic final override fun c() {} + @JvmStatic final override fun c() {} - @jvmStatic open fun d() {} + @JvmStatic open fun d() {} } class C { companion object: A() { - @jvmStatic override fun a() {} + @JvmStatic override fun a() {} - @jvmStatic override fun b() {} + @JvmStatic override fun b() {} - @jvmStatic final override fun c() {} + @JvmStatic final override fun c() {} - @jvmStatic open fun d() {} + @JvmStatic open fun d() {} } } \ No newline at end of file diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/finalAndAbstract.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/finalAndAbstract.txt index 3f513469131..7970f949807 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/finalAndAbstract.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/finalAndAbstract.txt @@ -12,10 +12,10 @@ internal abstract class A { internal object B : A { private constructor B() - kotlin.jvm.jvmStatic() internal open override /*1*/ fun a(): kotlin.Unit - kotlin.jvm.jvmStatic() internal open override /*1*/ fun b(): kotlin.Unit - kotlin.jvm.jvmStatic() internal final override /*1*/ fun c(): kotlin.Unit - kotlin.jvm.jvmStatic() internal open fun d(): kotlin.Unit + kotlin.jvm.JvmStatic() internal open override /*1*/ fun a(): kotlin.Unit + kotlin.jvm.JvmStatic() internal open override /*1*/ fun b(): kotlin.Unit + kotlin.jvm.JvmStatic() internal final override /*1*/ fun c(): kotlin.Unit + kotlin.jvm.JvmStatic() internal open fun d(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -29,10 +29,10 @@ internal final class C { public companion object Companion : A { private constructor Companion() - kotlin.jvm.jvmStatic() internal open override /*1*/ fun a(): kotlin.Unit - kotlin.jvm.jvmStatic() internal open override /*1*/ fun b(): kotlin.Unit - kotlin.jvm.jvmStatic() internal final override /*1*/ fun c(): kotlin.Unit - kotlin.jvm.jvmStatic() internal open fun d(): kotlin.Unit + kotlin.jvm.JvmStatic() internal open override /*1*/ fun a(): kotlin.Unit + kotlin.jvm.JvmStatic() internal open override /*1*/ fun b(): kotlin.Unit + kotlin.jvm.JvmStatic() internal final override /*1*/ fun c(): kotlin.Unit + kotlin.jvm.JvmStatic() internal open fun d(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.kt index 212a82d1c5c..4fc352bf328 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.kt @@ -1,54 +1,54 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -import kotlin.jvm.jvmStatic +import kotlin.jvm.JvmStatic class A { companion object { - jvmStatic fun a1() { + JvmStatic fun a1() { } } object A { - jvmStatic fun a2() { + JvmStatic fun a2() { } } fun test() { val s = object { - jvmStatic fun a3() { + JvmStatic fun a3() { } } } - jvmStatic fun a4() { + JvmStatic fun a4() { } } interface B { companion object { - jvmStatic fun a1() { + JvmStatic fun a1() { } } object A { - jvmStatic fun a2() { + JvmStatic fun a2() { } } fun test() { val s = object { - jvmStatic fun a3() { + JvmStatic fun a3() { } } } - jvmStatic fun a4() { + JvmStatic fun a4() { } } \ No newline at end of file diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.txt index c20bcb8258a..fcc779b9aa3 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.txt @@ -2,7 +2,7 @@ package internal final class A { public constructor A() - kotlin.jvm.jvmStatic() internal final fun a4(): kotlin.Unit + kotlin.jvm.JvmStatic() internal final fun a4(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int internal final fun test(): kotlin.Unit @@ -10,7 +10,7 @@ internal final class A { internal object A { private constructor A() - kotlin.jvm.jvmStatic() internal final fun a2(): kotlin.Unit + kotlin.jvm.JvmStatic() internal final fun a2(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -18,7 +18,7 @@ internal final class A { public companion object Companion { private constructor Companion() - kotlin.jvm.jvmStatic() internal final fun a1(): kotlin.Unit + kotlin.jvm.JvmStatic() internal final fun a1(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -26,7 +26,7 @@ internal final class A { } internal interface B { - kotlin.jvm.jvmStatic() internal open fun a4(): kotlin.Unit + kotlin.jvm.JvmStatic() internal open fun a4(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int internal open fun test(): kotlin.Unit @@ -34,7 +34,7 @@ internal interface B { internal object A { private constructor A() - kotlin.jvm.jvmStatic() internal final fun a2(): kotlin.Unit + kotlin.jvm.JvmStatic() internal final fun a2(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -42,7 +42,7 @@ internal interface B { public companion object Companion { private constructor Companion() - kotlin.jvm.jvmStatic() internal final fun a1(): kotlin.Unit + kotlin.jvm.JvmStatic() internal final fun a1(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/localFun.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/localFun.kt index 9689ae1d7f8..b5a621e1c0f 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/localFun.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/localFun.kt @@ -1,8 +1,8 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -import kotlin.jvm.jvmStatic +import kotlin.jvm.JvmStatic fun main(args: Array) { - @jvmStatic fun a(){ + @JvmStatic fun a(){ } } \ No newline at end of file diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.kt index cfe384c0287..fe0144e38db 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.kt @@ -1,5 +1,5 @@ // !DIAGNOSTICS: -UNUSED_VARIABLE -import kotlin.jvm.jvmStatic +import kotlin.jvm.JvmStatic open class B { public open val base1 : Int = 1 @@ -9,38 +9,38 @@ open class B { class A { companion object : B() { var p1:Int = 1 - @jvmStatic set(p: Int) { + @JvmStatic set(p: Int) { p1 = 1 } - @jvmStatic val z = 1; + @JvmStatic val z = 1; - @jvmStatic override val base1: Int = 0 + @JvmStatic override val base1: Int = 0 override val base2: Int = 0 - @jvmStatic get + @JvmStatic get } object A : B() { var p:Int = 1 - @jvmStatic set(p1: Int) { + @JvmStatic set(p1: Int) { p = 1 } - @jvmStatic val z = 1; + @JvmStatic val z = 1; - @jvmStatic override val base1: Int = 0 + @JvmStatic override val base1: Int = 0 - jvmStatic open fun f() {} + JvmStatic open fun f() {} override val base2: Int = 0 - @jvmStatic get + @JvmStatic get } var p:Int = 1 - @jvmStatic set(p1: Int) { + @JvmStatic set(p1: Int) { p = 1 } - @jvmStatic val z2 = 1; + @JvmStatic val z2 = 1; } \ No newline at end of file diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.txt index 64aae42a203..c03fd9500d7 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.txt @@ -3,29 +3,29 @@ package internal final class A { public constructor A() internal final var p: kotlin.Int - kotlin.jvm.jvmStatic() internal final val z2: kotlin.Int = 1 + kotlin.jvm.JvmStatic() internal final val z2: kotlin.Int = 1 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String internal object A : B { private constructor A() - kotlin.jvm.jvmStatic() public open override /*1*/ val base1: kotlin.Int = 0 + kotlin.jvm.JvmStatic() public open override /*1*/ val base1: kotlin.Int = 0 public open override /*1*/ val base2: kotlin.Int = 0 internal final var p: kotlin.Int - kotlin.jvm.jvmStatic() internal final val z: kotlin.Int = 1 + kotlin.jvm.JvmStatic() internal final val z: kotlin.Int = 1 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - kotlin.jvm.jvmStatic() internal open fun f(): kotlin.Unit + kotlin.jvm.JvmStatic() internal open fun f(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } public companion object Companion : B { private constructor Companion() - kotlin.jvm.jvmStatic() public open override /*1*/ val base1: kotlin.Int = 0 + kotlin.jvm.JvmStatic() public open override /*1*/ val base1: kotlin.Int = 0 public open override /*1*/ val base2: kotlin.Int = 0 internal final var p1: kotlin.Int - kotlin.jvm.jvmStatic() internal final val z: kotlin.Int = 1 + kotlin.jvm.JvmStatic() internal final val z: kotlin.Int = 1 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmOverloads.kt b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmOverloads.kt index bed08730a0b..d24851c5996 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmOverloads.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmOverloads.kt @@ -1,6 +1,6 @@ // !DIAGNOSTICS: -UNUSED_PARAMETER class A { - @kotlin.jvm.jvmOverloads fun foo(s: String = "") { + @kotlin.jvm.JvmOverloads fun foo(s: String = "") { } fun foo() { diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmOverloads.txt b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmOverloads.txt index f3716deb164..f07b12d25ff 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmOverloads.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmOverloads.txt @@ -4,7 +4,7 @@ internal final class A { public constructor A() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean internal final fun foo(): kotlin.Unit - kotlin.jvm.jvmOverloads() internal final fun foo(/*0*/ s: kotlin.String = ...): kotlin.Unit + kotlin.jvm.JvmOverloads() internal final fun foo(/*0*/ s: kotlin.String = ...): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNames.kt b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNames.kt index 62b80507114..6add6273f2c 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNames.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNames.kt @@ -1,20 +1,20 @@ // !DIAGNOSTICS: -UNUSED_PARAMETER -@jvmName("bar") +@JvmName("bar") fun foo(a: Any) {} fun Any.foo() {} -@jvmName("barInt") +@JvmName("barInt") fun bar(x: List) {} -@jvmName("barStr") +@JvmName("barStr") fun bar(x: List) {} class C { var rwProp: Int - @jvmName("get_rwProp") + @JvmName("get_rwProp") get() = 0 - @jvmName("set_rwProp") + @JvmName("set_rwProp") set(v) {} fun getRwProp(): Int = 123 diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNames.txt b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNames.txt index 01ac6f079a8..b8ed6c04dab 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNames.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNames.txt @@ -1,8 +1,8 @@ package -kotlin.jvm.jvmName(name = "barInt") internal fun bar(/*0*/ x: kotlin.List): kotlin.Unit -kotlin.jvm.jvmName(name = "barStr") internal fun bar(/*0*/ x: kotlin.List): kotlin.Unit -kotlin.jvm.jvmName(name = "bar") internal fun foo(/*0*/ a: kotlin.Any): kotlin.Unit +kotlin.jvm.JvmName(name = "barInt") internal fun bar(/*0*/ x: kotlin.List): kotlin.Unit +kotlin.jvm.JvmName(name = "barStr") internal fun bar(/*0*/ x: kotlin.List): kotlin.Unit +kotlin.jvm.JvmName(name = "bar") internal fun foo(/*0*/ a: kotlin.Any): kotlin.Unit internal fun kotlin.Any.foo(): kotlin.Unit internal final class C { diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNamesDuplicate.kt b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNamesDuplicate.kt index f3942af0235..0146979cee0 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNamesDuplicate.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNamesDuplicate.kt @@ -1,14 +1,14 @@ // !DIAGNOSTICS: -UNUSED_PARAMETER -@jvmName("bar") +@JvmName("bar") fun foo(a: Any) {} fun bar(a: Any) {} class C { - @jvmName("foo1") + @JvmName("foo1") fun foo(list: List) {} - @jvmName("foo1") + @JvmName("foo1") fun foo(list: List) {} } @@ -17,7 +17,7 @@ class C { // A1 -> B1 with accidental override open class A1 { - @jvmName("bar") + @JvmName("bar") open fun foo() {} } @@ -28,7 +28,7 @@ class B1 : A1() { // A2 -> B2 with intended override and conflicting JVM declarations open class A2 { - @jvmName("bar") + @JvmName("bar") open fun foo() {} } @@ -41,7 +41,7 @@ class B2 : A2() { // A3 -> B3 -> C3 with accidental override open class A3 { - @jvmName("bar") + @JvmName("bar") open fun foo() {} } diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNamesDuplicate.txt b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNamesDuplicate.txt index 55f6479b7b7..89b0dc926f7 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNamesDuplicate.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNamesDuplicate.txt @@ -1,12 +1,12 @@ package internal fun bar(/*0*/ a: kotlin.Any): kotlin.Unit -kotlin.jvm.jvmName(name = "bar") internal fun foo(/*0*/ a: kotlin.Any): kotlin.Unit +kotlin.jvm.JvmName(name = "bar") internal fun foo(/*0*/ a: kotlin.Any): kotlin.Unit internal open class A1 { public constructor A1() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - kotlin.jvm.jvmName(name = "bar") internal open fun foo(): kotlin.Unit + kotlin.jvm.JvmName(name = "bar") internal open fun foo(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } @@ -14,7 +14,7 @@ internal open class A1 { internal open class A2 { public constructor A2() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - kotlin.jvm.jvmName(name = "bar") internal open fun foo(): kotlin.Unit + kotlin.jvm.JvmName(name = "bar") internal open fun foo(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } @@ -22,7 +22,7 @@ internal open class A2 { internal open class A3 { public constructor A3() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - kotlin.jvm.jvmName(name = "bar") internal open fun foo(): kotlin.Unit + kotlin.jvm.JvmName(name = "bar") internal open fun foo(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } @@ -31,7 +31,7 @@ internal final class B1 : A1 { public constructor B1() internal final fun bar(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - kotlin.jvm.jvmName(name = "bar") internal open override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit + kotlin.jvm.JvmName(name = "bar") internal open override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } @@ -48,7 +48,7 @@ internal final class B2 : A2 { internal open class B3 : A3 { public constructor B3() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - kotlin.jvm.jvmName(name = "bar") internal open override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit + kotlin.jvm.JvmName(name = "bar") internal open override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } @@ -56,8 +56,8 @@ internal open class B3 : A3 { internal final class C { public constructor C() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - kotlin.jvm.jvmName(name = "foo1") internal final fun foo(/*0*/ list: kotlin.List): kotlin.Unit - kotlin.jvm.jvmName(name = "foo1") internal final fun foo(/*0*/ list: kotlin.List): kotlin.Unit + kotlin.jvm.JvmName(name = "foo1") internal final fun foo(/*0*/ list: kotlin.List): kotlin.Unit + kotlin.jvm.JvmName(name = "foo1") internal final fun foo(/*0*/ list: kotlin.List): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } @@ -66,7 +66,7 @@ internal final class C3 : B3 { public constructor C3() internal final fun bar(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - kotlin.jvm.jvmName(name = "bar") internal open override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit + kotlin.jvm.JvmName(name = "bar") internal open override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.kt b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.kt index 67c053ec61e..6266d73a424 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.kt @@ -1,4 +1,4 @@ -import kotlin.jvm.jvmStatic +import kotlin.jvm.JvmStatic open class Base { fun foo() {} @@ -6,6 +6,6 @@ open class Base { class Derived : Base() { companion object { - jvmStatic fun foo() {} + JvmStatic fun foo() {} } } diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.txt b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.txt index 8bea8a76e7d..bc192fe5991 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.txt @@ -18,7 +18,7 @@ internal final class Derived : Base { public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - kotlin.jvm.jvmStatic() internal final fun foo(): kotlin.Unit + kotlin.jvm.JvmStatic() internal final fun foo(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInObject.kt b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInObject.kt index 64cb16d3c83..3cf367e66cd 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInObject.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInObject.kt @@ -1,10 +1,10 @@ // !DIAGNOSTICS: -UNUSED_PARAMETER -import kotlin.jvm.jvmStatic +import kotlin.jvm.JvmStatic open class Base { fun `foo$default`(i: Int, mask: Int) {} } object Derived : Base() { - jvmStatic fun foo(i: Int = 0) {} + JvmStatic fun foo(i: Int = 0) {} } diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInObject.txt b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInObject.txt index 619afb57e12..aea1dce2537 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInObject.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInObject.txt @@ -11,7 +11,7 @@ internal open class Base { internal object Derived : Base { private constructor Derived() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - kotlin.jvm.jvmStatic() internal final fun foo(/*0*/ i: kotlin.Int = ...): kotlin.Unit + kotlin.jvm.JvmStatic() internal final fun foo(/*0*/ i: kotlin.Int = ...): kotlin.Unit internal final override /*1*/ /*fake_override*/ fun `foo$default`(/*0*/ i: kotlin.Int, /*1*/ mask: kotlin.Int): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java index a5abe752b8d..1f0300c4181 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java @@ -51,7 +51,7 @@ import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage. public class DescriptorUtils { public static final Name ENUM_VALUES = Name.identifier("values"); public static final Name ENUM_VALUE_OF = Name.identifier("valueOf"); - public static final FqName JVM_NAME = new FqName("kotlin.jvm.jvmName"); + public static final FqName JVM_NAME = new FqName("kotlin.jvm.JvmName"); public static final FqName PLATFORM_NAME = new FqName("kotlin.platform.platformName"); private DescriptorUtils() { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/JavaToKotlinPreconversionPullUpHelper.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/JavaToKotlinPreconversionPullUpHelper.kt index e57ba7388d4..815c368679f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/JavaToKotlinPreconversionPullUpHelper.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/JavaToKotlinPreconversionPullUpHelper.kt @@ -58,7 +58,7 @@ public class JavaToKotlinPreconversionPullUpHelper( private val fieldsToUsages = HashMap>() private val dummyAccessorByName = HashMap() - private val jvmStaticAnnotation = JetPsiFactory(data.sourceClass.project).createAnnotationEntry("kotlin.jvm.jvmStatic") + private val jvmStaticAnnotation = JetPsiFactory(data.sourceClass.project).createAnnotationEntry("kotlin.jvm.JvmStatic") companion object { private var PsiMember.originalMember: PsiMember? by CopyableUserDataProperty(Key.create("ORIGINAL_MEMBER")) diff --git a/idea/testData/checker/PlatformStaticUsagesRuntime.kt b/idea/testData/checker/PlatformStaticUsagesRuntime.kt index 5cce5f3c25d..c75bfd65dbc 100644 --- a/idea/testData/checker/PlatformStaticUsagesRuntime.kt +++ b/idea/testData/checker/PlatformStaticUsagesRuntime.kt @@ -1,57 +1,57 @@ -import kotlin.jvm.jvmStatic +import kotlin.jvm.JvmStatic -jvmStatic +JvmStatic class A { - jvmStatic + JvmStatic companion object { - jvmStatic fun a1() { + JvmStatic fun a1() { } } - jvmStatic + JvmStatic object A { - jvmStatic fun a2() { + JvmStatic fun a2() { } } fun test() { val s = object { - jvmStatic fun a3() { + JvmStatic fun a3() { } } } - jvmStatic fun a4() { + JvmStatic fun a4() { } } -jvmStatic +JvmStatic interface B { companion object { - jvmStatic fun a1() { + JvmStatic fun a1() { } } object A { - jvmStatic fun a2() { + JvmStatic fun a2() { } } fun test() { val s = object { - jvmStatic fun a3() { + JvmStatic fun a3() { } } } - jvmStatic fun a4() { + JvmStatic fun a4() { } } \ No newline at end of file diff --git a/idea/testData/copyPaste/conversion/AddImportsWithExplicitImports.expected.kt b/idea/testData/copyPaste/conversion/AddImportsWithExplicitImports.expected.kt index 1dd2516d636..a81e713696a 100644 --- a/idea/testData/copyPaste/conversion/AddImportsWithExplicitImports.expected.kt +++ b/idea/testData/copyPaste/conversion/AddImportsWithExplicitImports.expected.kt @@ -5,7 +5,7 @@ class C { } companion object { - jvmStatic public fun main(args: Array) { + JvmStatic public fun main(args: Array) { } } } \ No newline at end of file diff --git a/idea/testData/copyPaste/conversion/FileWithNoPackageStatement.expected.kt b/idea/testData/copyPaste/conversion/FileWithNoPackageStatement.expected.kt index 661e26aa67b..44cf4e2ce78 100644 --- a/idea/testData/copyPaste/conversion/FileWithNoPackageStatement.expected.kt +++ b/idea/testData/copyPaste/conversion/FileWithNoPackageStatement.expected.kt @@ -1,7 +1,7 @@ package to public object JavaClass { - jvmStatic public fun main(args: Array) { + JvmStatic public fun main(args: Array) { println("Hello, world!") } } \ No newline at end of file diff --git a/idea/testData/refactoring/pullUp/j2k/fromClassToClass.kt.after b/idea/testData/refactoring/pullUp/j2k/fromClassToClass.kt.after index 6d3a79d5fab..e2c44f4590d 100644 --- a/idea/testData/refactoring/pullUp/j2k/fromClassToClass.kt.after +++ b/idea/testData/refactoring/pullUp/j2k/fromClassToClass.kt.after @@ -21,7 +21,7 @@ abstract class A { var X = "1" + "2" // INFO: {"checked": "true"} - jvmStatic fun foo2(n: Int): String { + JvmStatic fun foo2(n: Int): String { return "_" + n + "_" } } diff --git a/idea/testData/refactoring/pullUp/j2k/fromClassToClassAndMakeAbstract.kt.after b/idea/testData/refactoring/pullUp/j2k/fromClassToClassAndMakeAbstract.kt.after index 901e843f176..294fdb7b7a0 100644 --- a/idea/testData/refactoring/pullUp/j2k/fromClassToClassAndMakeAbstract.kt.after +++ b/idea/testData/refactoring/pullUp/j2k/fromClassToClassAndMakeAbstract.kt.after @@ -19,7 +19,7 @@ abstract class A { var X = "1" + "2" // INFO: {"checked": "true", "toAbstract": "true"} - jvmStatic fun foo2(n: Int): String { + JvmStatic fun foo2(n: Int): String { return "_" + n + "_" } } diff --git a/idea/testData/refactoring/pullUp/j2k/fromClassToInterface.kt.after b/idea/testData/refactoring/pullUp/j2k/fromClassToInterface.kt.after index bf9ce487c82..3ff920fa998 100644 --- a/idea/testData/refactoring/pullUp/j2k/fromClassToInterface.kt.after +++ b/idea/testData/refactoring/pullUp/j2k/fromClassToInterface.kt.after @@ -15,7 +15,7 @@ interface A { var X = "1" + "2" // INFO: {"checked": "true"} - jvmStatic fun foo2(n: Int): String { + JvmStatic fun foo2(n: Int): String { return "_" + n + "_" } } diff --git a/idea/testData/refactoring/pullUp/j2k/fromClassToNestedClass.kt.after b/idea/testData/refactoring/pullUp/j2k/fromClassToNestedClass.kt.after index 7ab62522598..6ce799fffbe 100644 --- a/idea/testData/refactoring/pullUp/j2k/fromClassToNestedClass.kt.after +++ b/idea/testData/refactoring/pullUp/j2k/fromClassToNestedClass.kt.after @@ -23,7 +23,7 @@ class T { var X = "1" + "2" // INFO: {"checked": "true"} - jvmStatic fun foo2(n: Int): String { + JvmStatic fun foo2(n: Int): String { return "_" + n + "_" } } diff --git a/idea/testData/refactoring/rename/renameKotlinStaticMethod/after/RenameKotlinStaticMethod.kt b/idea/testData/refactoring/rename/renameKotlinStaticMethod/after/RenameKotlinStaticMethod.kt index 016e631db2c..d67dfdb49dd 100644 --- a/idea/testData/refactoring/rename/renameKotlinStaticMethod/after/RenameKotlinStaticMethod.kt +++ b/idea/testData/refactoring/rename/renameKotlinStaticMethod/after/RenameKotlinStaticMethod.kt @@ -2,6 +2,6 @@ package testing.rename public open class C { companion object { - jvmStatic fun second() {} + JvmStatic fun second() {} } } diff --git a/idea/testData/refactoring/rename/renameKotlinStaticMethod/before/RenameKotlinStaticMethod.kt b/idea/testData/refactoring/rename/renameKotlinStaticMethod/before/RenameKotlinStaticMethod.kt index 806dfa1ff02..0bb349d9eda 100644 --- a/idea/testData/refactoring/rename/renameKotlinStaticMethod/before/RenameKotlinStaticMethod.kt +++ b/idea/testData/refactoring/rename/renameKotlinStaticMethod/before/RenameKotlinStaticMethod.kt @@ -2,6 +2,6 @@ package testing.rename public open class C { companion object { - jvmStatic fun first() {} + JvmStatic fun first() {} } } diff --git a/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt b/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt index 9e7b0f0bc14..d22f3feda84 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt @@ -423,7 +423,7 @@ class Converter private constructor( if (function == null) return null if (PsiMethodUtil.isMainMethod(method)) { - val fqName = FqName("kotlin.jvm.jvmStatic") + val fqName = FqName("kotlin.jvm.JvmStatic") val identifier = Identifier(fqName.shortName().identifier, imports = listOf(fqName)).assignNoPrototype() function.annotations += Annotations( @@ -435,7 +435,7 @@ class Converter private constructor( if (function.parameterList.parameters.any { it is FunctionParameter && it.defaultValue != null } && !function.modifiers.isPrivate) { function.annotations += Annotations( - listOf(Annotation(Identifier("jvmOverloads").assignNoPrototype(), + listOf(Annotation(Identifier("JvmOverloads").assignNoPrototype(), listOf(), withAt = false, newLineAfter = false).assignNoPrototype())).assignNoPrototype() diff --git a/j2k/testData/fileOrElement/classExpression/primitivesAndArrays.kt b/j2k/testData/fileOrElement/classExpression/primitivesAndArrays.kt index a05d561940f..dfb9b6a9ff8 100644 --- a/j2k/testData/fileOrElement/classExpression/primitivesAndArrays.kt +++ b/j2k/testData/fileOrElement/classExpression/primitivesAndArrays.kt @@ -1,5 +1,5 @@ public object A { - jvmStatic public fun main(args: Array) { + JvmStatic public fun main(args: Array) { println(Void.TYPE) println(Integer.TYPE) println(java.lang.Double.TYPE) diff --git a/j2k/testData/fileOrElement/comments/commentsForConstructors.kt b/j2k/testData/fileOrElement/comments/commentsForConstructors.kt index d957586d9c2..51ab1a88b15 100644 --- a/j2k/testData/fileOrElement/comments/commentsForConstructors.kt +++ b/j2k/testData/fileOrElement/comments/commentsForConstructors.kt @@ -1,5 +1,5 @@ class A// this is a primary constructor -jvmOverloads constructor(p: Int = 1) { +JvmOverloads constructor(p: Int = 1) { private val v: Int init { diff --git a/j2k/testData/fileOrElement/constructors/allCallsPrimary.kt b/j2k/testData/fileOrElement/constructors/allCallsPrimary.kt index f27f523b4c2..f084ec1197d 100644 --- a/j2k/testData/fileOrElement/constructors/allCallsPrimary.kt +++ b/j2k/testData/fileOrElement/constructors/allCallsPrimary.kt @@ -1,6 +1,6 @@ package pack -class C jvmOverloads constructor(arg1: Int, arg2: Int = 0, arg3: Int = 0) +class C JvmOverloads constructor(arg1: Int, arg2: Int = 0, arg3: Int = 0) public object User { public fun main() { diff --git a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams9.kt b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams9.kt index e4d9bad2519..d67b110520b 100644 --- a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams9.kt +++ b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams9.kt @@ -1 +1 @@ -class C jvmOverloads constructor(private val string: String, a: Int = string.length()) +class C JvmOverloads constructor(private val string: String, a: Int = string.length()) diff --git a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults.kt b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults.kt index 76de64b2e04..c9d56ab41b8 100644 --- a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults.kt +++ b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults.kt @@ -1,4 +1,4 @@ -class A jvmOverloads constructor(nested: A.Nested = A.Nested(A.Nested.FIELD)) { +class A JvmOverloads constructor(nested: A.Nested = A.Nested(A.Nested.FIELD)) { class Nested(p: Int) { companion object { diff --git a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults2.kt b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults2.kt index 574888bb3c2..a0934eb53f1 100644 --- a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults2.kt +++ b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults2.kt @@ -1,7 +1,7 @@ // ERROR: Property must be initialized or be abstract import A.Nested -class A jvmOverloads constructor(nested: Nested = Nested(Nested.FIELD)) { +class A JvmOverloads constructor(nested: Nested = Nested(Nested.FIELD)) { class Nested(p: Int) { companion object { diff --git a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults3.kt b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults3.kt index 8b2dbc2204f..e9681c33051 100644 --- a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults3.kt +++ b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults3.kt @@ -3,7 +3,7 @@ package pack import pack.A.Nested -class A jvmOverloads constructor(nested: Nested = Nested(Nested.FIELD)) { +class A JvmOverloads constructor(nested: Nested = Nested(Nested.FIELD)) { class Nested(p: Int) { companion object { diff --git a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults4.kt b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults4.kt index 7b9aabf0fff..ef9ce050d27 100644 --- a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults4.kt +++ b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults4.kt @@ -3,7 +3,7 @@ package pack import pack.A.* -class A jvmOverloads constructor(nested: Nested = Nested(Nested.FIELD)) { +class A JvmOverloads constructor(nested: Nested = Nested(Nested.FIELD)) { class Nested(p: Int) { companion object { diff --git a/j2k/testData/fileOrElement/constructors/parameterDefaults1.kt b/j2k/testData/fileOrElement/constructors/parameterDefaults1.kt index be71bc80587..a60a322945b 100644 --- a/j2k/testData/fileOrElement/constructors/parameterDefaults1.kt +++ b/j2k/testData/fileOrElement/constructors/parameterDefaults1.kt @@ -1,6 +1,6 @@ package pack -class C jvmOverloads constructor(a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) { +class C JvmOverloads constructor(a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) { constructor(a: Int) : this(a, 0, 0, 0, 1) { } diff --git a/j2k/testData/fileOrElement/constructors/parameterDefaults2.kt b/j2k/testData/fileOrElement/constructors/parameterDefaults2.kt index f78ffe62d4f..d13e03a972f 100644 --- a/j2k/testData/fileOrElement/constructors/parameterDefaults2.kt +++ b/j2k/testData/fileOrElement/constructors/parameterDefaults2.kt @@ -1,6 +1,6 @@ package pack -class C jvmOverloads constructor(a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) { +class C JvmOverloads constructor(a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) { constructor(a1: Int, b1: Int, c1: Int) : this(a1, b1, c1, 0, 0) { } diff --git a/j2k/testData/fileOrElement/constructors/parameterDefaults3.kt b/j2k/testData/fileOrElement/constructors/parameterDefaults3.kt index 3ed89327e4c..1081025ae95 100644 --- a/j2k/testData/fileOrElement/constructors/parameterDefaults3.kt +++ b/j2k/testData/fileOrElement/constructors/parameterDefaults3.kt @@ -1,6 +1,6 @@ package pack -class C jvmOverloads constructor(a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) { +class C JvmOverloads constructor(a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) { constructor(a: Int, b: Int, c: Int) : this(b, a, c, 0, 0) { } diff --git a/j2k/testData/fileOrElement/constructors/parameterDefaults4.kt b/j2k/testData/fileOrElement/constructors/parameterDefaults4.kt index c37cbf22911..5ee254277cf 100644 --- a/j2k/testData/fileOrElement/constructors/parameterDefaults4.kt +++ b/j2k/testData/fileOrElement/constructors/parameterDefaults4.kt @@ -1,3 +1,3 @@ package pack -class C jvmOverloads constructor(a: Int = 1, b: Int = 2, c: Int = 3, d: Int = 4, e: Int = 5) +class C JvmOverloads constructor(a: Int = 1, b: Int = 2, c: Int = 3, d: Int = 4, e: Int = 5) diff --git a/j2k/testData/fileOrElement/constructors/parameterDefaults5.kt b/j2k/testData/fileOrElement/constructors/parameterDefaults5.kt index c37cbf22911..5ee254277cf 100644 --- a/j2k/testData/fileOrElement/constructors/parameterDefaults5.kt +++ b/j2k/testData/fileOrElement/constructors/parameterDefaults5.kt @@ -1,3 +1,3 @@ package pack -class C jvmOverloads constructor(a: Int = 1, b: Int = 2, c: Int = 3, d: Int = 4, e: Int = 5) +class C JvmOverloads constructor(a: Int = 1, b: Int = 2, c: Int = 3, d: Int = 4, e: Int = 5) diff --git a/j2k/testData/fileOrElement/constructors/parameterModification.kt b/j2k/testData/fileOrElement/constructors/parameterModification.kt index 5a9b4e63e90..c4175b496ec 100644 --- a/j2k/testData/fileOrElement/constructors/parameterModification.kt +++ b/j2k/testData/fileOrElement/constructors/parameterModification.kt @@ -1,4 +1,4 @@ -class C jvmOverloads constructor(arg1: Int, arg2: Int = 0, arg3: Int = 0) { +class C JvmOverloads constructor(arg1: Int, arg2: Int = 0, arg3: Int = 0) { private val field: Int init { diff --git a/j2k/testData/fileOrElement/constructors/secondaryConstructorWithDefaultValues.kt b/j2k/testData/fileOrElement/constructors/secondaryConstructorWithDefaultValues.kt index 2bd93b22d5e..4cdb44e282b 100644 --- a/j2k/testData/fileOrElement/constructors/secondaryConstructorWithDefaultValues.kt +++ b/j2k/testData/fileOrElement/constructors/secondaryConstructorWithDefaultValues.kt @@ -7,7 +7,7 @@ class A { public constructor() { } - jvmOverloads public constructor(p: Int, s: String, x: Int = 1) { + JvmOverloads public constructor(p: Int, s: String, x: Int = 1) { this.s = s this.x = x } diff --git a/j2k/testData/fileOrElement/constructors/secondaryConstructorWithDefaultValues2.kt b/j2k/testData/fileOrElement/constructors/secondaryConstructorWithDefaultValues2.kt index b6df916e74c..b180c4db4f5 100644 --- a/j2k/testData/fileOrElement/constructors/secondaryConstructorWithDefaultValues2.kt +++ b/j2k/testData/fileOrElement/constructors/secondaryConstructorWithDefaultValues2.kt @@ -4,7 +4,7 @@ class A() { private val s = "" private val x = 0 - jvmOverloads public constructor(p: Int, s: String, x: Int = 1) : this() { + JvmOverloads public constructor(p: Int, s: String, x: Int = 1) : this() { this.s = s this.x = x } diff --git a/j2k/testData/fileOrElement/dropAccessors/DifferentFieldNameAndDefaultParameterValue.kt b/j2k/testData/fileOrElement/dropAccessors/DifferentFieldNameAndDefaultParameterValue.kt index 6ea6a413b52..083d7a2eb05 100644 --- a/j2k/testData/fileOrElement/dropAccessors/DifferentFieldNameAndDefaultParameterValue.kt +++ b/j2k/testData/fileOrElement/dropAccessors/DifferentFieldNameAndDefaultParameterValue.kt @@ -1 +1 @@ -public class C jvmOverloads constructor(c: C, public val x: Int = c.x) +public class C JvmOverloads constructor(c: C, public val x: Int = c.x) diff --git a/j2k/testData/fileOrElement/for/withContinue1.kt b/j2k/testData/fileOrElement/for/withContinue1.kt index 917f163bb38..46d3c4ba253 100644 --- a/j2k/testData/fileOrElement/for/withContinue1.kt +++ b/j2k/testData/fileOrElement/for/withContinue1.kt @@ -1,5 +1,5 @@ public object TestClass { - jvmStatic public fun main(args: Array) { + JvmStatic public fun main(args: Array) { var i = 0 while (i < 10) { if (i == 4 || i == 8) { diff --git a/j2k/testData/fileOrElement/for/withContinue2.kt b/j2k/testData/fileOrElement/for/withContinue2.kt index f52a6d4d72a..622207d0352 100644 --- a/j2k/testData/fileOrElement/for/withContinue2.kt +++ b/j2k/testData/fileOrElement/for/withContinue2.kt @@ -1,5 +1,5 @@ public object TestClass { - jvmStatic public fun main(args: Array) { + JvmStatic public fun main(args: Array) { var i = 0 var j = 1 while (i < 10) { diff --git a/j2k/testData/fileOrElement/for/withContinue3.kt b/j2k/testData/fileOrElement/for/withContinue3.kt index a3d00cd5b4f..e64fa17f859 100644 --- a/j2k/testData/fileOrElement/for/withContinue3.kt +++ b/j2k/testData/fileOrElement/for/withContinue3.kt @@ -1,5 +1,5 @@ public object TestClass { - jvmStatic public fun main(args: Array) { + JvmStatic public fun main(args: Array) { var i = 1 while (i < 1000) { if (i == 4 || i == 8) { diff --git a/j2k/testData/fileOrElement/for/withContinueAndLabels.kt b/j2k/testData/fileOrElement/for/withContinueAndLabels.kt index af8b389af8e..b3777bfe1f6 100644 --- a/j2k/testData/fileOrElement/for/withContinueAndLabels.kt +++ b/j2k/testData/fileOrElement/for/withContinueAndLabels.kt @@ -1,5 +1,5 @@ public object TestClass { - jvmStatic public fun main(args: Array) { + JvmStatic public fun main(args: Array) { var i = 1 OuterLoop1@ OuterLoop2@ while (i < 1000) { var j = 1 diff --git a/j2k/testData/fileOrElement/function/main.kt b/j2k/testData/fileOrElement/function/main.kt index c231713c0c5..fc11692272b 100644 --- a/j2k/testData/fileOrElement/function/main.kt +++ b/j2k/testData/fileOrElement/function/main.kt @@ -1,2 +1,2 @@ -jvmStatic public fun main(args: Array) { +JvmStatic public fun main(args: Array) { } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/function/main2.kt b/j2k/testData/fileOrElement/function/main2.kt index 2df74fc65d8..61cc457dd3e 100644 --- a/j2k/testData/fileOrElement/function/main2.kt +++ b/j2k/testData/fileOrElement/function/main2.kt @@ -1,4 +1,4 @@ public object A { - jvmStatic public fun main(args: Array) { + JvmStatic public fun main(args: Array) { } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/function/mainAndNullabilitySetting.kt b/j2k/testData/fileOrElement/function/mainAndNullabilitySetting.kt index 94dd269709c..e356de2fc23 100644 --- a/j2k/testData/fileOrElement/function/mainAndNullabilitySetting.kt +++ b/j2k/testData/fileOrElement/function/mainAndNullabilitySetting.kt @@ -1,5 +1,5 @@ // !forceNotNullTypes: false public object A { - jvmStatic public fun main(args: Array) { + JvmStatic public fun main(args: Array) { } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/issues/kt-638.kt b/j2k/testData/fileOrElement/issues/kt-638.kt index e841a0bf806..38159892036 100644 --- a/j2k/testData/fileOrElement/issues/kt-638.kt +++ b/j2k/testData/fileOrElement/issues/kt-638.kt @@ -21,7 +21,7 @@ public class Identifier { } public object User { - jvmStatic public fun main(args: Array) { + JvmStatic public fun main(args: Array) { val i1 = Identifier("name", false, true) val i2 = Identifier("name", false) val i3 = Identifier("name") diff --git a/j2k/testData/fileOrElement/issues/kt-807.kt b/j2k/testData/fileOrElement/issues/kt-807.kt index 9fd22cc6de8..a18cf3ffa22 100644 --- a/j2k/testData/fileOrElement/issues/kt-807.kt +++ b/j2k/testData/fileOrElement/issues/kt-807.kt @@ -5,7 +5,7 @@ import java.io.* object FileRead { - jvmStatic public fun main(args: Array) { + JvmStatic public fun main(args: Array) { try { val fstream = FileInputStream() val `in` = DataInputStream(fstream) diff --git a/j2k/testData/fileOrElement/issues/kt-871.kt b/j2k/testData/fileOrElement/issues/kt-871.kt index e47e664331b..ab558e2a720 100644 --- a/j2k/testData/fileOrElement/issues/kt-871.kt +++ b/j2k/testData/fileOrElement/issues/kt-871.kt @@ -1,7 +1,7 @@ package demo object Program { - jvmStatic public fun main(args: Array) { + JvmStatic public fun main(args: Array) { println("Halo!") } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/overloads/Annotations.kt b/j2k/testData/fileOrElement/overloads/Annotations.kt index 59d2bb0cec4..6df95230ee6 100644 --- a/j2k/testData/fileOrElement/overloads/Annotations.kt +++ b/j2k/testData/fileOrElement/overloads/Annotations.kt @@ -1,7 +1,7 @@ // ERROR: Type mismatch: inferred type is kotlin.Any? but kotlin.Any was expected // ERROR: Type mismatch: inferred type is kotlin.Any? but kotlin.Any was expected class A { - jvmOverloads fun foo(s: String? = null): Any { + JvmOverloads fun foo(s: String? = null): Any { println("s = " + s!!) return "" } diff --git a/j2k/testData/fileOrElement/overloads/Simple.kt b/j2k/testData/fileOrElement/overloads/Simple.kt index 1bfaa3cf353..602a3dc68f2 100644 --- a/j2k/testData/fileOrElement/overloads/Simple.kt +++ b/j2k/testData/fileOrElement/overloads/Simple.kt @@ -1,9 +1,9 @@ class A { - jvmOverloads fun foo(i: Int, c: Char = 'a', s: String = "") { + JvmOverloads fun foo(i: Int, c: Char = 'a', s: String = "") { println("foo$i$c$s") } - jvmOverloads fun bar(s: String? = null): Int { + JvmOverloads fun bar(s: String? = null): Int { println("s = " + s!!) return 0 } diff --git a/j2k/testData/fileOrElement/switch/comlicatedFallDown.kt b/j2k/testData/fileOrElement/switch/comlicatedFallDown.kt index 63b656ac25d..734c7945e34 100644 --- a/j2k/testData/fileOrElement/switch/comlicatedFallDown.kt +++ b/j2k/testData/fileOrElement/switch/comlicatedFallDown.kt @@ -76,7 +76,7 @@ public object SwitchDemo { println(monthString) } - jvmStatic public fun main(args: Array) { + JvmStatic public fun main(args: Array) { for (i in 1..12) test(i) } diff --git a/j2k/testData/fileOrElement/switch/emptySwitch.kt b/j2k/testData/fileOrElement/switch/emptySwitch.kt index 530c3f992fd..7d138911474 100644 --- a/j2k/testData/fileOrElement/switch/emptySwitch.kt +++ b/j2k/testData/fileOrElement/switch/emptySwitch.kt @@ -1,5 +1,5 @@ public object NonDefault { - jvmStatic public fun main(args: Array) { + JvmStatic public fun main(args: Array) { val value = 3 val valueString = "" diff --git a/j2k/testData/fileOrElement/switch/fallDown.kt b/j2k/testData/fileOrElement/switch/fallDown.kt index de30e084c3c..fb5ba278d46 100644 --- a/j2k/testData/fileOrElement/switch/fallDown.kt +++ b/j2k/testData/fileOrElement/switch/fallDown.kt @@ -1,7 +1,7 @@ package switch_demo public object SwitchDemo { - jvmStatic public fun main(args: Array) { + JvmStatic public fun main(args: Array) { val month = 8 val monthString: String when (month) { diff --git a/j2k/testData/fileOrElement/switch/fallDownWithBlocks.kt b/j2k/testData/fileOrElement/switch/fallDownWithBlocks.kt index eef727c6749..96e3dcad364 100644 --- a/j2k/testData/fileOrElement/switch/fallDownWithBlocks.kt +++ b/j2k/testData/fileOrElement/switch/fallDownWithBlocks.kt @@ -1,5 +1,5 @@ public object C { - jvmStatic public fun main(args: Array) { + JvmStatic public fun main(args: Array) { when (args.size()) { 1 -> { run { diff --git a/j2k/testData/fileOrElement/switch/kt-539.kt b/j2k/testData/fileOrElement/switch/kt-539.kt index d8131a0e4ab..19aaf4ca3b8 100644 --- a/j2k/testData/fileOrElement/switch/kt-539.kt +++ b/j2k/testData/fileOrElement/switch/kt-539.kt @@ -1,7 +1,7 @@ package switch_demo public object SwitchDemo { - jvmStatic public fun main(args: Array) { + JvmStatic public fun main(args: Array) { val month = 8 val monthString: String diff --git a/j2k/testData/fileOrElement/switch/nondefault.kt b/j2k/testData/fileOrElement/switch/nondefault.kt index 14071c0117a..af4e9ffa899 100644 --- a/j2k/testData/fileOrElement/switch/nondefault.kt +++ b/j2k/testData/fileOrElement/switch/nondefault.kt @@ -1,5 +1,5 @@ public object NonDefault { - jvmStatic public fun main(args: Array) { + JvmStatic public fun main(args: Array) { val value = 3 var valueString = "" diff --git a/libraries/stdlib/src/kotlin/jvm/JvmPlatformAnnotations.kt b/libraries/stdlib/src/kotlin/jvm/JvmPlatformAnnotations.kt index 3d782146861..fad9a943de5 100644 --- a/libraries/stdlib/src/kotlin/jvm/JvmPlatformAnnotations.kt +++ b/libraries/stdlib/src/kotlin/jvm/JvmPlatformAnnotations.kt @@ -23,7 +23,7 @@ package kotlin.jvm * takes N-1 parameters (all but the last one that takes a default value), the second takes N-2 parameters, and so on. */ target(AnnotationTarget.FUNCTION, AnnotationTarget.CONSTRUCTOR) -public annotation(retention = AnnotationRetention.BINARY, mustBeDocumented = true) class jvmOverloads +public annotation(retention = AnnotationRetention.BINARY, mustBeDocumented = true) class JvmOverloads /** @@ -32,7 +32,7 @@ public annotation(retention = AnnotationRetention.BINARY, mustBeDocumented = tru * for more information. */ target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER) -public annotation(retention = AnnotationRetention.RUNTIME, mustBeDocumented = true) class jvmStatic +public annotation(retention = AnnotationRetention.RUNTIME, mustBeDocumented = true) class JvmStatic /** * Specifies the name for the Java class or method @@ -42,7 +42,7 @@ public annotation(retention = AnnotationRetention.RUNTIME, mustBeDocumented = tr * @property name the name of the element. */ target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER) -public annotation(retention = AnnotationRetention.RUNTIME, mustBeDocumented = true) class jvmName(public val name: String) +public annotation(retention = AnnotationRetention.RUNTIME, mustBeDocumented = true) class JvmName(public val name: String) /** * Instructs the Kotlin compiler to generate a public backing field for this property. diff --git a/libraries/stdlib/src/kotlin/platform/annotations.kt b/libraries/stdlib/src/kotlin/platform/annotations.kt index 640f207e005..5ed2adb7323 100644 --- a/libraries/stdlib/src/kotlin/platform/annotations.kt +++ b/libraries/stdlib/src/kotlin/platform/annotations.kt @@ -19,9 +19,9 @@ package kotlin.platform import kotlin.annotation.AnnotationTarget.* target(FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER) -deprecated("Use kotlin.jvm.jvmName instead", ReplaceWith("kotlin.jvm.jvmName")) +deprecated("Use kotlin.jvm.JvmName instead", ReplaceWith("kotlin.jvm.JvmName")) public annotation(retention = AnnotationRetention.RUNTIME, mustBeDocumented = true) class platformName(public val name: String) target(FUNCTION, PROPERTY, PROPERTY_GETTER, PROPERTY_SETTER) -deprecated("Use kotlin.jvm.jvmStatic instead", ReplaceWith("kotlin.jvm.jvmStatic")) +deprecated("Use kotlin.jvm.JvmStatic instead", ReplaceWith("kotlin.jvm.JvmStatic")) public annotation(retention = AnnotationRetention.RUNTIME, mustBeDocumented = true) class platformStatic