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

Shadowed declarations filtering: more correct selection of imported declarations

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-06-11 15:16:12 +03:00
parent 985d69880f
commit b3d74c380a
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/ide-common/src/org/jetbrains/kotlin/idea/util/ShadowedDeclarationsFilter.kt
+9 -6
View File
@@ -64,14 +64,17 @@ public class ShadowedDeclarationsFilter(
val importedDeclarationsSet = importedDeclarations.toSet() val importedDeclarationsSet = importedDeclarations.toSet()
val nonImportedDeclarations = declarations.filter { it !in importedDeclarationsSet } val nonImportedDeclarations = declarations.filter { it !in importedDeclarationsSet }
val importedDeclarationsBySignature = importedDeclarationsSet.groupBy { signature(it) }
val call = expression.getCall(bindingContext) ?: return nonImportedDeclarations val call = expression.getCall(bindingContext) ?: return nonImportedDeclarations
val notShadowed = nonImportedDeclarations val notShadowed = HashSet<DeclarationDescriptor>()
.groupBy { signature(it) to packageName(it) } // same signature non-imported declarations from different packages do not shadow each other // same signature non-imported declarations from different packages do not shadow each other
.values() for ((pair, group) in nonImportedDeclarations.groupBy { signature(it) to packageName(it) }) {
.flatMapTo(HashSet<DeclarationDescriptor>()) { group -> val imported = importedDeclarationsBySignature[pair.first]
filterEqualSignatureGroup(group + importedDeclarations, call, descriptorsToImport = group) val all = if (imported != null) group + imported else group
} notShadowed.addAll(filterEqualSignatureGroup(all, call, descriptorsToImport = group))
}
return declarations.filter { it in notShadowed } return declarations.filter { it in notShadowed }
} }