From 580885245d4eb6ed37d9131a39e5ec1f0a50835b Mon Sep 17 00:00:00 2001 From: Dmitry Gridin Date: Tue, 3 Dec 2019 14:00:34 +0700 Subject: [PATCH] JavaToKotlinAction: fix KNPE #EA-215300 Fixed --- .../jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt | 8 +++++--- 1 file changed, 5 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 92dd83c9744..ef67b6be1c3 100644 --- a/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt +++ b/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt @@ -172,7 +172,9 @@ class JavaToKotlinAction : AnAction() { var externalCodeUpdate: ((List) -> Unit)? = null - if (enableExternalCodeProcessing && converterResult!!.externalCodeProcessing != null) { + val result = converterResult ?: return emptyList() + val externalCodeProcessing = result.externalCodeProcessing + if (enableExternalCodeProcessing && externalCodeProcessing != null) { val question = "Some code in the rest of your project may require corrections after performing this conversion. Do you want to find such code and correct it too?" if (!askExternalCodeProcessing || (Messages.showYesNoDialog( @@ -185,7 +187,7 @@ class JavaToKotlinAction : AnAction() { ProgressManager.getInstance().runProcessWithProgressSynchronously( { runReadAction { - externalCodeUpdate = converterResult!!.externalCodeProcessing!!.prepareWriteOperation( + externalCodeUpdate = externalCodeProcessing.prepareWriteOperation( ProgressManager.getInstance().progressIndicator!! ) } @@ -200,7 +202,7 @@ class JavaToKotlinAction : AnAction() { return project.executeWriteCommand("Convert files from Java to Kotlin", null) { CommandProcessor.getInstance().markCurrentCommandAsGlobal(project) - val newFiles = saveResults(javaFiles, converterResult!!.results) + val newFiles = saveResults(javaFiles, result.results) .map { it.toPsiFile(project) as KtFile } .onEach { it.commitAndUnblockDocument() }