From 039738a9953fd8b166e1d522c5739fd108fe8e8f Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 27 Aug 2015 18:26:09 +0200 Subject: [PATCH] consider a companion object to be used if it contains any members --- .../idea/inspections/UnusedSymbolInspection.kt | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt index fd000e8a3be..313feaa655f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt @@ -237,10 +237,11 @@ public class UnusedSymbolInspection : AbstractKotlinInspection() { } } + return (declaration is JetObjectDeclaration && declaration.isCompanion() && + declaration.getBody()?.declarations?.isNotEmpty() == true) || + hasReferences(declaration, useScope) || + hasOverrides(declaration, useScope) - return hasReferences(declaration, useScope) || - hasOverrides(declaration, useScope) || - hasCompanionObjectMemberUsages(declaration, useScope) } private fun hasReferences(declaration: JetNamedDeclaration, useScope: SearchScope): Boolean { @@ -256,12 +257,6 @@ public class UnusedSymbolInspection : AbstractKotlinInspection() { return DefinitionsScopedSearch.search(declaration, useScope).findFirst() != null } - private fun hasCompanionObjectMemberUsages(declaration: JetNamedDeclaration, useScope: SearchScope): Boolean { - if (declaration !is JetObjectDeclaration || !declaration.isCompanion()) return false - - return declaration.declarations.any { it is JetNamedDeclaration && hasReferences(it, useScope) } - } - override fun createOptionsPanel(): JComponent? { val panel = JPanel(GridBagLayout()) panel.add(