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

New J2K: Fix collected import inserting in J2K

Browse Source
This commit is contained in:
Ilya Kirillov
2019-03-28 16:37:42 +03:00
committed by Ilya Kirillov
parent 1dd0a42298
commit 5ab9d6bba8
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt
+12 -4
View File
@@ -19,6 +19,7 @@ package org.jetbrains.kotlin.j2k
import com.intellij.codeInsight.documentation.DocumentationManager import com.intellij.codeInsight.documentation.DocumentationManager
import com.intellij.lang.java.JavaLanguage import com.intellij.lang.java.JavaLanguage
import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.application.ModalityState
import com.intellij.openapi.command.CommandProcessor import com.intellij.openapi.command.CommandProcessor
import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.diagnostic.Logger
import com.intellij.openapi.editor.Document import com.intellij.openapi.editor.Document
@@ -28,7 +29,10 @@ import com.intellij.openapi.project.Project
import com.intellij.openapi.util.Computable import com.intellij.openapi.util.Computable
import com.intellij.psi.* import com.intellij.psi.*
import com.intellij.psi.impl.source.DummyHolder import com.intellij.psi.impl.source.DummyHolder
import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.withContext
import org.jetbrains.kotlin.idea.KotlinLanguage import org.jetbrains.kotlin.idea.KotlinLanguage
import org.jetbrains.kotlin.idea.core.util.EDT
import org.jetbrains.kotlin.j2k.ast.Element import org.jetbrains.kotlin.j2k.ast.Element
import org.jetbrains.kotlin.j2k.usageProcessing.ExternalCodeProcessor import org.jetbrains.kotlin.j2k.usageProcessing.ExternalCodeProcessor
import org.jetbrains.kotlin.j2k.usageProcessing.UsageProcessing import org.jetbrains.kotlin.j2k.usageProcessing.UsageProcessing
@@ -89,11 +93,15 @@ abstract class JavaToKotlinConverter(private val project: Project) {
}) })
CommandProcessor.getInstance().executeCommand(project, { CommandProcessor.getInstance().runUndoTransparentAction {
result!!.importsToAdd.forEach { runBlocking(EDT.ModalityStateElement(ModalityState.defaultModalityState())) {
postProcessor.insertImport(kotlinFile, it) withContext(EDT) {
result!!.importsToAdd.forEach {
postProcessor.insertImport(kotlinFile, it)
}
}
} }
}, "Adding imports to Kotlin code", null) }
AfterConversionPass(project, postProcessor).run(kotlinFile, range = null) AfterConversionPass(project, postProcessor).run(kotlinFile, range = null)