diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/targets/LLFirClassWithAllCallablesResolveTarget.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/targets/LLFirClassWithAllCallablesResolveTarget.kt index 4cef3893bb8..4dfac78e50b 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/targets/LLFirClassWithAllCallablesResolveTarget.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/targets/LLFirClassWithAllCallablesResolveTarget.kt @@ -30,6 +30,4 @@ class LLFirClassWithAllCallablesResolveTarget( } } } - - override fun toStringForTarget(): String = target.name.asString() } diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/targets/LLFirClassWithAllMembersResolveTarget.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/targets/LLFirClassWithAllMembersResolveTarget.kt index 8ffd2871029..a9014b6dfde 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/targets/LLFirClassWithAllMembersResolveTarget.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/targets/LLFirClassWithAllMembersResolveTarget.kt @@ -26,6 +26,4 @@ class LLFirClassWithAllMembersResolveTarget( inline fun forEachMember(action: (FirDeclaration) -> Unit) { target.declarations.forEach(action) } - - override fun toStringForTarget(): String = target.name.asString() -} \ No newline at end of file +} diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/targets/LLFirResolveTargetWithDedicatedElement.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/targets/LLFirResolveTargetWithDedicatedElement.kt index aaf18c7698e..a87ffdfcc4b 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/targets/LLFirResolveTargetWithDedicatedElement.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/targets/LLFirResolveTargetWithDedicatedElement.kt @@ -7,6 +7,10 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.api.targets import org.jetbrains.kotlin.fir.FirElementWithResolveState import org.jetbrains.kotlin.fir.FirFileAnnotationsContainer +import org.jetbrains.kotlin.fir.declarations.FirAnonymousInitializer +import org.jetbrains.kotlin.fir.declarations.FirCallableDeclaration +import org.jetbrains.kotlin.fir.declarations.FirClassLikeDeclaration +import org.jetbrains.kotlin.fir.declarations.FirConstructor import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirFile import org.jetbrains.kotlin.fir.declarations.FirRegularClass @@ -23,7 +27,17 @@ sealed class LLFirResolveTargetWithDedicatedElement "constructor" + is FirClassLikeDeclaration -> target.symbol.name.asString() + is FirCallableDeclaration -> target.symbol.name.asString() + is FirAnonymousInitializer -> ("") + is FirFileAnnotationsContainer -> "" + is FirScript -> target.name.asString() + else -> "???" + } +} private fun pathWithScript(firFile: FirFile, path: List, target: FirElementWithResolveState): List { if (target is FirFile || target is FirFileAnnotationsContainer || target is FirScript) return path diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/targets/LLFirSingleResolveTarget.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/targets/LLFirSingleResolveTarget.kt index a2c8a71bff6..21f63157d9e 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/targets/LLFirSingleResolveTarget.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/targets/LLFirSingleResolveTarget.kt @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.api.targets import org.jetbrains.kotlin.fir.FirElementWithResolveState -import org.jetbrains.kotlin.fir.FirFileAnnotationsContainer import org.jetbrains.kotlin.fir.declarations.* /** @@ -20,14 +19,4 @@ class LLFirSingleResolveTarget( override fun forEachTarget(action: (FirElementWithResolveState) -> Unit) { action(target) } - - override fun toStringForTarget(): String = when (target) { - is FirConstructor -> "constructor" - is FirClassLikeDeclaration -> target.symbol.name.asString() - is FirCallableDeclaration -> target.symbol.name.asString() - is FirAnonymousInitializer -> ("") - is FirFileAnnotationsContainer -> "" - is FirScript -> target.name.asString() - else -> "???" - } -} \ No newline at end of file +}