diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt index 2178a9ba1b2..985c28896fd 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt @@ -274,7 +274,7 @@ class DefaultExpressionConverter : JavaElementVisitor(), ExpressionConverter { if (target is PsiMethod) { val specialMethod = SpecialMethod.values().firstOrNull { it.matches(target) } - if (specialMethod != null && arguments.size() == specialMethod.parameterCount) { + if (specialMethod != null && (specialMethod.parameterCount == null || specialMethod.parameterCount == arguments.size())) { val converted = specialMethod.convertCall(methodExpr.getQualifierExpression(), arguments, typeArguments, codeConverter) if (converted != null) { result = converted diff --git a/j2k/src/org/jetbrains/kotlin/j2k/SpecialMethod.kt b/j2k/src/org/jetbrains/kotlin/j2k/SpecialMethod.kt index 0f0c3f474f5..e4da99734b0 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/SpecialMethod.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/SpecialMethod.kt @@ -16,19 +16,14 @@ package org.jetbrains.kotlin.j2k -import com.intellij.psi.PsiMethod -import com.intellij.psi.PsiExpression -import org.jetbrains.kotlin.j2k.ast.BinaryExpression -import org.jetbrains.kotlin.j2k.ast.Expression -import org.jetbrains.kotlin.j2k.ast.MethodCallExpression import com.intellij.psi.CommonClassNames.JAVA_LANG_OBJECT +import com.intellij.psi.PsiExpression +import com.intellij.psi.PsiMethod +import com.intellij.psi.PsiReferenceExpression import com.intellij.psi.PsiSuperExpression -import org.jetbrains.kotlin.j2k.ast.QualifiedExpression -import org.jetbrains.kotlin.j2k.ast.Identifier -import org.jetbrains.kotlin.j2k.ast.assignNoPrototype -import org.jetbrains.kotlin.j2k.ast.Type +import org.jetbrains.kotlin.j2k.ast.* -enum class SpecialMethod(val qualifiedClassName: String?, val methodName: String, val parameterCount: Int) { +enum class SpecialMethod(val qualifiedClassName: String?, val methodName: String, val parameterCount: Int?) { OBJECT_EQUALS: SpecialMethod(null, "equals", 1) { override fun matches(method: PsiMethod) = super.matches(method) && method.getParameterList().getParameters().single().getType().getCanonicalText() == JAVA_LANG_OBJECT @@ -76,11 +71,36 @@ enum class SpecialMethod(val qualifiedClassName: String?, val methodName: String = MethodCallExpression.build(null, "setOf", listOf(codeConverter.convertExpression(arguments.single())), typeArgumentsConverted, false) } + SYSTEM_OUT_PRINTLN: SpecialMethod("java.io.PrintStream", "println", null) { + override fun convertCall(qualifier: PsiExpression?, arguments: Array, typeArgumentsConverted: List, codeConverter: CodeConverter) + = convertSystemOutMethodCall(methodName, qualifier, arguments, typeArgumentsConverted, codeConverter) + } + + SYSTEM_OUT_PRINT: SpecialMethod("java.io.PrintStream", "print", null) { + override fun convertCall(qualifier: PsiExpression?, arguments: Array, typeArgumentsConverted: List, codeConverter: CodeConverter) + = convertSystemOutMethodCall(methodName, qualifier, arguments, typeArgumentsConverted, codeConverter) + } + open fun matches(method: PsiMethod): Boolean { if (method.getName() != methodName) return false if (qualifiedClassName != null && method.getContainingClass()?.getQualifiedName() != qualifiedClassName) return false - return method.getParameterList().getParametersCount() == parameterCount + return parameterCount == null || parameterCount == method.getParameterList().getParametersCount() } abstract fun convertCall(qualifier: PsiExpression?, arguments: Array, typeArgumentsConverted: List, codeConverter: CodeConverter): Expression? } + +private fun convertSystemOutMethodCall( + methodName: String, + qualifier: PsiExpression?, + arguments: Array, + typeArgumentsConverted: List, + codeConverter: CodeConverter +): Expression? { + if (qualifier !is PsiReferenceExpression) return null + val qqualifier = qualifier.getQualifierExpression() as? PsiReferenceExpression ?: return null + if (qqualifier.getCanonicalText() != "java.lang.System") return null + if (qualifier.getReferenceName() != "out") return null + if (typeArgumentsConverted.isNotEmpty()) return null + return MethodCallExpression.build(null, methodName, arguments.map { codeConverter.convertExpression(it) }, emptyList(), false) +} diff --git a/j2k/testData/fileOrElement/annotations/jetbrainsNotNull.kt b/j2k/testData/fileOrElement/annotations/jetbrainsNotNull.kt index cc1737f26fe..56f9929057e 100644 --- a/j2k/testData/fileOrElement/annotations/jetbrainsNotNull.kt +++ b/j2k/testData/fileOrElement/annotations/jetbrainsNotNull.kt @@ -11,7 +11,7 @@ public class Test(str: String) { public fun sout(str: String) { // UNNECESSARY_NOT_NULL_ASSERTION heuristic does not work any more, instead we can skip generating !! altogether - System.out!!.println(str) + println(str) } public fun dummy(str: String): String { diff --git a/j2k/testData/fileOrElement/annotations/jetbrainsNullable.kt b/j2k/testData/fileOrElement/annotations/jetbrainsNullable.kt index 552033c5fa5..828ca361888 100644 --- a/j2k/testData/fileOrElement/annotations/jetbrainsNullable.kt +++ b/j2k/testData/fileOrElement/annotations/jetbrainsNullable.kt @@ -9,7 +9,7 @@ public class Test(str: String?) { } public fun sout(str: String?) { - System.out.println(str) + println(str) } public fun dummy(str: String?): String? { diff --git a/j2k/testData/fileOrElement/callChainExpression/sout.kt b/j2k/testData/fileOrElement/callChainExpression/sout.kt index 0dfec573287..6e2d21aee4f 100644 --- a/j2k/testData/fileOrElement/callChainExpression/sout.kt +++ b/j2k/testData/fileOrElement/callChainExpression/sout.kt @@ -1 +1 @@ -System.out.println("Hello, world") \ No newline at end of file +println("Hello, world") \ No newline at end of file diff --git a/j2k/testData/fileOrElement/classExpression/primitivesAndArrays.kt b/j2k/testData/fileOrElement/classExpression/primitivesAndArrays.kt index 01af03e2d6f..d4b94e724d0 100644 --- a/j2k/testData/fileOrElement/classExpression/primitivesAndArrays.kt +++ b/j2k/testData/fileOrElement/classExpression/primitivesAndArrays.kt @@ -1,11 +1,11 @@ public object A { public fun main(args: Array) { - System.out.println(Void.TYPE) - System.out.println(Integer.TYPE) - System.out.println(java.lang.Double.TYPE) - System.out.println(javaClass()) - System.out.println(javaClass>()) - System.out.println(javaClass>>()) + println(Void.TYPE) + println(Integer.TYPE) + println(java.lang.Double.TYPE) + println(javaClass()) + println(javaClass>()) + println(javaClass>>()) } } diff --git a/j2k/testData/fileOrElement/codeSimplifications/NotIs.kt b/j2k/testData/fileOrElement/codeSimplifications/NotIs.kt index 4b0e6821c8b..6f513993628 100644 --- a/j2k/testData/fileOrElement/codeSimplifications/NotIs.kt +++ b/j2k/testData/fileOrElement/codeSimplifications/NotIs.kt @@ -1,6 +1,6 @@ class C { fun foo(o: Any) { if (o !is String) return - System.out.println("String") + println("String") } } diff --git a/j2k/testData/fileOrElement/comments/comments.kt b/j2k/testData/fileOrElement/comments/comments.kt index d399f9b1a12..66fc696c282 100644 --- a/j2k/testData/fileOrElement/comments/comments.kt +++ b/j2k/testData/fileOrElement/comments/comments.kt @@ -10,17 +10,17 @@ import java.util.ArrayList // we need ArrayList class A /* just a sample name*/ : Runnable /* let's implement Runnable */ { fun foo/* again a sample name */(p: Int /* parameter p */, c: Char /* parameter c */) { // let's print something: - System.out.println("1") // print 1 - System.out.println("2") // print 2 + println("1") // print 1 + println("2") // print 2 - System.out.println("3") // print 3 + println("3") // print 3 // end of printing if (p > 0) { // do this only when p > 0 // we print 4 and return - System.out.println("3") + println("3") return // do not continue } diff --git a/j2k/testData/fileOrElement/conditionalExpression/multiline.kt b/j2k/testData/fileOrElement/conditionalExpression/multiline.kt index 48c79a321ad..2f5f828b244 100644 --- a/j2k/testData/fileOrElement/conditionalExpression/multiline.kt +++ b/j2k/testData/fileOrElement/conditionalExpression/multiline.kt @@ -1,6 +1,6 @@ fun foo(b: Boolean) { if (b) - System.out.println("true") + println("true") else - System.out.println("false") + println("false") } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/constructors/chain.kt b/j2k/testData/fileOrElement/constructors/chain.kt index 3a237c294c5..2d8e83d690f 100644 --- a/j2k/testData/fileOrElement/constructors/chain.kt +++ b/j2k/testData/fileOrElement/constructors/chain.kt @@ -1,11 +1,11 @@ class C(arg1: Int, arg2: Int, arg3: Int) { constructor(arg1: Int, arg2: Int) : this(arg1, arg2, 0) { - System.out.println() + println() } constructor(arg1: Int) : this(arg1, 0) { - System.out.println() + println() } } diff --git a/j2k/testData/fileOrElement/constructors/customerBuilder.kt b/j2k/testData/fileOrElement/constructors/customerBuilder.kt index 33521d8e2be..fcad06b3967 100644 --- a/j2k/testData/fileOrElement/constructors/customerBuilder.kt +++ b/j2k/testData/fileOrElement/constructors/customerBuilder.kt @@ -36,7 +36,7 @@ class CustomerBuilder { public object User { public fun main() { val customer = CustomerBuilder().WithFirstName("Homer").WithLastName("Simpson").Build() - System.out.println(customer.firstName) - System.out.println(customer.lastName) + println(customer.firstName) + println(customer.lastName) } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams2.kt b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams2.kt index 22ed76cc004..85afec15675 100644 --- a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams2.kt +++ b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams2.kt @@ -1,6 +1,6 @@ class C(private val field: Int) { init { - System.out.println(field) + println(field) } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams3.kt b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams3.kt index 83c5e9b7c47..8667c94e3ee 100644 --- a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams3.kt +++ b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams3.kt @@ -4,7 +4,7 @@ class C(p: Int) { init { var p = p this.p = p - System.out.println(p++) - System.out.println(p) + println(p++) + println(p) } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/constructors/methodCallInFactoryFun.kt b/j2k/testData/fileOrElement/constructors/methodCallInFactoryFun.kt index f67aeb5aee2..083cd2d74ef 100644 --- a/j2k/testData/fileOrElement/constructors/methodCallInFactoryFun.kt +++ b/j2k/testData/fileOrElement/constructors/methodCallInFactoryFun.kt @@ -5,7 +5,7 @@ class C(private val arg1: Int, private val arg2: Int, private val arg3: Int) { } constructor(arg1: Int, arg2: Int, other: C) : this(arg1, arg2, 0) { - System.out.println(foo(1) + this.foo(2) + other.foo(3) + staticFoo(4) + C.staticFoo(5)) + println(foo(1) + this.foo(2) + other.foo(3) + staticFoo(4) + C.staticFoo(5)) } companion object { diff --git a/j2k/testData/fileOrElement/constructors/noPrimary.kt b/j2k/testData/fileOrElement/constructors/noPrimary.kt index 4cbaab00da1..95bf0978356 100644 --- a/j2k/testData/fileOrElement/constructors/noPrimary.kt +++ b/j2k/testData/fileOrElement/constructors/noPrimary.kt @@ -3,11 +3,11 @@ class C { } constructor(arg1: Int, arg2: Int) : this(arg1, arg2, 0) { - System.out.println() + println() } constructor(arg: Int) { - System.out.println(arg) + println(arg) } } diff --git a/j2k/testData/fileOrElement/constructors/parameterModification.kt b/j2k/testData/fileOrElement/constructors/parameterModification.kt index 607ca12be76..3912190d9e2 100644 --- a/j2k/testData/fileOrElement/constructors/parameterModification.kt +++ b/j2k/testData/fileOrElement/constructors/parameterModification.kt @@ -6,7 +6,7 @@ class C(arg1: Int, arg2: Int = 0, arg3: Int = 0) { var arg1 = arg1 var arg3 = arg3 arg1++ - System.out.print(arg1 + arg2) + print(arg1 + arg2) field = arg3 arg3++ } diff --git a/j2k/testData/fileOrElement/constructors/qualifiedRefInFactoryFun.kt b/j2k/testData/fileOrElement/constructors/qualifiedRefInFactoryFun.kt index 4c1b685d01c..45baf9b89d5 100644 --- a/j2k/testData/fileOrElement/constructors/qualifiedRefInFactoryFun.kt +++ b/j2k/testData/fileOrElement/constructors/qualifiedRefInFactoryFun.kt @@ -1,7 +1,7 @@ class C(private val arg1: Int, private val arg2: Int, private val arg3: Int) { constructor(arg1: Int, arg2: Int, other: C) : this(arg1, arg2, 0) { - System.out.println(this.arg1 + other.arg2) + println(this.arg1 + other.arg2) } } diff --git a/j2k/testData/fileOrElement/constructors/staticFieldRefInFactoryFun.kt b/j2k/testData/fileOrElement/constructors/staticFieldRefInFactoryFun.kt index 03ced10d81f..5eb6e618d83 100644 --- a/j2k/testData/fileOrElement/constructors/staticFieldRefInFactoryFun.kt +++ b/j2k/testData/fileOrElement/constructors/staticFieldRefInFactoryFun.kt @@ -1,7 +1,7 @@ class C() { constructor(p: Int) : this() { - System.out.println(staticField1 + C.staticField2) + println(staticField1 + C.staticField2) } companion object { diff --git a/j2k/testData/fileOrElement/dropAccessors/AnonymousClass.kt b/j2k/testData/fileOrElement/dropAccessors/AnonymousClass.kt index ca571da3fcb..bd9ecef2dde 100644 --- a/j2k/testData/fileOrElement/dropAccessors/AnonymousClass.kt +++ b/j2k/testData/fileOrElement/dropAccessors/AnonymousClass.kt @@ -4,7 +4,7 @@ public class X { var value = 10 override fun run() { - System.out.println(value) + println(value) } } } diff --git a/j2k/testData/fileOrElement/dropAccessors/DataClass.kt b/j2k/testData/fileOrElement/dropAccessors/DataClass.kt index 59002f18e52..cf394fd9879 100644 --- a/j2k/testData/fileOrElement/dropAccessors/DataClass.kt +++ b/j2k/testData/fileOrElement/dropAccessors/DataClass.kt @@ -1,6 +1,6 @@ public class Test(public var id: String?, public val name: String, public val age: Int) { init { - System.out.println(age) + println(age) } } diff --git a/j2k/testData/fileOrElement/dropAccessors/DifferentFieldName.kt b/j2k/testData/fileOrElement/dropAccessors/DifferentFieldName.kt index 1dd682bc711..2f463cc3261 100644 --- a/j2k/testData/fileOrElement/dropAccessors/DifferentFieldName.kt +++ b/j2k/testData/fileOrElement/dropAccessors/DifferentFieldName.kt @@ -3,8 +3,8 @@ public class AAA { private set public fun foo(other: AAA) { - System.out.println(x) - System.out.println(other.x) + println(x) + println(other.x) x = 10 } } diff --git a/j2k/testData/fileOrElement/dropAccessors/DifferentProtectedFieldName.kt b/j2k/testData/fileOrElement/dropAccessors/DifferentProtectedFieldName.kt index a232f725e29..4946197a59c 100644 --- a/j2k/testData/fileOrElement/dropAccessors/DifferentProtectedFieldName.kt +++ b/j2k/testData/fileOrElement/dropAccessors/DifferentProtectedFieldName.kt @@ -3,15 +3,15 @@ public open class AAA { protected set public fun foo(other: AAA) { - System.out.println(x) - System.out.println(other.x) + println(x) + println(other.x) x = 10 } } class BBB : AAA() { fun bar() { - System.out.println(x) + println(x) x = 10 } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/dropAccessors/JavaKeywordPropertyName.kt b/j2k/testData/fileOrElement/dropAccessors/JavaKeywordPropertyName.kt index a597f9cb32e..550e132958f 100644 --- a/j2k/testData/fileOrElement/dropAccessors/JavaKeywordPropertyName.kt +++ b/j2k/testData/fileOrElement/dropAccessors/JavaKeywordPropertyName.kt @@ -2,6 +2,6 @@ class C { public val default: Int = 0 fun foo() { - System.out.println(default) + println(default) } } diff --git a/j2k/testData/fileOrElement/dropAccessors/KeywordPropertyName.kt b/j2k/testData/fileOrElement/dropAccessors/KeywordPropertyName.kt index d34c5328537..c3e69808ad8 100644 --- a/j2k/testData/fileOrElement/dropAccessors/KeywordPropertyName.kt +++ b/j2k/testData/fileOrElement/dropAccessors/KeywordPropertyName.kt @@ -2,6 +2,6 @@ class C { public val `this`: Int = 0 fun foo() { - System.out.println(`this`) + println(`this`) } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/enum/runnableImplementation.kt b/j2k/testData/fileOrElement/enum/runnableImplementation.kt index bb01ce3f3be..ecf36efd4c9 100644 --- a/j2k/testData/fileOrElement/enum/runnableImplementation.kt +++ b/j2k/testData/fileOrElement/enum/runnableImplementation.kt @@ -6,6 +6,6 @@ enum class Color : Runnable { BLUE override fun run() { - System.out.println("name()=" + name() + ", toString()=" + toString()) + println("name()=" + name() + ", toString()=" + toString()) } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/for/arrayIndicesReversed.kt b/j2k/testData/fileOrElement/for/arrayIndicesReversed.kt index ec85c7d4f73..aa28a630363 100644 --- a/j2k/testData/fileOrElement/for/arrayIndicesReversed.kt +++ b/j2k/testData/fileOrElement/for/arrayIndicesReversed.kt @@ -1,7 +1,7 @@ public class A { fun foo(array: Array) { for (i in array.indices.reversed()) { - System.out.println(i) + println(i) } } } diff --git a/j2k/testData/fileOrElement/for/downTo1.kt b/j2k/testData/fileOrElement/for/downTo1.kt index 085a2548b26..62368716e8d 100644 --- a/j2k/testData/fileOrElement/for/downTo1.kt +++ b/j2k/testData/fileOrElement/for/downTo1.kt @@ -1,7 +1,7 @@ public class A { fun foo() { for (i in 10 downTo 0) { - System.out.println(i) + println(i) } } } diff --git a/j2k/testData/fileOrElement/for/downTo2.kt b/j2k/testData/fileOrElement/for/downTo2.kt index e7781e4ee3a..cda0f8495a2 100644 --- a/j2k/testData/fileOrElement/for/downTo2.kt +++ b/j2k/testData/fileOrElement/for/downTo2.kt @@ -1,7 +1,7 @@ public class A { fun foo() { for (i in 10 downTo 1) { - System.out.println(i) + println(i) } } } diff --git a/j2k/testData/fileOrElement/for/downTo3.kt b/j2k/testData/fileOrElement/for/downTo3.kt index 8c3e067a6b0..26f4ace7aee 100644 --- a/j2k/testData/fileOrElement/for/downTo3.kt +++ b/j2k/testData/fileOrElement/for/downTo3.kt @@ -1,7 +1,7 @@ public class A { fun foo(min: Int) { for (i in 10 downTo min + 1) { - System.out.println(i) + println(i) } } } diff --git a/j2k/testData/fileOrElement/for/falseArrayIndicesReversed.kt b/j2k/testData/fileOrElement/for/falseArrayIndicesReversed.kt index d37884f73cf..d74a5689397 100644 --- a/j2k/testData/fileOrElement/for/falseArrayIndicesReversed.kt +++ b/j2k/testData/fileOrElement/for/falseArrayIndicesReversed.kt @@ -1,7 +1,7 @@ public class A { fun foo(array: Array) { for (i in array.size() downTo 0) { - System.out.println(i) + println(i) } } } diff --git a/j2k/testData/fileOrElement/for/falseArrayIndicesReversed2.kt b/j2k/testData/fileOrElement/for/falseArrayIndicesReversed2.kt index d70cb8c3254..bd833edb0ea 100644 --- a/j2k/testData/fileOrElement/for/falseArrayIndicesReversed2.kt +++ b/j2k/testData/fileOrElement/for/falseArrayIndicesReversed2.kt @@ -1,7 +1,7 @@ public class A { fun foo(array: Array) { for (i in array.size() - 2 downTo 0) { - System.out.println(i) + println(i) } } } diff --git a/j2k/testData/fileOrElement/for/falseIndicesReversed.kt b/j2k/testData/fileOrElement/for/falseIndicesReversed.kt index d0ad0ebd531..882797a658a 100644 --- a/j2k/testData/fileOrElement/for/falseIndicesReversed.kt +++ b/j2k/testData/fileOrElement/for/falseIndicesReversed.kt @@ -1,7 +1,7 @@ public class A { fun foo(collection: Collection) { for (i in collection.size() downTo 0) { - System.out.println(i) + println(i) } } } diff --git a/j2k/testData/fileOrElement/for/forRangeWithLT2.kt b/j2k/testData/fileOrElement/for/forRangeWithLT2.kt index 6045d1a2704..4353335bf69 100644 --- a/j2k/testData/fileOrElement/for/forRangeWithLT2.kt +++ b/j2k/testData/fileOrElement/for/forRangeWithLT2.kt @@ -1,3 +1,3 @@ for (i in 0..N - 1) { - System.out.println(i) + println(i) } diff --git a/j2k/testData/fileOrElement/for/forThroughCollectionIndices.kt b/j2k/testData/fileOrElement/for/forThroughCollectionIndices.kt index b59f5e7ee99..a86309ed398 100644 --- a/j2k/testData/fileOrElement/for/forThroughCollectionIndices.kt +++ b/j2k/testData/fileOrElement/for/forThroughCollectionIndices.kt @@ -3,7 +3,7 @@ import java.lang.System class C { fun foo1(collection: Collection) { for (i in collection.indices) { - System.out.print(i) + print(i) } } } diff --git a/j2k/testData/fileOrElement/for/forThroughNonArrayIndices.kt b/j2k/testData/fileOrElement/for/forThroughNonArrayIndices.kt index 1970901fbce..ce8b1a95934 100644 --- a/j2k/testData/fileOrElement/for/forThroughNonArrayIndices.kt +++ b/j2k/testData/fileOrElement/for/forThroughNonArrayIndices.kt @@ -5,7 +5,7 @@ class X { class C { fun foo(x: X) { for (i in 0..x.length - 1) { - System.out.print(i) + print(i) } } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/for/forThroughNonCollectionIndices.kt b/j2k/testData/fileOrElement/for/forThroughNonCollectionIndices.kt index a6befebc33d..56f1597b67b 100644 --- a/j2k/testData/fileOrElement/for/forThroughNonCollectionIndices.kt +++ b/j2k/testData/fileOrElement/for/forThroughNonCollectionIndices.kt @@ -7,7 +7,7 @@ class X { class C { fun foo(x: X) { for (i in 0..x.size() - 1) { - System.out.print(i) + print(i) } } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/for/forWithBlock.java b/j2k/testData/fileOrElement/for/forWithBlock.java index c648fa84a2a..8fc62f49a82 100644 --- a/j2k/testData/fileOrElement/for/forWithBlock.java +++ b/j2k/testData/fileOrElement/for/forWithBlock.java @@ -1,4 +1,5 @@ //statement +int j = 1; for (int i = 0; i < 10; j++, i++) { System.out.println(i); System.out.println(j); diff --git a/j2k/testData/fileOrElement/for/forWithBlock.kt b/j2k/testData/fileOrElement/for/forWithBlock.kt index 5f076fc172b..b550cd553bd 100644 --- a/j2k/testData/fileOrElement/for/forWithBlock.kt +++ b/j2k/testData/fileOrElement/for/forWithBlock.kt @@ -1,7 +1,8 @@ +var j = 1 var i = 0 while (i < 10) { - System.out.println(i) - System.out.println(j) + println(i) + println(j) j++ i++ } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/for/indicesReversed.kt b/j2k/testData/fileOrElement/for/indicesReversed.kt index a34cda5a4fb..fcbc7164bd7 100644 --- a/j2k/testData/fileOrElement/for/indicesReversed.kt +++ b/j2k/testData/fileOrElement/for/indicesReversed.kt @@ -1,7 +1,7 @@ public class A { fun foo(collection: Collection) { for (i in collection.indices.reversed()) { - System.out.println(i) + println(i) } } } diff --git a/j2k/testData/fileOrElement/for/nameConflict1.kt b/j2k/testData/fileOrElement/for/nameConflict1.kt index 085cb029a4f..26afacd2870 100644 --- a/j2k/testData/fileOrElement/for/nameConflict1.kt +++ b/j2k/testData/fileOrElement/for/nameConflict1.kt @@ -3,14 +3,14 @@ class A { run { var i = 1 while (i < 1000) { - System.out.println(i) + println(i) i *= 2 } } var i = 1 while (i < 2000) { - System.out.println(i) + println(i) i *= 2 } } diff --git a/j2k/testData/fileOrElement/for/nameConflict2.kt b/j2k/testData/fileOrElement/for/nameConflict2.kt index dd7ec89e425..5a2cb0b4dfe 100644 --- a/j2k/testData/fileOrElement/for/nameConflict2.kt +++ b/j2k/testData/fileOrElement/for/nameConflict2.kt @@ -4,7 +4,7 @@ class A { var i = 1 var j = 0 while (i < 1000) { - System.out.println(i) + println(i) i *= 2 j++ } @@ -12,7 +12,7 @@ class A { var j = 1 while (j < 2000) { - System.out.println(j) + println(j) j *= 2 } } diff --git a/j2k/testData/fileOrElement/for/nameConflict3.kt b/j2k/testData/fileOrElement/for/nameConflict3.kt index a9b6a9aca3f..72fb192d2a0 100644 --- a/j2k/testData/fileOrElement/for/nameConflict3.kt +++ b/j2k/testData/fileOrElement/for/nameConflict3.kt @@ -5,7 +5,7 @@ class A { run { var i = 1 while (i < 1000) { - System.out.println(i) + println(i) i *= 2 } } diff --git a/j2k/testData/fileOrElement/for/nameConflict4.kt b/j2k/testData/fileOrElement/for/nameConflict4.kt index d87c4265a30..a18911f6b84 100644 --- a/j2k/testData/fileOrElement/for/nameConflict4.kt +++ b/j2k/testData/fileOrElement/for/nameConflict4.kt @@ -3,7 +3,7 @@ class A { run { var i = 1 while (i < 1000) { - System.out.println(i) + println(i) i *= 2 } } diff --git a/j2k/testData/fileOrElement/for/nameConflict5.kt b/j2k/testData/fileOrElement/for/nameConflict5.kt index dee36f44469..fb5cbf4bc4e 100644 --- a/j2k/testData/fileOrElement/for/nameConflict5.kt +++ b/j2k/testData/fileOrElement/for/nameConflict5.kt @@ -6,7 +6,7 @@ class A { var i = 1 while (i < 1000) { - System.out.println(i) + println(i) i *= 2 } } diff --git a/j2k/testData/fileOrElement/for/notInBlock.kt b/j2k/testData/fileOrElement/for/notInBlock.kt index b1d7c600be5..ca4055c495a 100644 --- a/j2k/testData/fileOrElement/for/notInBlock.kt +++ b/j2k/testData/fileOrElement/for/notInBlock.kt @@ -3,7 +3,7 @@ class A { if (p) { var i = 1 while (i < 1000) { - System.out.println(i) + println(i) i *= 2 } } diff --git a/j2k/testData/fileOrElement/foreachStatement/nullableIterable.kt b/j2k/testData/fileOrElement/foreachStatement/nullableIterable.kt index 66aad977ef7..a682e597b51 100644 --- a/j2k/testData/fileOrElement/foreachStatement/nullableIterable.kt +++ b/j2k/testData/fileOrElement/foreachStatement/nullableIterable.kt @@ -3,7 +3,7 @@ class A { fun foo() { for (e in list!!) { - System.out.println(e) + println(e) } } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/ifStatement/elseIf.kt b/j2k/testData/fileOrElement/ifStatement/elseIf.kt index 7af2dea972a..318da3fef2c 100644 --- a/j2k/testData/fileOrElement/ifStatement/elseIf.kt +++ b/j2k/testData/fileOrElement/ifStatement/elseIf.kt @@ -1,14 +1,14 @@ fun foo() { if (a) - System.out.println("a") + println("a") else if (b) - System.out.println("b") + println("b") else - System.out.println("else") + println("else") if (c) { - System.out.println("c") + println("c") } else if (d) { - System.out.println("d") + println("d") } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/issues/kt-807.kt b/j2k/testData/fileOrElement/issues/kt-807.kt index 5802129f649..b4c74246a85 100644 --- a/j2k/testData/fileOrElement/issues/kt-807.kt +++ b/j2k/testData/fileOrElement/issues/kt-807.kt @@ -12,7 +12,7 @@ object FileRead { val br = BufferedReader(InputStreamReader(`in`)) val strLine: String while ((strLine = br.readLine()) != null) { - System.out.println(strLine) + println(strLine) } `in`.close() } catch (e: Exception) { diff --git a/j2k/testData/fileOrElement/issues/kt-824.kt b/j2k/testData/fileOrElement/issues/kt-824.kt index cb45531e44b..f609c240018 100644 --- a/j2k/testData/fileOrElement/issues/kt-824.kt +++ b/j2k/testData/fileOrElement/issues/kt-824.kt @@ -11,15 +11,15 @@ object One { class Test { fun test() { if (One.myContainer.myBoolean) - System.out.println("Ok") + println("Ok") val s = if (One.myContainer.myBoolean) "YES" else "NO" while (One.myContainer.myBoolean) - System.out.println("Ok") + println("Ok") do { - System.out.println("Ok") + println("Ok") } while (One.myContainer.myBoolean) } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/issues/kt-828.kt b/j2k/testData/fileOrElement/issues/kt-828.kt index eca1c95ebf2..9a4abf4068a 100644 --- a/j2k/testData/fileOrElement/issues/kt-828.kt +++ b/j2k/testData/fileOrElement/issues/kt-828.kt @@ -4,12 +4,12 @@ class Test { res = res and false res = res or false res = res xor false - System.out.println(true and false) - System.out.println(true or false) - System.out.println(true xor false) - System.out.println(!true) + println(true and false) + println(true or false) + println(true xor false) + println(!true) - System.out.println(true && false) - System.out.println(true || false) + println(true && false) + println(true || false) } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/issues/kt-871.kt b/j2k/testData/fileOrElement/issues/kt-871.kt index 97ecb8993bc..78e5b5b2271 100644 --- a/j2k/testData/fileOrElement/issues/kt-871.kt +++ b/j2k/testData/fileOrElement/issues/kt-871.kt @@ -2,7 +2,7 @@ package demo object Program { public fun main(args: Array) { - System.out.println("Halo!") + println("Halo!") } } diff --git a/j2k/testData/fileOrElement/issues/kt-893.kt b/j2k/testData/fileOrElement/issues/kt-893.kt index 6da724d32c5..7c4162736e1 100644 --- a/j2k/testData/fileOrElement/issues/kt-893.kt +++ b/j2k/testData/fileOrElement/issues/kt-893.kt @@ -3,7 +3,7 @@ package demo class Test { fun test() { for (i in 0..9) { - System.out.println(i) + println(i) } } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/issues/kt-899.kt b/j2k/testData/fileOrElement/issues/kt-899.kt index f03fd808c71..b86ae7e52d3 100644 --- a/j2k/testData/fileOrElement/issues/kt-899.kt +++ b/j2k/testData/fileOrElement/issues/kt-899.kt @@ -1,6 +1,6 @@ class Test { public fun printNumbers(number: Int) { for (i in 2..Math.sqrt(number.toDouble()) + 1 - 1) - System.out.println(i) + println(i) } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/kotlinApiAccess/InheritedProperty.kt b/j2k/testData/fileOrElement/kotlinApiAccess/InheritedProperty.kt index 4454ae59eb4..83e2b034af4 100644 --- a/j2k/testData/fileOrElement/kotlinApiAccess/InheritedProperty.kt +++ b/j2k/testData/fileOrElement/kotlinApiAccess/InheritedProperty.kt @@ -3,7 +3,7 @@ import kotlinApi.* class C : KotlinClass() { fun foo() { - System.out.println(property) + println(property) property = "a" } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/kotlinApiAccess/Property.kt b/j2k/testData/fileOrElement/kotlinApiAccess/Property.kt index 721368e2987..42a944ce306 100644 --- a/j2k/testData/fileOrElement/kotlinApiAccess/Property.kt +++ b/j2k/testData/fileOrElement/kotlinApiAccess/Property.kt @@ -2,7 +2,7 @@ import kotlinApi.* class C { fun foo(k: KotlinClass) { - System.out.println(k.property) + println(k.property) k.property = "a" } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/kotlinApiAccess/Property2.kt b/j2k/testData/fileOrElement/kotlinApiAccess/Property2.kt index d65a44f56ba..b187ac445a0 100644 --- a/j2k/testData/fileOrElement/kotlinApiAccess/Property2.kt +++ b/j2k/testData/fileOrElement/kotlinApiAccess/Property2.kt @@ -2,7 +2,7 @@ import kotlinApi.* class C { fun foo(k: KotlinClass) { - System.out.println(k.field) + println(k.field) k.field = 1 } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/labelStatement/complicatedExampleFromJavaTutorial.kt b/j2k/testData/fileOrElement/labelStatement/complicatedExampleFromJavaTutorial.kt index b20710df8d6..2bfa2530e14 100644 --- a/j2k/testData/fileOrElement/labelStatement/complicatedExampleFromJavaTutorial.kt +++ b/j2k/testData/fileOrElement/labelStatement/complicatedExampleFromJavaTutorial.kt @@ -10,4 +10,4 @@ foundIt = true break@test } -System.out.println(if (foundIt) "Found it" else "Didn't find it") \ No newline at end of file +println(if (foundIt) "Found it" else "Didn't find it") \ No newline at end of file diff --git a/j2k/testData/fileOrElement/literalExpression/dollarInsideString.kt b/j2k/testData/fileOrElement/literalExpression/dollarInsideString.kt index 84cf1b11f01..fa0313781e5 100644 --- a/j2k/testData/fileOrElement/literalExpression/dollarInsideString.kt +++ b/j2k/testData/fileOrElement/literalExpression/dollarInsideString.kt @@ -6,9 +6,9 @@ class Test { name = name.replaceAll("\\$[0-9]+", "\\$") val c = '$' - System.out.println(c) + println(c) val C = '$' - System.out.println(C) + println(C) } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/methodCallExpression/getClass.kt b/j2k/testData/fileOrElement/methodCallExpression/getClass.kt index 41f3407a21e..68c2d6922b7 100644 --- a/j2k/testData/fileOrElement/methodCallExpression/getClass.kt +++ b/j2k/testData/fileOrElement/methodCallExpression/getClass.kt @@ -1,6 +1,6 @@ class A { fun foo(o: Any) { - System.out.println(o.javaClass) - System.out.println(javaClass) + println(o.javaClass) + println(javaClass) } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/methodCallExpression/systemOut.java b/j2k/testData/fileOrElement/methodCallExpression/systemOut.java new file mode 100644 index 00000000000..9b0c7b562c1 --- /dev/null +++ b/j2k/testData/fileOrElement/methodCallExpression/systemOut.java @@ -0,0 +1,12 @@ +class A { + void foo() { + System.out.println(); + System.out.println(1); + System.out.println("1"); + System.out.print("1"); + System.out.print(1); + + System.err.println(); + System.err.println(1); + } +} \ No newline at end of file diff --git a/j2k/testData/fileOrElement/methodCallExpression/systemOut.kt b/j2k/testData/fileOrElement/methodCallExpression/systemOut.kt new file mode 100644 index 00000000000..cb2e61fa0df --- /dev/null +++ b/j2k/testData/fileOrElement/methodCallExpression/systemOut.kt @@ -0,0 +1,12 @@ +class A { + fun foo() { + println() + println(1) + println("1") + print("1") + print(1) + + System.err.println() + System.err.println(1) + } +} diff --git a/j2k/testData/fileOrElement/newClassExpression/newAnonymousClass.kt b/j2k/testData/fileOrElement/newClassExpression/newAnonymousClass.kt index da09fb6ea84..d748a1e570b 100644 --- a/j2k/testData/fileOrElement/newClassExpression/newAnonymousClass.kt +++ b/j2k/testData/fileOrElement/newClassExpression/newAnonymousClass.kt @@ -1,5 +1,5 @@ object : Runnable { override fun run() { - System.out.println("Run") + println("Run") } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/nullability/FieldComparedWithNull.kt b/j2k/testData/fileOrElement/nullability/FieldComparedWithNull.kt index 26ab0a9d749..c3ba4348fae 100644 --- a/j2k/testData/fileOrElement/nullability/FieldComparedWithNull.kt +++ b/j2k/testData/fileOrElement/nullability/FieldComparedWithNull.kt @@ -4,7 +4,7 @@ class C { fun foo() { if (s == null) { - System.out.print("null") + print("null") } } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/nullability/FieldComparedWithNull2.kt b/j2k/testData/fileOrElement/nullability/FieldComparedWithNull2.kt index 0d5c31887dc..db4fd9c21ef 100644 --- a/j2k/testData/fileOrElement/nullability/FieldComparedWithNull2.kt +++ b/j2k/testData/fileOrElement/nullability/FieldComparedWithNull2.kt @@ -2,7 +2,7 @@ class C(private val s: String?) { fun foo() { if (s != null) { - System.out.print("not null") + print("not null") } } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/nullability/FieldComparedWithNull3.kt b/j2k/testData/fileOrElement/nullability/FieldComparedWithNull3.kt index 7427ee628d9..76d36e80d78 100644 --- a/j2k/testData/fileOrElement/nullability/FieldComparedWithNull3.kt +++ b/j2k/testData/fileOrElement/nullability/FieldComparedWithNull3.kt @@ -5,7 +5,7 @@ class C { class D { fun foo(c: C) { if (null == c.s) { - System.out.println("null") + println("null") } } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/nullability/FieldComparedWithNull4.kt b/j2k/testData/fileOrElement/nullability/FieldComparedWithNull4.kt index c0f060a28e6..0a596c34676 100644 --- a/j2k/testData/fileOrElement/nullability/FieldComparedWithNull4.kt +++ b/j2k/testData/fileOrElement/nullability/FieldComparedWithNull4.kt @@ -2,7 +2,7 @@ class C(private val s: String?) { init { if (s == null) { - System.out.print("null") + print("null") } } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/nullability/NullableVariableDotAccess.kt b/j2k/testData/fileOrElement/nullability/NullableVariableDotAccess.kt index 01480307817..677f73205fd 100644 --- a/j2k/testData/fileOrElement/nullability/NullableVariableDotAccess.kt +++ b/j2k/testData/fileOrElement/nullability/NullableVariableDotAccess.kt @@ -1,5 +1,5 @@ fun foo(s: String?, b: Boolean): Int { - if (s == null) System.out.println("null") + if (s == null) println("null") if (b) return s!!.length() return 10 } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/rawGenerics/kt-540-rawGenericClass.kt b/j2k/testData/fileOrElement/rawGenerics/kt-540-rawGenericClass.kt index ee01e001cdc..b6ecad960b1 100644 --- a/j2k/testData/fileOrElement/rawGenerics/kt-540-rawGenericClass.kt +++ b/j2k/testData/fileOrElement/rawGenerics/kt-540-rawGenericClass.kt @@ -2,7 +2,7 @@ package demo class Collection(e: E) { init { - System.out.println(e) + println(e) } } diff --git a/j2k/testData/fileOrElement/settings/specifyLocalVariableTypeByDefaultInFor.kt b/j2k/testData/fileOrElement/settings/specifyLocalVariableTypeByDefaultInFor.kt index 7827ee2f420..cdfa76dca54 100644 --- a/j2k/testData/fileOrElement/settings/specifyLocalVariableTypeByDefaultInFor.kt +++ b/j2k/testData/fileOrElement/settings/specifyLocalVariableTypeByDefaultInFor.kt @@ -5,5 +5,5 @@ public fun foo(list: List) { array[i] = i } - for (s: String in list) System.out.print(s) + for (s: String in list) print(s) } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/switch/caseWithBlock.kt b/j2k/testData/fileOrElement/switch/caseWithBlock.kt index 81ce65fdae5..cc5b7f41d77 100644 --- a/j2k/testData/fileOrElement/switch/caseWithBlock.kt +++ b/j2k/testData/fileOrElement/switch/caseWithBlock.kt @@ -2,16 +2,16 @@ fun foo() { when (a) { 1 -> { val x = 1 - System.out.println(x) + println(x) } 2 -> { val x = 2 - System.out.println(x) + println(x) } 3 -> { - System.out.println(3) + println(3) } } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/switch/comlicatedFallDown.kt b/j2k/testData/fileOrElement/switch/comlicatedFallDown.kt index 3c559820e8c..2f56461f3d5 100644 --- a/j2k/testData/fileOrElement/switch/comlicatedFallDown.kt +++ b/j2k/testData/fileOrElement/switch/comlicatedFallDown.kt @@ -2,7 +2,7 @@ package demo public object SwitchDemo { public fun print(o: Any) { - System.out.println(o) + println(o) } public fun test(i: Int) { @@ -73,7 +73,7 @@ public object SwitchDemo { 12 -> monthString = "December" else -> monthString = "Invalid month" } - System.out.println(monthString) + println(monthString) } public fun main(args: Array) { diff --git a/j2k/testData/fileOrElement/switch/continueAndBreakWithLabel.kt b/j2k/testData/fileOrElement/switch/continueAndBreakWithLabel.kt index 6eab3c00ac8..7bd3d7928e8 100644 --- a/j2k/testData/fileOrElement/switch/continueAndBreakWithLabel.kt +++ b/j2k/testData/fileOrElement/switch/continueAndBreakWithLabel.kt @@ -3,11 +3,11 @@ fun foo() { when (take()) { 1 -> continue 2 -> { - System.out.println("2") + println("2") return } 3 -> break@Loop } - System.out.println() + println() } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/switch/emptySwitch.kt b/j2k/testData/fileOrElement/switch/emptySwitch.kt index 297040f48b0..fd5c168bd2d 100644 --- a/j2k/testData/fileOrElement/switch/emptySwitch.kt +++ b/j2k/testData/fileOrElement/switch/emptySwitch.kt @@ -6,7 +6,7 @@ public object NonDefault { when (value) { } - System.out.println(valueString) + println(valueString) } } diff --git a/j2k/testData/fileOrElement/switch/fallDown.kt b/j2k/testData/fileOrElement/switch/fallDown.kt index c65b8ea4935..8262568bb89 100644 --- a/j2k/testData/fileOrElement/switch/fallDown.kt +++ b/j2k/testData/fileOrElement/switch/fallDown.kt @@ -8,7 +8,7 @@ public object SwitchDemo { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 -> monthString = "December" else -> monthString = "Invalid month" } - System.out.println(monthString) + println(monthString) } } diff --git a/j2k/testData/fileOrElement/switch/fallDownWithBlocks.kt b/j2k/testData/fileOrElement/switch/fallDownWithBlocks.kt index 0f225552744..da9d8e190f2 100644 --- a/j2k/testData/fileOrElement/switch/fallDownWithBlocks.kt +++ b/j2k/testData/fileOrElement/switch/fallDownWithBlocks.kt @@ -4,17 +4,17 @@ public object C { 1 -> { run { val a = 1 - System.out.print("1") + print("1") } run { val a = 2 - System.out.print("2") + print("2") } } 2 -> { val a = 2 - System.out.print("2") + print("2") } } } diff --git a/j2k/testData/fileOrElement/switch/invalidSwitch.kt b/j2k/testData/fileOrElement/switch/invalidSwitch.kt index 19a65b7f6ba..ec525e9c042 100644 --- a/j2k/testData/fileOrElement/switch/invalidSwitch.kt +++ b/j2k/testData/fileOrElement/switch/invalidSwitch.kt @@ -1,8 +1,8 @@ fun foo() { when (a) { -> { - System.out.println("1") - System.out.println("2") + println("1") + println("2") } } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/switch/kt-539.kt b/j2k/testData/fileOrElement/switch/kt-539.kt index 2b7274f5fdf..0a455d17b34 100644 --- a/j2k/testData/fileOrElement/switch/kt-539.kt +++ b/j2k/testData/fileOrElement/switch/kt-539.kt @@ -20,7 +20,7 @@ public object SwitchDemo { 12 -> monthString = "December" else -> monthString = "Invalid month" } - System.out.println(monthString) + println(monthString) } } diff --git a/j2k/testData/fileOrElement/switch/nondefault.kt b/j2k/testData/fileOrElement/switch/nondefault.kt index 56e50b2e48e..2a3a483e5e9 100644 --- a/j2k/testData/fileOrElement/switch/nondefault.kt +++ b/j2k/testData/fileOrElement/switch/nondefault.kt @@ -8,7 +8,7 @@ public object NonDefault { 2 -> valueString = "TWO" 3 -> valueString = "THREE" } - System.out.println(valueString) + println(valueString) } } diff --git a/j2k/testData/fileOrElement/switch/returnsAndThrows.kt b/j2k/testData/fileOrElement/switch/returnsAndThrows.kt index 2d06758c936..0f406429c1f 100644 --- a/j2k/testData/fileOrElement/switch/returnsAndThrows.kt +++ b/j2k/testData/fileOrElement/switch/returnsAndThrows.kt @@ -1,19 +1,19 @@ fun foo(a: Int): Int { when (a) { 1 -> { - System.out.println("1") + println("1") return 1 } 2 -> { - System.out.println("2") + println("2") return 2 } 3 -> { - System.out.println("3") + println("3") throw RuntimeException() } else -> { - System.out.println("default") + println("default") return 0 } } diff --git a/j2k/testData/fileOrElement/tryWithResource/Multiline.kt b/j2k/testData/fileOrElement/tryWithResource/Multiline.kt index 09a44fd2cdd..99a0b66836c 100644 --- a/j2k/testData/fileOrElement/tryWithResource/Multiline.kt +++ b/j2k/testData/fileOrElement/tryWithResource/Multiline.kt @@ -6,7 +6,7 @@ public class C { ByteArrayInputStream(ByteArray(10)).use { stream -> // reading something val c = stream.read() - System.out.println(c) + println(c) } } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/tryWithResource/Simple.kt b/j2k/testData/fileOrElement/tryWithResource/Simple.kt index bd92651d419..0cfac5c1428 100644 --- a/j2k/testData/fileOrElement/tryWithResource/Simple.kt +++ b/j2k/testData/fileOrElement/tryWithResource/Simple.kt @@ -3,6 +3,6 @@ import java.io.* public class C { throws(javaClass()) fun foo() { - ByteArrayInputStream(ByteArray(10)).use { stream -> System.out.println(stream.read()) } + ByteArrayInputStream(ByteArray(10)).use { stream -> println(stream.read()) } } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/tryWithResource/WithCatch.kt b/j2k/testData/fileOrElement/tryWithResource/WithCatch.kt index 13adcc04b98..eb0a4ac1aae 100644 --- a/j2k/testData/fileOrElement/tryWithResource/WithCatch.kt +++ b/j2k/testData/fileOrElement/tryWithResource/WithCatch.kt @@ -6,10 +6,10 @@ public class C { ByteArrayInputStream(ByteArray(10)).use { stream -> // reading something val c = stream.read() - System.out.println(c) + println(c) } } catch (e: IOException) { - System.out.println(e) + println(e) } } diff --git a/j2k/testData/fileOrElement/tryWithResource/WithCatchAndFinally.kt b/j2k/testData/fileOrElement/tryWithResource/WithCatchAndFinally.kt index 2f792e94108..33c747ade0d 100644 --- a/j2k/testData/fileOrElement/tryWithResource/WithCatchAndFinally.kt +++ b/j2k/testData/fileOrElement/tryWithResource/WithCatchAndFinally.kt @@ -6,12 +6,12 @@ public class C { ByteArrayInputStream(ByteArray(10)).use { stream -> // reading something val c = stream.read() - System.out.println(c) + println(c) } } catch (e: IOException) { - System.out.println(e) + println(e) } finally { - System.out.println("Finally!") + println("Finally!") } } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/tryWithResource/WithCatches.kt b/j2k/testData/fileOrElement/tryWithResource/WithCatches.kt index 899e68018a8..04db5b1da42 100644 --- a/j2k/testData/fileOrElement/tryWithResource/WithCatches.kt +++ b/j2k/testData/fileOrElement/tryWithResource/WithCatches.kt @@ -6,10 +6,10 @@ public class C { ByteArrayInputStream(ByteArray(10)).use { stream -> // reading something val c = stream.read() - System.out.println(c) + println(c) } } catch (e: IOException) { - System.out.println(e) + println(e) } catch (e: Exception) { System.err.println(e) } diff --git a/j2k/testData/fileOrElement/tryWithResource/WithFinally.kt b/j2k/testData/fileOrElement/tryWithResource/WithFinally.kt index 0742ffc32f5..e9384976efc 100644 --- a/j2k/testData/fileOrElement/tryWithResource/WithFinally.kt +++ b/j2k/testData/fileOrElement/tryWithResource/WithFinally.kt @@ -7,7 +7,7 @@ public class C { ByteArrayInputStream(ByteArray(10)).use { stream -> // reading something val c = stream.read() - System.out.println(c) + println(c) } } finally { // dispose something else diff --git a/j2k/testData/fileOrElement/tryWithResource/WithReturnAtEnd.kt b/j2k/testData/fileOrElement/tryWithResource/WithReturnAtEnd.kt index 3acb8639f15..d1e75e322c6 100644 --- a/j2k/testData/fileOrElement/tryWithResource/WithReturnAtEnd.kt +++ b/j2k/testData/fileOrElement/tryWithResource/WithReturnAtEnd.kt @@ -9,7 +9,7 @@ public class C { return c } } catch (e: IOException) { - System.out.println(e) + println(e) return -1 } diff --git a/j2k/testData/multiFile/GetterAndSetterUsages/1.kt b/j2k/testData/multiFile/GetterAndSetterUsages/1.kt index e0b8ca34b65..c93222292ee 100644 --- a/j2k/testData/multiFile/GetterAndSetterUsages/1.kt +++ b/j2k/testData/multiFile/GetterAndSetterUsages/1.kt @@ -6,6 +6,6 @@ public class AAA { } public fun bar(b: B) { - System.out.println(b.YY) + println(b.YY) } } \ No newline at end of file diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java index 3c1eebf82db..36ae37ecb72 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java +++ b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java @@ -3064,6 +3064,12 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo doTest(fileName); } + @TestMetadata("systemOut.java") + public void testSystemOut() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/systemOut.java"); + doTest(fileName); + } + @TestMetadata("vararg1.java") public void testVararg1() throws Exception { String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/vararg1.java"); diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java index 5de68576b3b..fe1ebcaa2e4 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java +++ b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java @@ -3064,6 +3064,12 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo doTest(fileName); } + @TestMetadata("systemOut.java") + public void testSystemOut() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/systemOut.java"); + doTest(fileName); + } + @TestMetadata("vararg1.java") public void testVararg1() throws Exception { String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/vararg1.java");