From 7fb3e939a4e16c7528bdd29624a4d33fbab6d19a Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Wed, 8 May 2024 21:10:42 +0200 Subject: [PATCH] [kotlin] find usages: cleanup - refactoring - remove K2_IGNORE_LOG after 734ecff5131d387c1bcb176f7905285f5e994b26 which ignores log in k2 case anyway GitOrigin-RevId: f35cc8b40c388d91a4039cee6c2291975878e265 --- .../kotlin/idea/search/ExpectActualUtils.kt | 12 +++++++++ .../KotlinReferencesSearcher.kt | 27 ++++++------------- .../kotlin/idea/base/test/IgnoreTests.kt | 1 - .../ConventionUsages.0.java | 1 - .../JavaWithGroovyInvoke.0.java | 1 - .../MismatchedAccessor.0.java | 1 - .../javaComponentFunctions.0.java | 1 - .../findJavaMethodUsages/javaInvoke.0.java | 1 - .../javaInvokeWithStaticImport.0.java | 1 - .../kotlin/conventions/compareTo.0.kt | 1 - .../kotlin/conventions/components/SAM.0.kt | 2 +- .../components/callableReferences.0.kt | 2 +- .../components/companionObjectAccess.0.kt | 1 - .../componentFunForGenericType1.0.kt | 2 +- .../componentFunForGenericType2.0.kt | 2 +- .../conventions/components/dataClass.0.kt | 2 +- .../components/dataClassComponentByRef.0.kt | 2 +- .../dataClassComponentByRefLocal.0.kt | 2 +- .../components/dataClassInsideDataClass.0.kt | 2 +- .../components/extensionComponentFun.0.kt | 2 +- .../kotlin/conventions/components/for.0.kt | 2 +- .../conventions/components/isAndAs.0.kt | 2 +- .../conventions/components/lambdas.0.kt | 2 +- .../components/mayTypeAffectAncestors.0.kt | 2 +- .../components/memberComponentFun.0.kt | 2 +- .../conventions/components/operators.0.kt | 2 +- .../components/propertyDelegate.0.kt | 2 +- .../components/recursiveDataClass1.0.kt | 2 +- .../components/recursiveDataClass2.0.kt | 2 +- .../kotlin/conventions/components/when.0.kt | 2 +- .../kotlin/conventions/contains.0.kt | 1 - .../kotlin/conventions/forIteration.0.kt | 1 - .../findUsages/kotlin/conventions/get.0.kt | 1 - .../conventions/getAsPropertyDelegate.0.kt | 1 - .../findUsages/kotlin/conventions/inc.0.kt | 1 - .../invokeAsTypeParameterExtension.0.kt | 1 - ...AsTypeParameterExtensionWithSmartCast.0.kt | 1 - .../invoke/invokeInObjectAsFunction.0.kt | 2 +- .../conventions/invoke/suspendInvoke.0.kt | 2 +- .../kotlin/conventions/invokeExtension.0.kt | 1 - .../kotlin/conventions/invokeWithVarArg.0.kt | 1 - .../findUsages/kotlin/conventions/plus.0.kt | 1 - .../kotlin/conventions/plusAssign.0.kt | 1 - .../conventions/setAsPropertyDelegate.0.kt | 1 - .../kotlin/conventions/severalOperators.0.kt | 1 - .../kotlin/conventions/unaryMinus.0.kt | 1 - ...otlinComponentFunctionParameterUsages.0.kt | 1 - .../findClassConstructors/js/js.kt | 1 - .../js/js.kt | 1 - .../findDataComponentInJs/js/js.kt | 1 - .../findImportAlias/js/js.kt | 1 - .../findJvmFromActualJs/js/js.kt | 1 - .../findParameterInOverride/js/js.kt | 1 - 53 files changed, 41 insertions(+), 70 deletions(-) diff --git a/plugins/kotlin/base/analysis/src/org/jetbrains/kotlin/idea/search/ExpectActualUtils.kt b/plugins/kotlin/base/analysis/src/org/jetbrains/kotlin/idea/search/ExpectActualUtils.kt index 910010a308ca..e71dddfaf415 100644 --- a/plugins/kotlin/base/analysis/src/org/jetbrains/kotlin/idea/search/ExpectActualUtils.kt +++ b/plugins/kotlin/base/analysis/src/org/jetbrains/kotlin/idea/search/ExpectActualUtils.kt @@ -2,10 +2,13 @@ package org.jetbrains.kotlin.idea.search import com.intellij.openapi.module.Module +import com.intellij.psi.PsiNamedElement import org.jetbrains.kotlin.idea.base.psi.isExpectDeclaration +import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchOptions import org.jetbrains.kotlin.psi.KtCallableDeclaration import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtParameter +import org.jetbrains.kotlin.psi.psiUtil.hasActualModifier object ExpectActualUtils { fun KtDeclaration.expectedDeclarationIfAny(): KtDeclaration? = @@ -30,4 +33,13 @@ object ExpectActualUtils { val actuals = expect.actualsForExpected() return listOf(expect) + actuals } + + fun getElementToSearch( + kotlinOptions: KotlinReferencesSearchOptions, + unwrappedElement: PsiNamedElement + ): PsiNamedElement = if (kotlinOptions.searchForExpectedUsages && unwrappedElement is KtDeclaration && unwrappedElement.hasActualModifier()) { + unwrappedElement.expectedDeclarationIfAny() as? PsiNamedElement + } else { + null + } ?: unwrappedElement } \ No newline at end of file diff --git a/plugins/kotlin/base/analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt b/plugins/kotlin/base/analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt index 1443add41ed4..57a09dbbec3b 100644 --- a/plugins/kotlin/base/analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt +++ b/plugins/kotlin/base/analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt @@ -34,7 +34,7 @@ import org.jetbrains.kotlin.idea.base.util.restrictToKotlinSources import org.jetbrains.kotlin.idea.references.KtSimpleNameReference import org.jetbrains.kotlin.idea.references.mainReference import org.jetbrains.kotlin.idea.search.ExpectActualSupport -import org.jetbrains.kotlin.idea.search.ExpectActualUtils.expectedDeclarationIfAny +import org.jetbrains.kotlin.idea.search.ExpectActualUtils.getElementToSearch import org.jetbrains.kotlin.idea.search.KOTLIN_NAMED_ARGUMENT_SEARCH_CONTEXT import org.jetbrains.kotlin.idea.search.KotlinSearchUsagesSupport.SearchUtils.dataClassComponentMethodName import org.jetbrains.kotlin.idea.search.KotlinSearchUsagesSupport.SearchUtils.filterDataClassComponentsIfDisabled @@ -47,7 +47,6 @@ import org.jetbrains.kotlin.idea.search.usagesSearch.operators.OperatorReference import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.getQualifiedElementSelector import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType -import org.jetbrains.kotlin.psi.psiUtil.hasActualModifier import org.jetbrains.kotlin.psi.psiUtil.parameterIndex import org.jetbrains.kotlin.psi.psiUtil.parents import org.jetbrains.kotlin.utils.addToStdlib.safeAs @@ -101,12 +100,7 @@ class KotlinAliasedImportedElementSearcher : QueryExecutorBase -> { - val psiMethods = findAllRelatedActuals(element) + val psiMethods = findAllRelatedActualsOrSelf(element) .filterIsInstance>() .flatMap { getLightClassMethods(it) } @@ -324,7 +313,7 @@ class KotlinReferencesSearcher : QueryExecutorBase { - val propertyAccessors = findAllRelatedActuals(element) + val propertyAccessors = findAllRelatedActualsOrSelf(element) .filterIsInstance() .map { getLightClassPropertyMethods(it) } propertyAccessors.forEach { propertyAccessor -> @@ -367,7 +356,7 @@ class KotlinReferencesSearcher : QueryExecutorBase() .flatMap { it.toLightElements() } .toList() @@ -390,7 +379,7 @@ class KotlinReferencesSearcher : QueryExecutorBase { + private fun findAllRelatedActualsOrSelf(element: KtDeclaration): Set { val expectActualSupport = ExpectActualSupport.getInstance(element.project) return when { element.isExpectDeclaration() -> expectActualSupport.actualsForExpected(element) @@ -409,7 +398,7 @@ class KotlinReferencesSearcher : QueryExecutorBasea: Int, val b: String) -// IGNORE_K2_LOG + // IGNORE_PLATFORM_JS: Java-specific code // IGNORE_PLATFORM_NATIVE: Java-specific code diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/callableReferences.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/callableReferences.0.kt index fc1a010a56a8..d0ef03368a63 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/callableReferences.0.kt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/callableReferences.0.kt @@ -28,6 +28,6 @@ fun foo(x: X) { -// IGNORE_K2_LOG + // IGNORE_PLATFORM_JS: Java-specific code // IGNORE_PLATFORM_NATIVE: Java-specific code diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/companionObjectAccess.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/companionObjectAccess.0.kt index 3d1002668d67..569cf68c6729 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/companionObjectAccess.0.kt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/companionObjectAccess.0.kt @@ -16,4 +16,3 @@ fun foo() { -// IGNORE_K2_LOG \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/componentFunForGenericType1.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/componentFunForGenericType1.0.kt index caa2a54722f2..05037d28ba45 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/componentFunForGenericType1.0.kt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/componentFunForGenericType1.0.kt @@ -15,4 +15,4 @@ fun test() { -// IGNORE_K2_LOG + diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/componentFunForGenericType2.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/componentFunForGenericType2.0.kt index 7f508a73fb3d..26fbd8721dc9 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/componentFunForGenericType2.0.kt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/componentFunForGenericType2.0.kt @@ -22,4 +22,4 @@ fun test() { } -// IGNORE_K2_LOG + diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/dataClass.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/dataClass.0.kt index bcf5b81afeb7..22e356944211 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/dataClass.0.kt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/dataClass.0.kt @@ -30,6 +30,6 @@ fun T.getThis(): T = this -// IGNORE_K2_LOG + // IGNORE_PLATFORM_JS: Java-specific code // IGNORE_PLATFORM_NATIVE: Java-specific code diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/dataClassComponentByRef.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/dataClassComponentByRef.0.kt index 9e95bc6187e5..7a77098a81ad 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/dataClassComponentByRef.0.kt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/dataClassComponentByRef.0.kt @@ -13,4 +13,4 @@ fun test() { } -// IGNORE_K2_LOG + diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/dataClassComponentByRefLocal.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/dataClassComponentByRefLocal.0.kt index e88741877882..3b5605ced7f0 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/dataClassComponentByRefLocal.0.kt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/dataClassComponentByRefLocal.0.kt @@ -12,4 +12,4 @@ fun test() { } -// IGNORE_K2_LOG + diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/dataClassInsideDataClass.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/dataClassInsideDataClass.0.kt index 4d25e527cecb..8cbb7b28fb49 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/dataClassInsideDataClass.0.kt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/dataClassInsideDataClass.0.kt @@ -19,4 +19,4 @@ fun f(b: B, c: C) { } -// IGNORE_K2_LOG + diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/extensionComponentFun.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/extensionComponentFun.0.kt index 8128fcc4cad8..d29a8305141f 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/extensionComponentFun.0.kt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/extensionComponentFun.0.kt @@ -32,4 +32,4 @@ fun g(z1: Z1, z2: Z2) { } -// IGNORE_K2_LOG + diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/for.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/for.0.kt index 02c630cc709f..991b225d0af3 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/for.0.kt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/for.0.kt @@ -14,4 +14,4 @@ fun test() { } -// IGNORE_K2_LOG + diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/isAndAs.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/isAndAs.0.kt index 9cca9fe6ab3a..adac6d465f99 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/isAndAs.0.kt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/isAndAs.0.kt @@ -17,4 +17,4 @@ fun y(o: Any) { } -// IGNORE_K2_LOG + diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/lambdas.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/lambdas.0.kt index 705a35b9f528..5596184fc854 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/lambdas.0.kt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/lambdas.0.kt @@ -43,4 +43,4 @@ fun f() { -// IGNORE_K2_LOG + diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/mayTypeAffectAncestors.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/mayTypeAffectAncestors.0.kt index 1e98e980f650..bb4a0e33222b 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/mayTypeAffectAncestors.0.kt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/mayTypeAffectAncestors.0.kt @@ -35,4 +35,4 @@ fun y3(a: A) { -// IGNORE_K2_LOG + diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/memberComponentFun.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/memberComponentFun.0.kt index 3e62b7a3ea73..99528e60ad56 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/memberComponentFun.0.kt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/memberComponentFun.0.kt @@ -30,4 +30,4 @@ fun test() { } -// IGNORE_K2_LOG + diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/operators.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/operators.0.kt index 18b1f0587a2d..56884a9ee1c8 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/operators.0.kt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/operators.0.kt @@ -18,4 +18,4 @@ fun f(b1: B, b2: B) { } -// IGNORE_K2_LOG + diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/propertyDelegate.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/propertyDelegate.0.kt index 8723581f6dd9..ab888b5183fc 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/propertyDelegate.0.kt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/propertyDelegate.0.kt @@ -22,4 +22,4 @@ class Key { fun get(): Value = null as Value } -// IGNORE_K2_LOG + diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/recursiveDataClass1.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/recursiveDataClass1.0.kt index 9ea3bda701f1..01214fd27f46 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/recursiveDataClass1.0.kt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/recursiveDataClass1.0.kt @@ -12,4 +12,4 @@ fun f(a: A) { -// IGNORE_K2_LOG + diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/recursiveDataClass2.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/recursiveDataClass2.0.kt index 5c9e571b907c..db4835b015a7 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/recursiveDataClass2.0.kt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/recursiveDataClass2.0.kt @@ -11,4 +11,4 @@ fun f(a: A) { val (a1, s) = b } -// IGNORE_K2_LOG + diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/when.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/when.0.kt index 0656c4329713..6c22e08ed300 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/when.0.kt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/when.0.kt @@ -28,4 +28,4 @@ fun when2(o: Any) { } } -// IGNORE_K2_LOG + diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/contains.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/contains.0.kt index 9f351803e12b..32478c9f18e7 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/contains.0.kt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/contains.0.kt @@ -17,4 +17,3 @@ fun test() { } -// IGNORE_K2_LOG \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/forIteration.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/forIteration.0.kt index 6fb2ae804643..710e6e591190 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/forIteration.0.kt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/forIteration.0.kt @@ -22,4 +22,3 @@ fun test() { } -// IGNORE_K2_LOG \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/get.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/get.0.kt index ffc987d2b6a7..403a573c4e13 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/get.0.kt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/get.0.kt @@ -20,4 +20,3 @@ typealias DescriptorData = C class C -// IGNORE_K2_LOG \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/getAsPropertyDelegate.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/getAsPropertyDelegate.0.kt index 7828b895ee7f..42497a358c50 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/getAsPropertyDelegate.0.kt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/getAsPropertyDelegate.0.kt @@ -11,4 +11,3 @@ class Delegate() { val p: String by Delegate() -// IGNORE_K2_LOG \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/inc.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/inc.0.kt index 3d146a06d17d..8abcaa04a718 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/inc.0.kt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/inc.0.kt @@ -14,4 +14,3 @@ fun test() { } -// IGNORE_K2_LOG \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invoke/invokeAsTypeParameterExtension.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invoke/invokeAsTypeParameterExtension.0.kt index 1f4dae6441ad..096c1dad9199 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invoke/invokeAsTypeParameterExtension.0.kt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invoke/invokeAsTypeParameterExtension.0.kt @@ -15,4 +15,3 @@ fun test() { } -// IGNORE_K2_LOG \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invoke/invokeAsTypeParameterExtensionWithSmartCast.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invoke/invokeAsTypeParameterExtensionWithSmartCast.0.kt index f42b8c30e123..1b4bd0315799 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invoke/invokeAsTypeParameterExtensionWithSmartCast.0.kt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invoke/invokeAsTypeParameterExtensionWithSmartCast.0.kt @@ -19,4 +19,3 @@ fun test() { } -// IGNORE_K2_LOG \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invoke/invokeInObjectAsFunction.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invoke/invokeInObjectAsFunction.0.kt index 0f5a7170b791..3ce7291f1a90 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invoke/invokeInObjectAsFunction.0.kt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invoke/invokeInObjectAsFunction.0.kt @@ -13,4 +13,4 @@ fun test() { Foo() } -// IGNORE_K2_LOG + diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invoke/suspendInvoke.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invoke/suspendInvoke.0.kt index 6880988e5a1c..3fb3ffc7fc6e 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invoke/suspendInvoke.0.kt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invoke/suspendInvoke.0.kt @@ -11,4 +11,4 @@ suspend fun main() { a.invoke() } -// IGNORE_K2_LOG + diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invokeExtension.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invokeExtension.0.kt index 77fab33a9084..59c9edbafe69 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invokeExtension.0.kt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invokeExtension.0.kt @@ -13,4 +13,3 @@ fun f(p: P) { } -// IGNORE_K2_LOG \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invokeWithVarArg.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invokeWithVarArg.0.kt index 4d3af65c145c..3cc734097aa4 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invokeWithVarArg.0.kt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invokeWithVarArg.0.kt @@ -16,4 +16,3 @@ fun f(p: P) { } -// IGNORE_K2_LOG \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/plus.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/plus.0.kt index d95a3d4faab8..a4d1f8e82429 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/plus.0.kt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/plus.0.kt @@ -24,4 +24,3 @@ fun test(array: Array) { } -// IGNORE_K2_LOG \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/plusAssign.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/plusAssign.0.kt index df057c102032..6a0a24640c71 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/plusAssign.0.kt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/plusAssign.0.kt @@ -20,4 +20,3 @@ fun test() { } -// IGNORE_K2_LOG \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/setAsPropertyDelegate.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/setAsPropertyDelegate.0.kt index f62ac3f25bb7..2b2e0f2993a6 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/setAsPropertyDelegate.0.kt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/setAsPropertyDelegate.0.kt @@ -15,4 +15,3 @@ class Delegate() { var p: String by Delegate() -// IGNORE_K2_LOG \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/severalOperators.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/severalOperators.0.kt index 69baa38b6a7a..a26808caa391 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/severalOperators.0.kt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/severalOperators.0.kt @@ -41,4 +41,3 @@ fun test4() { } -// IGNORE_K2_LOG \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/unaryMinus.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/unaryMinus.0.kt index c3b54aac8318..05bd7ee3742a 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/unaryMinus.0.kt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/unaryMinus.0.kt @@ -12,4 +12,3 @@ fun test() { } -// IGNORE_K2_LOG \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findParameterUsages/kotlinComponentFunctionParameterUsages.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findParameterUsages/kotlinComponentFunctionParameterUsages.0.kt index 1d4fef1364b4..823171d6a6ab 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findParameterUsages/kotlinComponentFunctionParameterUsages.0.kt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findParameterUsages/kotlinComponentFunctionParameterUsages.0.kt @@ -10,4 +10,3 @@ package test public data class KotlinDataClass(val foo: Int, val bar: String) -// IGNORE_K2_LOG \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/multiModuleFindUsages/findClassConstructors/js/js.kt b/plugins/kotlin/idea/tests/testData/multiModuleFindUsages/findClassConstructors/js/js.kt index 814f9e16810f..d23dd5b27279 100644 --- a/plugins/kotlin/idea/tests/testData/multiModuleFindUsages/findClassConstructors/js/js.kt +++ b/plugins/kotlin/idea/tests/testData/multiModuleFindUsages/findClassConstructors/js/js.kt @@ -2,4 +2,3 @@ // OPTIONS: constructorUsages, expected actual open class Clazz004 actual constructor() val a1 = Clazz004() -// IGNORE_K2_LOG \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/multiModuleFindUsages/findClassUsagesWithoutConstructors/js/js.kt b/plugins/kotlin/idea/tests/testData/multiModuleFindUsages/findClassUsagesWithoutConstructors/js/js.kt index 7766cbd55556..f6f7c5d45306 100644 --- a/plugins/kotlin/idea/tests/testData/multiModuleFindUsages/findClassUsagesWithoutConstructors/js/js.kt +++ b/plugins/kotlin/idea/tests/testData/multiModuleFindUsages/findClassUsagesWithoutConstructors/js/js.kt @@ -2,4 +2,3 @@ // OPTIONS: usages, expected actual open class Clazz004 actual constructor() val a1 = Clazz004() -// IGNORE_K2_LOG \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/multiModuleFindUsages/findDataComponentInJs/js/js.kt b/plugins/kotlin/idea/tests/testData/multiModuleFindUsages/findDataComponentInJs/js/js.kt index c921789ad617..d8c144eb72d0 100644 --- a/plugins/kotlin/idea/tests/testData/multiModuleFindUsages/findDataComponentInJs/js/js.kt +++ b/plugins/kotlin/idea/tests/testData/multiModuleFindUsages/findDataComponentInJs/js/js.kt @@ -8,4 +8,3 @@ fun m(d: D) { d.a } -// IGNORE_K2_LOG \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/multiModuleFindUsages/findImportAlias/js/js.kt b/plugins/kotlin/idea/tests/testData/multiModuleFindUsages/findImportAlias/js/js.kt index 1de590445e76..98ba85ce0d6e 100644 --- a/plugins/kotlin/idea/tests/testData/multiModuleFindUsages/findImportAlias/js/js.kt +++ b/plugins/kotlin/idea/tests/testData/multiModuleFindUsages/findImportAlias/js/js.kt @@ -3,4 +3,3 @@ package foo actual interface OnlyInCommonInterface014 -// IGNORE_K2_LOG \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/multiModuleFindUsages/findJvmFromActualJs/js/js.kt b/plugins/kotlin/idea/tests/testData/multiModuleFindUsages/findJvmFromActualJs/js/js.kt index 41e60ff35a99..d0c454396fbf 100644 --- a/plugins/kotlin/idea/tests/testData/multiModuleFindUsages/findJvmFromActualJs/js/js.kt +++ b/plugins/kotlin/idea/tests/testData/multiModuleFindUsages/findJvmFromActualJs/js/js.kt @@ -1,4 +1,3 @@ // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtClass // OPTIONS: usages, expected actual interface OnlyInCommonInterface001 -// IGNORE_K2_LOG \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/multiModuleFindUsages/findParameterInOverride/js/js.kt b/plugins/kotlin/idea/tests/testData/multiModuleFindUsages/findParameterInOverride/js/js.kt index b5d9704a3a05..95ba7a1233f9 100644 --- a/plugins/kotlin/idea/tests/testData/multiModuleFindUsages/findParameterInOverride/js/js.kt +++ b/plugins/kotlin/idea/tests/testData/multiModuleFindUsages/findParameterInOverride/js/js.kt @@ -14,4 +14,3 @@ class E: D() { } } -// IGNORE_K2_LOG \ No newline at end of file