From e13b438a69543107358759d883fa62c31eeab4dd Mon Sep 17 00:00:00 2001
From: Sergey Ignatov <sergey.ignatov@jetbrains.com>
Date: Thu, 19 Jan 2012 12:19:51 +0400
Subject: [PATCH] KT-1074 Need to avoid unnecessary parenthesis for converted
 code

---
 .../jet/j2k/ast/BinaryExpression.java          |  2 +-
 .../jet/j2k/ast/PolyadicExpression.java        |  2 +-
 .../jetbrains/jet/j2k/ast/PostfixOperator.java |  2 +-
 .../jetbrains/jet/j2k/ast/PrefixOperator.java  |  2 +-
 .../ast/assignmentExpression/expression/and.kt |  2 +-
 .../ast/assignmentExpression/expression/or.kt  |  2 +-
 .../expression/shiftLeft.kt                    |  2 +-
 .../expression/shiftRight.kt                   |  2 +-
 .../expression/unsignedRightShift.kt           |  2 +-
 .../ast/assignmentExpression/expression/xor.kt |  2 +-
 .../ast/binaryExpression/expression/and.kt     |  2 +-
 .../expression/conditionalAnd.kt               |  2 +-
 .../expression/conditionalOr.kt                |  2 +-
 .../ast/binaryExpression/expression/divide.kt  |  2 +-
 .../binaryExpression/expression/greaterThan.kt |  2 +-
 .../expression/greaterThanEqual.kt             |  2 +-
 .../binaryExpression/expression/lessThan.kt    |  2 +-
 .../expression/lessThanEqual.kt                |  2 +-
 .../ast/binaryExpression/expression/minus.kt   |  2 +-
 .../binaryExpression/expression/multiply.kt    |  2 +-
 testData/ast/binaryExpression/expression/or.kt |  2 +-
 .../ast/binaryExpression/expression/plus.kt    |  2 +-
 .../binaryExpression/expression/remainder.kt   |  2 +-
 .../binaryExpression/expression/shiftLeft.kt   |  2 +-
 .../binaryExpression/expression/shiftRight.kt  |  2 +-
 .../ast/binaryExpression/expression/xor.kt     |  2 +-
 .../statement/whileWithBlock.kt                |  4 ++--
 .../statement/whileWithExpression.kt           |  2 +-
 .../ast/enum/class/runnableImplementation.kt   |  2 +-
 testData/ast/file/comp/intNullability.kt       |  2 +-
 testData/ast/for/statement/forRangeWithLT.kt   |  2 +-
 testData/ast/for/statement/forWithBlock.kt     |  2 +-
 .../statement/forWithBlockAndDoubleUpdate.kt   |  8 ++++----
 .../ast/for/statement/forWithEmptyBlock.kt     |  6 +++---
 .../ast/for/statement/forWithExpression.kt     |  2 +-
 testData/ast/for/statement/forWithReturn.kt    |  6 +++---
 .../statement/enhancedForWithBlock.kt          |  2 +-
 .../statement/enhancedForWithExpression.kt     |  2 +-
 .../ast/function/file/writableParameter.kt     |  2 +-
 .../statement/ifStatementWithEmptyBlocks.kt    |  2 +-
 .../ifStatementWithMultilineBlocks.kt          |  2 +-
 .../statement/ifStatementWithoutElse.kt        |  2 +-
 testData/ast/issues/file/kt-1074.jav           | 13 +++++++++++++
 testData/ast/issues/file/kt-1074.kt            | 13 +++++++++++++
 testData/ast/issues/file/kt-824-isDir.kt       |  2 +-
 testData/ast/issues/file/kt-828.kt             | 18 +++++++++---------
 testData/ast/issues/file/kt-837.kt             |  2 +-
 testData/ast/issues/file/kt-852.kt             |  4 ++--
 testData/ast/issues/file/kt-879.kt             |  2 +-
 testData/ast/issues/file/kt-893.kt             |  2 +-
 testData/ast/issues/file/kt-963.kt             |  2 +-
 .../complicatedExampleFromJavaTutorial.kt      |  4 ++--
 .../expression/parenthesized.kt                |  2 +-
 .../expression/parenthesized2.kt               |  2 +-
 .../polyadicExpression/expression/divide.kt    |  2 +-
 .../ast/polyadicExpression/expression/minus.kt |  2 +-
 .../polyadicExpression/expression/multiply.kt  |  2 +-
 .../ast/polyadicExpression/expression/plus.kt  |  2 +-
 .../polyadicExpression/expression/remainder.kt |  2 +-
 .../expression/unassignedShiftRight.kt         |  2 +-
 .../ast/postfixOperator/statement/decrement.kt |  2 +-
 .../ast/postfixOperator/statement/increment.kt |  2 +-
 .../ast/prefixOperator/statement/decrement.kt  |  2 +-
 testData/ast/prefixOperator/statement/excl.kt  |  2 +-
 .../ast/prefixOperator/statement/increment.kt  |  2 +-
 .../ast/prefixOperator/statement/kt-667.kt     |  2 +-
 .../ast/trait/class/interfaceWithFields.kt     |  2 +-
 .../trait/class/interfaceWithStaticFields.kt   |  2 +-
 .../whileStatement/statement/whileWithBlock.kt |  4 ++--
 .../statement/whileWithExpression.kt           |  2 +-
 70 files changed, 113 insertions(+), 87 deletions(-)
 create mode 100644 testData/ast/issues/file/kt-1074.jav
 create mode 100644 testData/ast/issues/file/kt-1074.kt

