Minor: remove unused parameter from LookupTracker.record

This commit is contained in:
Zalim Bashorov
2015-11-26 17:34:20 +03:00
parent 7faa886d26
commit d1c5bd4526
5 changed files with 8 additions and 7 deletions
@@ -29,7 +29,9 @@ import org.jetbrains.kotlin.incremental.record
import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.kotlin.load.java.JvmAbi
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.DescriptorUtils
import org.jetbrains.kotlin.resolve.scopes.* import org.jetbrains.kotlin.resolve.scopes.BaseImportingScope
import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
import org.jetbrains.kotlin.resolve.scopes.HierarchicalScope
import org.jetbrains.kotlin.resolve.scopes.utils.collectSyntheticExtensionProperties import org.jetbrains.kotlin.resolve.scopes.utils.collectSyntheticExtensionProperties
import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.kotlin.storage.StorageManager
import org.jetbrains.kotlin.types.* import org.jetbrains.kotlin.types.*
@@ -78,7 +80,7 @@ class JavaSyntheticPropertiesScope(storageManager: StorageManager, private val l
val (descriptor, lookedNames) = syntheticPropertyInClass(Pair(classifier, name)) val (descriptor, lookedNames) = syntheticPropertyInClass(Pair(classifier, name))
if (location !is NoLookupLocation) { if (location !is NoLookupLocation) {
lookedNames.forEach { lookupTracker.record(location, classifier, classifier.unsubstitutedMemberScope, it) } lookedNames.forEach { lookupTracker.record(location, classifier, it) }
} }
return descriptor return descriptor
@@ -187,6 +187,6 @@ protected constructor(
} }
private fun recordLookup(name: Name, from: LookupLocation) { private fun recordLookup(name: Name, from: LookupLocation) {
c.lookupTracker.record(from, thisDescriptor, this, name) c.lookupTracker.record(from, thisDescriptor, name)
} }
} }
@@ -361,6 +361,6 @@ public abstract class LazyJavaScope(protected val c: LazyJavaResolverContext) :
} }
protected fun recordLookup(name: Name, from: LookupLocation) { protected fun recordLookup(name: Name, from: LookupLocation) {
c.components.lookupTracker.record(from, ownerDescriptor, this, name) c.components.lookupTracker.record(from, ownerDescriptor, name)
} }
} }
@@ -22,9 +22,8 @@ import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
import org.jetbrains.kotlin.incremental.components.* import org.jetbrains.kotlin.incremental.components.*
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameUnsafe import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameUnsafe
import org.jetbrains.kotlin.resolve.scopes.MemberScope
public fun LookupTracker.record(from: LookupLocation, scopeOwner: DeclarationDescriptor, inScope: MemberScope, name: Name) { public fun LookupTracker.record(from: LookupLocation, scopeOwner: DeclarationDescriptor, name: Name) {
if (this == LookupTracker.DO_NOTHING || from is NoLookupLocation) return if (this == LookupTracker.DO_NOTHING || from is NoLookupLocation) return
val location = from.location ?: return val location = from.location ?: return
@@ -184,6 +184,6 @@ public abstract class DeserializedMemberScope protected constructor(
} }
private fun recordLookup(name: Name, from: LookupLocation) { private fun recordLookup(name: Name, from: LookupLocation) {
c.components.lookupTracker.record(from, c.containingDeclaration, this, name) c.components.lookupTracker.record(from, c.containingDeclaration, name)
} }
} }