Skip to content

Commit

Permalink
Refactored MemberNameEqualsClassName rule
Browse files Browse the repository at this point in the history
  • Loading branch information
schalkms authored and arturbosch committed Jan 1, 2018
1 parent 518554a commit 462a1eb
Showing 1 changed file with 3 additions and 7 deletions.
Expand Up @@ -97,13 +97,9 @@ class MemberNameEqualsClassName(config: Config = Config.empty) : Rule(config) {
}

private fun getMisnamedCompanionObjectMembers(klass: KtClass): List<KtNamedDeclaration> {
val list = mutableListOf<KtNamedDeclaration>()
klass.companionObjects.forEach { list.addAll(getMisnamedMembers(it, klass.name)) }
list
.filterIsInstance<KtNamedFunction>()
.filter { isFactoryMethod(it, klass) }
.forEach { it -> list.remove(it) }
return list
return klass.companionObjects
.flatMap { getMisnamedMembers(it, klass.name) }
.filterNot { it is KtNamedFunction && isFactoryMethod(it, klass) }
}

private fun isFactoryMethod(function: KtNamedFunction, klass: KtClass): Boolean {
Expand Down

0 comments on commit 462a1eb

Please sign in to comment.