KT-1074 Need to avoid unnecessary parenthesis for converted code

src/org/jetbrains/jet/j2k/ast/BinaryExpression.java

@@ -30,6 +30,6 @@ public class BinaryExpression extends Expression {
   @Override
   public String toKotlin() {
     List<String> expressionsWithConversions = AstUtil.applyConversions(AstUtil.nodesToKotlin(Arrays.asList(myLeft, myRight)), myConversions);
-    return "(" + AstUtil.join(expressionsWithConversions, SPACE + myOp + SPACE) + ")";
+    return AstUtil.join(expressionsWithConversions, SPACE + myOp + SPACE);
   }
 }

src/org/jetbrains/jet/j2k/ast/PolyadicExpression.java

@@ -24,6 +24,6 @@ public class PolyadicExpression extends Expression {
   @Override
   public String toKotlin() {
     List<String> expressionsWithConversions = AstUtil.applyConversions(AstUtil.nodesToKotlin(myExpressions), myConversions);
-    return "(" + AstUtil.join(expressionsWithConversions, SPACE + myToken + SPACE) + ")";
+    return AstUtil.join(expressionsWithConversions, SPACE + myToken + SPACE);
   }
 }

src/org/jetbrains/jet/j2k/ast/PostfixOperator.java

@@ -17,6 +17,6 @@ public class PostfixOperator extends Expression {
   @NotNull
   @Override
   public String toKotlin() {
-    return "(" + myExpression.toKotlin() + myOp + ")";
+    return myExpression.toKotlin() + myOp;
   }
 }

src/org/jetbrains/jet/j2k/ast/PrefixOperator.java

@@ -17,6 +17,6 @@ public class PrefixOperator extends Expression {
   @NotNull
   @Override
   public String toKotlin() {
-    return "(" + myOp + myExpression.toKotlin() + ")";
+    return myOp + myExpression.toKotlin();
   }
 }

testData/ast/assignmentExpression/expression/and.kt

@@ -1 +1 @@
-x = (x and 2)
+x = x and 2

testData/ast/assignmentExpression/expression/or.kt

@@ -1 +1 @@
-x = (x or 2)
+x = x or 2

testData/ast/assignmentExpression/expression/shiftLeft.kt

@@ -1 +1 @@
-x = (x shl 2)
+x = x shl 2

testData/ast/assignmentExpression/expression/shiftRight.kt

@@ -1 +1 @@
-x = (x shr 2)
+x = x shr 2

testData/ast/assignmentExpression/expression/unsignedRightShift.kt

@@ -1 +1 @@
-x = (x ushr 2)
+x = x ushr 2

testData/ast/assignmentExpression/expression/xor.kt

@@ -1 +1 @@
-x = (x xor 2)
+x = x xor 2

testData/ast/binaryExpression/expression/and.kt

@@ -1 +1 @@
-(x and 2)
+x and 2

testData/ast/binaryExpression/expression/conditionalAnd.kt

@@ -1 +1 @@
-(true && false)
+true && false

testData/ast/binaryExpression/expression/conditionalOr.kt

@@ -1 +1 @@
-(true || false)
+true || false

testData/ast/binaryExpression/expression/divide.kt

@@ -1 +1 @@
-(1 / 2)
+1 / 2

testData/ast/binaryExpression/expression/greaterThan.kt

@@ -1 +1 @@
-(1 > 2)
+1 > 2

testData/ast/binaryExpression/expression/greaterThanEqual.kt

@@ -1 +1 @@
-(1 >= 2)
+1 >= 2

testData/ast/binaryExpression/expression/lessThan.kt

@@ -1 +1 @@
-(1 < 2)
+1 < 2

testData/ast/binaryExpression/expression/lessThanEqual.kt

@@ -1 +1 @@
-(1 <= 2)
+1 <= 2

testData/ast/binaryExpression/expression/minus.kt

@@ -1 +1 @@
-(1 - 2)
+1 - 2

testData/ast/binaryExpression/expression/multiply.kt

@@ -1 +1 @@
-(1 * 2)
+1 * 2