diff --git a/src/org/jetbrains/jet/j2k/ast/BinaryExpression.java b/src/org/jetbrains/jet/j2k/ast/BinaryExpression.java
index 72baea6e515..2df6bfd2dd6 100644
--- a/src/org/jetbrains/jet/j2k/ast/BinaryExpression.java
+++ b/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);
   }
 }
diff --git a/src/org/jetbrains/jet/j2k/ast/PolyadicExpression.java b/src/org/jetbrains/jet/j2k/ast/PolyadicExpression.java
index f5872539874..d99481c305d 100644
--- a/src/org/jetbrains/jet/j2k/ast/PolyadicExpression.java
+++ b/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);
   }
 }
diff --git a/src/org/jetbrains/jet/j2k/ast/PostfixOperator.java b/src/org/jetbrains/jet/j2k/ast/PostfixOperator.java
index 036e2618aa3..ffac99c0d93 100644
--- a/src/org/jetbrains/jet/j2k/ast/PostfixOperator.java
+++ b/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;
   }
 }
\ No newline at end of file
diff --git a/src/org/jetbrains/jet/j2k/ast/PrefixOperator.java b/src/org/jetbrains/jet/j2k/ast/PrefixOperator.java
index c94da13002f..f91f98bc837 100644
--- a/src/org/jetbrains/jet/j2k/ast/PrefixOperator.java
+++ b/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();
   }
 }
