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

FIR supertype resolve: decrease priority of type parameter scope

Browse Source
This commit is contained in:
Mikhail Glukhikh
2019-10-23 10:42:52 +03:00
parent 634f324f51
commit e28d41aa61
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirAbstractTreeTransformerWithSuperTypes.kt
+1 -1
View File
@@ -43,12 +43,12 @@ abstract class FirAbstractTreeTransformerWithSuperTypes(
.asReversed().mapTo(towerScope.scopes) { .asReversed().mapTo(towerScope.scopes) {
nestedClassifierScope(it.lookupTag.classId, session) nestedClassifierScope(it.lookupTag.classId, session)
} }
regularClass.addTypeParametersScope()
val companionObjects = regularClass.declarations.filterIsInstance<FirRegularClass>().filter { it.isCompanion } val companionObjects = regularClass.declarations.filterIsInstance<FirRegularClass>().filter { it.isCompanion }
for (companionObject in companionObjects) { for (companionObject in companionObjects) {
towerScope.scopes += nestedClassifierScope(companionObject) towerScope.scopes += nestedClassifierScope(companionObject)
} }
towerScope.scopes += nestedClassifierScope(regularClass) towerScope.scopes += nestedClassifierScope(regularClass)
regularClass.addTypeParametersScope()
transformElement(regularClass, data) transformElement(regularClass, data)
} }
compiler/fir/resolve/testData/resolve/typeParameterVsNested.txt
Vendored
+5 -5
View File
@@ -13,10 +13,10 @@ FILE: typeParameterVsNested.kt
} }
public abstract val x: R|T| public abstract val x: R|test/My.T|
public get(): R|T| public get(): R|test/My.T|
public abstract fun foo(arg: R|T|): R|kotlin/Unit| public abstract fun foo(arg: R|test/My.T|): R|kotlin/Unit|
public abstract val y: R|test/My.T| public abstract val y: R|test/My.T|
public get(): R|test/My.T| public get(): R|test/My.T|
@@ -24,9 +24,9 @@ FILE: typeParameterVsNested.kt
public abstract val z: R|test/My.T| public abstract val z: R|test/My.T|
public get(): R|test/My.T| public get(): R|test/My.T|
public final class Some : R|class error: Type parameter cannot be a super-type: T| { public final class Some : R|test/My.T| {
public constructor(): R|test/My.Some| { public constructor(): R|test/My.Some| {
super<R|T|>() super<R|test/My.T|>()
} }
} }