diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt index 7cd47794450..dc963ceabb6 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt @@ -16,7 +16,6 @@ import org.jetbrains.kotlin.fir.declarations.FirRegularClass import org.jetbrains.kotlin.fir.declarations.FirTypeParameter import org.jetbrains.kotlin.fir.declarations.addDefaultBoundIfNecessary import org.jetbrains.kotlin.fir.declarations.builder.FirTypeParameterBuilder -import org.jetbrains.kotlin.fir.expressions.builder.buildAnnotationCall import org.jetbrains.kotlin.fir.java.declarations.* import org.jetbrains.kotlin.fir.resolve.AbstractFirSymbolProvider import org.jetbrains.kotlin.fir.resolve.constructType @@ -30,7 +29,7 @@ import org.jetbrains.kotlin.fir.scopes.impl.nestedClassifierScope import org.jetbrains.kotlin.fir.symbols.CallableId import org.jetbrains.kotlin.fir.symbols.impl.* import org.jetbrains.kotlin.fir.types.builder.buildResolvedTypeRef -import org.jetbrains.kotlin.fir.toFirSourceElement +import org.jetbrains.kotlin.fir.toFirPsiSourceElement import org.jetbrains.kotlin.fir.types.impl.ConeTypeParameterTypeImpl import org.jetbrains.kotlin.load.java.JavaClassFinder import org.jetbrains.kotlin.load.java.JvmAnnotationNames @@ -163,7 +162,7 @@ class JavaSymbolProvider( } } val firJavaClass = buildJavaClass { - source = (javaClass as? JavaElementImpl<*>)?.psi?.toFirSourceElement() + source = (javaClass as? JavaElementImpl<*>)?.psi?.toFirPsiSourceElement() session = this@JavaSymbolProvider.session symbol = firSymbol name = javaClass.name @@ -186,7 +185,7 @@ class JavaSymbolProvider( val fieldSymbol = FirFieldSymbol(fieldId) val returnType = javaField.type val firJavaField = buildJavaField { - source = (javaField as? JavaElementImpl<*>)?.psi?.toFirSourceElement() + source = (javaField as? JavaElementImpl<*>)?.psi?.toFirPsiSourceElement() session = this@JavaSymbolProvider.session symbol = fieldSymbol name = fieldName @@ -207,7 +206,7 @@ class JavaSymbolProvider( val returnType = javaMethod.returnType val firJavaMethod = buildJavaMethod { session = this@JavaSymbolProvider.session - source = (javaMethod as? JavaElementImpl<*>)?.psi?.toFirSourceElement() + source = (javaMethod as? JavaElementImpl<*>)?.psi?.toFirPsiSourceElement() symbol = methodSymbol name = methodName visibility = javaMethod.visibility @@ -235,7 +234,7 @@ class JavaSymbolProvider( val constructorSymbol = FirConstructorSymbol(constructorId) val classTypeParameters = javaClass.typeParameters.convertTypeParameters(javaTypeParameterStack) return FirJavaConstructorBuilder().apply { - source = psi?.toFirSourceElement() + source = psi?.toFirPsiSourceElement() session = this@JavaSymbolProvider.session symbol = constructorSymbol this.visibility = visibility diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaUtils.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaUtils.kt index e2846b6f203..394f50cea9a 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaUtils.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaUtils.kt @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.firUnsafe import org.jetbrains.kotlin.fir.symbols.StandardClassIds import org.jetbrains.kotlin.fir.symbols.impl.ConeClassLikeLookupTagImpl import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol -import org.jetbrains.kotlin.fir.toFirSourceElement +import org.jetbrains.kotlin.fir.toFirPsiSourceElement import org.jetbrains.kotlin.fir.types.* import org.jetbrains.kotlin.fir.types.builder.buildResolvedTypeRef import org.jetbrains.kotlin.fir.types.impl.ConeClassLikeTypeImpl @@ -353,7 +353,7 @@ internal fun JavaValueParameter.toFirValueParameter( session: FirSession, index: Int, javaTypeParameterStack: JavaTypeParameterStack ): FirValueParameter { return buildJavaValueParameter { - source = (this@toFirValueParameter as? JavaElementImpl<*>)?.psi?.toFirSourceElement() + source = (this@toFirValueParameter as? JavaElementImpl<*>)?.psi?.toFirPsiSourceElement() this.session = session name = this@toFirValueParameter.name ?: Name.identifier("p$index") returnTypeRef = type.toFirJavaTypeRef(session, javaTypeParameterStack) diff --git a/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/PsiConversionUtils.kt b/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/PsiConversionUtils.kt index d8835eee1a6..18d212ca79f 100644 --- a/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/PsiConversionUtils.kt +++ b/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/PsiConversionUtils.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.diagnostics.DiagnosticKind import org.jetbrains.kotlin.fir.expressions.* import org.jetbrains.kotlin.fir.expressions.builder.* import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol -import org.jetbrains.kotlin.fir.toFirSourceElement +import org.jetbrains.kotlin.fir.toFirPsiSourceElement import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.psi.* @@ -27,7 +27,7 @@ internal fun KtWhenCondition.toFirWhenCondition( convert: KtExpression?.(String) -> FirExpression, toFirOrErrorTypeRef: KtTypeReference?.() -> FirTypeRef, ): FirExpression { - val baseSource = this.toFirSourceElement() + val baseSource = this.toFirPsiSourceElement() val firSubjectExpression = buildWhenSubjectExpression { source = baseSource whenSubject = subject @@ -35,7 +35,7 @@ internal fun KtWhenCondition.toFirWhenCondition( return when (this) { is KtWhenConditionWithExpression -> { buildOperatorCall { - source = expression?.toFirSourceElement() + source = expression?.toFirPsiSourceElement() operation = FirOperation.EQ argumentList = buildBinaryArgumentList( firSubjectExpression, expression.convert("No expression in condition with expression") @@ -47,13 +47,13 @@ internal fun KtWhenCondition.toFirWhenCondition( firRange.generateContainsOperation( firSubjectExpression, isNegated, - rangeExpression?.toFirSourceElement(), - operationReference.toFirSourceElement() + rangeExpression?.toFirPsiSourceElement(), + operationReference.toFirPsiSourceElement() ) } is KtWhenConditionIsPattern -> { buildTypeOperatorCall { - source = typeReference?.toFirSourceElement() + source = typeReference?.toFirPsiSourceElement() operation = if (isNegated) FirOperation.NOT_IS else FirOperation.IS conversionTypeRef = typeReference.toFirOrErrorTypeRef() argumentList = buildUnaryArgumentList(firSubjectExpression) @@ -93,13 +93,13 @@ internal fun generateDestructuringBlock( toFirOrImplicitTypeRef: KtTypeReference?.() -> FirTypeRef, ): FirExpression { return buildBlock { - source = multiDeclaration.toFirSourceElement() + source = multiDeclaration.toFirPsiSourceElement() if (tmpVariable) { statements += container } val isVar = multiDeclaration.isVar for ((index, entry) in multiDeclaration.entries.withIndex()) { - val entrySource = entry.toFirSourceElement() + val entrySource = entry.toFirPsiSourceElement() val name = entry.nameAsSafeName statements += buildProperty { source = entrySource diff --git a/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt b/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt index 6faef7ede4c..e21db5596ee 100644 --- a/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt +++ b/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt @@ -54,7 +54,7 @@ class RawFirBuilder( } override fun PsiElement.toFirSourceElement(): FirPsiSourceElement<*> { - return FirPsiSourceElement(this) + return this.toFirPsiSourceElement() } override val PsiElement.elementType: IElementType diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirModifierList.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirModifierList.kt index 7e9c3c052b5..ab502665b69 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirModifierList.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirModifierList.kt @@ -60,7 +60,7 @@ val FirModifier<*>.lightNode: LighterASTNode? get() = (this as? FirLightModifier val FirModifier<*>.source: FirSourceElement? get() = when (this) { - is FirPsiModifier -> this.psi?.toFirSourceElement() + is FirPsiModifier -> this.psi?.toFirPsiSourceElement() is FirLightModifier -> { // TODO pretty sure I got offsets wrong here val startOffset = tree.getStartOffset(node) diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirSourceElement.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirSourceElement.kt index 56d06a23138..83f4276dc1b 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirSourceElement.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirSourceElement.kt @@ -47,7 +47,7 @@ val FirSourceElement?.psi: PsiElement? get() = (this as? FirPsiSourceElement<*>) val FirElement.psi: PsiElement? get() = (source as? FirPsiSourceElement<*>)?.psi @Suppress("NOTHING_TO_INLINE") -inline fun PsiElement.toFirSourceElement(): FirPsiSourceElement<*> = FirPsiSourceElement(this) +inline fun PsiElement.toFirPsiSourceElement(): FirPsiSourceElement<*> = FirPsiSourceElement(this) val FirSourceElement?.lightNode: LighterASTNode? get() = (this as? FirLightSourceElement)?.element