testData/ast/binaryExpression/expression/or.kt

@@ -1 +1 @@
-(x or 2)
+x or 2

testData/ast/binaryExpression/expression/plus.kt

@@ -1 +1 @@
-(1 + 2)
+1 + 2

testData/ast/binaryExpression/expression/remainder.kt

@@ -1 +1 @@
-(1 % 2)
+1 % 2

testData/ast/binaryExpression/expression/shiftLeft.kt

@@ -1 +1 @@
-(x shl 2)
+x shl 2

testData/ast/binaryExpression/expression/shiftRight.kt

@@ -1 +1 @@
-(x shr 2)
+x shr 2

testData/ast/binaryExpression/expression/xor.kt

@@ -1 +1 @@
-(x xor 2)
+x xor 2

testData/ast/doWhileStatement/statement/whileWithBlock.kt

@@ -1,6 +1,6 @@
 do
 {
 var i : Int = 1
-i = (i + 1)
+i = i + 1
 }
-while ((a > b))
+while (a > b)

testData/ast/doWhileStatement/statement/whileWithExpression.kt

@@ -1,3 +1,3 @@
 do
-i = (i + 1)
+i = i + 1
 while (true)

testData/ast/enum/class/runnableImplementation.kt

@@ -5,7 +5,7 @@ RED
 YELLOW
 BLUE
 override public fun run() : Unit {
-System.out?.println(("name()=" + name() + ", toString()=" + toString()))
+System.out?.println("name()=" + name() + ", toString()=" + toString())
 }
 public fun name() : String { return "" }
 public fun order() : Int { return 0 }

testData/ast/file/comp/intNullability.kt

@@ -4,6 +4,6 @@ open class Test() {
 open fun test() : Unit {
 var i : Int? = 10
 var j : Int? = 10
-System.out?.println((i + j))
+System.out?.println(i + j)
 }
 }

testData/ast/for/statement/forRangeWithLT.kt

@@ -1,4 +1,4 @@
 var array : IntArray? = IntArray(10)
