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

[FIR IDE] Fixed annotation application completion

Browse Source
This commit is contained in:
Igor Yakovlev
2021-05-10 19:20:54 +02:00
committed by TeamCityServer
parent 3275165619
commit dedcaf1eab
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/api/LowLevelFirApiFacadeForResolveOnAir.kt
+1 -7
View File
@@ -45,12 +45,6 @@ object LowLevelFirApiFacadeForResolveOnAir {
ktDeclaration.canBeEnclosingDeclaration() ktDeclaration.canBeEnclosingDeclaration()
} }
private fun <T : KtElement> locateDeclarationInFileByOffset(offsetElement: T, file: KtFile): T? {
val elementOffset = offsetElement.textOffset
val elementAtOffset = file.findElementAt(elementOffset) ?: return null
return PsiTreeUtil.getParentOfType(elementAtOffset, offsetElement::class.java, false)?.takeIf { it.textOffset == elementOffset }
}
private fun recordOriginalDeclaration(targetDeclaration: KtNamedDeclaration, originalDeclaration: KtNamedDeclaration) { private fun recordOriginalDeclaration(targetDeclaration: KtNamedDeclaration, originalDeclaration: KtNamedDeclaration) {
require(!targetDeclaration.isPhysical) require(!targetDeclaration.isPhysical)
require(originalDeclaration.containingKtFile !== targetDeclaration.containingKtFile) require(originalDeclaration.containingKtFile !== targetDeclaration.containingKtFile)
@@ -151,7 +145,7 @@ object LowLevelFirApiFacadeForResolveOnAir {
) )
val sameDeclarationInOriginalFile = locateDeclarationInFileByOffset(dependencyNonLocalDeclaration, originalKtFile) val sameDeclarationInOriginalFile = PsiTreeUtil.findSameElementInCopy(dependencyNonLocalDeclaration, originalKtFile)
?: error("Cannot find original function matching to ${dependencyNonLocalDeclaration.getElementTextInContext()} in $originalKtFile") ?: error("Cannot find original function matching to ${dependencyNonLocalDeclaration.getElementTextInContext()} in $originalKtFile")
recordOriginalDeclaration( recordOriginalDeclaration(