Cleanup: return empty Map instead of null

Motivation: nullable collections are an anti-pattern
Review: https://jetbrains.team/p/kt/reviews/12279/timeline
This commit is contained in:
Nikita Bobko
2023-10-03 15:08:09 +02:00
committed by Space Team
parent 91a337074e
commit ad6680d128
2 changed files with 5 additions and 5 deletions
@@ -96,7 +96,7 @@ open class FirExpectActualMatcherTransformer(
session,
scopeSession,
expectActualMatchingContext,
) ?: mapOf()
)
memberDeclaration.expectForActual = expectForActualData
}
}
@@ -27,7 +27,7 @@ object FirExpectActualResolver {
useSiteSession: FirSession,
scopeSession: ScopeSession,
context: FirExpectActualMatchingContext,
): ExpectForActualData? {
): ExpectForActualData {
with(context) {
val result = when (actualSymbol) {
is FirCallableSymbol<*> -> {
@@ -55,7 +55,7 @@ object FirExpectActualResolver {
else -> expectContainingClass?.getMembersForExpectClass(actualSymbol.name)
}.orEmpty()
}
callableId.isLocal -> return null
callableId.isLocal -> return emptyMap()
else -> {
val scope = FirPackageMemberScope(callableId.packageName, useSiteSession, useSiteSession.dependenciesSymbolProvider)
mutableListOf<FirCallableSymbol<*>>().apply {
@@ -85,7 +85,7 @@ object FirExpectActualResolver {
}
is FirClassLikeSymbol<*> -> {
val expectClassSymbol = useSiteSession.dependenciesSymbolProvider
.getClassLikeSymbolByClassId(actualSymbol.classId) as? FirRegularClassSymbol ?: return null
.getClassLikeSymbolByClassId(actualSymbol.classId) as? FirRegularClassSymbol ?: return emptyMap()
val compatibility = AbstractExpectActualCompatibilityChecker.getClassifiersCompatibility(
expectClassSymbol,
actualSymbol,
@@ -94,7 +94,7 @@ object FirExpectActualResolver {
)
mapOf(compatibility to listOf(expectClassSymbol))
}
else -> null
else -> emptyMap()
}
return result
}