From f05fe1d46d83c71888b00e50f71dd699a7bf4e81 Mon Sep 17 00:00:00 2001 From: Nikita Bobko Date: Tue, 15 Nov 2022 14:17:43 +0100 Subject: [PATCH] Drop outdated KDoc and fix findSourceFirDeclarationByExpression signature Review: https://jetbrains.team/p/kt/reviews/7690 Make findSourceFirDeclarationByExpression signature more specific. `KtDeclaration` is an inheritor of `KtExpression` `KtLambdaExpression` was changed to `KtFunctionLiteral` in c24ad0ba51888df0aff8a72ee09a386049c760dd. I run analysis-api-fir tests and ensured that `KtFunctionLiteral` appears in runtime instead of `KtFunctionLiteral` So `ktDeclaration` should be either `KtDeclaration` or `KtFunctionLiteral`. But we don't need a KDoc for that because `KtFunctionLiteral` is an inheritor of `KtDeclaration`, so type-system already checks this invariant --- .../level/api/fir/state/LLFirResolvableResolveSession.kt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirResolvableResolveSession.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirResolvableResolveSession.kt index 2de4da8c983..3b2b364b041 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirResolvableResolveSession.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirResolvableResolveSession.kt @@ -92,13 +92,10 @@ internal abstract class LLFirResolvableResolveSession( } private fun findSourceFirSymbol(ktDeclaration: KtDeclaration, module: KtModule): FirBasedSymbol<*> { - return findSourceFirDeclarationByExpression(ktDeclaration.originalDeclaration ?: ktDeclaration, module) + return findSourceFirDeclarationByDeclaration(ktDeclaration.originalDeclaration ?: ktDeclaration, module) } - /** - * [ktDeclaration] should be either [KtDeclaration] or [KtLambdaExpression] - */ - private fun findSourceFirDeclarationByExpression(ktDeclaration: KtExpression, module: KtModule): FirBasedSymbol<*> { + private fun findSourceFirDeclarationByDeclaration(ktDeclaration: KtDeclaration, module: KtModule): FirBasedSymbol<*> { require(getModuleKind(module) == ModuleKind.RESOLVABLE_MODULE) { "Declaration should be resolvable module, instead it had ${module::class}" }