\ No newline at end of file
diff --git a/testData/ast/assignmentExpression/expression/and.kt b/testData/ast/assignmentExpression/expression/and.kt
index 9d3b5a87264..dc3b47760da 100644
--- a/testData/ast/assignmentExpression/expression/and.kt
+++ b/testData/ast/assignmentExpression/expression/and.kt
@@ -1 +1 @@
-x = (x and 2)
\ No newline at end of file
+x = x and 2
\ No newline at end of file
diff --git a/testData/ast/assignmentExpression/expression/or.kt b/testData/ast/assignmentExpression/expression/or.kt
index 9ec6c02a731..776a84a8989 100644
--- a/testData/ast/assignmentExpression/expression/or.kt
+++ b/testData/ast/assignmentExpression/expression/or.kt
@@ -1 +1 @@
-x = (x or 2)
\ No newline at end of file
+x = x or 2
\ No newline at end of file
diff --git a/testData/ast/assignmentExpression/expression/shiftLeft.kt b/testData/ast/assignmentExpression/expression/shiftLeft.kt
index 9952d811313..bc26f965e4d 100644
--- a/testData/ast/assignmentExpression/expression/shiftLeft.kt
+++ b/testData/ast/assignmentExpression/expression/shiftLeft.kt
@@ -1 +1 @@
-x = (x shl 2)
\ No newline at end of file
+x = x shl 2
\ No newline at end of file
diff --git a/testData/ast/assignmentExpression/expression/shiftRight.kt b/testData/ast/assignmentExpression/expression/shiftRight.kt
index 05fb0966ed7..a731104d2f6 100644
--- a/testData/ast/assignmentExpression/expression/shiftRight.kt
+++ b/testData/ast/assignmentExpression/expression/shiftRight.kt
@@ -1 +1 @@
-x = (x shr 2)
\ No newline at end of file
+x = x shr 2
\ No newline at end of file
diff --git a/testData/ast/assignmentExpression/expression/unsignedRightShift.kt b/testData/ast/assignmentExpression/expression/unsignedRightShift.kt
index 484c3a6a13d..2450029bd56 100644
--- a/testData/ast/assignmentExpression/expression/unsignedRightShift.kt
+++ b/testData/ast/assignmentExpression/expression/unsignedRightShift.kt
@@ -1 +1 @@
-x = (x ushr 2)
\ No newline at end of file
+x = x ushr 2
\ No newline at end of file
diff --git a/testData/ast/assignmentExpression/expression/xor.kt b/testData/ast/assignmentExpression/expression/xor.kt
index e6cd6c7b628..381ed467f3d 100644
--- a/testData/ast/assignmentExpression/expression/xor.kt
+++ b/testData/ast/assignmentExpression/expression/xor.kt
@@ -1 +1 @@
-x = (x xor 2)
\ No newline at end of file
+x = x xor 2
\ No newline at end of file
diff --git a/testData/ast/binaryExpression/expression/and.kt b/testData/ast/binaryExpression/expression/and.kt
index cf06df2166f..cbf463b36ea 100644
--- a/testData/ast/binaryExpression/expression/and.kt
+++ b/testData/ast/binaryExpression/expression/and.kt
@@ -1 +1 @@
-(x and 2)
\ No newline at end of file
+x and 2
\ No newline at end of file
diff --git a/testData/ast/binaryExpression/expression/conditionalAnd.kt b/testData/ast/binaryExpression/expression/conditionalAnd.kt
index c15d239fc59..5aa60340840 100644
--- a/testData/ast/binaryExpression/expression/conditionalAnd.kt
+++ b/testData/ast/binaryExpression/expression/conditionalAnd.kt
@@ -1 +1 @@
-(true && false)
\ No newline at end of file
+true && false
\ No newline at end of file
diff --git a/testData/ast/binaryExpression/expression/conditionalOr.kt b/testData/ast/binaryExpression/expression/conditionalOr.kt
index 468a7054c7e..64634c472bc 100644
--- a/testData/ast/binaryExpression/expression/conditionalOr.kt
+++ b/testData/ast/binaryExpression/expression/conditionalOr.kt
@@ -1 +1 @@
-(true || false)
\ No newline at end of file
+true || false
\ No newline at end of file
diff --git a/testData/ast/binaryExpression/expression/divide.kt b/testData/ast/binaryExpression/expression/divide.kt
index 65ee04050be..0e0b5d58618 100644
--- a/testData/ast/binaryExpression/expression/divide.kt
+++ b/testData/ast/binaryExpression/expression/divide.kt
@@ -1 +1 @@
-(1 / 2)
\ No newline at end of file
+1 / 2
\ No newline at end of file
diff --git a/testData/ast/binaryExpression/expression/greaterThan.kt b/testData/ast/binaryExpression/expression/greaterThan.kt
index daff50ff64b..2774817e788 100644
--- a/testData/ast/binaryExpression/expression/greaterThan.kt
+++ b/testData/ast/binaryExpression/expression/greaterThan.kt
@@ -1 +1 @@
-(1 > 2)
\ No newline at end of file
+1 > 2
\ No newline at end of file
diff --git a/testData/ast/binaryExpression/expression/greaterThanEqual.kt b/testData/ast/binaryExpression/expression/greaterThanEqual.kt
index 3df78eab7e7..6993045c7a2 100644
--- a/testData/ast/binaryExpression/expression/greaterThanEqual.kt
+++ b/testData/ast/binaryExpression/expression/greaterThanEqual.kt
@@ -1 +1 @@
-(1 >= 2)
\ No newline at end of file
+1 >= 2
\ No newline at end of file
diff --git a/testData/ast/binaryExpression/expression/lessThan.kt b/testData/ast/binaryExpression/expression/lessThan.kt
index c82ddfbad9f..535e996ad9b 100644
--- a/testData/ast/binaryExpression/expression/lessThan.kt
+++ b/testData/ast/binaryExpression/expression/lessThan.kt
@@ -1 +1 @@
-(1 < 2)
\ No newline at end of file
+1 < 2
\ No newline at end of file
diff --git a/testData/ast/binaryExpression/expression/lessThanEqual.kt b/testData/ast/binaryExpression/expression/lessThanEqual.kt
index 46d80ee7ff7..5e9475f92bf 100644
--- a/testData/ast/binaryExpression/expression/lessThanEqual.kt
+++ b/testData/ast/binaryExpression/expression/lessThanEqual.kt
@@ -1 +1 @@
-(1 <= 2)
\ No newline at end of file
+1 <= 2
\ No newline at end of file
diff --git a/testData/ast/binaryExpression/expression/minus.kt b/testData/ast/binaryExpression/expression/minus.kt
index cf09bd8aa78..7ec0a893aef 100644
--- a/testData/ast/binaryExpression/expression/minus.kt
+++ b/testData/ast/binaryExpression/expression/minus.kt
@@ -1 +1 @@
-(1 - 2)
\ No newline at end of file
+1 - 2
\ No newline at end of file
diff --git a/testData/ast/binaryExpression/expression/multiply.kt b/testData/ast/binaryExpression/expression/multiply.kt
index aa007e342a1..a48dfec9fa5 100644
--- a/testData/ast/binaryExpression/expression/multiply.kt
+++ b/testData/ast/binaryExpression/expression/multiply.kt
@@ -1 +1 @@
-(1 * 2)
\ No newline at end of file
+1 * 2
\ No newline at end of file
diff --git a/testData/ast/binaryExpression/expression/or.kt b/testData/ast/binaryExpression/expression/or.kt
index 70cd0ea4f20..ccad705935d 100644
--- a/testData/ast/binaryExpression/expression/or.kt
+++ b/testData/ast/binaryExpression/expression/or.kt
@@ -1 +1 @@
-(x or 2)
\ No newline at end of file
+x or 2
\ No newline at end of file
diff --git a/testData/ast/binaryExpression/expression/plus.kt b/testData/ast/binaryExpression/expression/plus.kt
index 0a911375668..193df0b550b 100644
--- a/testData/ast/binaryExpression/expression/plus.kt
+++ b/testData/ast/binaryExpression/expression/plus.kt
@@ -1 +1 @@
-(1 + 2)
\ No newline at end of file
+1 + 2
\ No newline at end of file
diff --git a/testData/ast/binaryExpression/expression/remainder.kt b/testData/ast/binaryExpression/expression/remainder.kt
index 619e890f226..049211394d2 100644
--- a/testData/ast/binaryExpression/expression/remainder.kt
+++ b/testData/ast/binaryExpression/expression/remainder.kt
@@ -1 +1 @@
-(1 % 2)
\ No newline at end of file
+1 % 2
\ No newline at end of file
diff --git a/testData/ast/binaryExpression/expression/shiftLeft.kt b/testData/ast/binaryExpression/expression/shiftLeft.kt
index f9ea88f60e9..face9a53255 100644
--- a/testData/ast/binaryExpression/expression/shiftLeft.kt
+++ b/testData/ast/binaryExpression/expression/shiftLeft.kt
@@ -1 +1 @@
-(x shl 2)
\ No newline at end of file
+x shl 2
\ No newline at end of file
diff --git a/testData/ast/binaryExpression/expression/shiftRight.kt b/testData/ast/binaryExpression/expression/shiftRight.kt
index 43f26e93b84..771795abe88 100644
--- a/testData/ast/binaryExpression/expression/shiftRight.kt
+++ b/testData/ast/binaryExpression/expression/shiftRight.kt
@@ -1 +1 @@
-(x shr 2)
\ No newline at end of file
+x shr 2
\ No newline at end of file
diff --git a/testData/ast/binaryExpression/expression/xor.kt b/testData/ast/binaryExpression/expression/xor.kt
index 918f54e7c68..b8ad1650a31 100644
--- a/testData/ast/binaryExpression/expression/xor.kt
+++ b/testData/ast/binaryExpression/expression/xor.kt
@@ -1 +1 @@
-(x xor 2)
\ No newline at end of file
+x xor 2
\ No newline at end of file
diff --git a/testData/ast/doWhileStatement/statement/whileWithBlock.kt b/testData/ast/doWhileStatement/statement/whileWithBlock.kt
index 96ee36204cc..d86f9999196 100644
--- a/testData/ast/doWhileStatement/statement/whileWithBlock.kt
+++ b/testData/ast/doWhileStatement/statement/whileWithBlock.kt
@@ -1,6 +1,6 @@
 do
 {
 var i : Int = 1
-i = (i + 1)
+i = i + 1
 }
