From bdaf762d9327e7b2087c0a28127a2d704754274d Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Fri, 23 Nov 2018 16:52:13 +0700 Subject: [PATCH] CLion/AppCode: Disable action items in IDE: - Convert Java File to Kotlin File - Decompile Kotlin To Java Issue #KT-28345:fixed --- .../idea/actions/DecompileKotlinToJavaAction.kt | 7 ++++++- .../kotlin/idea/actions/JavaToKotlinAction.kt | 11 ++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/DecompileKotlinToJavaAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/DecompileKotlinToJavaAction.kt index d7ca77e487d..7cace2af94b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/actions/DecompileKotlinToJavaAction.kt +++ b/idea/src/org/jetbrains/kotlin/idea/actions/DecompileKotlinToJavaAction.kt @@ -24,6 +24,7 @@ import com.intellij.openapi.actionSystem.CommonDataKeys import com.intellij.openapi.roots.LibraryOrderEntry import com.intellij.openapi.util.ActionCallback import com.intellij.psi.PsiFile +import com.intellij.util.PlatformUtils import org.jetbrains.kotlin.idea.internal.showDecompiledCode import org.jetbrains.kotlin.psi.KtFile @@ -35,7 +36,11 @@ class DecompileKotlinToJavaAction : AnAction() { } override fun update(e: AnActionEvent) { - e.presentation.isEnabled = getBinaryKotlinFile(e) != null + if (PlatformUtils.isCidr()) { + e.presentation.isEnabledAndVisible = false + } else { + e.presentation.isEnabled = getBinaryKotlinFile(e) != null + } } private fun getBinaryKotlinFile(e: AnActionEvent): KtFile? { diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt index 4d68039f528..1842581f5be 100644 --- a/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt +++ b/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt @@ -42,6 +42,7 @@ import com.intellij.psi.PsiErrorElement import com.intellij.psi.PsiJavaFile import com.intellij.psi.PsiManager import com.intellij.psi.util.PsiTreeUtil +import com.intellij.util.PlatformUtils import org.jetbrains.kotlin.idea.KotlinFileType import org.jetbrains.kotlin.idea.j2k.IdeaJavaToKotlinServices import org.jetbrains.kotlin.idea.j2k.J2kPostProcessor @@ -202,10 +203,14 @@ class JavaToKotlinAction : AnAction() { } override fun update(e: AnActionEvent) { - val virtualFiles = e.getData(CommonDataKeys.VIRTUAL_FILE_ARRAY) ?: return - val project = e.project ?: return + if (PlatformUtils.isCidr()) { + e.presentation.isEnabledAndVisible = false + } else { + val virtualFiles = e.getData(CommonDataKeys.VIRTUAL_FILE_ARRAY) ?: return + val project = e.project ?: return - e.presentation.isEnabled = isAnyJavaFileSelected(project, virtualFiles) + e.presentation.isEnabled = isAnyJavaFileSelected(project, virtualFiles) + } } private fun isAnyJavaFileSelected(project: Project, files: Array): Boolean {