Introduced category for default object usages.

This commit is contained in:
Evgeny Gerashchenko
2015-03-13 20:31:11 +03:00
parent 510974e07c
commit 22a41e8012
10 changed files with 32 additions and 25 deletions
@@ -389,6 +389,7 @@ usageType.type.definition = Type definition
usageType.is = Target type of 'is' operation
usageType.as = Target type of 'as' operation
usageType.class.object = Nested class/object
usageType.default.object = Default object
usageType.instantiation = Instantiation
usageType.function.call = Function call
usageType.implicit.get = Implicit 'get'
@@ -29,12 +29,14 @@ import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.descriptors.ClassKind
import org.jetbrains.kotlin.descriptors.PackageViewDescriptor
import com.intellij.psi.PsiPackage
import com.intellij.psi.PsiReferenceExpression
import org.jetbrains.kotlin.descriptors.VariableDescriptor
import org.jetbrains.kotlin.idea.findUsages.UsageTypeEnum.*
import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.psi.psiUtil.getParentOfTypeAndBranch
import org.jetbrains.kotlin.idea.references.JetArrayAccessReference
import org.jetbrains.kotlin.idea.references.JetInvokeFunctionReference
import org.jetbrains.kotlin.idea.references.unwrappedTargets
import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.resolve.DescriptorUtils
@@ -208,6 +210,7 @@ public object UsageTypeUtils {
is ClassifierDescriptor -> when {
// Treat object accesses as variables to simulate the old behaviour (when variables were created for objects)
DescriptorUtils.isNonDefaultObject(descriptor), DescriptorUtils.isEnumEntry(descriptor) -> getVariableUsageType()
DescriptorUtils.isDefaultObject(descriptor) -> DEFAULT_OBJECT_ACCESS
else -> getClassUsageType()
}
is PackageViewDescriptor -> {
@@ -229,6 +232,7 @@ enum class UsageTypeEnum {
TYPE_DEFINITION
IS
CLASS_OBJECT_ACCESS
DEFAULT_OBJECT_ACCESS
EXTENSION_RECEIVER_TYPE
SUPER_TYPE_QUALIFIER