[FIR IDE] Rename refactoring
This commit is contained in:
+1
-1
@@ -68,7 +68,7 @@ internal class FirModuleResolveStateImpl(
|
|||||||
)
|
)
|
||||||
|
|
||||||
override fun getOrBuildFirFile(ktFile: KtFile): FirFile =
|
override fun getOrBuildFirFile(ktFile: KtFile): FirFile =
|
||||||
firFileBuilder.buildRawFirFileWithCaching(ktFile, rootModuleSession.cache, allowLazyBodies = false)
|
firFileBuilder.buildRawFirFileWithCaching(ktFile, rootModuleSession.cache, preferLazyBodies = false)
|
||||||
|
|
||||||
override fun tryGetCachedFirFile(declaration: FirDeclaration, cache: ModuleFileCache): FirFile? =
|
override fun tryGetCachedFirFile(declaration: FirDeclaration, cache: ModuleFileCache): FirFile? =
|
||||||
cache.getContainerFirFile(declaration)
|
cache.getContainerFirFile(declaration)
|
||||||
|
|||||||
+1
-2
@@ -30,7 +30,6 @@ import org.jetbrains.kotlin.idea.fir.low.level.api.element.builder.FirTowerDataC
|
|||||||
import org.jetbrains.kotlin.idea.fir.low.level.api.file.builder.runCustomResolveUnderLock
|
import org.jetbrains.kotlin.idea.fir.low.level.api.file.builder.runCustomResolveUnderLock
|
||||||
import org.jetbrains.kotlin.idea.fir.low.level.api.file.structure.FirElementsRecorder
|
import org.jetbrains.kotlin.idea.fir.low.level.api.file.structure.FirElementsRecorder
|
||||||
import org.jetbrains.kotlin.idea.fir.low.level.api.file.structure.KtToFirMapping
|
import org.jetbrains.kotlin.idea.fir.low.level.api.file.structure.KtToFirMapping
|
||||||
import org.jetbrains.kotlin.idea.fir.low.level.api.lazy.resolve.FirLazyDeclarationResolver
|
|
||||||
import org.jetbrains.kotlin.idea.fir.low.level.api.lazy.resolve.RawFirNonLocalDeclarationBuilder
|
import org.jetbrains.kotlin.idea.fir.low.level.api.lazy.resolve.RawFirNonLocalDeclarationBuilder
|
||||||
import org.jetbrains.kotlin.idea.fir.low.level.api.lazy.resolve.RawFirReplacement
|
import org.jetbrains.kotlin.idea.fir.low.level.api.lazy.resolve.RawFirReplacement
|
||||||
import org.jetbrains.kotlin.idea.fir.low.level.api.lazy.resolve.buildFileFirAnnotation
|
import org.jetbrains.kotlin.idea.fir.low.level.api.lazy.resolve.buildFileFirAnnotation
|
||||||
@@ -132,7 +131,7 @@ object LowLevelFirApiFacadeForResolveOnAir {
|
|||||||
val firFile = session.firFileBuilder.buildRawFirFileWithCaching(
|
val firFile = session.firFileBuilder.buildRawFirFileWithCaching(
|
||||||
ktFile = file,
|
ktFile = file,
|
||||||
cache = session.cache,
|
cache = session.cache,
|
||||||
allowLazyBodies = true
|
preferLazyBodies = true
|
||||||
)
|
)
|
||||||
|
|
||||||
state.firLazyDeclarationResolver.lazyResolveFileDeclaration(
|
state.firLazyDeclarationResolver.lazyResolveFileDeclaration(
|
||||||
|
|||||||
+1
-1
@@ -66,7 +66,7 @@ internal class FirElementBuilder {
|
|||||||
moduleFileCache: ModuleFileCache,
|
moduleFileCache: ModuleFileCache,
|
||||||
firLazyDeclarationResolver: FirLazyDeclarationResolver
|
firLazyDeclarationResolver: FirLazyDeclarationResolver
|
||||||
): FirFile {
|
): FirFile {
|
||||||
val firFile = firFileBuilder.buildRawFirFileWithCaching(ktFile, moduleFileCache, allowLazyBodies = false)
|
val firFile = firFileBuilder.buildRawFirFileWithCaching(ktFile, moduleFileCache, preferLazyBodies = false)
|
||||||
firLazyDeclarationResolver.lazyResolveFileDeclaration(
|
firLazyDeclarationResolver.lazyResolveFileDeclaration(
|
||||||
firFile = firFile,
|
firFile = firFile,
|
||||||
moduleFileCache = moduleFileCache,
|
moduleFileCache = moduleFileCache,
|
||||||
|
|||||||
+2
-2
@@ -29,9 +29,9 @@ internal class FirFileBuilder(
|
|||||||
fun buildRawFirFileWithCaching(
|
fun buildRawFirFileWithCaching(
|
||||||
ktFile: KtFile,
|
ktFile: KtFile,
|
||||||
cache: ModuleFileCache,
|
cache: ModuleFileCache,
|
||||||
allowLazyBodies: Boolean
|
preferLazyBodies: Boolean
|
||||||
): FirFile = cache.fileCached(ktFile) {
|
): FirFile = cache.fileCached(ktFile) {
|
||||||
RawFirBuilder(cache.session, scopeProvider, RawFirBuilderMode.lazyBodies(allowLazyBodies)).buildFirFile(ktFile)
|
RawFirBuilder(cache.session, scopeProvider, RawFirBuilderMode.lazyBodies(preferLazyBodies)).buildFirFile(ktFile)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -35,7 +35,7 @@ internal class FileStructure private constructor(
|
|||||||
firFileBuilder: FirFileBuilder,
|
firFileBuilder: FirFileBuilder,
|
||||||
moduleFileCache: ModuleFileCache,
|
moduleFileCache: ModuleFileCache,
|
||||||
): FileStructure {
|
): FileStructure {
|
||||||
val firFile = firFileBuilder.buildRawFirFileWithCaching(ktFile, moduleFileCache, allowLazyBodies = false)
|
val firFile = firFileBuilder.buildRawFirFileWithCaching(ktFile, moduleFileCache, preferLazyBodies = false)
|
||||||
return FileStructure(ktFile, firFile, firLazyDeclarationResolver, firFileBuilder, moduleFileCache)
|
return FileStructure(ktFile, firFile, firLazyDeclarationResolver, firFileBuilder, moduleFileCache)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -129,7 +129,7 @@ internal class FileStructure private constructor(
|
|||||||
|
|
||||||
private fun createStructureElement(container: KtAnnotated): FileStructureElement = when (container) {
|
private fun createStructureElement(container: KtAnnotated): FileStructureElement = when (container) {
|
||||||
is KtFile -> {
|
is KtFile -> {
|
||||||
val firFile = firFileBuilder.buildRawFirFileWithCaching(ktFile, moduleFileCache, allowLazyBodies = true)
|
val firFile = firFileBuilder.buildRawFirFileWithCaching(ktFile, moduleFileCache, preferLazyBodies = true)
|
||||||
firLazyDeclarationResolver.resolveFileAnnotations(
|
firLazyDeclarationResolver.resolveFileAnnotations(
|
||||||
firFile = firFile,
|
firFile = firFile,
|
||||||
annotations = firFile.annotations,
|
annotations = firFile.annotations,
|
||||||
|
|||||||
+2
-2
@@ -39,7 +39,7 @@ internal class FirProviderHelper(
|
|||||||
null -> indexHelper.typeAliasFromIndexByClassId(classId)
|
null -> indexHelper.typeAliasFromIndexByClassId(classId)
|
||||||
else -> if (klass.getClassId() == null) null else klass
|
else -> if (klass.getClassId() == null) null else klass
|
||||||
} ?: return@computeIfAbsent Optional.empty()
|
} ?: return@computeIfAbsent Optional.empty()
|
||||||
val firFile = firFileBuilder.buildRawFirFileWithCaching(ktClass.containingKtFile, cache, allowLazyBodies = true)
|
val firFile = firFileBuilder.buildRawFirFileWithCaching(ktClass.containingKtFile, cache, preferLazyBodies = true)
|
||||||
val classifier = FirElementFinder.findElementIn<FirClassLikeDeclaration<*>>(firFile) { classifier ->
|
val classifier = FirElementFinder.findElementIn<FirClassLikeDeclaration<*>>(firFile) { classifier ->
|
||||||
classifier.symbol.classId == classId
|
classifier.symbol.classId == classId
|
||||||
}
|
}
|
||||||
@@ -61,7 +61,7 @@ internal class FirProviderHelper(
|
|||||||
@OptIn(ExperimentalStdlibApi::class)
|
@OptIn(ExperimentalStdlibApi::class)
|
||||||
buildList {
|
buildList {
|
||||||
files.forEach { ktFile ->
|
files.forEach { ktFile ->
|
||||||
val firFile = firFileBuilder.buildRawFirFileWithCaching(ktFile, cache, allowLazyBodies = true)
|
val firFile = firFileBuilder.buildRawFirFileWithCaching(ktFile, cache, preferLazyBodies = true)
|
||||||
firFile.collectCallableDeclarationsTo(this, name)
|
firFile.collectCallableDeclarationsTo(this, name)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-3
@@ -42,7 +42,7 @@ internal fun KtDeclaration.findFirDeclarationForAnyFirSourceDeclaration(
|
|||||||
): FirDeclaration {
|
): FirDeclaration {
|
||||||
val nonLocalDeclaration = getNonLocalContainingOrThisDeclaration()
|
val nonLocalDeclaration = getNonLocalContainingOrThisDeclaration()
|
||||||
?.findSourceNonLocalFirDeclaration(firFileBuilder, firSymbolProvider, moduleFileCache)
|
?.findSourceNonLocalFirDeclaration(firFileBuilder, firSymbolProvider, moduleFileCache)
|
||||||
?: firFileBuilder.buildRawFirFileWithCaching(containingKtFile, moduleFileCache, allowLazyBodies = true)
|
?: firFileBuilder.buildRawFirFileWithCaching(containingKtFile, moduleFileCache, preferLazyBodies = true)
|
||||||
val originalDeclaration = originalDeclaration
|
val originalDeclaration = originalDeclaration
|
||||||
val fir = FirElementFinder.findElementIn<FirDeclaration>(nonLocalDeclaration) { firDeclaration ->
|
val fir = FirElementFinder.findElementIn<FirDeclaration>(nonLocalDeclaration) { firDeclaration ->
|
||||||
firDeclaration.psi == this || firDeclaration.psi == originalDeclaration
|
firDeclaration.psi == this || firDeclaration.psi == originalDeclaration
|
||||||
@@ -66,7 +66,7 @@ private fun KtDeclaration.findSourceOfNonLocalFirDeclarationByTraversingWholeTre
|
|||||||
moduleFileCache: ModuleFileCache,
|
moduleFileCache: ModuleFileCache,
|
||||||
containerFirFile: FirFile?,
|
containerFirFile: FirFile?,
|
||||||
): FirDeclaration? {
|
): FirDeclaration? {
|
||||||
val firFile = containerFirFile ?: firFileBuilder.buildRawFirFileWithCaching(containingKtFile, moduleFileCache, allowLazyBodies = true)
|
val firFile = containerFirFile ?: firFileBuilder.buildRawFirFileWithCaching(containingKtFile, moduleFileCache, preferLazyBodies = true)
|
||||||
val originalDeclaration = originalDeclaration
|
val originalDeclaration = originalDeclaration
|
||||||
return FirElementFinder.findElementIn(firFile, goInside = { it is FirRegularClass }) { firDeclaration ->
|
return FirElementFinder.findElementIn(firFile, goInside = { it is FirRegularClass }) { firDeclaration ->
|
||||||
firDeclaration.psi == this || firDeclaration.psi == originalDeclaration
|
firDeclaration.psi == this || firDeclaration.psi == originalDeclaration
|
||||||
@@ -88,7 +88,7 @@ private fun KtDeclaration.findSourceNonLocalFirDeclarationByProvider(
|
|||||||
containerClassFir?.declarations
|
containerClassFir?.declarations
|
||||||
} else {
|
} else {
|
||||||
val ktFile = containingKtFile
|
val ktFile = containingKtFile
|
||||||
val firFile = containerFirFile ?: firFileBuilder.buildRawFirFileWithCaching(ktFile, moduleFileCache, allowLazyBodies = true)
|
val firFile = containerFirFile ?: firFileBuilder.buildRawFirFileWithCaching(ktFile, moduleFileCache, preferLazyBodies = true)
|
||||||
firFile.declarations
|
firFile.declarations
|
||||||
}
|
}
|
||||||
val original = originalDeclaration
|
val original = originalDeclaration
|
||||||
|
|||||||
Reference in New Issue
Block a user