diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ConstructorProcessing.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ConstructorProcessing.kt index 6091bf17132..f51fe1deaf0 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ConstructorProcessing.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ConstructorProcessing.kt @@ -39,9 +39,8 @@ internal fun FirScope.processFunctionsAndConstructorsByName( processor, session, bodyResolveComponents.scopeSession, - name, - noInnerConstructors - ) + noInnerConstructors + ) processSyntheticConstructors( matchedClassSymbol, @@ -131,7 +130,6 @@ private fun processConstructors( processor: (FirFunctionSymbol<*>) -> Unit, session: FirSession, scopeSession: ScopeSession, - name: Name, noInner: Boolean ) { try { @@ -152,7 +150,8 @@ private fun processConstructors( val constructorName = when (matchedSymbol) { is FirTypeAliasSymbol -> finalExpansionName(matchedSymbol, session) ?: return - is FirClassSymbol -> name + is FirRegularClassSymbol -> matchedSymbol.fir.name + else -> return } //TODO: why don't we use declared member scope at this point? diff --git a/compiler/fir/resolve/testData/resolve/problems/asImports.kt b/compiler/fir/resolve/testData/resolve/problems/asImports.kt index 9a7f5bc4c4c..cf61f45b05c 100644 --- a/compiler/fir/resolve/testData/resolve/problems/asImports.kt +++ b/compiler/fir/resolve/testData/resolve/problems/asImports.kt @@ -12,7 +12,7 @@ import foo.A as B fun test_1() { val a = A() - val b = B() // should be OK + val b = B() // should be OK val c: B = A() } diff --git a/compiler/fir/resolve/testData/resolve/problems/asImports.txt b/compiler/fir/resolve/testData/resolve/problems/asImports.txt index cd12fff71f1..e4b0a5fa27d 100644 --- a/compiler/fir/resolve/testData/resolve/problems/asImports.txt +++ b/compiler/fir/resolve/testData/resolve/problems/asImports.txt @@ -11,7 +11,7 @@ FILE: A.kt FILE: main.kt public final fun test_1(): R|kotlin/Unit| { lval a: = #() - lval b: = #() + lval b: R|foo/A| = R|foo/A.A|() lval c: R|foo/A| = #() } public final fun test_2(b: R|foo/A|): R|kotlin/Unit| {