diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt index dc3a1a488bc..f2c2c5c2a6b 100644 --- a/j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt +++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt @@ -619,6 +619,10 @@ class NewCodeBuilder { } } + override fun visitBlockStatementWithoutBrackets(blockStatementWithoutBrackets: JKBlockStatementWithoutBrackets) { + blockStatementWithoutBrackets.block.accept(this) + } + override fun visitExpressionStatement(expressionStatement: JKExpressionStatement) { printer.printIndent() expressionStatement.expression.accept(this) diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/jk.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/jk.kt index ad6f7a5f0d9..455b2b43f10 100644 --- a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/jk.kt +++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/jk.kt @@ -300,6 +300,12 @@ class JKBlockStatementImpl(block: JKBlock) : JKBlockStatement, JKBranchElementBa override fun accept(visitor: JKVisitor, data: D): R = visitor.visitBlockStatement(this, data) } +class JKBlockStatementWithoutBracketsImpl(block: JKBlock) : JKBlockStatementWithoutBrackets, JKBranchElementBase(), PsiOwner by PsiOwnerImpl() { + override var block by child(block) + + override fun accept(visitor: JKVisitor, data: D): R = visitor.visitBlockStatementWithoutBrackets(this, data) +} + class JKThisExpressionImpl(qualifierLabel: JKLabel) : JKThisExpression, JKBranchElementBase(), PsiOwner by PsiOwnerImpl() { override var qualifierLabel: JKLabel by child(qualifierLabel) override fun accept(visitor: JKVisitor, data: D): R = visitor.visitThisExpression(this, data) diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/jk.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/jk.kt index 10cbee5af23..82fb943b95c 100644 --- a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/jk.kt +++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/jk.kt @@ -296,6 +296,10 @@ interface JKBlockStatement : JKStatement, JKBranchElement { var block: JKBlock } +interface JKBlockStatementWithoutBrackets : JKStatement, JKBranchElement { + var block: JKBlock +} + interface JKThisExpression : JKExpression { var qualifierLabel: JKLabel } diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/visitors/JKVisitor.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/visitors/JKVisitor.kt index ed1124be63b..2d5df73a120 100644 --- a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/visitors/JKVisitor.kt +++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/visitors/JKVisitor.kt @@ -50,6 +50,7 @@ interface JKVisitor { fun visitStubExpression(stubExpression: JKStubExpression, data: D): R = visitExpression(stubExpression, data) fun visitLoopStatement(loopStatement: JKLoopStatement, data: D): R = visitStatement(loopStatement, data) fun visitBlockStatement(blockStatement: JKBlockStatement, data: D): R = visitStatement(blockStatement, data) + fun visitBlockStatementWithoutBrackets(blockStatementWithoutBrackets: JKBlockStatementWithoutBrackets, data: D): R = visitStatement(blockStatementWithoutBrackets, data) fun visitThisExpression(thisExpression: JKThisExpression, data: D): R = visitExpression(thisExpression, data) fun visitSuperExpression(superExpression: JKSuperExpression, data: D): R = visitExpression(superExpression, data) fun visitWhileStatement(whileStatement: JKWhileStatement, data: D): R = visitLoopStatement(whileStatement, data) diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/visitors/JKVisitorVoid.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/visitors/JKVisitorVoid.kt index f15aa498b9c..8b0f7b2f9bd 100644 --- a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/visitors/JKVisitorVoid.kt +++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/visitors/JKVisitorVoid.kt @@ -97,6 +97,8 @@ interface JKVisitorVoid : JKVisitor { override fun visitLoopStatement(loopStatement: JKLoopStatement, data: Nothing?) = visitLoopStatement(loopStatement) fun visitBlockStatement(blockStatement: JKBlockStatement) = visitStatement(blockStatement, null) override fun visitBlockStatement(blockStatement: JKBlockStatement, data: Nothing?) = visitBlockStatement(blockStatement) + fun visitBlockStatementWithoutBrackets(blockStatementWithoutBrackets: JKBlockStatementWithoutBrackets) = visitStatement(blockStatementWithoutBrackets, null) + override fun visitBlockStatementWithoutBrackets(blockStatementWithoutBrackets: JKBlockStatementWithoutBrackets, data: Nothing?) = visitBlockStatementWithoutBrackets(blockStatementWithoutBrackets) fun visitThisExpression(thisExpression: JKThisExpression) = visitExpression(thisExpression, null) override fun visitThisExpression(thisExpression: JKThisExpression, data: Nothing?) = visitThisExpression(thisExpression) fun visitSuperExpression(superExpression: JKSuperExpression) = visitExpression(superExpression, null)