From 369056ca5d1cb66ecec160f453b8412079738e77 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 21 Oct 2020 14:26:03 +0200 Subject: [PATCH] Minor, add explicit type argument to workaround KT-42175 --- .../kotlin/fir/resolve/transformers/FirStatusResolver.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirStatusResolver.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirStatusResolver.kt index 1d44569d139..28313a5819f 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirStatusResolver.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirStatusResolver.kt @@ -52,7 +52,8 @@ class FirStatusResolver( fun resolveStatus(property: FirProperty, containingClass: FirClass<*>?, isLocal: Boolean): FirResolvedDeclarationStatus { return resolveStatus(property, property.status, containingClass, isLocal) l@{ if (containingClass == null) return@l emptyList() - buildList { + @Suppress("RemoveExplicitTypeArguments") // Workaround for KT-42175 + buildList { val scope = containingClass.unsubstitutedScope(session, scopeSession, withForcedTypeCalculator = false) scope.processPropertiesByName(property.name) {} scope.processDirectOverriddenPropertiesWithBaseScope(property.symbol) { symbol, _ -> @@ -69,7 +70,8 @@ class FirStatusResolver( fun resolveStatus(function: FirSimpleFunction, containingClass: FirClass<*>?, isLocal: Boolean): FirResolvedDeclarationStatus { return resolveStatus(function, function.status, containingClass, isLocal) l@{ if (containingClass == null) return@l emptyList() - buildList { + @Suppress("RemoveExplicitTypeArguments") // Workaround for KT-42175 + buildList> { val scope = containingClass.unsubstitutedScope(session, scopeSession, withForcedTypeCalculator = false) scope.processFunctionsByName(function.name) {} scope