From 8a94c66ce765f309f57c06d1c64cb36154a599e0 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Wed, 10 Apr 2019 15:59:45 +0300 Subject: [PATCH] KT-29568, KT-26550: show "Convert Java File to Kotlin File" only for Java files #KT-29568 fixed #KT-26550 fixed --- .../kotlin/idea/actions/JavaToKotlinAction.kt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt index ff7f2223ed8..6c87ee025e3 100644 --- a/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt +++ b/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt @@ -209,14 +209,14 @@ class JavaToKotlinAction : AnAction() { } override fun update(e: AnActionEvent) { - if (isRunningInCidrIde) { - e.presentation.isEnabledAndVisible = false - } else { - val virtualFiles = e.getData(CommonDataKeys.VIRTUAL_FILE_ARRAY) ?: return - val project = e.project ?: return + e.presentation.isEnabledAndVisible = isEnabled(e) + } - e.presentation.isEnabled = isAnyJavaFileSelected(project, virtualFiles) - } + private fun isEnabled(e: AnActionEvent): Boolean { + if (isRunningInCidrIde) return false + val virtualFiles = e.getData(CommonDataKeys.VIRTUAL_FILE_ARRAY) ?: return false + val project = e.project ?: return false + return isAnyJavaFileSelected(project, virtualFiles) } private fun isAnyJavaFileSelected(project: Project, files: Array): Boolean {