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

[FIR] Fix setting file in supertypes resolution

Browse Source 
^KT-49652 Fixed
This commit is contained in:
Dmitriy Novozhilov
2021-11-15 16:29:24 +03:00
committed by TeamCityServer
parent e11ffc75e4
commit 499b97d51e
7 changed files with 96 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerFirTestdataTestGenerated.java
Generated
+6
View File
@@ -3989,6 +3989,12 @@ public class DiagnosisCompilerFirTestdataTestGenerated extends AbstractDiagnosis
runTest("compiler/fir/analysis-tests/testData/resolve/visibility/kotlinJavaKotlinHierarchy.kt");
}
@Test
@TestMetadata("privateAliasInSamePackage.kt")
public void testPrivateAliasInSamePackage() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolve/visibility/privateAliasInSamePackage.kt");
}
@Test
@TestMetadata("protectedInCompanion.kt")
public void testProtectedInCompanion() throws Exception {
compiler/fir/analysis-tests/legacy-fir-tests/tests-gen/org/jetbrains/kotlin/fir/LazyBodyIsNotTouchedTilContractsPhaseTestGenerated.java
Generated
+5
View File
@@ -3574,6 +3574,11 @@ public class LazyBodyIsNotTouchedTilContractsPhaseTestGenerated extends Abstract
runTest("compiler/fir/analysis-tests/testData/resolve/visibility/kotlinJavaKotlinHierarchy.kt");
}
@TestMetadata("privateAliasInSamePackage.kt")
public void testPrivateAliasInSamePackage() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolve/visibility/privateAliasInSamePackage.kt");
}
@TestMetadata("protectedInCompanion.kt")
public void testProtectedInCompanion() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolve/visibility/protectedInCompanion.kt");
compiler/fir/analysis-tests/testData/resolve/visibility/privateAliasInSamePackage.fir.txt
Vendored
+26
View File
@@ -0,0 +1,26 @@
FILE: First.kt
package first
private final typealias Key = R|kotlin/String|
FILE: Third.kt
package first
public open class Base<T> : R|kotlin/Any| {
public constructor<T>(): R|first/Base<T>| {
super<R|kotlin/Any|>()
}
public final fun get(): R|T?| {
^get Null(null)
}
}
public final class Derived : R|first/Base<second/Second.Key>| {
public constructor(): R|first/Derived| {
super<R|first/Base<second/Second.Key>|>()
}
}
public final fun test(d: R|first/Derived|): R|kotlin/Unit| {
R|<local>/d|.R|SubstitutionOverride<first/Derived.get: R|second/Second.Key?|>|()?.{ $subj$.R|second/Second.Key.foo|() }
}
compiler/fir/analysis-tests/testData/resolve/visibility/privateAliasInSamePackage.kt
Vendored
+33
View File
@@ -0,0 +1,33 @@
// ISSUE: KT-49652
// FILE: First.kt
package first
private typealias Key = String
// FILE: second/Second.java
package second
public class Second {
public static class Key {
public void foo() {}
}
public void bar() {}
}
// FILE: Third.kt
package first
import second.Second.*
import second.Second
open class Base<T> {
fun get(): T? = null
}
// Key is resolved to first.Key. In fact, should be second.Second.Key, because first.Key is private-in-file
class Derived : Base<Key>()
fun test(d: Derived) {
d.get()?.foo()
}
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticTestGenerated.java
Generated
+6
View File
@@ -3989,6 +3989,12 @@ public class FirDiagnosticTestGenerated extends AbstractFirDiagnosticTest {
runTest("compiler/fir/analysis-tests/testData/resolve/visibility/kotlinJavaKotlinHierarchy.kt");
}
@Test
@TestMetadata("privateAliasInSamePackage.kt")
public void testPrivateAliasInSamePackage() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolve/visibility/privateAliasInSamePackage.kt");
}
@Test
@TestMetadata("protectedInCompanion.kt")
public void testProtectedInCompanion() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticsWithLightTreeTestGenerated.java
Generated
+6
View File
@@ -3989,6 +3989,12 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos
runTest("compiler/fir/analysis-tests/testData/resolve/visibility/kotlinJavaKotlinHierarchy.kt");
}
@Test
@TestMetadata("privateAliasInSamePackage.kt")
public void testPrivateAliasInSamePackage() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolve/visibility/privateAliasInSamePackage.kt");
}
@Test
@TestMetadata("protectedInCompanion.kt")
public void testProtectedInCompanion() throws Exception {
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSupertypesResolution.kt
+14 -2
View File
@@ -211,7 +211,7 @@ open class FirSupertypeResolverVisitor(
private val scopeForLocalClass: PersistentList<FirScope>? = null,
private val localClassesNavigationInfo: LocalClassesNavigationInfo? = null,
private val firProviderInterceptor: FirProviderInterceptor? = null,
private val useSiteFile: FirFile? = null,
private var useSiteFile: FirFile? = null,
containingDeclarations: List<FirDeclaration> = emptyList(),
) : FirDefaultVisitor<Unit, Any?>() {
private val supertypeGenerationExtensions = session.extensionService.supertypeGenerators
@@ -225,6 +225,16 @@ open class FirSupertypeResolverVisitor(
}
}
private inline fun <R> withFile(file: FirFile, block: () -> R): R {
val oldFile = useSiteFile
try {
useSiteFile = file
return block()
} finally {
useSiteFile = oldFile
}
}
private fun getFirClassifierContainerFileIfAny(symbol: FirClassLikeSymbol<*>): FirFile? =
if (firProviderInterceptor != null) firProviderInterceptor.getFirClassifierContainerFileIfAny(symbol)
else session.firProvider.getFirClassifierContainerFileIfAny(symbol.classId)
@@ -454,7 +464,9 @@ open class FirSupertypeResolverVisitor(
}
override fun visitFile(file: FirFile, data: Any?) {
visitDeclarationContent(file, null)
withFile(file) {
visitDeclarationContent(file, null)
}
}
}