diff --git a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/KotlinIconProviderBase.kt b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/KotlinIconProviderBase.kt index 4a3936ccf04..148ca7913f1 100644 --- a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/KotlinIconProviderBase.kt +++ b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/KotlinIconProviderBase.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.asJava.unwrapped import org.jetbrains.kotlin.idea.asJava.LightClassProvider.Companion.providedIsKtLightClassForDecompiledDeclaration import org.jetbrains.kotlin.idea.KotlinIconsIndependent.ACTUAL import org.jetbrains.kotlin.idea.KotlinIconsIndependent.EXPECT -import org.jetbrains.kotlin.idea.search.ifTrue +import org.jetbrains.kotlin.idea.util.ifTrue import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject diff --git a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt index 04e34bf8c5b..8730bc34631 100644 --- a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt +++ b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt @@ -48,6 +48,7 @@ import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchOpt import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchOptions.Companion.calculateEffectiveScope import org.jetbrains.kotlin.idea.search.usagesSearch.operators.OperatorReferenceSearcher import org.jetbrains.kotlin.idea.util.application.runReadAction +import org.jetbrains.kotlin.idea.util.ifTrue import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.* import java.util.* diff --git a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/search/searchUtil.kt b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/search/searchUtil.kt index be92150fc07..651e6ad7e61 100644 --- a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/search/searchUtil.kt +++ b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/search/searchUtil.kt @@ -148,8 +148,6 @@ fun findScriptsWithUsages(declaration: KtNamedDeclaration): List { .toList() } -inline fun Boolean.ifTrue(body: () -> T?): T? = if (this) body() else null - data class ReceiverTypeSearcherInfo( val psiClass: PsiClass?, val containsTypeOrDerivedInside: ((KtDeclaration) -> Boolean) diff --git a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/OperatorReferenceSearcher.kt b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/OperatorReferenceSearcher.kt index 0ada1b9c1ba..4f794c0d68f 100644 --- a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/OperatorReferenceSearcher.kt +++ b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/OperatorReferenceSearcher.kt @@ -18,12 +18,12 @@ import org.jetbrains.kotlin.idea.search.KotlinSearchUsagesSupport.Companion.forc import org.jetbrains.kotlin.idea.search.KotlinSearchUsagesSupport.Companion.getReceiverTypeSearcherInfo import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchOptions import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinRequestResultProcessor -import org.jetbrains.kotlin.idea.search.ifTrue import org.jetbrains.kotlin.idea.search.restrictToKotlinSources import org.jetbrains.kotlin.idea.search.usagesSearch.ExpressionsOfTypeProcessor import org.jetbrains.kotlin.idea.search.usagesSearch.ExpressionsOfTypeProcessor.Companion.logPresentation import org.jetbrains.kotlin.idea.search.usagesSearch.ExpressionsOfTypeProcessor.Companion.testLog import org.jetbrains.kotlin.idea.util.application.runReadAction +import org.jetbrains.kotlin.idea.util.ifTrue import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.* diff --git a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/util/utilsIndependent.kt b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/util/utilsIndependent.kt new file mode 100644 index 00000000000..c32e3e8b67c --- /dev/null +++ b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/util/utilsIndependent.kt @@ -0,0 +1,10 @@ +/* + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.idea.util + +inline fun Boolean.ifTrue(body: () -> T?): T? = if (this) body() else null + +inline fun Boolean.ifFalse(body: () -> T?): T? = if (!this) body() else null \ No newline at end of file