diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LowLevelFirApiFacade.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LowLevelFirApiFacade.kt index 8fa2fe2d03c..6a62108b32f 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LowLevelFirApiFacade.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LowLevelFirApiFacade.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.api import com.intellij.openapi.project.Project import org.jetbrains.kotlin.analysis.low.level.api.fir.LLFirResolveSessionService import org.jetbrains.kotlin.analysis.project.structure.KtModule -import org.jetbrains.kotlin.analysis.project.structure.getKtModule +import org.jetbrains.kotlin.analysis.project.structure.ProjectStructureProvider import org.jetbrains.kotlin.diagnostics.KtPsiDiagnostic import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.declarations.FirDeclaration @@ -19,14 +19,6 @@ import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtFile -/** - * Returns [LLFirResolveSession] which corresponds to containing module - */ -fun KtElement.getFirResolveSession(): LLFirResolveSession { - val project = project - return getKtModule(project).getFirResolveSession(project) -} - /** * Returns [LLFirResolveSession] which corresponds to containing module */ diff --git a/analysis/project-structure/src/org/jetbrains/kotlin/analysis/project/structure/ProjectStructureProvider.kt b/analysis/project-structure/src/org/jetbrains/kotlin/analysis/project/structure/ProjectStructureProvider.kt index 9ae66bd4e1b..7e9199c84ce 100644 --- a/analysis/project-structure/src/org/jetbrains/kotlin/analysis/project/structure/ProjectStructureProvider.kt +++ b/analysis/project-structure/src/org/jetbrains/kotlin/analysis/project/structure/ProjectStructureProvider.kt @@ -33,28 +33,4 @@ public abstract class ProjectStructureProvider { return getInstance(element.project).getModule(element, contextualModule) } } -} - -/** - * For a given [PsiElement] get a [KtModule] to which [PsiElement] belongs. - * @param project [Project] which contains current [PsiElement]. `PsiElement.project` may be a heavy operation as it includes PSI tree traversal. So, when a [Project] is already available, it is better to pass it explicitly - */ -public fun PsiElement.getKtModule(project: Project = this.project): KtModule = - project.getService(ProjectStructureProvider::class.java) - .getModule(this, null) - -/** - * For a given [PsiElement] get a [KtModule] to which [PsiElement] belongs. - * @return [KtModule] of type [M] if `result <: M`, [java.lang.ClassCastException] otherwise - * @param project [Project] which contains current [PsiElement]. `PsiElement.project` may be a heavy operation as it includes PSI tree traversal. So, when a [Project] is already available, it is better to pass it explicitly - */ -public inline fun PsiElement.getKtModuleOfType(project: Project = this.project): M = - getKtModule(project) as M - -/** - * For a given [PsiElement] get a [KtModule] to which [PsiElement] belongs. - * @return [KtModule] of type [M] if `result <: M`, `null` otherwise - * @param project [Project] which contains current [PsiElement]. `PsiElement.project` may be a heavy operation as it includes PSI tree traversal. So, when a [Project] is already available, it is better to pass it explicitly - */ -public inline fun PsiElement.getKtModuleOfTypeSafe(project: Project = this.project): M? = - getKtModule(project) as? M +} \ No newline at end of file