-while ((a > b))
\ No newline at end of file
+while (a > b)
\ No newline at end of file
diff --git a/testData/ast/doWhileStatement/statement/whileWithExpression.kt b/testData/ast/doWhileStatement/statement/whileWithExpression.kt
index c936946d560..a20c7c5d83d 100644
--- a/testData/ast/doWhileStatement/statement/whileWithExpression.kt
+++ b/testData/ast/doWhileStatement/statement/whileWithExpression.kt
@@ -1,3 +1,3 @@
 do
-i = (i + 1)
+i = i + 1
 while (true)
\ No newline at end of file
diff --git a/testData/ast/enum/class/runnableImplementation.kt b/testData/ast/enum/class/runnableImplementation.kt
index 11263ecd635..dad0edf7366 100644
--- a/testData/ast/enum/class/runnableImplementation.kt
+++ b/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 }
diff --git a/testData/ast/file/comp/intNullability.kt b/testData/ast/file/comp/intNullability.kt
index 9b798908ee1..e243159d8b6 100644
--- a/testData/ast/file/comp/intNullability.kt
+++ b/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)
 }
 }
\ No newline at end of file
diff --git a/testData/ast/for/statement/forRangeWithLT.kt b/testData/ast/for/statement/forRangeWithLT.kt
index e1431c409fb..f31b904afa4 100644
--- a/testData/ast/for/statement/forRangeWithLT.kt
+++ b/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
 }
