From 5790a324369be959e7b96e2f6ba5962d77867bc8 Mon Sep 17 00:00:00 2001
From: Marco Pennekamp <marco.pennekamp@jetbrains.com>
Date: Thu, 2 Feb 2023 20:52:48 +0100
Subject: [PATCH] [AA] Remove duplicate `withValidityAssertion` calls

---
 .../analysis/api/fir/scopes/KtFirDelegatingTypeScope.kt       | 4 ++--
 .../kotlin/analysis/api/components/KtCallResolver.kt          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/scopes/KtFirDelegatingTypeScope.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/scopes/KtFirDelegatingTypeScope.kt
index e20296998fe..716259bbdc9 100644
--- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/scopes/KtFirDelegatingTypeScope.kt
+++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/scopes/KtFirDelegatingTypeScope.kt
@@ -11,9 +11,9 @@ import org.jetbrains.kotlin.analysis.api.lifetime.KtLifetimeToken
 import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion
 import org.jetbrains.kotlin.analysis.api.scopes.KtScopeNameFilter
 import org.jetbrains.kotlin.analysis.api.scopes.KtTypeScope
+import org.jetbrains.kotlin.analysis.api.signatures.KtCallableSignature
 import org.jetbrains.kotlin.analysis.api.symbols.KtClassifierSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtConstructorSymbol
-import org.jetbrains.kotlin.analysis.api.signatures.KtCallableSignature
 import org.jetbrains.kotlin.fir.scopes.FirContainingNamesAwareScope
 import org.jetbrains.kotlin.name.Name
 
@@ -26,7 +26,7 @@ internal open class KtFirDelegatingTypeScope(
         getPossibleCallableNames() + getPossibleClassifierNames()
     }
 
-    override fun getAllPossibleNames(): Set<Name> = withValidityAssertion { withValidityAssertion { allNamesCached } }
+    override fun getAllPossibleNames(): Set<Name> = withValidityAssertion { allNamesCached }
 
     override fun getPossibleCallableNames(): Set<Name> = withValidityAssertion {
         firScope.getCallableNames()
diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtCallResolver.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtCallResolver.kt
index 2a74b525715..a288534f83c 100644
--- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtCallResolver.kt
+++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtCallResolver.kt
@@ -52,7 +52,7 @@ public abstract class KtCallResolver : KtAnalysisSessionComponent() {
 public interface KtCallResolverMixIn : KtAnalysisSessionMixIn {
 
     public fun KtElement.resolveCall(): KtCallInfo? =
-        withValidityAssertion { withValidityAssertion { analysisSession.callResolver.resolveCall(this) } }
+        withValidityAssertion { analysisSession.callResolver.resolveCall(this) }
 
     public fun KtCallElement.resolveCall(): KtCallInfo = withValidityAssertion {
         analysisSession.callResolver.resolveCall(this)