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

Migration to expect/actual: renames in DeclarationResolver

Browse Source
This commit is contained in:
Mikhail Glukhikh
2017-09-15 13:30:21 +03:00
parent afdd647df1
commit fc4ff3b760
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationResolver.kt
+3 -3
View File
@@ -78,12 +78,12 @@ class DeclarationResolver(
for ((fqName, declarationsOrPackageDirectives) in topLevelFqNames.asMap()) { for ((fqName, declarationsOrPackageDirectives) in topLevelFqNames.asMap()) {
if (fqName.isRoot) continue if (fqName.isRoot) continue
// TODO: report error on header class and impl val, or vice versa // TODO: report error on expected class and actual val, or vice versa
val (header, impl) = val (expected, actual) =
getTopLevelDescriptorsByFqName(topLevelDescriptorProvider, fqName, NoLookupLocation.WHEN_CHECK_DECLARATION_CONFLICTS) getTopLevelDescriptorsByFqName(topLevelDescriptorProvider, fqName, NoLookupLocation.WHEN_CHECK_DECLARATION_CONFLICTS)
.partition { it is MemberDescriptor && it.isExpect } .partition { it is MemberDescriptor && it.isExpect }
for (descriptors in listOf(header, impl)) { for (descriptors in listOf(expected, actual)) {
if (descriptors.size > 1) { if (descriptors.size > 1) {
for (directive in declarationsOrPackageDirectives) { for (directive in declarationsOrPackageDirectives) {
val reportAt = (directive as? KtPackageDirective)?.nameIdentifier ?: directive val reportAt = (directive as? KtPackageDirective)?.nameIdentifier ?: directive