From b4dbb666fc187328f42ae63f5d173a57000dff47 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Sat, 24 Oct 2015 15:47:04 +0300 Subject: [PATCH] More usages of asKtScope() removed --- .../kotlin/resolve/DescriptorResolver.java | 2 +- .../org/jetbrains/kotlin/idea/kdoc/KDocReference.kt | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java index bf6d92b82b1..bb29ec812d2 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java @@ -556,7 +556,7 @@ public class DescriptorResolver { Name name = nameExpression.getReferencedNameAsName(); - ClassifierDescriptor classifier = ScopeUtilsKt.asKtScope(scope).getClassifier(name, NoLookupLocation.UNSORTED); + ClassifierDescriptor classifier = ScopeUtilsKt.getClassifier(scope, name, NoLookupLocation.UNSORTED); if (classifier instanceof TypeParameterDescriptor && classifier.getContainingDeclaration() == descriptor) continue; if (classifier != null) { diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocReference.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocReference.kt index bf676bb1ec9..90b6616c19f 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocReference.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocReference.kt @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.FunctionDescriptorUtil import org.jetbrains.kotlin.resolve.scopes.* -import org.jetbrains.kotlin.resolve.scopes.utils.asKtScope +import org.jetbrains.kotlin.resolve.scopes.utils.getDescriptorsFromAllFiltered import org.jetbrains.kotlin.resolve.scopes.utils.memberScopeAsImportingScope import org.jetbrains.kotlin.resolve.source.PsiSourceElement @@ -85,9 +85,8 @@ public fun resolveKDocLink(resolutionFacade: ResolutionFacade, var result: Collection = listOf(fromDescriptor) qualifiedName.forEach { nameComponent -> - if (result.size() != 1) return listOf() - val scope = getResolutionScope(resolutionFacade, result.first()).asKtScope() - result = scope.getDescriptors().filter { it.getName().asString() == nameComponent } + val scope = getResolutionScope(resolutionFacade, result.singleOrNull() ?: return emptyList()) + result = scope.getDescriptorsFromAllFiltered(nameFilter = { it.asString() == nameComponent}) } return result @@ -96,9 +95,9 @@ public fun resolveKDocLink(resolutionFacade: ResolutionFacade, private fun resolveInLocalScope(fromDescriptor: DeclarationDescriptor, name: String, resolutionFacade: ResolutionFacade): List { - val scope = getResolutionScope(resolutionFacade, fromDescriptor).asKtScope() - return scope.getDescriptors().filter { - it.getName().asString() == name && it.getContainingDeclaration() == fromDescriptor + val scope = getResolutionScope(resolutionFacade, fromDescriptor) + return scope.getDescriptorsFromAllFiltered(nameFilter = { it.asString() == name }).filter { + it.containingDeclaration == fromDescriptor } }