From e1f47823d41ebe8deb15deb61750994fe828339d Mon Sep 17 00:00:00 2001 From: Dimach Date: Tue, 26 Jun 2018 11:12:45 +0300 Subject: [PATCH] New J2K: Array access expression. --- j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt | 7 +++++++ .../kotlin/j2k/conversions/PolyadicExpressionConversion.kt | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt index ec247771070..dad828d0f73 100644 --- a/j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt +++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt @@ -241,6 +241,13 @@ class NewCodeBuilder { override fun visitFieldAccessExpression(fieldAccessExpression: JKFieldAccessExpression) { printer.printWithNoIndent(FqName(fieldAccessExpression.identifier.fqName).shortName().asString()) } + + override fun visitArrayAccessExpression(arrayAccessExpression: JKArrayAccessExpression) { + arrayAccessExpression.expression.accept(this) + printer.printWithNoIndent("[") + arrayAccessExpression.indexExpression.accept(this) + printer.printWithNoIndent("]") + } } fun printCodeOut(root: JKTreeElement): String { diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/PolyadicExpressionConversion.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/PolyadicExpressionConversion.kt index 33b9402391a..eb7ea946ae1 100644 --- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/PolyadicExpressionConversion.kt +++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/PolyadicExpressionConversion.kt @@ -18,7 +18,7 @@ class PolyadicExpressionConversion : RecursiveApplicableConversionBase() { convertPolyadic(element.operands.also { element.operands = emptyList() }, element.tokens) else element).also { - recurse(element) + recurse(it) } }