\ No newline at end of file
diff --git a/testData/ast/for/statement/forWithBlock.kt b/testData/ast/for/statement/forWithBlock.kt
index e1431c409fb..f31b904afa4 100644
--- a/testData/ast/for/statement/forWithBlock.kt
+++ b/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
 }
\ No newline at end of file
diff --git a/testData/ast/for/statement/forWithBlockAndDoubleUpdate.kt b/testData/ast/for/statement/forWithBlockAndDoubleUpdate.kt
index 5c7a0168951..4fd380f6ffe 100644
--- a/testData/ast/for/statement/forWithBlockAndDoubleUpdate.kt
+++ b/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++
 }
 }
 }
\ No newline at end of file
diff --git a/testData/ast/for/statement/forWithEmptyBlock.kt b/testData/ast/for/statement/forWithEmptyBlock.kt
index 8ec3c763bf8..a5743d94b32 100644
--- a/testData/ast/for/statement/forWithEmptyBlock.kt
+++ b/testData/ast/for/statement/forWithEmptyBlock.kt
@@ -1,12 +1,12 @@
 {
 var i : Int = 0
-while ((i < 0))
+while (i < 0)
 {
 {
 }
 {
-(j++)
-(i++)
+j++
+i++
 }
 }
 }
\ No newline at end of file
diff --git a/testData/ast/for/statement/forWithExpression.kt b/testData/ast/for/statement/forWithExpression.kt
index 6333d6a9828..be1826e8d8a 100644
--- a/testData/ast/for/statement/forWithExpression.kt
+++ b/testData/ast/for/statement/forWithExpression.kt
@@ -1 +1 @@
-for (i in 0..(0 - 1)) (t++)
\ No newline at end of file
+for (i in 0..0 - 1) t++
\ No newline at end of file
diff --git a/testData/ast/for/statement/forWithReturn.kt b/testData/ast/for/statement/forWithReturn.kt
index d7c34312768..1c9a6cb9016 100644
--- a/testData/ast/for/statement/forWithReturn.kt
+++ b/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++
 }
 }
 }
\ No newline at end of file
diff --git a/testData/ast/foreachStatement/statement/enhancedForWithBlock.kt b/testData/ast/foreachStatement/statement/enhancedForWithBlock.kt
index 06e9f5653fd..43cfc79c100 100644
--- a/testData/ast/foreachStatement/statement/enhancedForWithBlock.kt
+++ b/testData/ast/foreachStatement/statement/enhancedForWithBlock.kt
@@ -1,5 +1,5 @@
 for (n : Node? in list)
 {
 var i : Int = 1
-(i++)
+i++
 }
\ No newline at end of file
diff --git a/testData/ast/foreachStatement/statement/enhancedForWithExpression.kt b/testData/ast/foreachStatement/statement/enhancedForWithExpression.kt
index b2135910585..7affa022577 100644
--- a/testData/ast/foreachStatement/statement/enhancedForWithExpression.kt
+++ b/testData/ast/foreachStatement/statement/enhancedForWithExpression.kt
@@ -1,2 +1,2 @@
 for (n : Node? in list)