-for (i in 0..(10 - 1)) {
+for (i in 0..10 - 1) {
 array[i] = i
 }

testData/ast/for/statement/forWithBlock.kt

@@ -1,4 +1,4 @@
 var array : IntArray? = IntArray(10)
-for (i in 0..(10 - 1)) {
+for (i in 0..10 - 1) {
 array[i] = i
 }

testData/ast/for/statement/forWithBlockAndDoubleUpdate.kt

@@ -1,14 +1,14 @@
 {
 var i : Int = 0
-while ((i < 0))
+while (i < 0)
 {
 {
 var i : Int = 1
-(i++)
+i++
 }
 {
-(j++)
-(i++)
+j++
+i++
 }
 }
 }

testData/ast/for/statement/forWithEmptyBlock.kt

@@ -1,12 +1,12 @@
 {
 var i : Int = 0
-while ((i < 0))
+while (i < 0)
 {
 {
 }
 {
-(j++)
-(i++)
+j++
+i++
 }
 }
 }

testData/ast/for/statement/forWithExpression.kt

@@ -1 +1 @@
-for (i in 0..(0 - 1)) (t++)
+for (i in 0..0 - 1) t++

testData/ast/for/statement/forWithReturn.kt

@@ -1,11 +1,11 @@
 {
 var i : Int = 0
-while ((i < 0))
+while (i < 0)
 {
 return i
 {
-(j++)
-(i++)
+j++
+i++
 }
 }
 }

testData/ast/foreachStatement/statement/enhancedForWithBlock.kt

@@ -1,5 +1,5 @@
 for (n : Node? in list)
 {
 var i : Int = 1
-(i++)
+i++
 }

testData/ast/foreachStatement/statement/enhancedForWithExpression.kt

@@ -1,2 +1,2 @@
 for (n : Node? in list)
-(i++)
+i++

testData/ast/function/file/writableParameter.kt

@@ -2,6 +2,6 @@ package demo
 open class Test() {
 open fun test(var i : Int) : Int {
 i = 10
-return (i + 20)
+return i + 20
 }
 }

testData/ast/ifStatement/statement/ifStatementWithEmptyBlocks.kt

@@ -1,4 +1,4 @@
-if ((1 > 0))
+if (1 > 0)
 {
 }
 else

testData/ast/ifStatement/statement/ifStatementWithMultilineBlocks.kt

@@ -1,4 +1,4 @@
-if ((1 > 0))
+if (1 > 0)
 {
 var n : Int = 1
 return n

testData/ast/ifStatement/statement/ifStatementWithoutElse.kt

@@ -1,4 +1,4 @@
-if ((1 > 0))
+if (1 > 0)
 {
 var n : Int = 1
 return n

testData/ast/issues/file/kt-1074.jav

@@ -0,0 +1,13 @@
+package demo;
+
+class Test {
+    static void subListRangeCheck(int fromIndex, int toIndex, int size) {
+        if (fromIndex < 0)
+            throw new IndexOutOfBoundsException("fromIndex = " + fromIndex);
+        if (toIndex > size)
+            throw new IndexOutOfBoundsException("toIndex = " + toIndex);
+        if (fromIndex > toIndex)
+            throw new IllegalArgumentException("fromIndex(" + fromIndex
+                    + ") > toIndex(" + toIndex + ")");
+    }
+}

testData/ast/issues/file/kt-1074.kt

@@ -0,0 +1,13 @@
+package demo
+open class Test() {
+class object {
+open fun subListRangeCheck(fromIndex : Int, toIndex : Int, size : Int) : Unit {
+if (fromIndex < 0)
+throw IndexOutOfBoundsException("fromIndex = " + fromIndex)
+if (toIndex > size)
+throw IndexOutOfBoundsException("toIndex = " + toIndex)
+if (fromIndex > toIndex)
+throw IllegalArgumentException("fromIndex(" + fromIndex + ") > toIndex(" + toIndex + ")")
+}
+}
+}

testData/ast/issues/file/kt-824-isDir.kt

@@ -3,7 +3,7 @@ import java.io.File
 public open class Test() {
 class object {
 open public fun isDir(parent : File?) : Boolean {
-if (((parent == null) || (!parent?.exists())))
+if (parent == null || !parent?.exists())
 {
 return false
 }

testData/ast/issues/file/kt-828.kt

@@ -1,14 +1,14 @@
 open class Test() {
 open fun test() : Unit {
 var res : Boolean = true
-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))
-System.out?.println((true && false))
-System.out?.println((true || false))
+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)
+System.out?.println(true && false)
+System.out?.println(true || false)
 }
 }

testData/ast/issues/file/kt-837.kt

@@ -11,6 +11,6 @@ this.code = code
 class object {
 public var ENGLISH : Language? = Language("en")
 public var SWEDISH : Language? = Language("sv")
-private val serialVersionUID : Long = (-2442762969929206780)
+private val serialVersionUID : Long = -2442762969929206780
 }
 }

testData/ast/issues/file/kt-852.kt

@@ -4,9 +4,9 @@ open fun test() : String? {
 var s1 : String? = ""
 var s2 : String? = ""
 var s3 : String? = ""
-if (((s1?.isEmpty()).sure() && (s2?.isEmpty()).sure()))
+if ((s1?.isEmpty()).sure() && (s2?.isEmpty()).sure())
 return "OK"
-if (((s1?.isEmpty()).sure() && (s2?.isEmpty()).sure() && (s3?.isEmpty()).sure()))
+if ((s1?.isEmpty()).sure() && (s2?.isEmpty()).sure() && (s3?.isEmpty()).sure())
 return "OOOK"
 return ""
 }

testData/ast/issues/file/kt-879.kt

@@ -15,7 +15,7 @@ return 2
 return 3
 }
 else -> {
-return (-1)
+return -1
 }
 }
 }

testData/ast/issues/file/kt-893.kt

