From 326b6fa7c23dcca33d3b25739985747c15c25dec Mon Sep 17 00:00:00 2001 From: Marco Pennekamp Date: Mon, 22 May 2023 14:40:39 +0200 Subject: [PATCH] [AA] Add missing `withValidityAssertion` calls to scopes ^KT-58653 --- .../kotlin/analysis/api/descriptors/scopes/KtFe10FileScope.kt | 4 ++-- .../analysis/api/descriptors/scopes/KtFe10ScopeResolution.kt | 4 ++-- .../fir/components/KtFirSymbolFromResolveExtensionProvider.kt | 2 +- .../analysis/api/fir/scopes/KtFirDelegatedMemberScope.kt | 2 +- .../kotlin/analysis/api/fir/scopes/KtFirFileScope.kt | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/scopes/KtFe10FileScope.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/scopes/KtFe10FileScope.kt index a953875c75e..296d58bad65 100644 --- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/scopes/KtFe10FileScope.kt +++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/scopes/KtFe10FileScope.kt @@ -51,7 +51,7 @@ internal class KtFe10FileScope( } } - override fun getCallableSymbols(names: Collection): Sequence { + override fun getCallableSymbols(names: Collection): Sequence = withValidityAssertion { if (names.isEmpty()) return emptySequence() val namesSet = names.toSet() return getCallableSymbols { it in namesSet } @@ -71,7 +71,7 @@ internal class KtFe10FileScope( } } - override fun getClassifierSymbols(names: Collection): Sequence { + override fun getClassifierSymbols(names: Collection): Sequence = withValidityAssertion { if (names.isEmpty()) return emptySequence() val namesSet = names.toSet() return getClassifierSymbols { it in namesSet } diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/scopes/KtFe10ScopeResolution.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/scopes/KtFe10ScopeResolution.kt index 7fe2f517295..4efe8b8fcb1 100644 --- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/scopes/KtFe10ScopeResolution.kt +++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/scopes/KtFe10ScopeResolution.kt @@ -34,7 +34,7 @@ internal abstract class KtFe10ScopeResolution : KtScope, KtLifetimeOwner { .mapNotNull { it.toKtSymbol(analysisContext) as? KtCallableSymbol } } - override fun getCallableSymbols(names: Collection): Sequence { + override fun getCallableSymbols(names: Collection): Sequence = withValidityAssertion { if (names.isEmpty()) return emptySequence() val namesSet = names.toSet() return getCallableSymbols { it in namesSet } @@ -48,7 +48,7 @@ internal abstract class KtFe10ScopeResolution : KtScope, KtLifetimeOwner { .mapNotNull { it.toKtSymbol(analysisContext) as? KtClassifierSymbol } } - override fun getClassifierSymbols(names: Collection): Sequence { + override fun getClassifierSymbols(names: Collection): Sequence = withValidityAssertion { if (names.isEmpty()) return emptySequence() val namesSet = names.toSet() return getClassifierSymbols { it in namesSet } diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSymbolFromResolveExtensionProvider.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSymbolFromResolveExtensionProvider.kt index 0c9572b65ab..30e1280b602 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSymbolFromResolveExtensionProvider.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSymbolFromResolveExtensionProvider.kt @@ -56,7 +56,7 @@ private class KtFirResolveExtensionScope( gelTopLevelDeclarations(nameFilter) { it.getTopLevelClassifiers() } } - override fun getClassifierSymbols(names: Collection): Sequence { + override fun getClassifierSymbols(names: Collection): Sequence = withValidityAssertion { if (names.isEmpty()) return emptySequence() val namesSet = names.toSet() return getClassifierSymbols { it in namesSet } diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/scopes/KtFirDelegatedMemberScope.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/scopes/KtFirDelegatedMemberScope.kt index cd0f9a2f6ff..7d396ae16e9 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/scopes/KtFirDelegatedMemberScope.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/scopes/KtFirDelegatedMemberScope.kt @@ -22,7 +22,7 @@ internal class KtFirDelegatedMemberScope( return super.getCallableSymbols(nameFilter).filter { it.origin == KtSymbolOrigin.DELEGATED } } - override fun getCallableSymbols(names: Collection): Sequence { + override fun getCallableSymbols(names: Collection): Sequence = withValidityAssertion { return super.getCallableSymbols(names).filter { it.origin == KtSymbolOrigin.DELEGATED } } } diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/scopes/KtFirFileScope.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/scopes/KtFirFileScope.kt index 731cf1fdda7..c212041d950 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/scopes/KtFirFileScope.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/scopes/KtFirFileScope.kt @@ -99,7 +99,7 @@ internal class KtFirFileScope( } } - override fun getClassifierSymbols(names: Collection): Sequence { + override fun getClassifierSymbols(names: Collection): Sequence = withValidityAssertion { if (names.isEmpty()) return emptySequence() val namesSet = names.toSet() return getClassifierSymbols { it in namesSet }