-(i++)
\ No newline at end of file
+i++
\ No newline at end of file
diff --git a/testData/ast/function/file/writableParameter.kt b/testData/ast/function/file/writableParameter.kt
index 645403e2035..b098e657066 100644
--- a/testData/ast/function/file/writableParameter.kt
+++ b/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
 }
 }
\ No newline at end of file
diff --git a/testData/ast/ifStatement/statement/ifStatementWithEmptyBlocks.kt b/testData/ast/ifStatement/statement/ifStatementWithEmptyBlocks.kt
index 6cff12d424b..4587b89bf1e 100644
--- a/testData/ast/ifStatement/statement/ifStatementWithEmptyBlocks.kt
+++ b/testData/ast/ifStatement/statement/ifStatementWithEmptyBlocks.kt
@@ -1,4 +1,4 @@
-if ((1 > 0))
+if (1 > 0)
 {
 }
 else
diff --git a/testData/ast/ifStatement/statement/ifStatementWithMultilineBlocks.kt b/testData/ast/ifStatement/statement/ifStatementWithMultilineBlocks.kt
index 03496fee3ad..41cfc10ac2d 100644
--- a/testData/ast/ifStatement/statement/ifStatementWithMultilineBlocks.kt
+++ b/testData/ast/ifStatement/statement/ifStatementWithMultilineBlocks.kt
@@ -1,4 +1,4 @@
-if ((1 > 0))
+if (1 > 0)
 {
 var n : Int = 1
 return n
diff --git a/testData/ast/ifStatement/statement/ifStatementWithoutElse.kt b/testData/ast/ifStatement/statement/ifStatementWithoutElse.kt
index a8e52d980ec..a63a714b79c 100644
--- a/testData/ast/ifStatement/statement/ifStatementWithoutElse.kt
+++ b/testData/ast/ifStatement/statement/ifStatementWithoutElse.kt
@@ -1,4 +1,4 @@
-if ((1 > 0))
+if (1 > 0)
 {
 var n : Int = 1
 return n
diff --git a/testData/ast/issues/file/kt-1074.jav b/testData/ast/issues/file/kt-1074.jav
new file mode 100644
index 00000000000..4579da0addc
--- /dev/null
+++ b/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 + ")");
+    }
+}
\ No newline at end of file
diff --git a/testData/ast/issues/file/kt-1074.kt b/testData/ast/issues/file/kt-1074.kt
new file mode 100644
index 00000000000..652697c03b5
--- /dev/null
+++ b/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 + ")")
+}
+}
+}
\ No newline at end of file
diff --git a/testData/ast/issues/file/kt-824-isDir.kt b/testData/ast/issues/file/kt-824-isDir.kt
index f03d1382414..8e899910fd4 100644
--- a/testData/ast/issues/file/kt-824-isDir.kt
+++ b/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
 }
diff --git a/testData/ast/issues/file/kt-828.kt b/testData/ast/issues/file/kt-828.kt
index e88498d1039..3ed25233de4 100644
--- a/testData/ast/issues/file/kt-828.kt
+++ b/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)
 }
 }
\ No newline at end of file
diff --git a/testData/ast/issues/file/kt-837.kt b/testData/ast/issues/file/kt-837.kt
index 7aabbfc9c55..79d431e87c6 100644
--- a/testData/ast/issues/file/kt-837.kt
+++ b/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
 }
 }
\ No newline at end of file
diff --git a/testData/ast/issues/file/kt-852.kt b/testData/ast/issues/file/kt-852.kt
index be058a4976f..4e642d623ac 100644
--- a/testData/ast/issues/file/kt-852.kt
+++ b/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 ""
 }
diff --git a/testData/ast/issues/file/kt-879.kt b/testData/ast/issues/file/kt-879.kt
index c017138ef1f..94d7f7761fb 100644
--- a/testData/ast/issues/file/kt-879.kt
+++ b/testData/ast/issues/file/kt-879.kt
@@ -15,7 +15,7 @@ return 2
 return 3
 }
 else -> {
-return (-1)
+return -1
 }
 }
 }
diff --git a/testData/ast/issues/file/kt-893.kt b/testData/ast/issues/file/kt-893.kt
index af7dceb91c2..7e5d3bb6509 100644
--- a/testData/ast/issues/file/kt-893.kt
+++ b/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)
 }
 }