@@ -1,7 +1,7 @@
 package demo
 open class Test() {
 open fun test() : Unit {
-for (i in 0..(10 - 1)) {
+for (i in 0..10 - 1) {
 System.out?.println(i)
 }
 }

testData/ast/issues/file/kt-963.kt

@@ -2,6 +2,6 @@ package demo
 open class C(a : Int) {
 var abc : Int = 0
 {
-abc = (a * 2)
+abc = a * 2
 }
 }

testData/ast/labelStatement/statement/complicatedExampleFromJavaTutorial.kt

@@ -2,9 +2,9 @@
 var n : Int = substring.length()
 var j : Int = i
 var k : Int = 0
-while (((n--) != 0))
+while (n-- != 0)
 {
-if ((searchMe.charAt((j++)) != substring.charAt((k++))))
+if (searchMe.charAt(j++) != substring.charAt(k++))
 {
 continue@test
 }

testData/ast/parenthesizedExpression/expression/parenthesized.kt

@@ -1 +1 @@
-((1 + 2))
+(1 + 2)

testData/ast/parenthesizedExpression/expression/parenthesized2.kt

@@ -1 +1 @@
-((str.toString() + "abc"))
+(str.toString() + "abc")

testData/ast/polyadicExpression/expression/divide.kt

@@ -1 +1 @@
-(1 / 2 / 3)
+1 / 2 / 3

testData/ast/polyadicExpression/expression/minus.kt

@@ -1 +1 @@
-(1 - 2 - 3)
+1 - 2 - 3

testData/ast/polyadicExpression/expression/multiply.kt

@@ -1 +1 @@
-(1 * 2 * 3)
+1 * 2 * 3

testData/ast/polyadicExpression/expression/plus.kt

@@ -1 +1 @@
-(1 + 2 + 3)
+1 + 2 + 3

testData/ast/polyadicExpression/expression/remainder.kt

@@ -1 +1 @@
-(1 % 2 % 3)
+1 % 2 % 3

testData/ast/polyadicExpression/expression/unassignedShiftRight.kt

@@ -1 +1 @@
-(1 ushr 2 ushr 3)
+1 ushr 2 ushr 3

testData/ast/postfixOperator/statement/decrement.kt

@@ -1 +1 @@
-(i--)
+i--

testData/ast/postfixOperator/statement/increment.kt

@@ -1 +1 @@
-(i++)
+i++

testData/ast/prefixOperator/statement/decrement.kt

@@ -1 +1 @@
-(--i)
+--i

testData/ast/prefixOperator/statement/excl.kt

@@ -1,2 +1,2 @@
 var i : Boolean = true
-var j : Boolean = (!i)
+var j : Boolean = !i

testData/ast/prefixOperator/statement/increment.kt

@@ -1 +1 @@
-(++i)
+++i

testData/ast/prefixOperator/statement/kt-667.kt

@@ -1,2 +1,2 @@
 var i : Int = (10).inv()
-var j : Int = (((i * 100))).inv()
+var j : Int = ((i * 100)).inv()

testData/ast/trait/class/interfaceWithFields.kt

@@ -2,6 +2,6 @@ trait INode {
 class object {
 val IN : String? = "in"
 val AT : String? = "@"
-val COMMA_WITH_SPACE : String? = (COMMA + SPACE)
+val COMMA_WITH_SPACE : String? = COMMA + SPACE
 }
 }

testData/ast/trait/class/interfaceWithStaticFields.kt

@@ -2,6 +2,6 @@ public trait INode {
 class object {
 public val IN : String? = "in"
 public val AT : String? = "@"
-public val COMMA_WITH_SPACE : String? = (COMMA + SPACE)
+public val COMMA_WITH_SPACE : String? = COMMA + SPACE
 }
 }

testData/ast/whileStatement/statement/whileWithBlock.kt

@@ -1,5 +1,5 @@
-while ((a > b))
+while (a > b)
 {
 var i : Int = 1
-i = (i + 1)
+i = i + 1
 }

testData/ast/whileStatement/statement/whileWithExpression.kt

@@ -1,2 +1,2 @@
 while (true)
-i = (i + 1)
+i = i + 1