From 7cbff97c6e4b2b81dc1bb6bc3a2f7cf196de1612 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Fri, 1 Jun 2012 16:35:43 +0200
Subject: [PATCH] filter whitespace nodes when converting list of elements

---
 src/org/jetbrains/jet/j2k/Converter.kt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/org/jetbrains/jet/j2k/Converter.kt b/src/org/jetbrains/jet/j2k/Converter.kt
index 452068878e7..c2da7368b30 100644
--- a/src/org/jetbrains/jet/j2k/Converter.kt
+++ b/src/org/jetbrains/jet/j2k/Converter.kt
@@ -303,9 +303,9 @@ public open class Converter() {
     }
 
     private fun caseForObject(method: PsiMethod): Boolean {
-        var containing: PsiClass? = method.getContainingClass()
+        val containing: PsiClass? = method.getContainingClass()
         if (containing != null) {
-            for (s : PsiClassType? in containing?.getSuperTypes()) {
+            for (s : PsiClassType? in containing.getSuperTypes()) {
                 val canonicalText: String? = s?.getCanonicalText()
                 if (canonicalText != JAVA_LANG_OBJECT && !getClassIdentifiers().contains(canonicalText)) {
                     return true
@@ -319,7 +319,7 @@ public open class Converter() {
         if (block == null)
             return Block.EMPTY_BLOCK
 
-        return Block(block.getChildren().map { statementToStatement(it) }, notEmpty)
+        return Block(statementsToStatementList(block.getChildren()), notEmpty)
     }
 
     public open fun blockToBlock(block: PsiCodeBlock?): Block {
@@ -327,11 +327,11 @@ public open class Converter() {
     }
 
     public open fun statementsToStatementList(statements: Array<PsiElement?>): List<Element> {
-        return statements.map { statementToStatement(it) }
+        return statements.filterNot { it is PsiWhiteSpace }.map { statementToStatement(it) }
     }
 
     public open fun statementsToStatementList(statements: List<PsiElement?>): List<Element> {
-        return statements.map { statementToStatement(it) }
+        return statements.filterNot { it is PsiWhiteSpace }.map { statementToStatement(it) }
     }
 
     public open fun statementToStatement(s: PsiElement?): Element {