diff --git a/testData/ast/issues/file/kt-963.kt b/testData/ast/issues/file/kt-963.kt
index 3b22ff9d391..2e024295a77 100644
--- a/testData/ast/issues/file/kt-963.kt
+++ b/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
 }
 }
\ No newline at end of file
diff --git a/testData/ast/labelStatement/statement/complicatedExampleFromJavaTutorial.kt b/testData/ast/labelStatement/statement/complicatedExampleFromJavaTutorial.kt
index f636c05dd7f..bb5b07c2f36 100644
--- a/testData/ast/labelStatement/statement/complicatedExampleFromJavaTutorial.kt
+++ b/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
 }
diff --git a/testData/ast/parenthesizedExpression/expression/parenthesized.kt b/testData/ast/parenthesizedExpression/expression/parenthesized.kt
index eb8f4ff5a21..0a911375668 100644
--- a/testData/ast/parenthesizedExpression/expression/parenthesized.kt
+++ b/testData/ast/parenthesizedExpression/expression/parenthesized.kt
@@ -1 +1 @@
-((1 + 2))
\ No newline at end of file
+(1 + 2)
\ No newline at end of file
diff --git a/testData/ast/parenthesizedExpression/expression/parenthesized2.kt b/testData/ast/parenthesizedExpression/expression/parenthesized2.kt
index 42a621de6bb..01d3d19b7d8 100644
--- a/testData/ast/parenthesizedExpression/expression/parenthesized2.kt
+++ b/testData/ast/parenthesizedExpression/expression/parenthesized2.kt
@@ -1 +1 @@
-((str.toString() + "abc"))
\ No newline at end of file
+(str.toString() + "abc")
\ No newline at end of file
diff --git a/testData/ast/polyadicExpression/expression/divide.kt b/testData/ast/polyadicExpression/expression/divide.kt
index 8da2777c101..6005ff02b5d 100644
--- a/testData/ast/polyadicExpression/expression/divide.kt
+++ b/testData/ast/polyadicExpression/expression/divide.kt
@@ -1 +1 @@
-(1 / 2 / 3)
\ No newline at end of file
+1 / 2 / 3
\ No newline at end of file
diff --git a/testData/ast/polyadicExpression/expression/minus.kt b/testData/ast/polyadicExpression/expression/minus.kt
index 220aab2cfa6..35002f64d1e 100644
--- a/testData/ast/polyadicExpression/expression/minus.kt
+++ b/testData/ast/polyadicExpression/expression/minus.kt
@@ -1 +1 @@
-(1 - 2 - 3)
\ No newline at end of file
+1 - 2 - 3
\ No newline at end of file
diff --git a/testData/ast/polyadicExpression/expression/multiply.kt b/testData/ast/polyadicExpression/expression/multiply.kt
index 588078fc87e..89ddea79483 100644
--- a/testData/ast/polyadicExpression/expression/multiply.kt
+++ b/testData/ast/polyadicExpression/expression/multiply.kt
@@ -1 +1 @@
-(1 * 2 * 3)
\ No newline at end of file
+1 * 2 * 3
\ No newline at end of file
diff --git a/testData/ast/polyadicExpression/expression/plus.kt b/testData/ast/polyadicExpression/expression/plus.kt
index 5dcba15ae9a..8a2a3c5ef6f 100644
--- a/testData/ast/polyadicExpression/expression/plus.kt
+++ b/testData/ast/polyadicExpression/expression/plus.kt
@@ -1 +1 @@
-(1 + 2 + 3)
\ No newline at end of file
+1 + 2 + 3
\ No newline at end of file
diff --git a/testData/ast/polyadicExpression/expression/remainder.kt b/testData/ast/polyadicExpression/expression/remainder.kt
index 65b18900b56..2e120c0cd68 100644
--- a/testData/ast/polyadicExpression/expression/remainder.kt
+++ b/testData/ast/polyadicExpression/expression/remainder.kt
@@ -1 +1 @@
-(1 % 2 % 3)
\ No newline at end of file
+1 % 2 % 3
\ No newline at end of file
diff --git a/testData/ast/polyadicExpression/expression/unassignedShiftRight.kt b/testData/ast/polyadicExpression/expression/unassignedShiftRight.kt
index cc8c414081e..83d192a6a77 100644
--- a/testData/ast/polyadicExpression/expression/unassignedShiftRight.kt
+++ b/testData/ast/polyadicExpression/expression/unassignedShiftRight.kt
@@ -1 +1 @@
-(1 ushr 2 ushr 3)
\ No newline at end of file
+1 ushr 2 ushr 3
\ No newline at end of file
diff --git a/testData/ast/postfixOperator/statement/decrement.kt b/testData/ast/postfixOperator/statement/decrement.kt
index 1387099f5a4..b45bc7f1686 100644
--- a/testData/ast/postfixOperator/statement/decrement.kt
+++ b/testData/ast/postfixOperator/statement/decrement.kt
@@ -1 +1 @@
-(i--)
\ No newline at end of file
+i--
\ No newline at end of file
diff --git a/testData/ast/postfixOperator/statement/increment.kt b/testData/ast/postfixOperator/statement/increment.kt
index 568dc98d422..f47eebed94d 100644
--- a/testData/ast/postfixOperator/statement/increment.kt
+++ b/testData/ast/postfixOperator/statement/increment.kt
@@ -1 +1 @@
-(i++)
\ No newline at end of file
+i++
\ No newline at end of file
diff --git a/testData/ast/prefixOperator/statement/decrement.kt b/testData/ast/prefixOperator/statement/decrement.kt
index 93712ce027e..33b7049c8ba 100644
--- a/testData/ast/prefixOperator/statement/decrement.kt
+++ b/testData/ast/prefixOperator/statement/decrement.kt
@@ -1 +1 @@
-(--i)
\ No newline at end of file
+--i
\ No newline at end of file
diff --git a/testData/ast/prefixOperator/statement/excl.kt b/testData/ast/prefixOperator/statement/excl.kt
index aaaf7a4cdbd..54a88090fcb 100644
--- a/testData/ast/prefixOperator/statement/excl.kt
+++ b/testData/ast/prefixOperator/statement/excl.kt
@@ -1,2 +1,2 @@
 var i : Boolean = true
