diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/JavaSyntheticPropertiesScope.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/JavaSyntheticPropertiesScope.kt index 2390ee13356..ceea96af979 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/JavaSyntheticPropertiesScope.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/JavaSyntheticPropertiesScope.kt @@ -23,6 +23,7 @@ import org.jetbrains.kotlin.descriptors.impl.PropertyDescriptorImpl import org.jetbrains.kotlin.descriptors.impl.PropertyGetterDescriptorImpl import org.jetbrains.kotlin.descriptors.impl.PropertySetterDescriptorImpl import org.jetbrains.kotlin.incremental.components.LookupLocation +import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter @@ -99,13 +100,13 @@ class JavaSyntheticPropertiesScope(storageManager: StorageManager) : JetScopeImp val memberScope = ownerClass.unsubstitutedMemberScope val getMethod = possibleGetMethodNames(name) - .flatMap { memberScope.getFunctions(it).asSequence() } + .flatMap { memberScope.getFunctions(it, NoLookupLocation.UNSORTED).asSequence() } .singleOrNull { isGoodGetMethod(it) && it.hasJavaOriginInHierarchy() } ?: return null - val setMethod = memberScope.getFunctions(setMethodName(getMethod.name)) + val setMethod = memberScope.getFunctions(setMethodName(getMethod.name), NoLookupLocation.UNSORTED) .singleOrNull { isGoodSetMethod(it, getMethod) } val propertyType = getMethod.returnType ?: return null diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/JetScope.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/JetScope.kt index ce1b8f0c2fa..c93d6db7f28 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/JetScope.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/JetScope.kt @@ -50,8 +50,6 @@ public interface JetScope { // Temporary overloads which will be dropped when all usages will be processed @deprecated("Provide `location` explicitly", replaceWith = ReplaceWith("getClassifier(name, NoLookupLocation.UNSORTED)")) public final fun getClassifier(name: Name): ClassifierDescriptor? = getClassifier(name, NoLookupLocation.UNSORTED) - @deprecated("Provide `location` explicitly", replaceWith = ReplaceWith("getFunctions(name, NoLookupLocation.UNSORTED)")) - public final fun getFunctions(name: Name): Collection = getFunctions(name, NoLookupLocation.UNSORTED) /** * All visible descriptors from current scope. diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java b/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java index 10085d3983f..0c722e2cad2 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java @@ -80,12 +80,6 @@ public class ErrorUtils { public ClassifierDescriptor getClassifier(@NotNull Name name) { return getClassifier(name, NoLookupLocation.UNSORTED); } - - @NotNull - @Override - public Collection getFunctions(@NotNull Name name) { - return getFunctions(name, NoLookupLocation.UNSORTED); - } } public static class ErrorScope extends AbstractErrorScope {