Code cleanup: several inspections applied

This commit is contained in:
Mikhail Glukhikh
2017-06-27 14:26:19 +03:00
committed by Mikhail Glukhikh
parent fdca96634e
commit 840847e47c
76 changed files with 121 additions and 147 deletions
@@ -55,8 +55,7 @@ private class UnusedInstanceCollector : JsVisitorWithContextImpl() {
tracker.addCandidateForRemoval(name, currentStatement!!)
val references = collectUsedNames(x)
references.filterNotNull()
.forEach { tracker.addRemovableReference(name, it) }
references.forEach { tracker.addRemovableReference(name, it) }
return false
}
@@ -157,8 +157,7 @@ class ClassModelGenerator(val context: StaticContext) {
// When none found, we have nothing to copy, ignore.
// When multiple found, our current class should provide implementation, ignore.
val memberToCopy = member.findNonRepeatingOverriddenDescriptors({ overriddenDescriptors }, { original })
.filter { it.modality != Modality.ABSTRACT }
.singleOrNull() ?: return null
.singleOrNull { it.modality != Modality.ABSTRACT } ?: return null
// If found member is not from interface, we don't need to copy it, it's already in prototype
if ((memberToCopy.containingDeclaration as ClassDescriptor).kind != ClassKind.INTERFACE) return null
@@ -172,8 +171,7 @@ class ClassModelGenerator(val context: StaticContext) {
// When non found, we have nothing to copy, ignore.
// When multiple found, our current class should provide implementation, ignore.
val memberToCopy = member.findNonRepeatingOverriddenDescriptors({ overriddenDescriptors }, { original })
.filter { it.hasOrInheritsParametersWithDefaultValue() }
.singleOrNull() ?: return null
.singleOrNull { it.hasOrInheritsParametersWithDefaultValue() } ?: return null
// If found member is not from interface, we don't need to copy it, it's already in prototype
if ((memberToCopy.containingDeclaration as ClassDescriptor).kind != ClassKind.INTERFACE) return null