From 7caccd7578a2fddc4da57624fcfab5ce4fc2e187 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Tue, 15 Sep 2015 12:47:08 +0300 Subject: [PATCH] J2K: all annotations should be with "@" --- .../AddImportsWithExplicitImports.expected.kt | 2 +- .../conversion/AddKClassImport.expected.kt | 2 +- .../conversion/CopyAnnotation.expected.kt | 2 +- ...ldWithNoModifierAndNoSemicolon.expected.kt | 2 +- .../FileWithNoPackageStatement.expected.kt | 2 +- .../MethodWithOnlyOneAnnotation.expected.kt | 2 +- .../kotlin/j2k/AnnotationConverter.kt | 14 ++++----- j2k/src/org/jetbrains/kotlin/j2k/Converter.kt | 11 +++---- .../jetbrains/kotlin/j2k/ast/Annotation.kt | 8 +++-- .../org/jetbrains/kotlin/j2k/ast/Modifier.kt | 1 + .../annotations/annotationInterface1.kt | 10 +++---- .../annotations/annotationInterface2.kt | 4 +-- .../annotations/annotationInterface3.kt | 4 +-- .../annotations/annotationInterface4.kt | 10 +++---- .../annotations/annotationUsages.kt | 30 +++++++++---------- .../annotations/javaClassArgument.kt | 4 +-- .../annotations/javaClassArrayArgument.kt | 6 ++-- .../primaryConstructorAnnotation.kt | 2 +- .../classExpression/primitivesAndArrays.kt | 2 +- .../comments/commentsForConstructors.kt | 2 +- .../constructors/allCallsPrimary.kt | 2 +- .../constructors/constructorAnnotations.kt | 8 ++--- .../fieldsInitializedFromParams9.kt | 2 +- .../fieldsInitializedFromParamsAnnotations.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 +- .../docComments/deprecatedDocTag.kt | 2 +- .../docComments/onlyDeprecatedDocTag.kt | 2 +- ...ferentFieldNameAndDefaultParameterValue.kt | 2 +- .../field/volatileTransientAndStrictFp.kt | 8 ++--- .../fileOrElement/for/withContinue1.kt | 2 +- .../fileOrElement/for/withContinue2.kt | 2 +- .../fileOrElement/for/withContinue3.kt | 2 +- .../for/withContinueAndLabels.kt | 2 +- .../function/extendsBaseWhichExtendsObject.kt | 8 ++--- j2k/testData/fileOrElement/function/main.kt | 2 +- j2k/testData/fileOrElement/function/main2.kt | 2 +- .../function/mainAndNullabilitySetting.kt | 2 +- .../fileOrElement/function/overrideObject.kt | 4 +-- .../fileOrElement/function/overrideObject2.kt | 2 +- .../function/synchronizedMethod.kt | 2 +- j2k/testData/fileOrElement/function/throws.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 +- .../methodCallExpression/vararg1.kt | 2 +- .../fileOrElement/overloads/Annotations.kt | 4 +-- .../fileOrElement/overloads/Simple.kt | 4 +-- .../fileOrElement/overloads/Synchronized.kt | 2 +- .../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 +- .../tryWithResource/Multiline.kt | 2 +- .../tryWithResource/MultipleResources.kt | 2 +- .../fileOrElement/tryWithResource/Simple.kt | 2 +- .../tryWithResource/WithFinally.kt | 2 +- .../WithReturnInAnonymousClass.kt | 8 ++--- .../WithReturnInAnonymousClass2.kt | 8 ++--- 71 files changed, 129 insertions(+), 129 deletions(-) diff --git a/idea/testData/copyPaste/conversion/AddImportsWithExplicitImports.expected.kt b/idea/testData/copyPaste/conversion/AddImportsWithExplicitImports.expected.kt index 739fb2d85f8..0afbeaeb1a7 100644 --- a/idea/testData/copyPaste/conversion/AddImportsWithExplicitImports.expected.kt +++ b/idea/testData/copyPaste/conversion/AddImportsWithExplicitImports.expected.kt @@ -5,7 +5,7 @@ internal class C { } companion object { - JvmStatic fun main(args: Array) { + @JvmStatic fun main(args: Array) { } } } \ No newline at end of file diff --git a/idea/testData/copyPaste/conversion/AddKClassImport.expected.kt b/idea/testData/copyPaste/conversion/AddKClassImport.expected.kt index 47d889c5f67..bd7fbd1fc81 100644 --- a/idea/testData/copyPaste/conversion/AddKClassImport.expected.kt +++ b/idea/testData/copyPaste/conversion/AddKClassImport.expected.kt @@ -2,4 +2,4 @@ package to import kotlin.reflect.KClass -annotation internal class Ann(val value: KClass) \ No newline at end of file +internal annotation class Ann(val value: KClass) \ No newline at end of file diff --git a/idea/testData/copyPaste/conversion/CopyAnnotation.expected.kt b/idea/testData/copyPaste/conversion/CopyAnnotation.expected.kt index c570051a471..b75c44b8819 100644 --- a/idea/testData/copyPaste/conversion/CopyAnnotation.expected.kt +++ b/idea/testData/copyPaste/conversion/CopyAnnotation.expected.kt @@ -1,2 +1,2 @@ -Ann(String::class) +@Ann(String::class) class X \ No newline at end of file diff --git a/idea/testData/copyPaste/conversion/FieldWithNoModifierAndNoSemicolon.expected.kt b/idea/testData/copyPaste/conversion/FieldWithNoModifierAndNoSemicolon.expected.kt index 24b7d42c6c4..690eea3078e 100644 --- a/idea/testData/copyPaste/conversion/FieldWithNoModifierAndNoSemicolon.expected.kt +++ b/idea/testData/copyPaste/conversion/FieldWithNoModifierAndNoSemicolon.expected.kt @@ -1,3 +1,3 @@ package to -Volatile internal var field = 1 \ No newline at end of file +@Volatile internal var field = 1 \ 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 6cd156c6a49..9f1d0ac817c 100644 --- a/idea/testData/copyPaste/conversion/FileWithNoPackageStatement.expected.kt +++ b/idea/testData/copyPaste/conversion/FileWithNoPackageStatement.expected.kt @@ -1,7 +1,7 @@ package to object JavaClass { - JvmStatic fun main(args: Array) { + @JvmStatic fun main(args: Array) { println("Hello, world!") } } \ No newline at end of file diff --git a/idea/testData/copyPaste/conversion/MethodWithOnlyOneAnnotation.expected.kt b/idea/testData/copyPaste/conversion/MethodWithOnlyOneAnnotation.expected.kt index 91a31a8c20a..148b68695cb 100644 --- a/idea/testData/copyPaste/conversion/MethodWithOnlyOneAnnotation.expected.kt +++ b/idea/testData/copyPaste/conversion/MethodWithOnlyOneAnnotation.expected.kt @@ -1,6 +1,6 @@ package to -SomeAnnotation +@SomeAnnotation fun foo(): String { return "" } diff --git a/j2k/src/org/jetbrains/kotlin/j2k/AnnotationConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/AnnotationConverter.kt index 8694728d78e..732893e8e70 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/AnnotationConverter.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/AnnotationConverter.kt @@ -55,7 +55,7 @@ class AnnotationConverter(private val converter: Converter) { if (child is PsiWhiteSpace) !child.isInSingleLine() else false } - annotations.map { convertAnnotation(it, withAt = owner is PsiLocalVariable, newLineAfter = newLines) }.filterNotNull() //TODO: '@' is also needed for local classes + annotations.map { convertAnnotation(it, newLineAfter = newLines) }.filterNotNull() //TODO: '@' is also needed for local classes } else { listOf() @@ -77,14 +77,14 @@ class AnnotationConverter(private val converter: Converter) { LiteralExpression("\"" + StringUtil.escapeStringCharacters(deprecatedTag.content()) + "\"").assignNoPrototype() } return Annotation(Identifier("Deprecated").assignPrototype(deprecatedTag.getNameElement()), - listOf(null to deferredExpression), withAt = false, newLineAfter = true) + listOf(null to deferredExpression), newLineAfter = true) .assignPrototype(deprecatedTag) } private fun convertModifiersToAnnotations(owner: PsiModifierListOwner): Annotations { val list = MODIFIER_TO_ANNOTATION .filter { owner.hasModifierProperty(it.first) } - .map { Annotation(Identifier(it.second).assignNoPrototype(), listOf(), withAt = false, newLineAfter = false).assignNoPrototype() } + .map { Annotation(Identifier(it.second).assignNoPrototype(), listOf(), newLineAfter = false).assignNoPrototype() } return Annotations(list).assignNoPrototype() } @@ -99,11 +99,11 @@ class AnnotationConverter(private val converter: Converter) { return expr.referenceName?.let { JavaAnnotationTargetMapper.mapJavaTargetArgumentByName(it) } ?: emptySet() } - public fun convertAnnotation(annotation: PsiAnnotation, withAt: Boolean, newLineAfter: Boolean): Annotation? { + public fun convertAnnotation(annotation: PsiAnnotation, newLineAfter: Boolean): Annotation? { val qualifiedName = annotation.getQualifiedName() if (qualifiedName == CommonClassNames.JAVA_LANG_DEPRECATED && annotation.getParameterList().getAttributes().isEmpty()) { val deferredExpression = converter.deferredElement { LiteralExpression("\"\"").assignNoPrototype() } - return Annotation(Identifier("Deprecated").assignNoPrototype(), listOf(null to deferredExpression), withAt, newLineAfter).assignPrototype(annotation) //TODO: insert comment + return Annotation(Identifier("Deprecated").assignNoPrototype(), listOf(null to deferredExpression), newLineAfter).assignPrototype(annotation) //TODO: insert comment } if (qualifiedName == CommonClassNames.JAVA_LANG_ANNOTATION_TARGET) { val attributes = annotation.parameterList.attributes @@ -129,7 +129,7 @@ class AnnotationConverter(private val converter: Converter) { } } return Annotation(Identifier("Target").assignNoPrototype(), - deferredExpressionList, true, newLineAfter).assignPrototype(annotation) + deferredExpressionList, newLineAfter).assignPrototype(annotation) } val nameRef = annotation.getNameReferenceElement() @@ -148,7 +148,7 @@ class AnnotationConverter(private val converter: Converter) { attrValues.map { attrName to converter.deferredElement(it) } } - return Annotation(name, arguments, withAt, newLineAfter).assignPrototype(annotation) + return Annotation(name, arguments, newLineAfter).assignPrototype(annotation) } public fun convertAnnotationMethodDefault(method: PsiAnnotationMethod): DeferredElement? { diff --git a/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt b/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt index eb7e2d1ce38..fca1a323b59 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt @@ -109,7 +109,7 @@ class Converter private constructor( is PsiExpression -> createDefaultCodeConverter().convertExpression(element) is PsiImportList -> convertImportList(element) is PsiImportStatementBase -> convertImport(element, false) - is PsiAnnotation -> annotationConverter.convertAnnotation(element, withAt = false, newLineAfter = false) + is PsiAnnotation -> annotationConverter.convertAnnotation(element, newLineAfter = false) is PsiPackageStatement -> PackageStatement(quoteKeywords(element.getPackageName() ?: "")).assignPrototype(element) is PsiJavaCodeReferenceElement -> { if (element.parent is PsiReferenceList) { @@ -280,10 +280,9 @@ class Converter private constructor( classBody = ClassBody(constructorSignature, classBody.baseClassParams, classBody.members, classBody.companionObjectMembers, classBody.lBrace, classBody.rBrace, classBody.isEnumBody, classBody.isAnonymousClassBody) - val annotationAnnotation = Annotation(Identifier("annotation").assignNoPrototype(), listOf(), withAt = false, newLineAfter = false).assignNoPrototype() return Class(psiClass.declarationIdentifier(), - convertAnnotations(psiClass) + Annotations(listOf(annotationAnnotation)), - convertModifiers(psiClass).without(Modifier.ABSTRACT), + convertAnnotations(psiClass), + convertModifiers(psiClass).with(Modifier.ANNOTATION).without(Modifier.ABSTRACT), TypeParameterList.Empty, listOf(), null, @@ -427,7 +426,6 @@ class Converter private constructor( function.annotations += Annotations( listOf(Annotation(identifier, listOf(), - withAt = false, newLineAfter = false).assignNoPrototype())).assignNoPrototype() } @@ -435,7 +433,6 @@ class Converter private constructor( function.annotations += Annotations( listOf(Annotation(Identifier("JvmOverloads").assignNoPrototype(), listOf(), - withAt = false, newLineAfter = false).assignNoPrototype())).assignNoPrototype() } @@ -586,7 +583,7 @@ class Converter private constructor( val convertedType = typeConverter.convertType(types[index], Nullability.NotNull) null to deferredElement { ClassLiteralExpression(convertedType.assignPrototype(refElements[index])) } } - val annotation = Annotation(Identifier("Throws").assignNoPrototype(), arguments, withAt = false, newLineAfter = true) + val annotation = Annotation(Identifier("Throws").assignNoPrototype(), arguments, newLineAfter = true) return Annotations(listOf(annotation.assignPrototype(throwsList))).assignPrototype(throwsList) } diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ast/Annotation.kt b/j2k/src/org/jetbrains/kotlin/j2k/ast/Annotation.kt index 70596948153..d8ffd61708a 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/ast/Annotation.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/ast/Annotation.kt @@ -16,11 +16,13 @@ package org.jetbrains.kotlin.j2k.ast -import org.jetbrains.kotlin.j2k.* +import org.jetbrains.kotlin.j2k.CodeBuilder +import org.jetbrains.kotlin.j2k.append +import org.jetbrains.kotlin.j2k.buildList -class Annotation(val name: Identifier, val arguments: List>>, val withAt: Boolean, val newLineAfter: Boolean) : Element() { +class Annotation(val name: Identifier, val arguments: List>>, val newLineAfter: Boolean) : Element() { override fun generateCode(builder: CodeBuilder) { - if (withAt) builder.append("@") + builder.append("@") if (arguments.isEmpty()) { builder.append(name) } diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ast/Modifier.kt b/j2k/src/org/jetbrains/kotlin/j2k/ast/Modifier.kt index efe8f28caa0..046e3c898b1 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/ast/Modifier.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/ast/Modifier.kt @@ -23,6 +23,7 @@ enum class Modifier(val name: String) { PROTECTED("protected"), PRIVATE("private"), INTERNAL("internal"), + ANNOTATION("annotation"), ABSTRACT("abstract"), OPEN("open"), OVERRIDE("override"), diff --git a/j2k/testData/fileOrElement/annotations/annotationInterface1.kt b/j2k/testData/fileOrElement/annotations/annotationInterface1.kt index 0ea8bb844c4..5bc8a0baef6 100644 --- a/j2k/testData/fileOrElement/annotations/annotationInterface1.kt +++ b/j2k/testData/fileOrElement/annotations/annotationInterface1.kt @@ -1,12 +1,12 @@ -annotation internal class Anon(val stringArray: Array, val intArray: IntArray, // string +internal annotation class Anon(val stringArray: Array, val intArray: IntArray, // string val string: String) -Anon(string = "a", stringArray = arrayOf("a", "b"), intArray = intArrayOf(1, 2)) +@Anon(string = "a", stringArray = arrayOf("a", "b"), intArray = intArrayOf(1, 2)) @Target(AnnotationTarget.CONSTRUCTOR, AnnotationTarget.FIELD) -annotation internal class I +internal annotation class I @Target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER) -annotation internal class J +internal annotation class J @Target -annotation internal class K +internal annotation class K diff --git a/j2k/testData/fileOrElement/annotations/annotationInterface2.kt b/j2k/testData/fileOrElement/annotations/annotationInterface2.kt index 189b9469c55..26e179cb5f5 100644 --- a/j2k/testData/fileOrElement/annotations/annotationInterface2.kt +++ b/j2k/testData/fileOrElement/annotations/annotationInterface2.kt @@ -1,4 +1,4 @@ -annotation internal class Anon(val s: String = "a", val stringArray: Array = arrayOf("a", "b"), val intArray: IntArray) +internal annotation class Anon(val s: String = "a", val stringArray: Array = arrayOf("a", "b"), val intArray: IntArray) -Anon(intArray = intArrayOf(1, 2)) +@Anon(intArray = intArrayOf(1, 2)) internal class A diff --git a/j2k/testData/fileOrElement/annotations/annotationInterface3.kt b/j2k/testData/fileOrElement/annotations/annotationInterface3.kt index d40df1923f6..03d24fe1683 100644 --- a/j2k/testData/fileOrElement/annotations/annotationInterface3.kt +++ b/j2k/testData/fileOrElement/annotations/annotationInterface3.kt @@ -1,6 +1,6 @@ // ERROR: Body is not allowed for annotation class // ERROR: Modifier 'companion' is not applicable inside 'annotation class' -annotation internal class Anon(val value: String) { +internal annotation class Anon(val value: String) { enum class E { A, B @@ -12,7 +12,7 @@ annotation internal class Anon(val value: String) { } } -Anon("a") +@Anon("a") internal interface I { companion object { val e: Anon.E = Anon.field diff --git a/j2k/testData/fileOrElement/annotations/annotationInterface4.kt b/j2k/testData/fileOrElement/annotations/annotationInterface4.kt index 092fcc03351..7ca90f6b8ca 100644 --- a/j2k/testData/fileOrElement/annotations/annotationInterface4.kt +++ b/j2k/testData/fileOrElement/annotations/annotationInterface4.kt @@ -1,13 +1,13 @@ -annotation internal class Anon(vararg val value: String, val x: Int = 1) +internal annotation class Anon(vararg val value: String, val x: Int = 1) -Anon("a", "b") +@Anon("a", "b") internal interface I1 -Anon("c", "d", x = 1) +@Anon("c", "d", x = 1) internal interface I2 -Anon("c", "d", x = 1) +@Anon("c", "d", x = 1) internal interface I3 -Anon(value = *arrayOf("c", "d")) +@Anon(value = *arrayOf("c", "d")) internal interface I4 diff --git a/j2k/testData/fileOrElement/annotations/annotationUsages.kt b/j2k/testData/fileOrElement/annotations/annotationUsages.kt index 41023487d11..b1b2c429ee6 100644 --- a/j2k/testData/fileOrElement/annotations/annotationUsages.kt +++ b/j2k/testData/fileOrElement/annotations/annotationUsages.kt @@ -3,30 +3,30 @@ // ERROR: This annotation is not applicable to target 'value parameter' import javaApi.* -Anon1(value = *arrayOf("a"), stringArray = arrayOf("b"), intArray = intArrayOf(1, 2), string = "x") -Anon2(value = "a", intValue = 1, charValue = 'a') -Anon3(e = E.A, stringArray = arrayOf(), value = *arrayOf("a", "b")) -Anon4("x", "y") -Anon5(1) -Anon6("x", "y") -Anon7(String::class, StringBuilder::class) -Anon8(classes = arrayOf(String::class, StringBuilder::class)) +@Anon1(value = *arrayOf("a"), stringArray = arrayOf("b"), intArray = intArrayOf(1, 2), string = "x") +@Anon2(value = "a", intValue = 1, charValue = 'a') +@Anon3(e = E.A, stringArray = arrayOf(), value = *arrayOf("a", "b")) +@Anon4("x", "y") +@Anon5(1) +@Anon6("x", "y") +@Anon7(String::class, StringBuilder::class) +@Anon8(classes = arrayOf(String::class, StringBuilder::class)) internal class C { - Anon5(1) Deprecated("") private val field1 = 0 + @Anon5(1) @Deprecated("") private val field1 = 0 - Anon5(1) + @Anon5(1) private val field2 = 0 - Anon5(1) internal var field3 = 0 + @Anon5(1) internal var field3 = 0 - Anon5(1) + @Anon5(1) internal var field4 = 0 - Anon6 - internal fun foo(Deprecated("") p1: Int, Deprecated("") Anon5(2) p2: Char) { + @Anon6 + internal fun foo(@Deprecated("") p1: Int, @Deprecated("") @Anon5(2) p2: Char) { @Deprecated("") @Anon5(3) val c = 'a' } - Anon5(1) internal fun bar() { + @Anon5(1) internal fun bar() { } } diff --git a/j2k/testData/fileOrElement/annotations/javaClassArgument.kt b/j2k/testData/fileOrElement/annotations/javaClassArgument.kt index 179f9ed03c9..25e2b5366eb 100644 --- a/j2k/testData/fileOrElement/annotations/javaClassArgument.kt +++ b/j2k/testData/fileOrElement/annotations/javaClassArgument.kt @@ -1,6 +1,6 @@ import kotlin.reflect.KClass -annotation internal class Ann(val value: KClass<*>, val other: KClass<*>) +internal annotation class Ann(val value: KClass<*>, val other: KClass<*>) -Ann(other = String::class, value = Any::class) +@Ann(other = String::class, value = Any::class) internal class C \ No newline at end of file diff --git a/j2k/testData/fileOrElement/annotations/javaClassArrayArgument.kt b/j2k/testData/fileOrElement/annotations/javaClassArrayArgument.kt index ce7c64a95a4..50d51e8be32 100644 --- a/j2k/testData/fileOrElement/annotations/javaClassArrayArgument.kt +++ b/j2k/testData/fileOrElement/annotations/javaClassArrayArgument.kt @@ -1,9 +1,9 @@ import kotlin.reflect.KClass -annotation internal class Ann(vararg val value: KClass<*>) +internal annotation class Ann(vararg val value: KClass<*>) -Ann(String::class, Any::class) +@Ann(String::class, Any::class) internal class C -Ann +@Ann internal class D \ No newline at end of file diff --git a/j2k/testData/fileOrElement/annotations/primaryConstructorAnnotation.kt b/j2k/testData/fileOrElement/annotations/primaryConstructorAnnotation.kt index 1924cfaeae1..e65bcd70d68 100644 --- a/j2k/testData/fileOrElement/annotations/primaryConstructorAnnotation.kt +++ b/j2k/testData/fileOrElement/annotations/primaryConstructorAnnotation.kt @@ -1,2 +1,2 @@ -internal class C Deprecated("") +internal class C @Deprecated("") constructor() diff --git a/j2k/testData/fileOrElement/classExpression/primitivesAndArrays.kt b/j2k/testData/fileOrElement/classExpression/primitivesAndArrays.kt index 9c937a2cf59..5bc2715d7f2 100644 --- a/j2k/testData/fileOrElement/classExpression/primitivesAndArrays.kt +++ b/j2k/testData/fileOrElement/classExpression/primitivesAndArrays.kt @@ -1,5 +1,5 @@ object A { - JvmStatic fun main(args: Array) { + @JvmStatic 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 92f14dcd6b6..cac56b5d623 100644 --- a/j2k/testData/fileOrElement/comments/commentsForConstructors.kt +++ b/j2k/testData/fileOrElement/comments/commentsForConstructors.kt @@ -1,5 +1,5 @@ internal class A// this is a primary constructor -JvmOverloads internal constructor(p: Int = 1) { +@JvmOverloads internal 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 ccf4d8345a9..9888a6926d0 100644 --- a/j2k/testData/fileOrElement/constructors/allCallsPrimary.kt +++ b/j2k/testData/fileOrElement/constructors/allCallsPrimary.kt @@ -1,6 +1,6 @@ package pack -internal class C JvmOverloads internal constructor(arg1: Int, arg2: Int = 0, arg3: Int = 0) +internal class C @JvmOverloads internal constructor(arg1: Int, arg2: Int = 0, arg3: Int = 0) object User { fun main() { diff --git a/j2k/testData/fileOrElement/constructors/constructorAnnotations.kt b/j2k/testData/fileOrElement/constructors/constructorAnnotations.kt index a6edb85fae5..3e3281a85b3 100644 --- a/j2k/testData/fileOrElement/constructors/constructorAnnotations.kt +++ b/j2k/testData/fileOrElement/constructors/constructorAnnotations.kt @@ -1,16 +1,16 @@ import javaApi.Anon5 internal class A -Anon5(10) +@Anon5(10) constructor(private val a: Int, private val b: Int) { - Deprecated("") // this constructor will not be replaced by default parameter value in primary because of this annotation + @Deprecated("") // this constructor will not be replaced by default parameter value in primary because of this annotation constructor(a: Int) : this(a, 1) { } } -internal class B Anon5(11) +internal class B @Anon5(11) constructor() -internal class C Anon5(12) +internal class C @Anon5(12) private constructor() \ No newline at end of file diff --git a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams9.kt b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams9.kt index a8b16f29385..34647d758b5 100644 --- a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams9.kt +++ b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams9.kt @@ -1 +1 @@ -internal class C JvmOverloads constructor(private val string: String, a: Int = string.length()) +internal class C @JvmOverloads constructor(private val string: String, a: Int = string.length()) diff --git a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParamsAnnotations.kt b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParamsAnnotations.kt index 877bb59b7a7..e8cce015662 100644 --- a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParamsAnnotations.kt +++ b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParamsAnnotations.kt @@ -1,3 +1,3 @@ import java.lang.SuppressWarnings -internal class C(Deprecated("") private val p1: Int, Deprecated("") private val myP2: Int, Deprecated("") SuppressWarnings("x") var p3: Int) +internal class C(@Deprecated("") private val p1: Int, @Deprecated("") private val myP2: Int, @Deprecated("") @SuppressWarnings("x") var p3: Int) diff --git a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults.kt b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults.kt index 5a52f045ded..3d1d17f7b32 100644 --- a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults.kt +++ b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults.kt @@ -1,4 +1,4 @@ -internal class A JvmOverloads internal constructor(nested: A.Nested = A.Nested(A.Nested.FIELD)) { +internal class A @JvmOverloads internal constructor(nested: A.Nested = A.Nested(A.Nested.FIELD)) { internal class Nested internal constructor(p: Int) { companion object { diff --git a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults2.kt b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults2.kt index c4b5d80b067..c9430ee5c43 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 -internal class A JvmOverloads internal constructor(nested: Nested = Nested(Nested.FIELD)) { +internal class A @JvmOverloads internal constructor(nested: Nested = Nested(Nested.FIELD)) { internal class Nested internal constructor(p: Int) { companion object { diff --git a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults3.kt b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults3.kt index acf106f1127..79914add408 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 -internal class A JvmOverloads internal constructor(nested: Nested = Nested(Nested.FIELD)) { +internal class A @JvmOverloads internal constructor(nested: Nested = Nested(Nested.FIELD)) { internal class Nested internal constructor(p: Int) { companion object { diff --git a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults4.kt b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults4.kt index f192ecc1213..768ca9ff3fc 100644 --- a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults4.kt +++ b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults4.kt @@ -3,7 +3,7 @@ package pack import pack.A.* -internal class A JvmOverloads internal constructor(nested: Nested = Nested(Nested.FIELD)) { +internal class A @JvmOverloads internal constructor(nested: Nested = Nested(Nested.FIELD)) { internal class Nested internal constructor(p: Int) { companion object { diff --git a/j2k/testData/fileOrElement/constructors/parameterDefaults1.kt b/j2k/testData/fileOrElement/constructors/parameterDefaults1.kt index 7b1924f85c9..da1aa9a14c0 100644 --- a/j2k/testData/fileOrElement/constructors/parameterDefaults1.kt +++ b/j2k/testData/fileOrElement/constructors/parameterDefaults1.kt @@ -1,6 +1,6 @@ package pack -internal class C JvmOverloads internal constructor(a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) { +internal class C @JvmOverloads internal constructor(a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) { internal 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 176822fddf7..c122fc20ce1 100644 --- a/j2k/testData/fileOrElement/constructors/parameterDefaults2.kt +++ b/j2k/testData/fileOrElement/constructors/parameterDefaults2.kt @@ -1,6 +1,6 @@ package pack -internal class C JvmOverloads internal constructor(a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) { +internal class C @JvmOverloads internal constructor(a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) { internal 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 996215679e4..84c5d41a2c1 100644 --- a/j2k/testData/fileOrElement/constructors/parameterDefaults3.kt +++ b/j2k/testData/fileOrElement/constructors/parameterDefaults3.kt @@ -1,6 +1,6 @@ package pack -internal class C JvmOverloads internal constructor(a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) { +internal class C @JvmOverloads internal constructor(a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) { internal 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 a6e224b0613..07e680b896f 100644 --- a/j2k/testData/fileOrElement/constructors/parameterDefaults4.kt +++ b/j2k/testData/fileOrElement/constructors/parameterDefaults4.kt @@ -1,3 +1,3 @@ package pack -internal class C JvmOverloads internal constructor(a: Int = 1, b: Int = 2, c: Int = 3, d: Int = 4, e: Int = 5) +internal class C @JvmOverloads internal 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 a6e224b0613..07e680b896f 100644 --- a/j2k/testData/fileOrElement/constructors/parameterDefaults5.kt +++ b/j2k/testData/fileOrElement/constructors/parameterDefaults5.kt @@ -1,3 +1,3 @@ package pack -internal class C JvmOverloads internal constructor(a: Int = 1, b: Int = 2, c: Int = 3, d: Int = 4, e: Int = 5) +internal class C @JvmOverloads internal 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 904c71117da..9885d0a9dd7 100644 --- a/j2k/testData/fileOrElement/constructors/parameterModification.kt +++ b/j2k/testData/fileOrElement/constructors/parameterModification.kt @@ -1,4 +1,4 @@ -internal class C JvmOverloads internal constructor(arg1: Int, arg2: Int = 0, arg3: Int = 0) { +internal class C @JvmOverloads internal 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 211dab393d0..6c1c523832b 100644 --- a/j2k/testData/fileOrElement/constructors/secondaryConstructorWithDefaultValues.kt +++ b/j2k/testData/fileOrElement/constructors/secondaryConstructorWithDefaultValues.kt @@ -7,7 +7,7 @@ internal class A { constructor() { } - JvmOverloads constructor(p: Int, s: String, x: Int = 1) { + @JvmOverloads 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 19877626cda..c476048721b 100644 --- a/j2k/testData/fileOrElement/constructors/secondaryConstructorWithDefaultValues2.kt +++ b/j2k/testData/fileOrElement/constructors/secondaryConstructorWithDefaultValues2.kt @@ -4,7 +4,7 @@ internal class A() { private val s = "" private val x = 0 - JvmOverloads constructor(p: Int, s: String, x: Int = 1) : this() { + @JvmOverloads constructor(p: Int, s: String, x: Int = 1) : this() { this.s = s this.x = x } diff --git a/j2k/testData/fileOrElement/docComments/deprecatedDocTag.kt b/j2k/testData/fileOrElement/docComments/deprecatedDocTag.kt index 094bbc1f51f..82aeb4ce083 100644 --- a/j2k/testData/fileOrElement/docComments/deprecatedDocTag.kt +++ b/j2k/testData/fileOrElement/docComments/deprecatedDocTag.kt @@ -1,5 +1,5 @@ /** * This is a deprecated class. */ -Deprecated("do not use") +@Deprecated("do not use") internal class C diff --git a/j2k/testData/fileOrElement/docComments/onlyDeprecatedDocTag.kt b/j2k/testData/fileOrElement/docComments/onlyDeprecatedDocTag.kt index f33a26a5c61..1741c0370d2 100644 --- a/j2k/testData/fileOrElement/docComments/onlyDeprecatedDocTag.kt +++ b/j2k/testData/fileOrElement/docComments/onlyDeprecatedDocTag.kt @@ -1,2 +1,2 @@ -Deprecated("do not use") +@Deprecated("do not use") internal class C diff --git a/j2k/testData/fileOrElement/dropAccessors/DifferentFieldNameAndDefaultParameterValue.kt b/j2k/testData/fileOrElement/dropAccessors/DifferentFieldNameAndDefaultParameterValue.kt index 48a4ea8f774..d30d2fb2334 100644 --- a/j2k/testData/fileOrElement/dropAccessors/DifferentFieldNameAndDefaultParameterValue.kt +++ b/j2k/testData/fileOrElement/dropAccessors/DifferentFieldNameAndDefaultParameterValue.kt @@ -1 +1 @@ -class C JvmOverloads internal constructor(c: C, val x: Int = c.x) +class C @JvmOverloads internal constructor(c: C, val x: Int = c.x) diff --git a/j2k/testData/fileOrElement/field/volatileTransientAndStrictFp.kt b/j2k/testData/fileOrElement/field/volatileTransientAndStrictFp.kt index 5e66ad12e3f..872f2dbffd2 100644 --- a/j2k/testData/fileOrElement/field/volatileTransientAndStrictFp.kt +++ b/j2k/testData/fileOrElement/field/volatileTransientAndStrictFp.kt @@ -1,10 +1,10 @@ // ERROR: This annotation is not applicable to target 'member property' internal class A { - Deprecated("") - Volatile internal var field1 = 0 + @Deprecated("") + @Volatile internal var field1 = 0 - Transient internal var field2 = 1 + @Transient internal var field2 = 1 // Should work even for bad modifiers - Strictfp internal var field3 = 2.0 + @Strictfp internal var field3 = 2.0 } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/for/withContinue1.kt b/j2k/testData/fileOrElement/for/withContinue1.kt index 549df3fb4aa..014a6478416 100644 --- a/j2k/testData/fileOrElement/for/withContinue1.kt +++ b/j2k/testData/fileOrElement/for/withContinue1.kt @@ -1,5 +1,5 @@ object TestClass { - JvmStatic fun main(args: Array) { + @JvmStatic 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 f3fd46edc35..0f7e701b13a 100644 --- a/j2k/testData/fileOrElement/for/withContinue2.kt +++ b/j2k/testData/fileOrElement/for/withContinue2.kt @@ -1,5 +1,5 @@ object TestClass { - JvmStatic fun main(args: Array) { + @JvmStatic 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 0aedf4ac398..5da05bfe4db 100644 --- a/j2k/testData/fileOrElement/for/withContinue3.kt +++ b/j2k/testData/fileOrElement/for/withContinue3.kt @@ -1,5 +1,5 @@ object TestClass { - JvmStatic fun main(args: Array) { + @JvmStatic 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 ed2e7836a80..3390d1118a6 100644 --- a/j2k/testData/fileOrElement/for/withContinueAndLabels.kt +++ b/j2k/testData/fileOrElement/for/withContinueAndLabels.kt @@ -1,5 +1,5 @@ object TestClass { - JvmStatic fun main(args: Array) { + @JvmStatic fun main(args: Array) { var i = 1 OuterLoop1@ OuterLoop2@ while (i < 1000) { var j = 1 diff --git a/j2k/testData/fileOrElement/function/extendsBaseWhichExtendsObject.kt b/j2k/testData/fileOrElement/function/extendsBaseWhichExtendsObject.kt index 9f8606526cd..9c30d21b350 100644 --- a/j2k/testData/fileOrElement/function/extendsBaseWhichExtendsObject.kt +++ b/j2k/testData/fileOrElement/function/extendsBaseWhichExtendsObject.kt @@ -11,7 +11,7 @@ internal class Test : Base() { return super.equals(o) } - Throws(CloneNotSupportedException::class) + @Throws(CloneNotSupportedException::class) override fun clone(): Any { return super.clone() } @@ -20,7 +20,7 @@ internal class Test : Base() { return super.toString() } - Throws(Throwable::class) + @Throws(Throwable::class) override fun finalize() { super.finalize() } @@ -35,7 +35,7 @@ internal open class Base { return super.equals(o) } - Throws(CloneNotSupportedException::class) + @Throws(CloneNotSupportedException::class) protected open fun clone(): Any { return super.clone() } @@ -44,7 +44,7 @@ internal open class Base { return super.toString() } - Throws(Throwable::class) + @Throws(Throwable::class) protected open fun finalize() { super.finalize() } diff --git a/j2k/testData/fileOrElement/function/main.kt b/j2k/testData/fileOrElement/function/main.kt index 64da132258e..bf42ac419b3 100644 --- a/j2k/testData/fileOrElement/function/main.kt +++ b/j2k/testData/fileOrElement/function/main.kt @@ -1,2 +1,2 @@ -JvmStatic fun main(args: Array) { +@JvmStatic 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 9d272f4375e..f263509378b 100644 --- a/j2k/testData/fileOrElement/function/main2.kt +++ b/j2k/testData/fileOrElement/function/main2.kt @@ -1,4 +1,4 @@ object A { - JvmStatic fun main(args: Array) { + @JvmStatic 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 344b0741ab0..402a9981735 100644 --- a/j2k/testData/fileOrElement/function/mainAndNullabilitySetting.kt +++ b/j2k/testData/fileOrElement/function/mainAndNullabilitySetting.kt @@ -1,5 +1,5 @@ // !forceNotNullTypes: false object A { - JvmStatic fun main(args: Array) { + @JvmStatic fun main(args: Array) { } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/function/overrideObject.kt b/j2k/testData/fileOrElement/function/overrideObject.kt index 5a78de59862..51fa102a966 100644 --- a/j2k/testData/fileOrElement/function/overrideObject.kt +++ b/j2k/testData/fileOrElement/function/overrideObject.kt @@ -12,14 +12,14 @@ internal class X { return super.toString() } - Throws(CloneNotSupportedException::class) + @Throws(CloneNotSupportedException::class) protected fun clone(): Any { return super.clone() } } internal class Y : Thread() { - Throws(CloneNotSupportedException::class) + @Throws(CloneNotSupportedException::class) override fun clone(): Any { return super.clone() } diff --git a/j2k/testData/fileOrElement/function/overrideObject2.kt b/j2k/testData/fileOrElement/function/overrideObject2.kt index b459e049e59..8aa82cdf93f 100644 --- a/j2k/testData/fileOrElement/function/overrideObject2.kt +++ b/j2k/testData/fileOrElement/function/overrideObject2.kt @@ -14,7 +14,7 @@ internal class X : Base() { return super.toString() } - Throws(CloneNotSupportedException::class) + @Throws(CloneNotSupportedException::class) protected fun clone(): Any { return super.clone() } diff --git a/j2k/testData/fileOrElement/function/synchronizedMethod.kt b/j2k/testData/fileOrElement/function/synchronizedMethod.kt index 05d1f78fd5d..fbfb8454990 100644 --- a/j2k/testData/fileOrElement/function/synchronizedMethod.kt +++ b/j2k/testData/fileOrElement/function/synchronizedMethod.kt @@ -1,5 +1,5 @@ internal class A { - Synchronized internal fun foo() { + @Synchronized internal fun foo() { bar() } diff --git a/j2k/testData/fileOrElement/function/throws.kt b/j2k/testData/fileOrElement/function/throws.kt index 3ba5bb50182..b0497615f6a 100644 --- a/j2k/testData/fileOrElement/function/throws.kt +++ b/j2k/testData/fileOrElement/function/throws.kt @@ -1,2 +1,2 @@ -Throws(IOException::class, SerializationException::class) +@Throws(IOException::class, SerializationException::class) internal fun foo() \ 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 01d657216b3..4fbcc5f07a1 100644 --- a/j2k/testData/fileOrElement/issues/kt-638.kt +++ b/j2k/testData/fileOrElement/issues/kt-638.kt @@ -21,7 +21,7 @@ class Identifier { } object User { - JvmStatic fun main(args: Array) { + @JvmStatic 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 ff57d65ef36..9baf73cdf13 100644 --- a/j2k/testData/fileOrElement/issues/kt-807.kt +++ b/j2k/testData/fileOrElement/issues/kt-807.kt @@ -5,7 +5,7 @@ import java.io.* internal object FileRead { - JvmStatic fun main(args: Array) { + @JvmStatic 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 10500ce0bb2..af9dc2b10ce 100644 --- a/j2k/testData/fileOrElement/issues/kt-871.kt +++ b/j2k/testData/fileOrElement/issues/kt-871.kt @@ -1,7 +1,7 @@ package demo internal object Program { - JvmStatic fun main(args: Array) { + @JvmStatic fun main(args: Array) { println("Halo!") } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/methodCallExpression/vararg1.kt b/j2k/testData/fileOrElement/methodCallExpression/vararg1.kt index 95b682f0027..5fa9d941b08 100644 --- a/j2k/testData/fileOrElement/methodCallExpression/vararg1.kt +++ b/j2k/testData/fileOrElement/methodCallExpression/vararg1.kt @@ -1,7 +1,7 @@ import java.lang.reflect.Constructor internal object X { - Throws(Exception::class) + @Throws(Exception::class) internal fun foo(constructor: Constructor, args1: Array, args2: Array) { constructor.newInstance(*args1) constructor.newInstance(args1, args2) diff --git a/j2k/testData/fileOrElement/overloads/Annotations.kt b/j2k/testData/fileOrElement/overloads/Annotations.kt index 0621f8b7497..8ea0865e595 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 internal class A { - JvmOverloads internal fun foo(s: String? = null): Any { + @JvmOverloads internal fun foo(s: String? = null): Any { println("s = " + s!!) return "" } @@ -24,7 +24,7 @@ internal class A { return bar1(null) } - Deprecated("") + @Deprecated("") fun f() { f(1) } diff --git a/j2k/testData/fileOrElement/overloads/Simple.kt b/j2k/testData/fileOrElement/overloads/Simple.kt index f42158938ca..c4625b66bca 100644 --- a/j2k/testData/fileOrElement/overloads/Simple.kt +++ b/j2k/testData/fileOrElement/overloads/Simple.kt @@ -1,9 +1,9 @@ internal class A { - JvmOverloads internal fun foo(i: Int, c: Char = 'a', s: String = "") { + @JvmOverloads internal fun foo(i: Int, c: Char = 'a', s: String = "") { println("foo" + i + c + s) } - JvmOverloads internal fun bar(s: String? = null): Int { + @JvmOverloads internal fun bar(s: String? = null): Int { println("s = " + s!!) return 0 } diff --git a/j2k/testData/fileOrElement/overloads/Synchronized.kt b/j2k/testData/fileOrElement/overloads/Synchronized.kt index 1c27dd5415a..2d2f0abcb46 100644 --- a/j2k/testData/fileOrElement/overloads/Synchronized.kt +++ b/j2k/testData/fileOrElement/overloads/Synchronized.kt @@ -3,7 +3,7 @@ internal class A { println("p = [$p]") } - Synchronized fun foo() { + @Synchronized fun foo() { foo(calcSomething()) } diff --git a/j2k/testData/fileOrElement/switch/comlicatedFallDown.kt b/j2k/testData/fileOrElement/switch/comlicatedFallDown.kt index b24f74268e8..64a37cf88cf 100644 --- a/j2k/testData/fileOrElement/switch/comlicatedFallDown.kt +++ b/j2k/testData/fileOrElement/switch/comlicatedFallDown.kt @@ -76,7 +76,7 @@ object SwitchDemo { println(monthString) } - JvmStatic fun main(args: Array) { + @JvmStatic 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 cf2d71a99e8..5509a12724a 100644 --- a/j2k/testData/fileOrElement/switch/emptySwitch.kt +++ b/j2k/testData/fileOrElement/switch/emptySwitch.kt @@ -1,5 +1,5 @@ object NonDefault { - JvmStatic fun main(args: Array) { + @JvmStatic 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 95c7e657459..4cf157521dd 100644 --- a/j2k/testData/fileOrElement/switch/fallDown.kt +++ b/j2k/testData/fileOrElement/switch/fallDown.kt @@ -1,7 +1,7 @@ package switch_demo object SwitchDemo { - JvmStatic fun main(args: Array) { + @JvmStatic 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 6fc6a713709..2a7f6bc40f0 100644 --- a/j2k/testData/fileOrElement/switch/fallDownWithBlocks.kt +++ b/j2k/testData/fileOrElement/switch/fallDownWithBlocks.kt @@ -1,5 +1,5 @@ object C { - JvmStatic fun main(args: Array) { + @JvmStatic 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 8ab5c492a2d..1dbe57db1cc 100644 --- a/j2k/testData/fileOrElement/switch/kt-539.kt +++ b/j2k/testData/fileOrElement/switch/kt-539.kt @@ -1,7 +1,7 @@ package switch_demo object SwitchDemo { - JvmStatic fun main(args: Array) { + @JvmStatic 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 988e995bd7c..bd8b9b6897b 100644 --- a/j2k/testData/fileOrElement/switch/nondefault.kt +++ b/j2k/testData/fileOrElement/switch/nondefault.kt @@ -1,5 +1,5 @@ object NonDefault { - JvmStatic fun main(args: Array) { + @JvmStatic fun main(args: Array) { val value = 3 var valueString = "" diff --git a/j2k/testData/fileOrElement/tryWithResource/Multiline.kt b/j2k/testData/fileOrElement/tryWithResource/Multiline.kt index 5feb502f60f..c0021a11ccc 100644 --- a/j2k/testData/fileOrElement/tryWithResource/Multiline.kt +++ b/j2k/testData/fileOrElement/tryWithResource/Multiline.kt @@ -1,7 +1,7 @@ import java.io.* class C { - Throws(IOException::class) + @Throws(IOException::class) internal fun foo() { ByteArrayInputStream(ByteArray(10)).use { stream -> // reading something diff --git a/j2k/testData/fileOrElement/tryWithResource/MultipleResources.kt b/j2k/testData/fileOrElement/tryWithResource/MultipleResources.kt index a6fc4505eb2..2eacfccde51 100644 --- a/j2k/testData/fileOrElement/tryWithResource/MultipleResources.kt +++ b/j2k/testData/fileOrElement/tryWithResource/MultipleResources.kt @@ -1,7 +1,7 @@ import java.io.* class C { - Throws(IOException::class) + @Throws(IOException::class) internal fun foo() { ByteArrayInputStream(ByteArray(10)).use { input -> ByteArrayOutputStream().use { output -> diff --git a/j2k/testData/fileOrElement/tryWithResource/Simple.kt b/j2k/testData/fileOrElement/tryWithResource/Simple.kt index 9440bbb0eaa..0cc581f7638 100644 --- a/j2k/testData/fileOrElement/tryWithResource/Simple.kt +++ b/j2k/testData/fileOrElement/tryWithResource/Simple.kt @@ -1,7 +1,7 @@ import java.io.* class C { - Throws(IOException::class) + @Throws(IOException::class) internal fun foo() { ByteArrayInputStream(ByteArray(10)).use { stream -> println(stream.read()) } } diff --git a/j2k/testData/fileOrElement/tryWithResource/WithFinally.kt b/j2k/testData/fileOrElement/tryWithResource/WithFinally.kt index 56574e55d16..9484e6efd56 100644 --- a/j2k/testData/fileOrElement/tryWithResource/WithFinally.kt +++ b/j2k/testData/fileOrElement/tryWithResource/WithFinally.kt @@ -1,7 +1,7 @@ import java.io.* class C { - Throws(IOException::class) + @Throws(IOException::class) internal fun foo() { try { ByteArrayInputStream(ByteArray(10)).use { stream -> diff --git a/j2k/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass.kt b/j2k/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass.kt index 2769af1f4f0..e6ff0724964 100644 --- a/j2k/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass.kt +++ b/j2k/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass.kt @@ -1,16 +1,16 @@ import java.io.* internal interface I { - Throws(IOException::class) + @Throws(IOException::class) fun doIt(stream: InputStream): Int } class C { - Throws(IOException::class) + @Throws(IOException::class) internal fun foo() { ByteArrayInputStream(ByteArray(10)).use { stream -> bar(object : I { - Throws(IOException::class) + @Throws(IOException::class) override fun doIt(stream: InputStream): Int { return stream.available() } @@ -18,7 +18,7 @@ class C { } } - Throws(IOException::class) + @Throws(IOException::class) internal fun bar(i: I, stream: InputStream): Int { return i.doIt(stream) } diff --git a/j2k/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass2.kt b/j2k/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass2.kt index 67fa6176818..35673b345b7 100644 --- a/j2k/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass2.kt +++ b/j2k/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass2.kt @@ -1,16 +1,16 @@ import java.io.* internal interface I { - Throws(IOException::class) + @Throws(IOException::class) fun doIt(stream: InputStream): Int } class C { - Throws(IOException::class) + @Throws(IOException::class) internal fun foo(): Int { ByteArrayInputStream(ByteArray(10)).use { stream -> return bar(object : I { - Throws(IOException::class) + @Throws(IOException::class) override fun doIt(stream: InputStream): Int { return stream.available() } @@ -18,7 +18,7 @@ class C { } } - Throws(IOException::class) + @Throws(IOException::class) internal fun bar(i: I, stream: InputStream): Int { return i.doIt(stream) }