azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make JavaToKotlinAction.convertFiles compatible with AS 3.3

Browse Source
This commit is contained in:
Vyacheslav Gerasimov
2018-08-06 14:43:29 +03:00
parent 1972387022
commit 6db2037440
4 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt
+6 -2
View File
@@ -104,7 +104,11 @@ class JavaToKotlinAction : AnAction() {
return result return result
} }
fun convertFiles(javaFiles: List<PsiJavaFile>, project: Project, enableExternalCodeProcessing: Boolean = true): List<KtFile> { fun convertFiles(
javaFiles: List<PsiJavaFile>, project: Project,
enableExternalCodeProcessing: Boolean = true,
askExternalCodeProcessing: Boolean = true
): List<KtFile> {
var converterResult: JavaToKotlinConverter.FilesResult? = null var converterResult: JavaToKotlinConverter.FilesResult? = null
fun convert() { fun convert() {
val converter = JavaToKotlinConverter(project, ConverterSettings.defaultSettings, IdeaJavaToKotlinServices) val converter = JavaToKotlinConverter(project, ConverterSettings.defaultSettings, IdeaJavaToKotlinServices)
@@ -126,7 +130,7 @@ class JavaToKotlinAction : AnAction() {
if (enableExternalCodeProcessing && converterResult!!.externalCodeProcessing != null) { 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?" 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( ProgressManager.getInstance().runProcessWithProgressSynchronously(
{ {
runReadAction { runReadAction {
idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt.181
+6 -2
View File
@@ -100,7 +100,11 @@ class JavaToKotlinAction : AnAction() {
return result return result
} }
fun convertFiles(javaFiles: List<PsiJavaFile>, project: Project, enableExternalCodeProcessing: Boolean = true): List<KtFile> { fun convertFiles(
javaFiles: List<PsiJavaFile>, project: Project,
enableExternalCodeProcessing: Boolean = true,
askExternalCodeProcessing: Boolean = true
): List<KtFile> {
var converterResult: JavaToKotlinConverter.FilesResult? = null var converterResult: JavaToKotlinConverter.FilesResult? = null
fun convert() { fun convert() {
val converter = JavaToKotlinConverter(project, ConverterSettings.defaultSettings, IdeaJavaToKotlinServices) val converter = JavaToKotlinConverter(project, ConverterSettings.defaultSettings, IdeaJavaToKotlinServices)
@@ -122,7 +126,7 @@ class JavaToKotlinAction : AnAction() {
if (enableExternalCodeProcessing && converterResult!!.externalCodeProcessing != null) { 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?" 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( ProgressManager.getInstance().runProcessWithProgressSynchronously(
{ {
runReadAction { runReadAction {
idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt.as31
+5 -3
View File
@@ -99,9 +99,11 @@ class JavaToKotlinAction : AnAction() {
return result return result
} }
fun convertFiles(javaFiles: List<PsiJavaFile>, project: Project, fun convertFiles(
enableExternalCodeProcessing: Boolean = true, javaFiles: List<PsiJavaFile>, project: Project,
askExternalCodeProcessing: Boolean = true): List<KtFile> { enableExternalCodeProcessing: Boolean = true,
askExternalCodeProcessing: Boolean = true
): List<KtFile> {
var converterResult: JavaToKotlinConverter.FilesResult? = null var converterResult: JavaToKotlinConverter.FilesResult? = null
fun convert() { fun convert() {
val converter = JavaToKotlinConverter(project, ConverterSettings.defaultSettings, IdeaJavaToKotlinServices) val converter = JavaToKotlinConverter(project, ConverterSettings.defaultSettings, IdeaJavaToKotlinServices)
idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt.as32
+5 -3
View File
@@ -99,9 +99,11 @@ class JavaToKotlinAction : AnAction() {
return result return result
} }
fun convertFiles(javaFiles: List<PsiJavaFile>, project: Project, fun convertFiles(
enableExternalCodeProcessing: Boolean = true, javaFiles: List<PsiJavaFile>, project: Project,
askExternalCodeProcessing: Boolean = true): List<KtFile> { enableExternalCodeProcessing: Boolean = true,
askExternalCodeProcessing: Boolean = true
): List<KtFile> {
var converterResult: JavaToKotlinConverter.FilesResult? = null var converterResult: JavaToKotlinConverter.FilesResult? = null
fun convert() { fun convert() {
val converter = JavaToKotlinConverter(project, ConverterSettings.defaultSettings, IdeaJavaToKotlinServices) val converter = JavaToKotlinConverter(project, ConverterSettings.defaultSettings, IdeaJavaToKotlinServices)