[FIR] Recursively search dependsOn modules in visibility checks
#KT-59071 Fixed
This commit is contained in:
+6
@@ -22184,6 +22184,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
|
||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/multimodule"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true, "multiplatform");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("dependsOnModule.kt")
|
||||
public void testDependsOnModule() throws Exception {
|
||||
runTest("compiler/testData/diagnostics/tests/multimodule/dependsOnModule.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("friendModule.kt")
|
||||
public void testFriendModule() throws Exception {
|
||||
|
||||
+6
@@ -22190,6 +22190,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
|
||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/multimodule"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true, "multiplatform");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("dependsOnModule.kt")
|
||||
public void testDependsOnModule() throws Exception {
|
||||
runTest("compiler/testData/diagnostics/tests/multimodule/dependsOnModule.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("friendModule.kt")
|
||||
public void testFriendModule() throws Exception {
|
||||
|
||||
+1
-3
@@ -149,9 +149,7 @@ abstract class FirAbstractSessionFactory {
|
||||
// dependsOnDependencies can actualize declarations from their dependencies. Because actual declarations can be more specific
|
||||
// (e.g. have additional supertypes), the modules must be ordered from most specific (i.e. actual) to most generic (i.e. expect)
|
||||
// to prevent false positive resolution errors (see KT-57369 for an example).
|
||||
val dependsOnDependencies = topologicalSort(moduleData.dependsOnDependencies) { it.dependsOnDependencies }
|
||||
|
||||
return (moduleData.dependencies + moduleData.friendDependencies + dependsOnDependencies)
|
||||
return (moduleData.dependencies + moduleData.friendDependencies + moduleData.allDependsOnDependencies)
|
||||
.mapNotNull { sessionProvider?.getSession(it) }
|
||||
.map { it.symbolProvider }
|
||||
.flatMap { it.flatten(visited, collectSourceProviders = it.session.kind == FirSession.Kind.Source) }
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
package org.jetbrains.kotlin.fir
|
||||
|
||||
import org.jetbrains.kotlin.config.LanguageFeature
|
||||
import org.jetbrains.kotlin.container.topologicalSort
|
||||
import org.jetbrains.kotlin.descriptors.Visibilities
|
||||
import org.jetbrains.kotlin.descriptors.Visibility
|
||||
import org.jetbrains.kotlin.fir.declarations.*
|
||||
@@ -34,12 +35,14 @@ abstract class FirModuleVisibilityChecker : FirSessionComponent {
|
||||
abstract fun isInFriendModule(declaration: FirMemberDeclaration): Boolean
|
||||
|
||||
class Standard(val session: FirSession) : FirModuleVisibilityChecker() {
|
||||
private val useSiteModuleData = session.moduleData
|
||||
private val allDependsOnDependencies = useSiteModuleData.allDependsOnDependencies
|
||||
|
||||
override fun isInFriendModule(declaration: FirMemberDeclaration): Boolean {
|
||||
val useSiteModuleData = session.moduleData
|
||||
return when (declaration.moduleData) {
|
||||
useSiteModuleData,
|
||||
in useSiteModuleData.friendDependencies,
|
||||
in useSiteModuleData.dependsOnDependencies -> true
|
||||
in allDependsOnDependencies -> true
|
||||
|
||||
else -> false
|
||||
}
|
||||
@@ -47,6 +50,8 @@ abstract class FirModuleVisibilityChecker : FirSessionComponent {
|
||||
}
|
||||
}
|
||||
|
||||
val FirModuleData.allDependsOnDependencies: List<FirModuleData> get() = topologicalSort(dependsOnDependencies) { it.dependsOnDependencies }
|
||||
|
||||
abstract class FirVisibilityChecker : FirSessionComponent {
|
||||
@NoMutableState
|
||||
object Default : FirVisibilityChecker() {
|
||||
|
||||
Reference in New Issue
Block a user