JavaToKotlinAction: fix KNPE

#EA-215300 Fixed
This commit is contained in:
Dmitry Gridin
2019-12-03 14:00:34 +07:00
parent 34dcc72e7f
commit 580885245d
@@ -172,7 +172,9 @@ class JavaToKotlinAction : AnAction() {
var externalCodeUpdate: ((List<KtFile>) -> 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() }