This commit is contained in:
Valentin Kipyatkov
2015-11-10 13:38:08 +03:00
parent bba960f1a5
commit afc968fe83
@@ -155,11 +155,9 @@ public class ImportInsertHelperImpl(private val project: Project) : ImportInsert
is PackageViewDescriptor -> topLevelScope.findPackage(name)
else -> null
}
if (conflict != null && imports.any {
!it.isAllUnder()
&& it.getImportPath()?.fqnPart() == conflict.importableFqName
&& it.getImportPath()?.getImportedName() == name
}) {
if (conflict != null
&& imports.any { !it.isAllUnder && it.importPath?.fqnPart() == conflict.importableFqName && it.importPath?.importedName == name }
) {
return ImportDescriptorResult.FAIL
}