From 9d1452bbbc2a359a9bf17663f1084d69935d3e90 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Thu, 26 Jun 2014 16:06:34 +0400
Subject: [PATCH] Java to Kotlin converter: minor code refactoring

---
 j2k/src/org/jetbrains/jet/j2k/ConstructorConverter.kt    | 9 ++++++++-
 j2k/src/org/jetbrains/jet/j2k/ConstructorUtils.kt        | 3 ---
 .../org/jetbrains/jet/j2k/visitors/ExpressionVisitor.kt  | 2 --
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/j2k/src/org/jetbrains/jet/j2k/ConstructorConverter.kt b/j2k/src/org/jetbrains/jet/j2k/ConstructorConverter.kt
index 89fe01052be..9af0ab11c9c 100644
--- a/j2k/src/org/jetbrains/jet/j2k/ConstructorConverter.kt
+++ b/j2k/src/org/jetbrains/jet/j2k/ConstructorConverter.kt
@@ -101,7 +101,14 @@ class ConstructorConverter(private val converter: Converter) {
                 }
             }
 
-            val bodyConverter = converter.withExpressionVisitor { ExpressionVisitor(it, usageReplacementMap) }
+            val bodyConverter = converter.withExpressionVisitor {
+                object : ExpressionVisitor(it, usageReplacementMap) {
+                    override fun visitMethodCallExpression(expression: PsiMethodCallExpression) {
+                        if (expression.isSuperConstructorCall()) return // skip it
+                        super.visitMethodCallExpression(expression)
+                    }
+                }
+            }
             postProcessBody(bodyConverter.convertBlock(body, false, { !statementsToRemove.contains(it) }))
         }
         else {
diff --git a/j2k/src/org/jetbrains/jet/j2k/ConstructorUtils.kt b/j2k/src/org/jetbrains/jet/j2k/ConstructorUtils.kt
index 1a5608ce4e5..b35d369e1b3 100644
--- a/j2k/src/org/jetbrains/jet/j2k/ConstructorUtils.kt
+++ b/j2k/src/org/jetbrains/jet/j2k/ConstructorUtils.kt
@@ -59,9 +59,6 @@ fun PsiClass.getPrimaryConstructor(): PsiMethod? {
     }
 }
 
-fun PsiElement.isInsidePrimaryConstructor(): Boolean
-        = getContainingConstructor()?.isPrimaryConstructor() ?: false
-
 fun PsiElement.getContainingMethod(): PsiMethod? {
     var context = getContext()
     while (context != null) {
diff --git a/j2k/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.kt b/j2k/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.kt
index dc61f524c6c..e7d607abaec 100644
--- a/j2k/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.kt
+++ b/j2k/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.kt
@@ -163,8 +163,6 @@ open class ExpressionVisitor(private val converter: Converter,
     }
 
     override fun visitMethodCallExpression(expression: PsiMethodCallExpression) {
-        if (expression.isSuperConstructorCall() && expression.isInsidePrimaryConstructor()) return // skip it
-
         val methodExpr = expression.getMethodExpression()
         val arguments = expression.getArgumentList().getExpressions()
         val target = methodExpr.resolve()