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

[FIR] Find the correct FIR file in Java finder for file with JvmName

Browse Source 
#KT-57802
This commit is contained in:
Ivan Kylchik
2023-07-10 12:55:59 +02:00
committed by Space Team
parent 8c7c44f9f5
commit a45bb8d92b
11 changed files with 92 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirJvmNameChecker.kt
+1 -7
View File
@@ -18,8 +18,8 @@ import org.jetbrains.kotlin.fir.declarations.utils.isOverridable
import org.jetbrains.kotlin.fir.declarations.utils.isOverride
import org.jetbrains.kotlin.fir.expressions.FirAnnotation
import org.jetbrains.kotlin.fir.expressions.FirConstExpression
import org.jetbrains.kotlin.fir.java.findJvmNameAnnotation
import org.jetbrains.kotlin.fir.resolve.getContainingClass
import org.jetbrains.kotlin.fir.types.classId
import org.jetbrains.kotlin.fir.types.coneType
import org.jetbrains.kotlin.fir.types.resolvedType
import org.jetbrains.kotlin.name.JvmStandardClassIds
@@ -57,12 +57,6 @@ object FirJvmNameChecker : FirBasicDeclarationChecker() {
}
}
private fun FirDeclaration.findJvmNameAnnotation(): FirAnnotation? {
return annotations.firstOrNull {
it.annotationTypeRef.coneType.classId == JvmStandardClassIds.Annotations.JvmName
}
}
private fun CheckerContext.isRenamableFunction(function: FirFunction): Boolean {
val containingClass = function.getContainingClassSymbol(session)
return containingClass != null || !function.symbol.callableId.isLocal