From 5f9a33564a32207955da495978cbf53180474d71 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 22 Jun 2017 19:59:18 +0200 Subject: [PATCH] Implement option for wrapping method annotations --- .../jetbrains/kotlin/idea/formatter/KotlinCommonBlock.kt | 6 ++++++ .../formatter/KotlinLanguageCodeStyleSettingsProvider.kt | 3 ++- .../conversion/AddImportsWithExplicitImports.expected.kt | 4 +++- .../conversion/FileWithNoPackageStatement.expected.kt | 3 ++- idea/testData/formatter/MethodAnnotationWrapping.after.kt | 4 ++++ idea/testData/formatter/MethodAnnotationWrapping.kt | 2 ++ .../modifierList/funAnnotationBeforeAnnotation.after.kt | 3 ++- .../funAnnotationEntryBeforeAnnotation.after.kt | 3 ++- .../modifierList/funAnnotationEntryBeforeAnnotation.kt | 3 ++- .../modifierList/funModifierBeforeAnnotation.after.kt | 3 ++- .../formatter/modifierList/funModifierBeforeAnnotation.kt | 3 ++- .../convertPropertyToFunction/unchangedElements.kt.after | 3 ++- .../topLevelFunctionSuppressNoArgsTheSameLine.kt.after | 3 ++- .../topLevelFunctionSuppressNoArgsTheSameLineBare.kt.after | 3 ++- .../refactoring/copy/kt18149/after/refactor/copy2/test.kt | 3 ++- .../refactoring/pullUp/j2k/fromClassToClass.kt.after | 3 ++- .../pullUp/j2k/fromClassToClassAndMakeAbstract.kt.after | 3 ++- .../refactoring/pullUp/j2k/fromClassToInterface.kt.after | 3 ++- .../refactoring/pullUp/j2k/fromClassToNestedClass.kt.after | 3 ++- .../jetbrains/kotlin/formatter/FormatterTestGenerated.java | 6 ++++++ j2k/testData/fileOrElement/annotations/annotationUsages.kt | 4 +++- .../fileOrElement/binaryExpression/lhsObjectPlusString.kt | 3 ++- .../fileOrElement/binaryExpression/orWithNewLine.kt | 3 ++- .../fileOrElement/classExpression/primitivesAndArrays.kt | 3 ++- j2k/testData/fileOrElement/comments/commentInsideCall.kt | 3 ++- j2k/testData/fileOrElement/for/overMapEntries.kt | 3 ++- j2k/testData/fileOrElement/for/withContinue1.kt | 3 ++- j2k/testData/fileOrElement/for/withContinue2.kt | 3 ++- j2k/testData/fileOrElement/for/withContinue3.kt | 3 ++- j2k/testData/fileOrElement/for/withContinueAndLabels.kt | 3 ++- j2k/testData/fileOrElement/function/main.kt | 4 +++- j2k/testData/fileOrElement/function/main2.kt | 4 +++- .../fileOrElement/function/mainAndNullabilitySetting.kt | 4 +++- j2k/testData/fileOrElement/function/synchronizedMethod.kt | 3 ++- j2k/testData/fileOrElement/issues/kt-638.kt | 3 ++- j2k/testData/fileOrElement/issues/kt-807.kt | 3 ++- j2k/testData/fileOrElement/issues/kt-871.kt | 3 ++- j2k/testData/fileOrElement/overloads/Annotations.kt | 3 ++- j2k/testData/fileOrElement/overloads/Simple.kt | 6 ++++-- j2k/testData/fileOrElement/overloads/Synchronized.kt | 3 ++- j2k/testData/fileOrElement/switch/comlicatedFallDown.kt | 3 ++- j2k/testData/fileOrElement/switch/emptySwitch.kt | 3 ++- j2k/testData/fileOrElement/switch/fallDown.kt | 3 ++- j2k/testData/fileOrElement/switch/fallDownWithBlocks.kt | 3 ++- j2k/testData/fileOrElement/switch/kt-539.kt | 3 ++- j2k/testData/fileOrElement/switch/nondefault.kt | 3 ++- .../fileOrElement/toKotlinClasses/LibraryFunctions.kt | 3 ++- 47 files changed, 111 insertions(+), 44 deletions(-) create mode 100644 idea/testData/formatter/MethodAnnotationWrapping.after.kt create mode 100644 idea/testData/formatter/MethodAnnotationWrapping.kt diff --git a/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinCommonBlock.kt b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinCommonBlock.kt index 81a3684b823..f6e5089f1ab 100644 --- a/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinCommonBlock.kt +++ b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinCommonBlock.kt @@ -359,6 +359,9 @@ abstract class KotlinCommonBlock( return getWrappingStrategyForItemList(commonSettings.CLASS_ANNOTATION_WRAP, KtNodeTypes.ANNOTATION_ENTRY) + is KtNamedFunction -> + return getWrappingStrategyForItemList(commonSettings.METHOD_ANNOTATION_WRAP, + KtNodeTypes.ANNOTATION_ENTRY) } elementType === KtNodeTypes.VALUE_PARAMETER -> @@ -366,6 +369,9 @@ abstract class KotlinCommonBlock( node.psi is KtClassOrObject -> return wrapAfterAnnotation(commonSettings.CLASS_ANNOTATION_WRAP) + + node.psi is KtNamedFunction -> + return wrapAfterAnnotation(commonSettings.METHOD_ANNOTATION_WRAP) } return WrappingStrategy.NoWrapping diff --git a/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinLanguageCodeStyleSettingsProvider.kt b/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinLanguageCodeStyleSettingsProvider.kt index da7602ab24e..abafcebf91a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinLanguageCodeStyleSettingsProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinLanguageCodeStyleSettingsProvider.kt @@ -34,7 +34,7 @@ class KotlinLanguageCodeStyleSettingsProvider : LanguageCodeStyleSettingsProvide val test = 12 - fun foo1(i1: Int, i2: Int, i3: Int) : Int { + @Deprecated("Foo") fun foo1(i1: Int, i2: Int, i3: Int) : Int { when (i1) { is Number -> 0 else -> 1 @@ -236,6 +236,7 @@ class KotlinLanguageCodeStyleSettingsProvider : LanguageCodeStyleSettingsProvide "CALL_PARAMETERS_WRAP", "METHOD_PARAMETERS_WRAP", "EXTENDS_LIST_WRAP", + "METHOD_ANNOTATION_WRAP", "CLASS_ANNOTATION_WRAP", "PARAMETER_ANNOTATION_WRAP", "METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE", diff --git a/idea/testData/copyPaste/conversion/AddImportsWithExplicitImports.expected.kt b/idea/testData/copyPaste/conversion/AddImportsWithExplicitImports.expected.kt index e1b97a2fae3..b9b8f631955 100644 --- a/idea/testData/copyPaste/conversion/AddImportsWithExplicitImports.expected.kt +++ b/idea/testData/copyPaste/conversion/AddImportsWithExplicitImports.expected.kt @@ -4,6 +4,8 @@ internal class C { private fun memberFun(file: File) {} 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/FileWithNoPackageStatement.expected.kt b/idea/testData/copyPaste/conversion/FileWithNoPackageStatement.expected.kt index 9f1d0ac817c..41067f3dac3 100644 --- a/idea/testData/copyPaste/conversion/FileWithNoPackageStatement.expected.kt +++ b/idea/testData/copyPaste/conversion/FileWithNoPackageStatement.expected.kt @@ -1,7 +1,8 @@ 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/formatter/MethodAnnotationWrapping.after.kt b/idea/testData/formatter/MethodAnnotationWrapping.after.kt new file mode 100644 index 00000000000..57591b9042f --- /dev/null +++ b/idea/testData/formatter/MethodAnnotationWrapping.after.kt @@ -0,0 +1,4 @@ +@Deprecated("Foo") +@Deprecated("Bar") +fun foo() { +} \ No newline at end of file diff --git a/idea/testData/formatter/MethodAnnotationWrapping.kt b/idea/testData/formatter/MethodAnnotationWrapping.kt new file mode 100644 index 00000000000..3f5c6e6c846 --- /dev/null +++ b/idea/testData/formatter/MethodAnnotationWrapping.kt @@ -0,0 +1,2 @@ +@Deprecated("Foo") @Deprecated("Bar") fun foo() { +} \ No newline at end of file diff --git a/idea/testData/formatter/modifierList/funAnnotationBeforeAnnotation.after.kt b/idea/testData/formatter/modifierList/funAnnotationBeforeAnnotation.after.kt index 66535cc4ce1..b7e5385d5f6 100644 --- a/idea/testData/formatter/modifierList/funAnnotationBeforeAnnotation.after.kt +++ b/idea/testData/formatter/modifierList/funAnnotationBeforeAnnotation.after.kt @@ -1,4 +1,5 @@ @annot -@foo fun foo() { +@foo +fun foo() { } diff --git a/idea/testData/formatter/modifierList/funAnnotationEntryBeforeAnnotation.after.kt b/idea/testData/formatter/modifierList/funAnnotationEntryBeforeAnnotation.after.kt index d7a5afe840b..8f6ae6cb7fa 100644 --- a/idea/testData/formatter/modifierList/funAnnotationEntryBeforeAnnotation.after.kt +++ b/idea/testData/formatter/modifierList/funAnnotationEntryBeforeAnnotation.after.kt @@ -1,4 +1,5 @@ annot() -@foo fun foo() { +@foo +fun foo() { } diff --git a/idea/testData/formatter/modifierList/funAnnotationEntryBeforeAnnotation.kt b/idea/testData/formatter/modifierList/funAnnotationEntryBeforeAnnotation.kt index d7a5afe840b..8f6ae6cb7fa 100644 --- a/idea/testData/formatter/modifierList/funAnnotationEntryBeforeAnnotation.kt +++ b/idea/testData/formatter/modifierList/funAnnotationEntryBeforeAnnotation.kt @@ -1,4 +1,5 @@ annot() -@foo fun foo() { +@foo +fun foo() { } diff --git a/idea/testData/formatter/modifierList/funModifierBeforeAnnotation.after.kt b/idea/testData/formatter/modifierList/funModifierBeforeAnnotation.after.kt index d20d2afc545..bfed66dc511 100644 --- a/idea/testData/formatter/modifierList/funModifierBeforeAnnotation.after.kt +++ b/idea/testData/formatter/modifierList/funModifierBeforeAnnotation.after.kt @@ -1,4 +1,5 @@ public -@foo fun foo() { +@foo +fun foo() { } diff --git a/idea/testData/formatter/modifierList/funModifierBeforeAnnotation.kt b/idea/testData/formatter/modifierList/funModifierBeforeAnnotation.kt index d20d2afc545..bfed66dc511 100644 --- a/idea/testData/formatter/modifierList/funModifierBeforeAnnotation.kt +++ b/idea/testData/formatter/modifierList/funModifierBeforeAnnotation.kt @@ -1,4 +1,5 @@ public -@foo fun foo() { +@foo +fun foo() { } diff --git a/idea/testData/intentions/convertPropertyToFunction/unchangedElements.kt.after b/idea/testData/intentions/convertPropertyToFunction/unchangedElements.kt.after index b2de30cf0d8..ec5c54447bd 100644 --- a/idea/testData/intentions/convertPropertyToFunction/unchangedElements.kt.after +++ b/idea/testData/intentions/convertPropertyToFunction/unchangedElements.kt.after @@ -3,7 +3,8 @@ annotation class X(val s: String) class A(val n: Int) { - internal @X("1") fun T.getFoo(): Boolean = toInt() - n > 1 + internal @X("1") + fun T.getFoo(): Boolean = toInt() - n > 1 } fun test() { diff --git a/idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressNoArgsTheSameLine.kt.after b/idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressNoArgsTheSameLine.kt.after index b758b3cc93b..83713f3230f 100644 --- a/idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressNoArgsTheSameLine.kt.after +++ b/idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressNoArgsTheSameLine.kt.after @@ -1,3 +1,4 @@ // "Suppress 'REDUNDANT_NULLABLE' for fun foo" "true" -@Suppress("REDUNDANT_NULLABLE") fun foo(): String?? = null \ No newline at end of file +@Suppress("REDUNDANT_NULLABLE") +fun foo(): String?? = null \ No newline at end of file diff --git a/idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressNoArgsTheSameLineBare.kt.after b/idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressNoArgsTheSameLineBare.kt.after index b758b3cc93b..83713f3230f 100644 --- a/idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressNoArgsTheSameLineBare.kt.after +++ b/idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressNoArgsTheSameLineBare.kt.after @@ -1,3 +1,4 @@ // "Suppress 'REDUNDANT_NULLABLE' for fun foo" "true" -@Suppress("REDUNDANT_NULLABLE") fun foo(): String?? = null \ No newline at end of file +@Suppress("REDUNDANT_NULLABLE") +fun foo(): String?? = null \ No newline at end of file diff --git a/idea/testData/refactoring/copy/kt18149/after/refactor/copy2/test.kt b/idea/testData/refactoring/copy/kt18149/after/refactor/copy2/test.kt index fe483c9b2ed..4201fe58970 100644 --- a/idea/testData/refactoring/copy/kt18149/after/refactor/copy2/test.kt +++ b/idea/testData/refactoring/copy/kt18149/after/refactor/copy2/test.kt @@ -42,7 +42,8 @@ class Variety { private fun privateFun() = 0 fun genFunB(p: T): T = p fun genFunC(p: T): C where T : C = p - @MemAnn fun annotatedFun() = 0 + @MemAnn + fun annotatedFun() = 0 final fun finalFun() = 0 // property var publicProp = 0 diff --git a/idea/testData/refactoring/pullUp/j2k/fromClassToClass.kt.after b/idea/testData/refactoring/pullUp/j2k/fromClassToClass.kt.after index f2771d828e1..fc464b450dc 100644 --- a/idea/testData/refactoring/pullUp/j2k/fromClassToClass.kt.after +++ b/idea/testData/refactoring/pullUp/j2k/fromClassToClass.kt.after @@ -21,7 +21,8 @@ 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 4a5f2e20d30..4100e573a43 100644 --- a/idea/testData/refactoring/pullUp/j2k/fromClassToClassAndMakeAbstract.kt.after +++ b/idea/testData/refactoring/pullUp/j2k/fromClassToClassAndMakeAbstract.kt.after @@ -19,7 +19,8 @@ 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 9daa591e1e7..2b6de9bd773 100644 --- a/idea/testData/refactoring/pullUp/j2k/fromClassToInterface.kt.after +++ b/idea/testData/refactoring/pullUp/j2k/fromClassToInterface.kt.after @@ -15,7 +15,8 @@ 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 4c382a125a4..f54eb7ca958 100644 --- a/idea/testData/refactoring/pullUp/j2k/fromClassToNestedClass.kt.after +++ b/idea/testData/refactoring/pullUp/j2k/fromClassToNestedClass.kt.after @@ -23,7 +23,8 @@ 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/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java b/idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java index 777b54d8ee5..50c76e4f7a1 100644 --- a/idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java @@ -494,6 +494,12 @@ public class FormatterTestGenerated extends AbstractFormatterTest { doTest(fileName); } + @TestMetadata("MethodAnnotationWrapping.after.kt") + public void testMethodAnnotationWrapping() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/MethodAnnotationWrapping.after.kt"); + doTest(fileName); + } + @TestMetadata("MethodCall.after.kt") public void testMethodCall() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/MethodCall.after.kt"); diff --git a/j2k/testData/fileOrElement/annotations/annotationUsages.kt b/j2k/testData/fileOrElement/annotations/annotationUsages.kt index 462e08a3b63..8d12cf6ef88 100644 --- a/j2k/testData/fileOrElement/annotations/annotationUsages.kt +++ b/j2k/testData/fileOrElement/annotations/annotationUsages.kt @@ -27,5 +27,7 @@ internal class C { @Deprecated("") @Anon5(3) val c = 'a' } - @Anon5(1) fun bar() {} + @Anon5(1) + fun bar() { + } } diff --git a/j2k/testData/fileOrElement/binaryExpression/lhsObjectPlusString.kt b/j2k/testData/fileOrElement/binaryExpression/lhsObjectPlusString.kt index e2855e7f08d..2a6dd50d11b 100644 --- a/j2k/testData/fileOrElement/binaryExpression/lhsObjectPlusString.kt +++ b/j2k/testData/fileOrElement/binaryExpression/lhsObjectPlusString.kt @@ -16,7 +16,8 @@ class Test { companion object { - @JvmStatic fun main(args: Array) { + @JvmStatic + fun main(args: Array) { val p = Test().toString() + "123" } } diff --git a/j2k/testData/fileOrElement/binaryExpression/orWithNewLine.kt b/j2k/testData/fileOrElement/binaryExpression/orWithNewLine.kt index df9d544295a..cc1483f45ac 100644 --- a/j2k/testData/fileOrElement/binaryExpression/orWithNewLine.kt +++ b/j2k/testData/fileOrElement/binaryExpression/orWithNewLine.kt @@ -1,5 +1,6 @@ object A { - @JvmStatic fun main(args: Array) { + @JvmStatic + fun main(args: Array) { val ANDAND = true && true && true diff --git a/j2k/testData/fileOrElement/classExpression/primitivesAndArrays.kt b/j2k/testData/fileOrElement/classExpression/primitivesAndArrays.kt index d9cfcc0c9cf..3fab6700d0b 100644 --- a/j2k/testData/fileOrElement/classExpression/primitivesAndArrays.kt +++ b/j2k/testData/fileOrElement/classExpression/primitivesAndArrays.kt @@ -1,5 +1,6 @@ object A { - @JvmStatic fun main(args: Array) { + @JvmStatic + fun main(args: Array) { println(Void.TYPE) println(Boolean::class.javaPrimitiveType) println(Int::class.javaPrimitiveType) diff --git a/j2k/testData/fileOrElement/comments/commentInsideCall.kt b/j2k/testData/fileOrElement/comments/commentInsideCall.kt index 7b55028920f..b09ef69eb6c 100644 --- a/j2k/testData/fileOrElement/comments/commentInsideCall.kt +++ b/j2k/testData/fileOrElement/comments/commentInsideCall.kt @@ -1,7 +1,8 @@ package test object Test { - @JvmStatic fun main(args: Array) { + @JvmStatic + fun main(args: Array) { println()// Comment Test diff --git a/j2k/testData/fileOrElement/for/overMapEntries.kt b/j2k/testData/fileOrElement/for/overMapEntries.kt index f580cb59921..1cb8af88ef5 100644 --- a/j2k/testData/fileOrElement/for/overMapEntries.kt +++ b/j2k/testData/fileOrElement/for/overMapEntries.kt @@ -1,7 +1,8 @@ import java.util.HashMap internal object Test { - @JvmStatic fun main(args: Array) { + @JvmStatic + fun main(args: Array) { val resultMap = HashMap() for ((key, type) in resultMap) { diff --git a/j2k/testData/fileOrElement/for/withContinue1.kt b/j2k/testData/fileOrElement/for/withContinue1.kt index 014a6478416..caf371c239a 100644 --- a/j2k/testData/fileOrElement/for/withContinue1.kt +++ b/j2k/testData/fileOrElement/for/withContinue1.kt @@ -1,5 +1,6 @@ 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 0f7e701b13a..6c5426dbcb3 100644 --- a/j2k/testData/fileOrElement/for/withContinue2.kt +++ b/j2k/testData/fileOrElement/for/withContinue2.kt @@ -1,5 +1,6 @@ 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 5da05bfe4db..fab12f905df 100644 --- a/j2k/testData/fileOrElement/for/withContinue3.kt +++ b/j2k/testData/fileOrElement/for/withContinue3.kt @@ -1,5 +1,6 @@ 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 3390d1118a6..fde62c2c4f1 100644 --- a/j2k/testData/fileOrElement/for/withContinueAndLabels.kt +++ b/j2k/testData/fileOrElement/for/withContinueAndLabels.kt @@ -1,5 +1,6 @@ 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/main.kt b/j2k/testData/fileOrElement/function/main.kt index cf81fbf6226..6218bf21af6 100644 --- a/j2k/testData/fileOrElement/function/main.kt +++ b/j2k/testData/fileOrElement/function/main.kt @@ -1 +1,3 @@ -@JvmStatic fun main(args: Array) {} \ No newline at end of file +@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 f8fb44ebca5..6bb87aafff7 100644 --- a/j2k/testData/fileOrElement/function/main2.kt +++ b/j2k/testData/fileOrElement/function/main2.kt @@ -1,3 +1,5 @@ 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 44b39deb49c..5300954bdea 100644 --- a/j2k/testData/fileOrElement/function/mainAndNullabilitySetting.kt +++ b/j2k/testData/fileOrElement/function/mainAndNullabilitySetting.kt @@ -1,4 +1,6 @@ // !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/synchronizedMethod.kt b/j2k/testData/fileOrElement/function/synchronizedMethod.kt index aeb8c131a29..1740fca3a06 100644 --- a/j2k/testData/fileOrElement/function/synchronizedMethod.kt +++ b/j2k/testData/fileOrElement/function/synchronizedMethod.kt @@ -1,5 +1,6 @@ internal class A { - @Synchronized fun foo() { + @Synchronized + fun foo() { bar() } diff --git a/j2k/testData/fileOrElement/issues/kt-638.kt b/j2k/testData/fileOrElement/issues/kt-638.kt index 4fbcc5f07a1..945bd51d4cc 100644 --- a/j2k/testData/fileOrElement/issues/kt-638.kt +++ b/j2k/testData/fileOrElement/issues/kt-638.kt @@ -21,7 +21,8 @@ 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 d64b80e9020..8dc57ec2a2e 100644 --- a/j2k/testData/fileOrElement/issues/kt-807.kt +++ b/j2k/testData/fileOrElement/issues/kt-807.kt @@ -5,7 +5,8 @@ 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 af9dc2b10ce..bff2ef25bf4 100644 --- a/j2k/testData/fileOrElement/issues/kt-871.kt +++ b/j2k/testData/fileOrElement/issues/kt-871.kt @@ -1,7 +1,8 @@ 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/overloads/Annotations.kt b/j2k/testData/fileOrElement/overloads/Annotations.kt index ca34b64e070..1f3deffbf66 100644 --- a/j2k/testData/fileOrElement/overloads/Annotations.kt +++ b/j2k/testData/fileOrElement/overloads/Annotations.kt @@ -1,7 +1,8 @@ // ERROR: Type mismatch: inferred type is Any? but Any was expected // ERROR: Type mismatch: inferred type is Any? but Any was expected internal 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 b475c9ac937..a3cd69d5585 100644 --- a/j2k/testData/fileOrElement/overloads/Simple.kt +++ b/j2k/testData/fileOrElement/overloads/Simple.kt @@ -1,9 +1,11 @@ internal 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/overloads/Synchronized.kt b/j2k/testData/fileOrElement/overloads/Synchronized.kt index 2d2f0abcb46..f4b6443d6e7 100644 --- a/j2k/testData/fileOrElement/overloads/Synchronized.kt +++ b/j2k/testData/fileOrElement/overloads/Synchronized.kt @@ -3,7 +3,8 @@ 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 64a37cf88cf..7078133583e 100644 --- a/j2k/testData/fileOrElement/switch/comlicatedFallDown.kt +++ b/j2k/testData/fileOrElement/switch/comlicatedFallDown.kt @@ -76,7 +76,8 @@ 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 5509a12724a..f7223e62b2e 100644 --- a/j2k/testData/fileOrElement/switch/emptySwitch.kt +++ b/j2k/testData/fileOrElement/switch/emptySwitch.kt @@ -1,5 +1,6 @@ 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 4cf157521dd..9ec288be8bf 100644 --- a/j2k/testData/fileOrElement/switch/fallDown.kt +++ b/j2k/testData/fileOrElement/switch/fallDown.kt @@ -1,7 +1,8 @@ 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 d2d144de89b..69ccb8c7f5b 100644 --- a/j2k/testData/fileOrElement/switch/fallDownWithBlocks.kt +++ b/j2k/testData/fileOrElement/switch/fallDownWithBlocks.kt @@ -1,5 +1,6 @@ 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 1dbe57db1cc..b39a1948d41 100644 --- a/j2k/testData/fileOrElement/switch/kt-539.kt +++ b/j2k/testData/fileOrElement/switch/kt-539.kt @@ -1,7 +1,8 @@ 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 bd8b9b6897b..7ebf10a36cc 100644 --- a/j2k/testData/fileOrElement/switch/nondefault.kt +++ b/j2k/testData/fileOrElement/switch/nondefault.kt @@ -1,5 +1,6 @@ object NonDefault { - @JvmStatic fun main(args: Array) { + @JvmStatic + fun main(args: Array) { val value = 3 var valueString = "" diff --git a/j2k/testData/fileOrElement/toKotlinClasses/LibraryFunctions.kt b/j2k/testData/fileOrElement/toKotlinClasses/LibraryFunctions.kt index 49550a90885..3bcf25a7483 100644 --- a/j2k/testData/fileOrElement/toKotlinClasses/LibraryFunctions.kt +++ b/j2k/testData/fileOrElement/toKotlinClasses/LibraryFunctions.kt @@ -9,7 +9,8 @@ class TestJava { } companion object { - @JvmStatic fun main(args: Array) { + @JvmStatic + fun main(args: Array) { val x = ArrayList() x.filter { o -> o == "a" } val lazy = lazy(LazyThreadSafetyMode.NONE) { "aaa" }