From 7b1bf4c7ddc530fe72bc4ba1b2d93f9ee698df33 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Thu, 5 May 2016 17:11:06 +0300 Subject: [PATCH] Fixed dialog with suggestion to process external code shown even when there is nothing to process --- j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt index 3994d4c5bc8..f0e2cca8765 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt @@ -152,7 +152,7 @@ class JavaToKotlinConverter( val map: Map> = usageProcessings.values .flatMap { it } - .filter { it.javaCodeProcessors != null || it.kotlinCodeProcessors != null } + .filter { it.javaCodeProcessors.isNotEmpty() || it.kotlinCodeProcessors.isNotEmpty() } .groupBy { it.targetElement } if (map.isEmpty()) return null @@ -171,8 +171,8 @@ class JavaToKotlinConverter( ProgressManager.getInstance().runProcess( { - val searchJava = processings.any { it.javaCodeProcessors != null } - val searchKotlin = processings.any { it.kotlinCodeProcessors != null } + val searchJava = processings.any { it.javaCodeProcessors.isNotEmpty() } + val searchKotlin = processings.any { it.kotlinCodeProcessors.isNotEmpty() } services.referenceSearcher.findUsagesForExternalCodeProcessing(psiElement, searchJava, searchKotlin) .filterNot { inConversionScope(it.element) } .mapTo(refs) { ReferenceInfo(it, psiElement, it.element.containingFile, processings) }