azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[LL FIR] rename LLFirResolveMultiDesignationCollector to LLFirResolveDesignationCollector

Browse Source 
As it is not "multi" after 77c850f0d0
This commit is contained in:
Dmitrii Gridin
2024-02-16 18:34:27 +01:00
committed by Space Team
parent 0ecb174720
commit a9f7c153d2
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/LLFirModuleLazyDeclarationResolver.kt
+3 -3
View File
@@ -35,7 +35,7 @@ internal class LLFirModuleLazyDeclarationResolver(val moduleComponents: LLFirMod
toPhase: FirResolvePhase, toPhase: FirResolvePhase,
) { ) {
if (target.resolvePhase >= toPhase) return if (target.resolvePhase >= toPhase) return
lazyResolve(target, scopeSession, toPhase, LLFirResolveMultiDesignationCollector::getDesignationToResolve) lazyResolve(target, scopeSession, toPhase, LLFirResolveDesignationCollector::getDesignationToResolve)
} }
/** /**
@@ -50,7 +50,7 @@ internal class LLFirModuleLazyDeclarationResolver(val moduleComponents: LLFirMod
scopeSession: ScopeSession, scopeSession: ScopeSession,
toPhase: FirResolvePhase, toPhase: FirResolvePhase,
) { ) {
lazyResolve(target, scopeSession, toPhase, LLFirResolveMultiDesignationCollector::getDesignationToResolveWithCallableMembers) lazyResolve(target, scopeSession, toPhase, LLFirResolveDesignationCollector::getDesignationToResolveWithCallableMembers)
} }
/** /**
@@ -65,7 +65,7 @@ internal class LLFirModuleLazyDeclarationResolver(val moduleComponents: LLFirMod
scopeSession: ScopeSession, scopeSession: ScopeSession,
toPhase: FirResolvePhase, toPhase: FirResolvePhase,
) { ) {
lazyResolve(target, scopeSession, toPhase, LLFirResolveMultiDesignationCollector::getDesignationToResolveRecursively) lazyResolve(target, scopeSession, toPhase, LLFirResolveDesignationCollector::getDesignationToResolveRecursively)
} }
private inline fun <T : FirElementWithResolveState> lazyResolve( private inline fun <T : FirElementWithResolveState> lazyResolve(
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/LLFirResolveMultiDesignationCollector.kt → analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/LLFirResolveDesignationCollector.kt
+1 -1
View File
@@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticProperty
import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticPropertyAccessor import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticPropertyAccessor
import org.jetbrains.kotlin.fir.isCopyCreatedInScope import org.jetbrains.kotlin.fir.isCopyCreatedInScope
internal object LLFirResolveMultiDesignationCollector { internal object LLFirResolveDesignationCollector {
fun getDesignationToResolve(target: FirElementWithResolveState): LLFirResolveTarget? { fun getDesignationToResolve(target: FirElementWithResolveState): LLFirResolveTarget? {
return getDesignationToResolve(target, FirDesignation::asResolveTarget) return getDesignationToResolve(target, FirDesignation::asResolveTarget)
} }
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractFirLazyDeclarationResolveOverAllPhasesTest.kt
+2 -2
View File
@@ -6,7 +6,7 @@
package org.jetbrains.kotlin.analysis.low.level.api.fir package org.jetbrains.kotlin.analysis.low.level.api.fir
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirResolveSession import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirResolveSession
import org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve.LLFirResolveMultiDesignationCollector import org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve.LLFirResolveDesignationCollector
import org.jetbrains.kotlin.analysis.test.framework.project.structure.allKtFiles import org.jetbrains.kotlin.analysis.test.framework.project.structure.allKtFiles
import org.jetbrains.kotlin.fir.FirElementWithResolveState import org.jetbrains.kotlin.fir.FirElementWithResolveState
import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
@@ -41,7 +41,7 @@ abstract class AbstractFirLazyDeclarationResolveOverAllPhasesTest : AbstractFirL
testServices.allKtFiles().map(firResolveSession::getOrBuildFirFile) testServices.allKtFiles().map(firResolveSession::getOrBuildFirFile)
} else { } else {
val firFile = firResolveSession.getOrBuildFirFile(ktFile) val firFile = firResolveSession.getOrBuildFirFile(ktFile)
val designation = LLFirResolveMultiDesignationCollector.getDesignationToResolve(elementToResolve) val designation = LLFirResolveDesignationCollector.getDesignationToResolve(elementToResolve)
listOfNotNull(firFile, designation?.firFile).distinct() listOfNotNull(firFile, designation?.firFile).distinct()
} }