CodeFragment: find inner expression correctly

2014-04-23 15:46:24 +04:00
parent a1fa366e8f
commit 2309751ee9
1 changed files with 13 additions and 1 deletions
@@ -73,7 +73,19 @@ class JetExpressionCodeFragmentImpl(
        return true
    }

-    override fun getExpression() = findChildByClass(javaClass<JetExpression>())
+    override fun getExpression(): JetExpression? {
+        var resultingExpression: JetExpression? = null
+        this.accept(object: JetTreeVisitor<Void>() {
+            override fun visitExpression(expression: JetExpression, data: Void?): Void? {
+                resultingExpression = expression
+                return null
+            }
+
+            override fun visitElement(element: PsiElement) = element.acceptChildren(this)
+
+        }, null)
+        return resultingExpression
+    }

    class object {
        val IMPORT_SEPARATOR = ","