From 6db20374403aec198a47dbbf42199efb5c68a266 Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Mon, 6 Aug 2018 14:43:29 +0300 Subject: [PATCH] Make JavaToKotlinAction.convertFiles compatible with AS 3.3 --- .../jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt | 8 ++++++-- .../kotlin/idea/actions/JavaToKotlinAction.kt.181 | 8 ++++++-- .../kotlin/idea/actions/JavaToKotlinAction.kt.as31 | 8 +++++--- .../kotlin/idea/actions/JavaToKotlinAction.kt.as32 | 8 +++++--- 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt index 7c0eef36e22..4d68039f528 100644 --- a/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt +++ b/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt @@ -104,7 +104,11 @@ class JavaToKotlinAction : AnAction() { return result } - fun convertFiles(javaFiles: List, project: Project, enableExternalCodeProcessing: Boolean = true): List { + fun convertFiles( + javaFiles: List, project: Project, + enableExternalCodeProcessing: Boolean = true, + askExternalCodeProcessing: Boolean = true + ): List { var converterResult: JavaToKotlinConverter.FilesResult? = null fun convert() { val converter = JavaToKotlinConverter(project, ConverterSettings.defaultSettings, IdeaJavaToKotlinServices) @@ -126,7 +130,7 @@ class JavaToKotlinAction : AnAction() { if (enableExternalCodeProcessing && converterResult!!.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 (Messages.showOkCancelDialog(project, question, title, Messages.getQuestionIcon()) == Messages.OK) { + if (!askExternalCodeProcessing || (Messages.showOkCancelDialog(project, question, title, Messages.getQuestionIcon()) == Messages.OK)) { ProgressManager.getInstance().runProcessWithProgressSynchronously( { runReadAction { diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt.181 b/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt.181 index a6fa0673bba..3855662ad02 100644 --- a/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt.181 +++ b/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt.181 @@ -100,7 +100,11 @@ class JavaToKotlinAction : AnAction() { return result } - fun convertFiles(javaFiles: List, project: Project, enableExternalCodeProcessing: Boolean = true): List { + fun convertFiles( + javaFiles: List, project: Project, + enableExternalCodeProcessing: Boolean = true, + askExternalCodeProcessing: Boolean = true + ): List { var converterResult: JavaToKotlinConverter.FilesResult? = null fun convert() { val converter = JavaToKotlinConverter(project, ConverterSettings.defaultSettings, IdeaJavaToKotlinServices) @@ -122,7 +126,7 @@ class JavaToKotlinAction : AnAction() { if (enableExternalCodeProcessing && converterResult!!.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 (Messages.showOkCancelDialog(project, question, title, Messages.getQuestionIcon()) == Messages.OK) { + if (!askExternalCodeProcessing || (Messages.showOkCancelDialog(project, question, title, Messages.getQuestionIcon()) == Messages.OK)) { ProgressManager.getInstance().runProcessWithProgressSynchronously( { runReadAction { diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt.as31 b/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt.as31 index 4df096b1f96..d8b581545c8 100644 --- a/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt.as31 +++ b/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt.as31 @@ -99,9 +99,11 @@ class JavaToKotlinAction : AnAction() { return result } - fun convertFiles(javaFiles: List, project: Project, - enableExternalCodeProcessing: Boolean = true, - askExternalCodeProcessing: Boolean = true): List { + fun convertFiles( + javaFiles: List, project: Project, + enableExternalCodeProcessing: Boolean = true, + askExternalCodeProcessing: Boolean = true + ): List { var converterResult: JavaToKotlinConverter.FilesResult? = null fun convert() { val converter = JavaToKotlinConverter(project, ConverterSettings.defaultSettings, IdeaJavaToKotlinServices) diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt.as32 b/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt.as32 index 4df096b1f96..d8b581545c8 100644 --- a/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt.as32 +++ b/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt.as32 @@ -99,9 +99,11 @@ class JavaToKotlinAction : AnAction() { return result } - fun convertFiles(javaFiles: List, project: Project, - enableExternalCodeProcessing: Boolean = true, - askExternalCodeProcessing: Boolean = true): List { + fun convertFiles( + javaFiles: List, project: Project, + enableExternalCodeProcessing: Boolean = true, + askExternalCodeProcessing: Boolean = true + ): List { var converterResult: JavaToKotlinConverter.FilesResult? = null fun convert() { val converter = JavaToKotlinConverter(project, ConverterSettings.defaultSettings, IdeaJavaToKotlinServices)