From 35271af07c3ee196c892f12abae3ba8504ae5109 Mon Sep 17 00:00:00 2001
From: Natalia Ukhorskaya <natalia.ukhorskaya@jetbrains.com>
Date: Wed, 24 Feb 2016 14:38:07 +0300
Subject: [PATCH] Do not convert invalid files to Kotlin

---
 .../kotlin/android/actions/NewKotlinActivityAction.kt        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/actions/NewKotlinActivityAction.kt b/idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/actions/NewKotlinActivityAction.kt
index c7fa933d694..0ffde0460ab 100644
--- a/idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/actions/NewKotlinActivityAction.kt
+++ b/idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/actions/NewKotlinActivityAction.kt
@@ -71,7 +71,10 @@ class NewKotlinActivityAction: AnAction(KotlinIcons.FILE) {
             private fun convertFiles(project: Project) {
                 if (javaFilesToKotlin != null) {
                     DumbService.getInstance(project).smartInvokeLater {
-                        JavaToKotlinAction.convertFiles(javaFilesToKotlin!!, project, false)
+                        val filesToConvert = javaFilesToKotlin!!.filter { it.isValid }
+                        if (filesToConvert.isNotEmpty()) {
+                            JavaToKotlinAction.convertFiles(filesToConvert, project, false)
+                        }
                         javaFilesToKotlin = null
                     }
                 }