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

consider a companion object to be used if it contains any members

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-08-27 18:26:09 +02:00
parent c645b9c237
commit 039738a995
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt
+4 -9
View File
@@ -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 { private fun hasReferences(declaration: JetNamedDeclaration, useScope: SearchScope): Boolean {
@@ -256,12 +257,6 @@ public class UnusedSymbolInspection : AbstractKotlinInspection() {
return DefinitionsScopedSearch.search(declaration, useScope).findFirst() != null 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? { override fun createOptionsPanel(): JComponent? {
val panel = JPanel(GridBagLayout()) val panel = JPanel(GridBagLayout())
panel.add( panel.add(