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

MPP: Do not report ACTUAL_WITHOUT_EXPECT if compatibility is null for all modules

Browse Source 
This fixes diagnostic tests
This commit is contained in:
Alexey Sedunov
2018-03-12 15:58:14 +03:00
parent c0a17f72a7
commit 1be33b91fa
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ExpectedActualDeclarationChecker.kt
+4 -7
View File
@@ -117,13 +117,10 @@ object ExpectedActualDeclarationChecker : DeclarationChecker {
// So yet we are using own module in compiler context and common module in IDE context. // So yet we are using own module in compiler context and common module in IDE context.
val commonOrOwnModules = descriptor.module.expectedByModules.ifEmpty { listOf(descriptor.module) } val commonOrOwnModules = descriptor.module.expectedByModules.ifEmpty { listOf(descriptor.module) }
val compatibility = commonOrOwnModules val compatibility = commonOrOwnModules
.asSequence() .mapNotNull { ExpectedActualResolver.findExpectedForActual(descriptor, it) }
.fold(LinkedHashMap<Compatibility, List<MemberDescriptor>>()) { resultMap, commonModule -> .ifEmpty { return }
val currentMap = ExpectedActualResolver.findExpectedForActual(descriptor, commonModule) .fold(LinkedHashMap<Compatibility, List<MemberDescriptor>>()) { resultMap, partialMap ->
if (currentMap != null) { resultMap.apply { putAll(partialMap) }
resultMap.putAll(currentMap)
}
resultMap
} }
val hasActualModifier = descriptor.isActual && reportOn.hasActualModifier() val hasActualModifier = descriptor.isActual && reportOn.hasActualModifier()