diff --git a/src/org/jetbrains/jet/j2k/ast/ParenthesizedExpression.java b/src/org/jetbrains/jet/j2k/ast/ParenthesizedExpression.java new file mode 100644 index 00000000000..8a5ac18447c --- /dev/null +++ b/src/org/jetbrains/jet/j2k/ast/ParenthesizedExpression.java @@ -0,0 +1,20 @@ +package org.jetbrains.jet.j2k.ast; + +import org.jetbrains.annotations.NotNull; + +/** + * @author ignatov + */ +public class ParenthesizedExpression extends Expression { + private final Expression myExpression; + + public ParenthesizedExpression(Expression expression) { + myExpression = expression; + } + + @NotNull + @Override + public String toKotlin() { + return "(" + myExpression.toKotlin() + ")"; + } +} diff --git a/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java b/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java index ea87fdd0de3..aeae98e4587 100644 --- a/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java +++ b/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java @@ -165,6 +165,9 @@ public class ExpressionVisitor extends StatementVisitor implements Visitor { @Override public void visitParenthesizedExpression(PsiParenthesizedExpression expression) { super.visitParenthesizedExpression(expression); + myResult = new ParenthesizedExpression( + expressionToExpression(expression.getExpression()) + ); } @Override diff --git a/test/org/jetbrains/jet/j2k/ast/ParenthesizedExpressionTest.java b/test/org/jetbrains/jet/j2k/ast/ParenthesizedExpressionTest.java new file mode 100644 index 00000000000..22b90d535a6 --- /dev/null +++ b/test/org/jetbrains/jet/j2k/ast/ParenthesizedExpressionTest.java @@ -0,0 +1,17 @@ +package org.jetbrains.jet.j2k.ast; + +import junit.framework.Assert; +import org.jetbrains.jet.j2k.JetTestCaseBase; + +/** + * @author ignatov + */ +public class ParenthesizedExpressionTest extends JetTestCaseBase { + public void testParenthesized() throws Exception { + Assert.assertEquals(expressionToSingleLineKotlin("(1 + 2)"), "((1 + 2))"); + } + + public void testParenthesized2() throws Exception { + Assert.assertEquals(expressionToSingleLineKotlin("(o.toString() + \"abc\")"), "((o.toString() + \"abc\"))"); + } +} \ No newline at end of file