Minor: remove unused parameter from LookupTracker.record
This commit is contained in:
+4
-2
@@ -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
|
||||||
|
|||||||
+1
-1
@@ -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)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -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
|
||||||
|
|||||||
+1
-1
@@ -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)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user