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

Fixed dialog with suggestion to process external code shown even when there is nothing to process

Browse Source
This commit is contained in:
Valentin Kipyatkov
2016-05-05 17:11:06 +03:00
parent 48ba63fa27
commit 7b1bf4c7dd
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt
+3 -3
View File
@@ -152,7 +152,7 @@ class JavaToKotlinConverter(
val map: Map<PsiElement, Collection<UsageProcessing>> = usageProcessings.values val map: Map<PsiElement, Collection<UsageProcessing>> = usageProcessings.values
.flatMap { it } .flatMap { it }
.filter { it.javaCodeProcessors != null || it.kotlinCodeProcessors != null } .filter { it.javaCodeProcessors.isNotEmpty() || it.kotlinCodeProcessors.isNotEmpty() }
.groupBy { it.targetElement } .groupBy { it.targetElement }
if (map.isEmpty()) return null if (map.isEmpty()) return null
@@ -171,8 +171,8 @@ class JavaToKotlinConverter(
ProgressManager.getInstance().runProcess( ProgressManager.getInstance().runProcess(
{ {
val searchJava = processings.any { it.javaCodeProcessors != null } val searchJava = processings.any { it.javaCodeProcessors.isNotEmpty() }
val searchKotlin = processings.any { it.kotlinCodeProcessors != null } val searchKotlin = processings.any { it.kotlinCodeProcessors.isNotEmpty() }
services.referenceSearcher.findUsagesForExternalCodeProcessing(psiElement, searchJava, searchKotlin) services.referenceSearcher.findUsagesForExternalCodeProcessing(psiElement, searchJava, searchKotlin)
.filterNot { inConversionScope(it.element) } .filterNot { inConversionScope(it.element) }
.mapTo(refs) { ReferenceInfo(it, psiElement, it.element.containingFile, processings) } .mapTo(refs) { ReferenceInfo(it, psiElement, it.element.containingFile, processings) }