From 90511c734da7d0f6e5581943a2d4d0d6c3dd4073 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Sat, 7 Sep 2019 15:01:39 +0300 Subject: [PATCH] Fix NPE in JavaToKotlinAction (EA-210821) --- .../org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt index ab23b676601..714f2e455ac 100644 --- a/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt +++ b/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt @@ -212,7 +212,8 @@ class JavaToKotlinAction : AnAction() { override fun actionPerformed(e: AnActionEvent) { val javaFiles = selectedJavaFiles(e).filter { it.isWritable }.toList() - val project = CommonDataKeys.PROJECT.getData(e.dataContext)!! + val project = CommonDataKeys.PROJECT.getData(e.dataContext) ?: return + val module = e.getData(LangDataKeys.MODULE) ?: return if (javaFiles.isEmpty()) { val statusBar = WindowManager.getInstance().getStatusBar(project) @@ -222,8 +223,6 @@ class JavaToKotlinAction : AnAction() { .showInCenterOf(statusBar.component) } - - val module = e.getData(LangDataKeys.MODULE)!! if (!J2kConverterExtension.extension().doCheckBeforeConversion(project, module)) return val firstSyntaxError = javaFiles.asSequence().map { PsiTreeUtil.findChildOfType(it, PsiErrorElement::class.java) }.firstOrNull() @@ -261,6 +260,7 @@ class JavaToKotlinAction : AnAction() { if (isRunningInCidrIde) return false val virtualFiles = e.getData(CommonDataKeys.VIRTUAL_FILE_ARRAY) ?: return false val project = e.project ?: return false + e.getData(LangDataKeys.MODULE) ?: return false return isAnyJavaFileSelected(project, virtualFiles) }