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

New J2K: Fix converters spliting

Browse Source
This commit is contained in:
Ilya Kirillov
2019-03-28 14:15:47 +03:00
committed by Ilya Kirillov
parent db2ad96f00
commit 02a206bf7c
4 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt
+6 -2
View File
@@ -67,6 +67,7 @@ data class FilesResult(val results: List<String>, val externalCodeProcessing: Ex
abstract class JavaToKotlinConverter(private val project: Project) {
protected abstract fun elementsToKotlin(inputElements: List<PsiElement>, processor: WithProgressProcessor): Result
protected abstract fun createDummyKtFile(text: String, project: Project, context: PsiElement): KtFile
private val LOG = Logger.getInstance("#org.jetbrains.kotlin.j2k.JavaToKotlinConverter")
@@ -84,7 +85,7 @@ abstract class JavaToKotlinConverter(private val project: Project) {
val (i, result) = pair
try {
val kotlinFile = ApplicationManager.getApplication().runReadAction(Computable {
KtPsiFactory(project).createFileWithLightClassSupport("dummy.kt", result!!.text, files[i])
createDummyKtFile(result!!.text, project, files[i])
})
@@ -119,7 +120,10 @@ class OldJavaToKotlinConverter(
private val services: JavaToKotlinConverterServices
) : JavaToKotlinConverter(project) {
protected override fun elementsToKotlin(inputElements: List<PsiElement>, processor: WithProgressProcessor): Result {
override fun createDummyKtFile(text: String, project: Project, context: PsiElement): KtFile =
KtPsiFactory(project).createAnalyzableFile("dummy.kt", text, context)
override fun elementsToKotlin(inputElements: List<PsiElement>, processor: WithProgressProcessor): Result {
try {
val usageProcessings = LinkedHashMap<PsiElement, MutableCollection<UsageProcessing>>()
val usageProcessingCollector: (UsageProcessing) -> Unit = {