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

Do check isCheapEnoughToSearch for companion objects, but just ignore ZERO_OCCURENCES outcome.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2015-03-27 15:01:36 +03:00
parent 83f2a08708
commit 59f939d9ef
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt
+13 -10
View File
@@ -162,19 +162,22 @@ public class UnusedSymbolInspection : AbstractKotlinInspection() {
val psiSearchHelper = PsiSearchHelper.SERVICE.getInstance(declaration.getProject())
val useScope = declaration.getUseScope()
if (!(declaration is JetObjectDeclaration && declaration.isCompanion())) {
if (useScope is GlobalSearchScope) {
var zeroOccurrences = true
if (useScope is GlobalSearchScope) {
var zeroOccurrences = true
for (name in listOf(declaration.getName()) + declaration.getAccessorNames() + declaration.getClassNameForCompanionObject().singletonOrEmptyList()) {
when (psiSearchHelper.isCheapEnoughToSearch(name, useScope, null, null)) {
ZERO_OCCURRENCES -> {} // go on, check other names
FEW_OCCURRENCES -> zeroOccurrences = false
TOO_MANY_OCCURRENCES -> return true // searching usages is too expensive; behave like it is used
}
for (name in listOf(declaration.getName()) + declaration.getAccessorNames() + declaration.getClassNameForCompanionObject().singletonOrEmptyList()) {
when (psiSearchHelper.isCheapEnoughToSearch(name, useScope, null, null)) {
ZERO_OCCURRENCES -> {} // go on, check other names
FEW_OCCURRENCES -> zeroOccurrences = false
TOO_MANY_OCCURRENCES -> return true // searching usages is too expensive; behave like it is used
}
}
if (zeroOccurrences) {
if (zeroOccurrences) {
if (declaration is JetObjectDeclaration && declaration.isCompanion()) {
// go on: companion object can be used only in containing class
}
else {
return false
}
}