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

Cleanup: return empty Map instead of null

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/mpp/FirExpectActualMatcherTransformer.kt
+1 -1
View File
@@ -96,7 +96,7 @@ open class FirExpectActualMatcherTransformer(
session, session,
scopeSession, scopeSession,
expectActualMatchingContext, expectActualMatchingContext,
) ?: mapOf() )
memberDeclaration.expectForActual = expectForActualData memberDeclaration.expectForActual = expectForActualData
} }
} }
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/mpp/FirExpectActualResolver.kt
+4 -4
View File
@@ -27,7 +27,7 @@ object FirExpectActualResolver {
useSiteSession: FirSession, useSiteSession: FirSession,
scopeSession: ScopeSession, scopeSession: ScopeSession,
context: FirExpectActualMatchingContext, context: FirExpectActualMatchingContext,
): ExpectForActualData? { ): ExpectForActualData {
with(context) { with(context) {
val result = when (actualSymbol) { val result = when (actualSymbol) {
is FirCallableSymbol<*> -> { is FirCallableSymbol<*> -> {
@@ -55,7 +55,7 @@ object FirExpectActualResolver {
else -> expectContainingClass?.getMembersForExpectClass(actualSymbol.name) else -> expectContainingClass?.getMembersForExpectClass(actualSymbol.name)
}.orEmpty() }.orEmpty()
} }
callableId.isLocal -> return null callableId.isLocal -> return emptyMap()
else -> { else -> {
val scope = FirPackageMemberScope(callableId.packageName, useSiteSession, useSiteSession.dependenciesSymbolProvider) val scope = FirPackageMemberScope(callableId.packageName, useSiteSession, useSiteSession.dependenciesSymbolProvider)
mutableListOf<FirCallableSymbol<*>>().apply { mutableListOf<FirCallableSymbol<*>>().apply {
@@ -85,7 +85,7 @@ object FirExpectActualResolver {
} }
is FirClassLikeSymbol<*> -> { is FirClassLikeSymbol<*> -> {
val expectClassSymbol = useSiteSession.dependenciesSymbolProvider val expectClassSymbol = useSiteSession.dependenciesSymbolProvider
.getClassLikeSymbolByClassId(actualSymbol.classId) as? FirRegularClassSymbol ?: return null .getClassLikeSymbolByClassId(actualSymbol.classId) as? FirRegularClassSymbol ?: return emptyMap()
val compatibility = AbstractExpectActualCompatibilityChecker.getClassifiersCompatibility( val compatibility = AbstractExpectActualCompatibilityChecker.getClassifiersCompatibility(
expectClassSymbol, expectClassSymbol,
actualSymbol, actualSymbol,
@@ -94,7 +94,7 @@ object FirExpectActualResolver {
) )
mapOf(compatibility to listOf(expectClassSymbol)) mapOf(compatibility to listOf(expectClassSymbol))
} }
else -> null else -> emptyMap()
} }
return result return result
} }