-var j : Boolean = (!i)
\ No newline at end of file
+var j : Boolean = !i
\ No newline at end of file
diff --git a/testData/ast/prefixOperator/statement/increment.kt b/testData/ast/prefixOperator/statement/increment.kt
index b981de4d9b3..de36816d982 100644
--- a/testData/ast/prefixOperator/statement/increment.kt
+++ b/testData/ast/prefixOperator/statement/increment.kt
@@ -1 +1 @@
-(++i)
\ No newline at end of file
+++i
\ No newline at end of file
diff --git a/testData/ast/prefixOperator/statement/kt-667.kt b/testData/ast/prefixOperator/statement/kt-667.kt
index 80f8ac234ee..529e9a8b422 100644
--- a/testData/ast/prefixOperator/statement/kt-667.kt
+++ b/testData/ast/prefixOperator/statement/kt-667.kt
@@ -1,2 +1,2 @@
 var i : Int = (10).inv()
-var j : Int = (((i * 100))).inv()
\ No newline at end of file
+var j : Int = ((i * 100)).inv()
\ No newline at end of file
diff --git a/testData/ast/trait/class/interfaceWithFields.kt b/testData/ast/trait/class/interfaceWithFields.kt
index 8e2b43d7e84..008928c5d7c 100644
--- a/testData/ast/trait/class/interfaceWithFields.kt
+++ b/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
 }
 }
\ No newline at end of file
diff --git a/testData/ast/trait/class/interfaceWithStaticFields.kt b/testData/ast/trait/class/interfaceWithStaticFields.kt
index 22d47bf9a91..b7b74d0ed87 100644
--- a/testData/ast/trait/class/interfaceWithStaticFields.kt
+++ b/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
 }
 }
\ No newline at end of file
diff --git a/testData/ast/whileStatement/statement/whileWithBlock.kt b/testData/ast/whileStatement/statement/whileWithBlock.kt
index fa368e489ee..88e9992f59a 100644
--- a/testData/ast/whileStatement/statement/whileWithBlock.kt
+++ b/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
 }
\ No newline at end of file
diff --git a/testData/ast/whileStatement/statement/whileWithExpression.kt b/testData/ast/whileStatement/statement/whileWithExpression.kt
index af7baeada37..fd2a7536a52 100644
--- a/testData/ast/whileStatement/statement/whileWithExpression.kt
+++ b/testData/ast/whileStatement/statement/whileWithExpression.kt
@@ -1,2 +1,2 @@
 while (true)
-i = (i + 1)
\ No newline at end of file
+i = i + 1
\ No newline at end of file