azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KT-64080 [LL] Use nullable receiver overload for isAncestor function

Browse Source 
This simplifies the `bodyResolveRequired` a lot
This commit is contained in:
Roman Golyshev
2023-12-06 14:31:24 +01:00
parent a475a3031e
commit 3c7dfc0e5b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LowLevelFirApiFacadeForResolveOnAir.kt
+5 -5
View File
@@ -456,14 +456,14 @@ object LowLevelFirApiFacadeForResolveOnAir {
private fun bodyResolveRequired(container: KtDeclaration, elementToReplace: PsiElement): Boolean = when { private fun bodyResolveRequired(container: KtDeclaration, elementToReplace: PsiElement): Boolean = when {
container == elementToReplace -> true container == elementToReplace -> true
container is KtDeclarationWithBody -> container.bodyExpression?.isAncestor(elementToReplace) container is KtDeclarationWithBody -> container.bodyExpression.isAncestor(elementToReplace)
container is KtProperty -> container.delegateExpressionOrInitializer?.isAncestor(elementToReplace) container is KtProperty -> container.delegateExpressionOrInitializer.isAncestor(elementToReplace)
container is KtParameter -> container.defaultValue?.isAncestor(elementToReplace) container is KtParameter -> container.defaultValue.isAncestor(elementToReplace)
container is KtEnumEntry -> { container is KtEnumEntry -> {
container.initializerList?.isAncestor(elementToReplace) == true || container.body?.isAncestor(elementToReplace) == true container.initializerList.isAncestor(elementToReplace) || container.body.isAncestor(elementToReplace)
} }
container is KtScript || container is KtAnonymousInitializer -> true container is KtScript || container is KtAnonymousInitializer -> true
else -> false else -> false
} == true }
} }