diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt index f060f2311ff..0e49a107ef3 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.fir.backend import com.intellij.psi.PsiCompiledElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.psi import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference import org.jetbrains.kotlin.fir.references.FirThisReference diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt index da59e8235c5..882488af7c6 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt @@ -9,6 +9,7 @@ import org.jetbrains.kotlin.config.LanguageVersionSettings import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.FirFile import org.jetbrains.kotlin.fir.descriptors.FirModuleDescriptor +import org.jetbrains.kotlin.fir.psi import org.jetbrains.kotlin.ir.declarations.IrFile import org.jetbrains.kotlin.ir.declarations.IrModuleFragment import org.jetbrains.kotlin.ir.declarations.impl.IrModuleFragmentImpl diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt index ef803c60fbc..078c786758b 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt @@ -15,8 +15,11 @@ import org.jetbrains.kotlin.fir.declarations.impl.FirDefaultPropertyGetter import org.jetbrains.kotlin.fir.declarations.impl.FirDefaultPropertySetter import org.jetbrains.kotlin.fir.descriptors.FirModuleDescriptor import org.jetbrains.kotlin.fir.descriptors.FirPackageFragmentDescriptor +import org.jetbrains.kotlin.fir.psi import org.jetbrains.kotlin.fir.render -import org.jetbrains.kotlin.fir.resolve.* +import org.jetbrains.kotlin.fir.resolve.firProvider +import org.jetbrains.kotlin.fir.resolve.firSymbolProvider +import org.jetbrains.kotlin.fir.resolve.getOrPut import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt index 5b29babe2bb..ed5e01a39e7 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt @@ -7,8 +7,7 @@ package org.jetbrains.kotlin.fir.backend import org.jetbrains.kotlin.backend.common.descriptors.WrappedValueParameterDescriptor import org.jetbrains.kotlin.descriptors.* -import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.* import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.impl.FirDefaultPropertyGetter import org.jetbrains.kotlin.fir.declarations.impl.FirDefaultPropertySetter @@ -20,7 +19,6 @@ import org.jetbrains.kotlin.fir.expressions.impl.FirUnitExpression import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference import org.jetbrains.kotlin.fir.references.impl.FirPropertyFromParameterResolvedNamedReference -import org.jetbrains.kotlin.fir.render import org.jetbrains.kotlin.fir.resolve.ScopeSession import org.jetbrains.kotlin.fir.resolve.buildUseSiteMemberScope import org.jetbrains.kotlin.fir.resolve.calls.SyntheticPropertySymbol @@ -29,7 +27,6 @@ import org.jetbrains.kotlin.fir.resolve.toSymbol import org.jetbrains.kotlin.fir.scopes.ProcessorAction import org.jetbrains.kotlin.fir.scopes.impl.FirClassSubstitutionScope import org.jetbrains.kotlin.fir.symbols.impl.* -import org.jetbrains.kotlin.fir.typeContext import org.jetbrains.kotlin.fir.types.* import org.jetbrains.kotlin.fir.visitors.FirDefaultVisitor import org.jetbrains.kotlin.ir.IrElement diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaElementFinder.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaElementFinder.kt index e4b3788a87a..f6c9298b330 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaElementFinder.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaElementFinder.kt @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.* -import org.jetbrains.kotlin.fir.resolve.FirProvider +import org.jetbrains.kotlin.fir.psi import org.jetbrains.kotlin.fir.resolve.directExpansionType import org.jetbrains.kotlin.fir.resolve.firProvider import org.jetbrains.kotlin.fir.resolve.toSymbol diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaElementFinder.kt.183 b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaElementFinder.kt.183 index 713d2d1de69..99fe3c67684 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaElementFinder.kt.183 +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaElementFinder.kt.183 @@ -23,6 +23,7 @@ import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.* +import org.jetbrains.kotlin.fir.psi import org.jetbrains.kotlin.fir.resolve.FirProvider import org.jetbrains.kotlin.fir.resolve.directExpansionType import org.jetbrains.kotlin.fir.resolve.firProvider 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 f6e2026d5d0..45a7bea06f6 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 @@ -28,6 +28,7 @@ import org.jetbrains.kotlin.fir.scopes.impl.FirSuperTypeScope import org.jetbrains.kotlin.fir.scopes.impl.declaredMemberScope import org.jetbrains.kotlin.fir.symbols.CallableId import org.jetbrains.kotlin.fir.symbols.impl.* +import org.jetbrains.kotlin.fir.toFirSourceElement import org.jetbrains.kotlin.fir.types.ConeClassErrorType import org.jetbrains.kotlin.fir.types.impl.ConeTypeParameterTypeImpl import org.jetbrains.kotlin.fir.types.impl.FirResolvedTypeRefImpl @@ -175,7 +176,7 @@ class JavaSymbolProvider( } } FirJavaClass( - (javaClass as? JavaElementImpl<*>)?.psi, session, + (javaClass as? JavaElementImpl<*>)?.psi?.toFirSourceElement(), session, firSymbol as FirClassSymbol, javaClass.name, javaClass.visibility, javaClass.modality, javaClass.classKind, isTopLevel = isTopLevel, @@ -195,7 +196,7 @@ class JavaSymbolProvider( val fieldSymbol = FirFieldSymbol(fieldId) val returnType = javaField.type val firJavaField = FirJavaField( - (javaField as? JavaElementImpl<*>)?.psi, this@JavaSymbolProvider.session, + (javaField as? JavaElementImpl<*>)?.psi?.toFirSourceElement(), this@JavaSymbolProvider.session, fieldSymbol, fieldName, javaField.visibility, javaField.modality, returnTypeRef = returnType.toFirJavaTypeRef(this@JavaSymbolProvider.session, javaTypeParameterStack), @@ -212,7 +213,7 @@ class JavaSymbolProvider( val methodSymbol = FirNamedFunctionSymbol(methodId) val returnType = javaMethod.returnType val firJavaMethod = FirJavaMethod( - this@JavaSymbolProvider.session, (javaMethod as? JavaElementImpl<*>)?.psi, + this@JavaSymbolProvider.session, (javaMethod as? JavaElementImpl<*>)?.psi?.toFirSourceElement(), methodSymbol, methodName, javaMethod.visibility, javaMethod.modality, returnTypeRef = returnType.toFirJavaTypeRef(this@JavaSymbolProvider.session, javaTypeParameterStack), @@ -239,7 +240,7 @@ class JavaSymbolProvider( val constructorSymbol = FirConstructorSymbol(constructorId) val classTypeParameters = javaClass.typeParameters.convertTypeParameters(javaTypeParameterStack) val firJavaConstructor = FirJavaConstructor( - psi, + psi?.toFirSourceElement(), this@JavaSymbolProvider.session, constructorSymbol, 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 1e26919c621..d6963dd09af 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 @@ -29,6 +29,7 @@ import org.jetbrains.kotlin.fir.resolve.getClassDeclaredCallableSymbols import org.jetbrains.kotlin.fir.symbols.StandardClassIds import org.jetbrains.kotlin.fir.symbols.impl.ConeClassLikeLookupTagImpl import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol +import org.jetbrains.kotlin.fir.toFirSourceElement import org.jetbrains.kotlin.fir.types.* import org.jetbrains.kotlin.fir.types.impl.ConeClassTypeImpl import org.jetbrains.kotlin.fir.types.impl.ConeTypeParameterTypeImpl @@ -94,7 +95,7 @@ internal fun JavaClassifierType.toFirResolvedTypeRef( ): FirResolvedTypeRef { val coneType = this.toConeKotlinTypeWithNullability(session, javaTypeParameterStack, isNullable = false) return FirResolvedTypeRefImpl( - psi = null, type = coneType + source = null, type = coneType ).apply { annotations += this@toFirResolvedTypeRef.annotations.map { it.toFirAnnotationCall(session, javaTypeParameterStack) } } @@ -174,9 +175,9 @@ internal fun JavaAnnotation.toFirAnnotationCall( session: FirSession, javaTypeParameterStack: JavaTypeParameterStack ): FirAnnotationCall { return FirAnnotationCallImpl( - psi = null, useSiteTarget = null, + source = null, useSiteTarget = null, annotationTypeRef = FirResolvedTypeRefImpl( - psi = null, + source = null, type = ConeClassTypeImpl(FirClassSymbol(classId!!).toLookupTag(), emptyArray(), isNullable = false) ) ).apply { @@ -198,7 +199,7 @@ internal fun JavaValueParameter.toFirValueParameters( session: FirSession, javaTypeParameterStack: JavaTypeParameterStack ): FirValueParameter { return FirJavaValueParameter( - session, (this as? JavaElementImpl<*>)?.psi, name ?: Name.special(""), + session, (this as? JavaElementImpl<*>)?.psi?.toFirSourceElement(), name ?: Name.special(""), returnTypeRef = type.toFirJavaTypeRef(session, javaTypeParameterStack), isVararg = isVararg ).apply { @@ -312,7 +313,7 @@ private fun JavaType.toFirResolvedTypeRef( ): FirResolvedTypeRef { if (this is JavaClassifierType) return toFirResolvedTypeRef(session, javaTypeParameterStack) return FirResolvedTypeRefImpl( - psi = null, type = ConeClassErrorType("Unexpected JavaType: $this") + source = null, type = ConeClassErrorType("Unexpected JavaType: $this") ) } diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaClass.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaClass.kt index b8e7adb6540..bf2bbf7ba8d 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaClass.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaClass.kt @@ -5,12 +5,12 @@ package org.jetbrains.kotlin.fir.java.declarations -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.fir.FirPureAbstractElement import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.impl.FirDeclarationStatusImpl import org.jetbrains.kotlin.fir.declarations.impl.FirModifiableClass @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.fir.visitors.transformSingle import org.jetbrains.kotlin.name.Name class FirJavaClass internal constructor( - override val psi: PsiElement?, + override val source: FirSourceElement?, override val session: FirSession, override val symbol: FirClassSymbol, override val name: Name, diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaConstructor.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaConstructor.kt index 8c7a4f31992..353e8364d49 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaConstructor.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaConstructor.kt @@ -5,13 +5,12 @@ package org.jetbrains.kotlin.fir.java.declarations -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.fir.CONSTRUCTOR_NAME -import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirPureAbstractElement import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.impl.FirDeclarationStatusImpl import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall @@ -30,7 +29,7 @@ import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource class FirJavaConstructor( - override val psi: PsiElement?, + override val source: FirSourceElement?, override val session: FirSession, override val symbol: FirConstructorSymbol, visibility: Visibility, diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaField.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaField.kt index 3c8c9f4b8ef..b36b655f23f 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaField.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaField.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.fir.java.declarations -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.impl.FirDeclarationStatusImpl import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource class FirJavaField( - override val psi: PsiElement?, + override val source: FirSourceElement?, override val session: FirSession, override val symbol: FirFieldSymbol, override val name: Name, diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaMethod.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaMethod.kt index 10e52667aea..3b177a98934 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaMethod.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaMethod.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.fir.java.declarations -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.impl.FirDeclarationStatusImpl import org.jetbrains.kotlin.fir.declarations.impl.FirSimpleFunctionImpl @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.name.Name class FirJavaMethod( session: FirSession, - psi: PsiElement?, + source: FirSourceElement?, symbol: FirNamedFunctionSymbol, name: Name, visibility: Visibility, @@ -26,7 +26,7 @@ class FirJavaMethod( returnTypeRef: FirJavaTypeRef, isStatic: Boolean ) : FirSimpleFunctionImpl( - psi, + source, session, returnTypeRef, null, diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaValueParameter.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaValueParameter.kt index 7a23bb3e34b..61e4d6d728a 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaValueParameter.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaValueParameter.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.java.declarations -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.impl.FirValueParameterImpl import org.jetbrains.kotlin.fir.java.types.FirJavaTypeRef @@ -15,12 +15,12 @@ import org.jetbrains.kotlin.name.Name class FirJavaValueParameter( session: FirSession, - psi: PsiElement?, + source: FirSourceElement?, name: Name, returnTypeRef: FirJavaTypeRef, isVararg: Boolean ) : FirValueParameterImpl( - psi, + source, session, returnTypeRef, name, diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/javaTypeUtils.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/javaTypeUtils.kt index f3503a1dd27..ba9c0961fe0 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/javaTypeUtils.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/javaTypeUtils.kt @@ -10,7 +10,10 @@ import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.* -import org.jetbrains.kotlin.fir.expressions.* +import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirConstExpression +import org.jetbrains.kotlin.fir.expressions.FirExpression +import org.jetbrains.kotlin.fir.expressions.classId import org.jetbrains.kotlin.fir.expressions.impl.FirConstExpressionImpl import org.jetbrains.kotlin.fir.expressions.impl.FirQualifiedAccessExpressionImpl import org.jetbrains.kotlin.fir.java.JavaTypeParameterStack @@ -24,7 +27,9 @@ import org.jetbrains.kotlin.fir.references.impl.FirSimpleNamedReference import org.jetbrains.kotlin.fir.resolve.constructType import org.jetbrains.kotlin.fir.resolve.toSymbol import org.jetbrains.kotlin.fir.resolve.toTypeProjection -import org.jetbrains.kotlin.fir.symbols.* +import org.jetbrains.kotlin.fir.symbols.ConeClassLikeLookupTag +import org.jetbrains.kotlin.fir.symbols.ConeClassifierLookupTag +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.ConeClassLikeLookupTagImpl import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol import org.jetbrains.kotlin.fir.typeContext @@ -85,7 +90,7 @@ private fun JavaType?.enhancePossiblyFlexible( ) FirResolvedTypeRefImpl( - psi = null, + source = null, type = coneFlexibleOrSimpleType(session, lowerResult, upperResult) ).apply { this.annotations += annotations @@ -93,7 +98,7 @@ private fun JavaType?.enhancePossiblyFlexible( } else -> { val enhanced = type.toNotNullConeKotlinType(session, javaTypeParameterStack) - FirResolvedTypeRefImpl(psi = null, type = enhanced).apply { + FirResolvedTypeRefImpl(source = null, type = enhanced).apply { this.annotations += annotations } } diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassEnhancementScope.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassEnhancementScope.kt index b52f978ce06..208b2a5da01 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassEnhancementScope.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassEnhancementScope.kt @@ -22,7 +22,8 @@ import org.jetbrains.kotlin.fir.scopes.FirScope import org.jetbrains.kotlin.fir.scopes.ProcessorAction import org.jetbrains.kotlin.fir.symbols.CallableId import org.jetbrains.kotlin.fir.symbols.impl.* -import org.jetbrains.kotlin.fir.types.* +import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef +import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.ir.expressions.IrConstKind import org.jetbrains.kotlin.load.java.AnnotationTypeQualifierResolver import org.jetbrains.kotlin.load.java.descriptors.NullDefaultValue @@ -84,7 +85,7 @@ class JavaClassEnhancementScope( val symbol = FirFieldSymbol(original.callableId) with(firElement) { FirJavaField( - firElement.psi, + firElement.source, this@JavaClassEnhancementScope.session, symbol, name, @@ -172,7 +173,7 @@ class JavaClassEnhancementScope( val (newTypeRef, newDefaultValue) = newInfo with(valueParameter) { FirValueParameterImpl( - psi, this@JavaClassEnhancementScope.session, + source, this@JavaClassEnhancementScope.session, newTypeRef, this.name, FirVariableSymbol(this.name), defaultValue ?: newDefaultValue, isCrossinline, isNoinline, isVararg @@ -192,7 +193,7 @@ class JavaClassEnhancementScope( } if (firMethod.isPrimary) { FirPrimaryConstructorImpl( - firMethod.psi, + firMethod.source, this@JavaClassEnhancementScope.session, newReturnTypeRef, null, @@ -201,7 +202,7 @@ class JavaClassEnhancementScope( ) } else { FirConstructorImpl( - firMethod.psi, + firMethod.source, this@JavaClassEnhancementScope.session, newReturnTypeRef, newReceiverTypeRef, @@ -215,7 +216,7 @@ class JavaClassEnhancementScope( } } else -> FirSimpleFunctionImpl( - firMethod.psi, + firMethod.source, this@JavaClassEnhancementScope.session, newReturnTypeRef, newReceiverTypeRef, diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/types/FirJavaTypeRef.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/types/FirJavaTypeRef.kt index dc84e7815f8..8be15eeb874 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/types/FirJavaTypeRef.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/types/FirJavaTypeRef.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.load.java.structure.JavaType class FirJavaTypeRef( annotations: List, val type: JavaType -) : FirUserTypeRefImpl(psi = null, isMarkedNullable = false) { +) : FirUserTypeRefImpl(source = null, isMarkedNullable = false) { init { this.annotations += annotations } diff --git a/compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/fir/modifier/Modifier.kt b/compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/fir/modifier/Modifier.kt index 8f3040c4ab9..c19e7f606bf 100644 --- a/compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/fir/modifier/Modifier.kt +++ b/compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/fir/modifier/Modifier.kt @@ -6,10 +6,10 @@ package org.jetbrains.kotlin.fir.lightTree.fir.modifier import com.intellij.lang.LighterASTNode -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.impl.FirAbstractAnnotatedElement import org.jetbrains.kotlin.fir.lightTree.fir.modifier.ModifierSets.CLASS_MODIFIER @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.fir.visitors.FirTransformer import org.jetbrains.kotlin.fir.visitors.FirVisitor class Modifier( - override val psi: PsiElement? = null, + override val source: FirSourceElement? = null, private val classModifiers: MutableList = mutableListOf(), private val memberModifiers: MutableList = mutableListOf(), private val visibilityModifiers: MutableList = mutableListOf(), diff --git a/compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/fir/modifier/TypeModifier.kt b/compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/fir/modifier/TypeModifier.kt index 44ff0f01788..899773b0059 100644 --- a/compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/fir/modifier/TypeModifier.kt +++ b/compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/fir/modifier/TypeModifier.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.lightTree.fir.modifier import com.intellij.lang.LighterASTNode -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.impl.FirAbstractAnnotatedElement import org.jetbrains.kotlin.fir.visitors.FirTransformer @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.lexer.KtTokens class TypeModifier( - override val psi: PsiElement? = null, + override val source: FirSourceElement? = null, var hasSuspend: Boolean = false ) : FirAbstractAnnotatedElement { override val annotations: MutableList = mutableListOf() diff --git a/compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/fir/modifier/TypeParameterModifier.kt b/compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/fir/modifier/TypeParameterModifier.kt index 4bcc37e9f4e..816ac605820 100644 --- a/compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/fir/modifier/TypeParameterModifier.kt +++ b/compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/fir/modifier/TypeParameterModifier.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.lightTree.fir.modifier import com.intellij.lang.LighterASTNode -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.impl.FirAbstractAnnotatedElement import org.jetbrains.kotlin.fir.lightTree.fir.modifier.ModifierSets.REIFICATION_MODIFIER @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.types.Variance class TypeParameterModifier( - override val psi: PsiElement? = null, + override val source: FirSourceElement? = null, private val varianceModifiers: MutableList = mutableListOf(), private var reificationModifier: ReificationModifier? = null ) : FirAbstractAnnotatedElement { diff --git a/compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/fir/modifier/TypeProjectionModifier.kt b/compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/fir/modifier/TypeProjectionModifier.kt index 79d8c7a84bb..3a02b837ce3 100644 --- a/compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/fir/modifier/TypeProjectionModifier.kt +++ b/compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/fir/modifier/TypeProjectionModifier.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.lightTree.fir.modifier import com.intellij.lang.LighterASTNode -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.impl.FirAbstractAnnotatedElement import org.jetbrains.kotlin.fir.lightTree.fir.modifier.ModifierSets.VARIANCE_MODIFIER @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.types.Variance class TypeProjectionModifier( - override val psi: PsiElement? = null, + override val source: FirSourceElement? = null, private val varianceModifiers: MutableList = mutableListOf() ) : FirAbstractAnnotatedElement { override val annotations: MutableList = mutableListOf() diff --git a/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/BaseFirBuilder.kt b/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/BaseFirBuilder.kt index a41405685b9..6c6af84a1b6 100644 --- a/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/BaseFirBuilder.kt +++ b/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/BaseFirBuilder.kt @@ -8,9 +8,7 @@ package org.jetbrains.kotlin.fir.builder import com.intellij.psi.PsiElement import com.intellij.psi.tree.IElementType import org.jetbrains.kotlin.KtNodeTypes.* -import org.jetbrains.kotlin.fir.FirFunctionTarget -import org.jetbrains.kotlin.fir.FirLoopTarget -import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.* import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.impl.FirErrorFunctionImpl import org.jetbrains.kotlin.fir.declarations.impl.FirTypeParameterImpl @@ -97,9 +95,9 @@ abstract class BaseFirBuilder(val session: FirSession, val context: Context = val KNPE = Name.identifier("KotlinNullPointerException") } - fun FirExpression.toReturn(basePsi: PsiElement? = psi, labelName: String? = null): FirReturnExpression { + fun FirExpression.toReturn(baseSource: FirSourceElement? = source, labelName: String? = null): FirReturnExpression { return FirReturnExpressionImpl( - basePsi, + baseSource, this ).apply { target = FirFunctionTarget(labelName) @@ -110,7 +108,7 @@ abstract class BaseFirBuilder(val session: FirSession, val context: Context = } else { target.bind( FirErrorFunctionImpl( - psi, + source, this@BaseFirBuilder.session, "Cannot bind unlabeled return to a function", FirErrorFunctionSymbol() @@ -136,7 +134,7 @@ abstract class BaseFirBuilder(val session: FirSession, val context: Context = } target.bind( FirErrorFunctionImpl( - psi, + source, this@BaseFirBuilder.session, "Cannot bind label $labelName to a function", FirErrorFunctionSymbol() @@ -148,13 +146,13 @@ abstract class BaseFirBuilder(val session: FirSession, val context: Context = fun KtClassOrObject?.toDelegatedSelfType(firClass: FirRegularClass): FirTypeRef { val typeParameters = firClass.typeParameters.map { - FirTypeParameterImpl(it.psi, session, it.name, FirTypeParameterSymbol(), Variance.INVARIANT, false).apply { + FirTypeParameterImpl(it.source, session, it.name, FirTypeParameterSymbol(), Variance.INVARIANT, false).apply { this.bounds += it.bounds addDefaultBoundIfNecessary() } } return FirResolvedTypeRefImpl( - this, + this?.toFirSourceElement(), ConeClassTypeImpl( firClass.symbol.toLookupTag(), typeParameters.map { ConeTypeParameterTypeImpl(it.symbol.toLookupTag(), false) }.toTypedArray(), @@ -171,13 +169,14 @@ abstract class BaseFirBuilder(val session: FirSession, val context: Context = } fun T?.bangBangToWhen(parent: KtUnaryExpression?, convert: T?.(String) -> FirExpression): FirWhenExpression { + val source = parent.getSourceOrNull() return this.convert("No operand").generateNotNullOrOther( session, FirThrowExpressionImpl( - parent.getPsiOrNull(), FirFunctionCallImpl(parent.getPsiOrNull()).apply { - calleeReference = FirSimpleNamedReference(parent, KNPE, null) + source, FirFunctionCallImpl(source).apply { + calleeReference = FirSimpleNamedReference(source, KNPE, null) } - ), "bangbang", parent + ), "bangbang", source ) } @@ -197,7 +196,7 @@ abstract class BaseFirBuilder(val session: FirSession, val context: Context = if (lastLoop != null) { target.bind(lastLoop) } else { - target.bind(FirErrorLoop(expression.getPsiOrNull(), "Cannot bind unlabeled jump to a loop")) + target.bind(FirErrorLoop(expression.getSourceOrNull(), "Cannot bind unlabeled jump to a loop")) } } else { for (firLoop in context.firLoops.asReversed()) { @@ -206,14 +205,14 @@ abstract class BaseFirBuilder(val session: FirSession, val context: Context = return this } } - target.bind(FirErrorLoop(expression.getPsiOrNull(), "Cannot bind label $labelName to a loop")) + target.bind(FirErrorLoop(expression.getSourceOrNull(), "Cannot bind label $labelName to a loop")) } return this } /**** Conversion utils ****/ - private fun T.getPsiOrNull(): PsiElement? { - return if (this is PsiElement) this else null + private fun T.getSourceOrNull(): FirSourceElement? { + return if (this is PsiElement) FirPsiSourceElement(this) else null } fun generateConstantExpressionByLiteral(expression: T): FirExpression { @@ -231,34 +230,34 @@ abstract class BaseFirBuilder(val session: FirSession, val context: Context = convertedText > Int.MAX_VALUE || convertedText < Int.MIN_VALUE) ) { FirConstExpressionImpl( - expression.getPsiOrNull(), IrConstKind.Long, convertedText, "Incorrect long: $text" + expression.getSourceOrNull(), IrConstKind.Long, convertedText, "Incorrect long: $text" ) } else if (convertedText is Number) { // TODO: support byte / short FirConstExpressionImpl( - expression.getPsiOrNull(), IrConstKind.Int, convertedText.toInt(), "Incorrect int: $text" + expression.getSourceOrNull(), IrConstKind.Int, convertedText.toInt(), "Incorrect int: $text" ) } else { - FirErrorExpressionImpl(expression.getPsiOrNull(), reason = "Incorrect constant expression: $text") + FirErrorExpressionImpl(expression.getSourceOrNull(), reason = "Incorrect constant expression: $text") } FLOAT_CONSTANT -> if (convertedText is Float) { FirConstExpressionImpl( - expression.getPsiOrNull(), IrConstKind.Float, convertedText, "Incorrect float: $text" + expression.getSourceOrNull(), IrConstKind.Float, convertedText, "Incorrect float: $text" ) } else { FirConstExpressionImpl( - expression.getPsiOrNull(), IrConstKind.Double, convertedText as Double, "Incorrect double: $text" + expression.getSourceOrNull(), IrConstKind.Double, convertedText as Double, "Incorrect double: $text" ) } CHARACTER_CONSTANT -> FirConstExpressionImpl( - expression.getPsiOrNull(), IrConstKind.Char, text.parseCharacter(), "Incorrect character: $text" + expression.getSourceOrNull(), IrConstKind.Char, text.parseCharacter(), "Incorrect character: $text" ) BOOLEAN_CONSTANT -> - FirConstExpressionImpl(expression.getPsiOrNull(), IrConstKind.Boolean, convertedText as Boolean) + FirConstExpressionImpl(expression.getSourceOrNull(), IrConstKind.Boolean, convertedText as Boolean) NULL -> - FirConstExpressionImpl(expression.getPsiOrNull(), IrConstKind.Null, null) + FirConstExpressionImpl(expression.getSourceOrNull(), IrConstKind.Null, null) else -> throw AssertionError("Unknown literal type: $type, $text") } @@ -278,11 +277,11 @@ abstract class BaseFirBuilder(val session: FirSession, val context: Context = OPEN_QUOTE, CLOSING_QUOTE -> continue@L LITERAL_STRING_TEMPLATE_ENTRY -> { sb.append(entry.asText) - FirConstExpressionImpl(entry.getPsiOrNull(), IrConstKind.String, entry.asText) + FirConstExpressionImpl(entry.getSourceOrNull(), IrConstKind.String, entry.asText) } ESCAPE_STRING_TEMPLATE_ENTRY -> { sb.append(entry.unescapedValue) - FirConstExpressionImpl(entry.getPsiOrNull(), IrConstKind.String, entry.unescapedValue) + FirConstExpressionImpl(entry.getSourceOrNull(), IrConstKind.String, entry.unescapedValue) } SHORT_STRING_TEMPLATE_ENTRY, LONG_STRING_TEMPLATE_ENTRY -> { hasExpressions = true @@ -291,7 +290,7 @@ abstract class BaseFirBuilder(val session: FirSession, val context: Context = else -> { hasExpressions = true FirErrorExpressionImpl( - entry.getPsiOrNull(), "Incorrect template entry: ${entry.asText}" + entry.getSourceOrNull(), "Incorrect template entry: ${entry.asText}" ) } } @@ -302,14 +301,14 @@ abstract class BaseFirBuilder(val session: FirSession, val context: Context = } else -> { callCreated = true - FirStringConcatenationCallImpl(base).apply { + FirStringConcatenationCallImpl(base?.toFirSourceElement()).apply { arguments += result!! arguments += nextArgument } } } } - return if (hasExpressions) result!! else FirConstExpressionImpl(base, IrConstKind.String, sb.toString()) + return if (hasExpressions) result!! else FirConstExpressionImpl(base?.toFirSourceElement(), IrConstKind.String, sb.toString()) } /** @@ -346,20 +345,21 @@ abstract class BaseFirBuilder(val session: FirSession, val context: Context = if (argument == null) { return FirErrorExpressionImpl(argument, "Inc/dec without operand") } - return FirBlockImpl(baseExpression).apply { + val source = baseExpression?.toFirSourceElement() + return FirBlockImpl(source).apply { val tempName = Name.special("") - val temporaryVariable = generateTemporaryVariable(this@BaseFirBuilder.session, baseExpression, tempName, argument.convert()) + val temporaryVariable = generateTemporaryVariable(this@BaseFirBuilder.session, source, tempName, argument.convert()) statements += temporaryVariable val resultName = Name.special("") - val resultInitializer = FirFunctionCallImpl(baseExpression).apply { - this.calleeReference = FirSimpleNamedReference(baseExpression?.operationReference, callName, null) - this.explicitReceiver = generateResolvedAccessExpression(baseExpression, temporaryVariable) + val resultInitializer = FirFunctionCallImpl(source).apply { + this.calleeReference = FirSimpleNamedReference(baseExpression?.operationReference?.toFirSourceElement(), callName, null) + this.explicitReceiver = generateResolvedAccessExpression(source, temporaryVariable) } - val resultVar = generateTemporaryVariable(this@BaseFirBuilder.session, baseExpression, resultName, resultInitializer) + val resultVar = generateTemporaryVariable(this@BaseFirBuilder.session, source, resultName, resultInitializer) val assignment = argument.generateAssignment( - baseExpression, + source, if (prefix && argument.elementType != REFERENCE_EXPRESSION) - generateResolvedAccessExpression(baseExpression, resultVar) + generateResolvedAccessExpression(source, resultVar) else resultInitializer, FirOperation.ASSIGN, convert @@ -377,14 +377,14 @@ abstract class BaseFirBuilder(val session: FirSession, val context: Context = if (argument.elementType != REFERENCE_EXPRESSION) { statements += resultVar appendAssignment() - statements += generateResolvedAccessExpression(baseExpression, resultVar) + statements += generateResolvedAccessExpression(source, resultVar) } else { appendAssignment() - statements += generateAccessExpression(baseExpression, argument.getReferencedNameAsName()) + statements += generateAccessExpression(source, argument.getReferencedNameAsName()) } } else { appendAssignment() - statements += generateResolvedAccessExpression(baseExpression, temporaryVariable) + statements += generateResolvedAccessExpression(source, temporaryVariable) } } } @@ -397,10 +397,10 @@ abstract class BaseFirBuilder(val session: FirSession, val context: Context = if (left != null) { when (tokenType) { REFERENCE_EXPRESSION -> { - return FirSimpleNamedReference(left.getPsiOrNull(), left.getReferencedNameAsName(), null) + return FirSimpleNamedReference(left.getSourceOrNull(), left.getReferencedNameAsName(), null) } THIS_EXPRESSION -> { - return FirExplicitThisReference(left.getPsiOrNull(), left.getLabelName()) + return FirExplicitThisReference(left.getSourceOrNull(), left.getLabelName()) } DOT_QUALIFIED_EXPRESSION, SAFE_ACCESS_EXPRESSION -> { val firMemberAccess = left.convertQualified() @@ -410,7 +410,7 @@ abstract class BaseFirBuilder(val session: FirSession, val context: Context = firMemberAccess.calleeReference } else { FirErrorNamedReferenceImpl( - left.getPsiOrNull(), "Unsupported qualified LValue: ${left.asText}" + left.getSourceOrNull(), "Unsupported qualified LValue: ${left.asText}" ) } } @@ -419,28 +419,28 @@ abstract class BaseFirBuilder(val session: FirSession, val context: Context = } } } - return FirErrorNamedReferenceImpl(left.getPsiOrNull(), "Unsupported LValue: $tokenType") + return FirErrorNamedReferenceImpl(left.getSourceOrNull(), "Unsupported LValue: $tokenType") } fun T?.generateAssignment( - psi: PsiElement?, + source: FirSourceElement?, value: FirExpression, operation: FirOperation, convert: T.() -> FirExpression ): FirStatement { val tokenType = this?.elementType if (tokenType == PARENTHESIZED) { - return this!!.getExpressionInParentheses().generateAssignment(psi, value, operation, convert) + return this!!.getExpressionInParentheses().generateAssignment(source, value, operation, convert) } if (tokenType == ARRAY_ACCESS_EXPRESSION) { val firArrayAccess = this!!.convert() as FirFunctionCallImpl val arraySet = if (operation != FirOperation.ASSIGN) { - FirArraySetCallImpl(psi, value, operation).apply { + FirArraySetCallImpl(source, value, operation).apply { indexes += firArrayAccess.arguments } } else { return firArrayAccess.apply { - calleeReference = FirSimpleNamedReference(psi, OperatorNameConventions.SET, null) + calleeReference = FirSimpleNamedReference(source, OperatorNameConventions.SET, null) arguments += value } } @@ -451,40 +451,40 @@ abstract class BaseFirBuilder(val session: FirSession, val context: Context = } } val psiArrayExpression = firArrayAccess.explicitReceiver?.psi - return FirBlockImpl(psiArrayExpression).apply { + return FirBlockImpl(psiArrayExpression?.toFirSourceElement()).apply { val name = Name.special("") statements += generateTemporaryVariable( - this@BaseFirBuilder.session, this@generateAssignment.getPsiOrNull(), name, firArrayAccess.explicitReceiver!! + this@BaseFirBuilder.session, this@generateAssignment.getSourceOrNull(), name, firArrayAccess.explicitReceiver!! ) - statements += arraySet.apply { lValue = FirSimpleNamedReference(psiArrayExpression, name, null) } + statements += arraySet.apply { lValue = FirSimpleNamedReference(psiArrayExpression?.toFirSourceElement(), name, null) } } } if (operation != FirOperation.ASSIGN && tokenType != REFERENCE_EXPRESSION && tokenType != THIS_EXPRESSION && ((tokenType != DOT_QUALIFIED_EXPRESSION && tokenType != SAFE_ACCESS_EXPRESSION) || this.selectorExpression?.elementType != REFERENCE_EXPRESSION) ) { - return FirBlockImpl(this.getPsiOrNull()).apply { + return FirBlockImpl(this.getSourceOrNull()).apply { val name = Name.special("") statements += generateTemporaryVariable( - this@BaseFirBuilder.session, this@generateAssignment.getPsiOrNull(), name, + this@BaseFirBuilder.session, this@generateAssignment.getSourceOrNull(), name, this@generateAssignment?.convert() - ?: FirErrorExpressionImpl(this.getPsiOrNull(), "No LValue in assignment") + ?: FirErrorExpressionImpl(this.getSourceOrNull(), "No LValue in assignment") ) - statements += FirVariableAssignmentImpl(psi, false, value, operation).apply { - lValue = FirSimpleNamedReference(this.getPsiOrNull(), name, null) + statements += FirVariableAssignmentImpl(source, false, value, operation).apply { + lValue = FirSimpleNamedReference(this.getSourceOrNull(), name, null) } } } if (operation in FirOperation.ASSIGNMENTS && operation != FirOperation.ASSIGN) { - return FirOperatorCallImpl(psi, operation).apply { + return FirOperatorCallImpl(source, operation).apply { // TODO: take good psi - arguments += this@generateAssignment?.convert() ?: FirErrorExpressionImpl(null, "Unsupported left value of assignment: ${psi?.text}") + arguments += this@generateAssignment?.convert() ?: FirErrorExpressionImpl(null, "Unsupported left value of assignment: ${source?.psi?.text}") arguments += value } } - return FirVariableAssignmentImpl(psi, false, value, operation).apply { + return FirVariableAssignmentImpl(source, false, value, operation).apply { lValue = initializeLValue(this@generateAssignment) { convert() as? FirQualifiedAccess } } } diff --git a/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt b/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt index 52b34fdc481..639efb8af7c 100644 --- a/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt +++ b/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt @@ -5,13 +5,10 @@ package org.jetbrains.kotlin.fir.builder -import com.intellij.psi.PsiElement import com.intellij.psi.tree.IElementType import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.kotlin.fir.FirFunctionTarget -import org.jetbrains.kotlin.fir.FirSession -import org.jetbrains.kotlin.fir.FirWhenSubject +import org.jetbrains.kotlin.fir.* import org.jetbrains.kotlin.fir.declarations.FirVariable import org.jetbrains.kotlin.fir.declarations.impl.* import org.jetbrains.kotlin.fir.expressions.* @@ -136,41 +133,41 @@ fun IElementType.toFirOperation(): FirOperation = } fun FirExpression.generateNotNullOrOther( - session: FirSession, other: FirExpression, caseId: String, basePsi: KtElement? + session: FirSession, other: FirExpression, caseId: String, baseSource: FirSourceElement? ): FirWhenExpression { val subjectName = Name.special("<$caseId>") - val subjectVariable = generateTemporaryVariable(session, basePsi, subjectName, this) + val subjectVariable = generateTemporaryVariable(session, baseSource, subjectName, this) val subject = FirWhenSubject() - val subjectExpression = FirWhenSubjectExpressionImpl(basePsi, subject) + val subjectExpression = FirWhenSubjectExpressionImpl(baseSource, subject) return FirWhenExpressionImpl( - basePsi, this, subjectVariable + baseSource, this, subjectVariable ).apply { subject.bind(this) branches += FirWhenBranchImpl( - basePsi, - FirOperatorCallImpl(basePsi, FirOperation.EQ).apply { + baseSource, + FirOperatorCallImpl(baseSource, FirOperation.EQ).apply { arguments += subjectExpression - arguments += FirConstExpressionImpl(basePsi, IrConstKind.Null, null) + arguments += FirConstExpressionImpl(baseSource, IrConstKind.Null, null) }, FirSingleExpressionBlock(other) ) branches += FirWhenBranchImpl( - other.psi, FirElseIfTrueCondition(basePsi), + other.source, FirElseIfTrueCondition(baseSource), FirSingleExpressionBlock( - generateResolvedAccessExpression(basePsi, subjectVariable) + generateResolvedAccessExpression(baseSource, subjectVariable) ) ) } } fun FirExpression.generateLazyLogicalOperation( - other: FirExpression, isAnd: Boolean, basePsi: KtElement? + other: FirExpression, isAnd: Boolean, baseSource: FirSourceElement? ): FirBinaryLogicExpression { val kind = if (isAnd) LogicOperationKind.AND else LogicOperationKind.OR - return FirBinaryLogicExpressionImpl(basePsi, this, other, kind) + return FirBinaryLogicExpressionImpl(baseSource, this, other, kind) } internal fun KtWhenCondition.toFirWhenCondition( @@ -178,11 +175,11 @@ internal fun KtWhenCondition.toFirWhenCondition( convert: KtExpression?.(String) -> FirExpression, toFirOrErrorTypeRef: KtTypeReference?.() -> FirTypeRef ): FirExpression { - val firSubjectExpression = FirWhenSubjectExpressionImpl(this, subject) + val firSubjectExpression = FirWhenSubjectExpressionImpl(this.toFirSourceElement(), subject) return when (this) { is KtWhenConditionWithExpression -> { FirOperatorCallImpl( - expression, + expression?.toFirSourceElement(), FirOperation.EQ ).apply { arguments += firSubjectExpression @@ -195,20 +192,21 @@ internal fun KtWhenCondition.toFirWhenCondition( } is KtWhenConditionIsPattern -> { FirTypeOperatorCallImpl( - typeReference, if (isNegated) FirOperation.NOT_IS else FirOperation.IS, + typeReference?.toFirSourceElement(), + if (isNegated) FirOperation.NOT_IS else FirOperation.IS, typeReference.toFirOrErrorTypeRef() ).apply { arguments += firSubjectExpression } } else -> { - FirErrorExpressionImpl(this, "Unsupported when condition: ${this.javaClass}") + FirErrorExpressionImpl(this.toFirSourceElement(), "Unsupported when condition: ${this.javaClass}") } } } internal fun Array.toFirWhenCondition( - basePsi: KtElement, + baseSource: FirSourceElement?, subject: FirWhenSubject, convert: KtExpression?.(String) -> FirExpression, toFirOrErrorTypeRef: KtTypeReference?.() -> FirTypeRef @@ -219,7 +217,7 @@ internal fun Array.toFirWhenCondition( firCondition = when (firCondition) { null -> firConditionElement else -> firCondition.generateLazyLogicalOperation( - firConditionElement, false, basePsi + firConditionElement, false, baseSource ) } } @@ -232,26 +230,28 @@ fun FirExpression.generateContainsOperation( base: KtExpression?, operationReference: KtOperationReferenceExpression? ): FirFunctionCall { - val containsCall = FirFunctionCallImpl(base).apply { - calleeReference = FirSimpleNamedReference(operationReference, OperatorNameConventions.CONTAINS, null) + val baseSource = base?.toFirSourceElement() + val operationReferenceSource = operationReference?.toFirSourceElement() + val containsCall = FirFunctionCallImpl(baseSource).apply { + calleeReference = FirSimpleNamedReference(operationReferenceSource, OperatorNameConventions.CONTAINS, null) explicitReceiver = this@generateContainsOperation arguments += argument } if (!inverted) return containsCall - return FirFunctionCallImpl(base).apply { - calleeReference = FirSimpleNamedReference(operationReference, OperatorNameConventions.NOT, null) + return FirFunctionCallImpl(baseSource).apply { + calleeReference = FirSimpleNamedReference(operationReferenceSource, OperatorNameConventions.NOT, null) explicitReceiver = containsCall } } -fun generateAccessExpression(psi: PsiElement?, name: Name): FirQualifiedAccessExpression = - FirQualifiedAccessExpressionImpl(psi).apply { - calleeReference = FirSimpleNamedReference(psi, name, null) +fun generateAccessExpression(source: FirSourceElement?, name: Name): FirQualifiedAccessExpression = + FirQualifiedAccessExpressionImpl(source).apply { + calleeReference = FirSimpleNamedReference(source, name, null) } -fun generateResolvedAccessExpression(psi: PsiElement?, variable: FirVariable<*>): FirQualifiedAccessExpression = - FirQualifiedAccessExpressionImpl(psi).apply { - calleeReference = FirResolvedNamedReferenceImpl(psi, variable.name, variable.symbol) +fun generateResolvedAccessExpression(source: FirSourceElement?, variable: FirVariable<*>): FirQualifiedAccessExpression = + FirQualifiedAccessExpressionImpl(source).apply { + calleeReference = FirResolvedNamedReferenceImpl(source, variable.name, variable.symbol) } internal fun generateDestructuringBlock( @@ -262,19 +262,20 @@ internal fun generateDestructuringBlock( extractAnnotationsTo: KtAnnotated.(FirAbstractAnnotatedElement) -> Unit, toFirOrImplicitTypeRef: KtTypeReference?.() -> FirTypeRef ): FirExpression { - return FirBlockImpl(multiDeclaration).apply { + return FirBlockImpl(multiDeclaration.toFirSourceElement()).apply { if (tmpVariable) { statements += container } val isVar = multiDeclaration.isVar for ((index, entry) in multiDeclaration.entries.withIndex()) { + val entrySource = entry.toFirSourceElement() statements += FirPropertyImpl( - entry, + entrySource, session, entry.typeReference.toFirOrImplicitTypeRef(), null, entry.nameAsSafeName, - FirComponentCallImpl(entry, generateResolvedAccessExpression(entry, container), index + 1), + FirComponentCallImpl(entrySource, generateResolvedAccessExpression(entrySource, container), index + 1), null, isVar, FirPropertySymbol(CallableId(entry.nameAsSafeName)), // TODO? @@ -289,12 +290,12 @@ internal fun generateDestructuringBlock( } fun generateTemporaryVariable( - session: FirSession, psi: PsiElement?, name: Name, initializer: FirExpression + session: FirSession, source: FirSourceElement?, name: Name, initializer: FirExpression ): FirVariable<*> = FirPropertyImpl( - psi, + source, session, - FirImplicitTypeRefImpl(psi), + FirImplicitTypeRefImpl(source), null, name, initializer, @@ -308,8 +309,8 @@ fun generateTemporaryVariable( } fun generateTemporaryVariable( - session: FirSession, psi: PsiElement?, specialName: String, initializer: FirExpression -): FirVariable<*> = generateTemporaryVariable(session, psi, Name.special("<$specialName>"), initializer) + session: FirSession, source: FirSourceElement?, specialName: String, initializer: FirExpression +): FirVariable<*> = generateTemporaryVariable(session, source, Name.special("<$specialName>"), initializer) fun FirModifiableVariable<*>.generateAccessorsByDelegate(session: FirSession, member: Boolean, stubMode: Boolean) { val variable = this as FirVariable<*> @@ -385,7 +386,7 @@ fun FirModifiableVariable<*>.generateAccessorsByDelegate(session: FirSession, me arguments += thisRef() arguments += propertyRef() arguments += FirQualifiedAccessExpressionImpl(null).apply { - calleeReference = FirResolvedNamedReferenceImpl(psi, DELEGATED_SETTER_PARAM, parameter.symbol) + calleeReference = FirResolvedNamedReferenceImpl(source, DELEGATED_SETTER_PARAM, parameter.symbol) } } ) diff --git a/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/DataClassUtils.kt b/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/DataClassUtils.kt index d9f5fe30bdf..fd0f663b5c2 100644 --- a/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/DataClassUtils.kt +++ b/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/DataClassUtils.kt @@ -22,6 +22,7 @@ import org.jetbrains.kotlin.fir.references.impl.FirResolvedNamedReferenceImpl import org.jetbrains.kotlin.fir.symbols.CallableId import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirVariableSymbol +import org.jetbrains.kotlin.fir.toFirSourceElement import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImpl import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name @@ -49,22 +50,23 @@ fun List>.generateComponentFunctions( isExternal = false isSuspend = false } + val parameterSource = ktParameter?.toFirSourceElement() firClass.addDeclaration( FirSimpleFunctionImpl( - ktParameter, session, FirImplicitTypeRefImpl(ktParameter), + parameterSource, session, FirImplicitTypeRefImpl(parameterSource), null, name, status, symbol ).apply { val componentFunction = this body = FirSingleExpressionBlock( FirReturnExpressionImpl( - ktParameter, - FirQualifiedAccessExpressionImpl(ktParameter).apply { + parameterSource, + FirQualifiedAccessExpressionImpl(parameterSource).apply { val parameterName = firProperty.name dispatchReceiver = FirThisReceiverExpressionImpl(null, FirImplicitThisReference(firClass.symbol)).apply { typeRef = firPrimaryConstructor.returnTypeRef } calleeReference = FirResolvedNamedReferenceImpl( - ktParameter, + parameterSource, parameterName, firProperty.symbol ) } @@ -98,7 +100,7 @@ fun List>.generateCopyFunction( } firClass.addDeclaration( FirSimpleFunctionImpl( - classOrObject, + classOrObject?.toFirSourceElement(), session, firPrimaryConstructor.returnTypeRef, null, @@ -108,15 +110,16 @@ fun List>.generateCopyFunction( ).apply { for ((ktParameter, firProperty) in this@generateCopyFunction) { val name = firProperty.name + val parameterSource = ktParameter?.toFirSourceElement() valueParameters += FirValueParameterImpl( - ktParameter, session, firProperty.returnTypeRef, + parameterSource, session, firProperty.returnTypeRef, name, FirVariableSymbol(name), - FirQualifiedAccessExpressionImpl(ktParameter).apply { + FirQualifiedAccessExpressionImpl(parameterSource).apply { dispatchReceiver = FirThisReceiverExpressionImpl(null, FirImplicitThisReference(firClass.symbol)).apply { typeRef = firPrimaryConstructor.returnTypeRef } - calleeReference = FirResolvedNamedReferenceImpl(ktParameter, name, firProperty.symbol) + calleeReference = FirResolvedNamedReferenceImpl(parameterSource, name, firProperty.symbol) }, isCrossinline = false, isNoinline = false, isVararg = false ) diff --git a/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt b/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt index 84d4290484f..354ddb95a0d 100644 --- a/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt +++ b/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt @@ -98,27 +98,27 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder this.accept(this@Visitor, Unit) as R private fun KtTypeReference?.toFirOrImplicitType(): FirTypeRef = - convertSafe() ?: FirImplicitTypeRefImpl(this) + convertSafe() ?: FirImplicitTypeRefImpl(this?.toFirSourceElement()) private fun KtTypeReference?.toFirOrUnitType(): FirTypeRef = convertSafe() ?: implicitUnitType private fun KtTypeReference?.toFirOrErrorType(): FirTypeRef = - convertSafe() ?: FirErrorTypeRefImpl(this, if (this == null) "Incomplete code" else "Conversion failed") + convertSafe() ?: FirErrorTypeRefImpl(this?.toFirSourceElement(), if (this == null) "Incomplete code" else "Conversion failed") // Here we accept lambda as receiver to prevent expression calculation in stub mode private fun (() -> KtExpression?).toFirExpression(errorReason: String): FirExpression = if (stubMode) FirExpressionStub(null) else with(this()) { - convertSafe() ?: FirErrorExpressionImpl(this, errorReason) + convertSafe() ?: FirErrorExpressionImpl(this?.toFirSourceElement(), errorReason) } private fun KtExpression?.toFirExpression(errorReason: String): FirExpression = if (stubMode) FirExpressionStub(null) - else convertSafe() ?: FirErrorExpressionImpl(this, errorReason) + else convertSafe() ?: FirErrorExpressionImpl(this?.toFirSourceElement(), errorReason) private fun KtExpression.toFirStatement(errorReason: String): FirStatement = - convertSafe() ?: FirErrorExpressionImpl(this, errorReason) + convertSafe() ?: FirErrorExpressionImpl(this.toFirSourceElement(), errorReason) private fun KtExpression.toFirStatement(): FirStatement = convert() @@ -129,7 +129,7 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder return when (this) { is KtSecondaryConstructor -> toFirConstructor( delegatedSuperType, - delegatedSelfType ?: FirErrorTypeRefImpl(this, "Constructor in object"), + delegatedSelfType ?: FirErrorTypeRefImpl(this.toFirSourceElement(), "Constructor in object"), owner, hasPrimaryConstructor ) @@ -154,17 +154,17 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder hasBlockBody() -> if (!stubMode) { bodyBlockExpression?.accept(this@Visitor, Unit) as? FirBlock } else { - FirSingleExpressionBlock(FirExpressionStub(this).toReturn()) + FirSingleExpressionBlock(FirExpressionStub(this.toFirSourceElement()).toReturn()) } else -> { val result = { bodyExpression }.toFirExpression("Function has no body (but should)") // basePsi is null, because 'return' is synthetic & should not be bound to some PSI - FirSingleExpressionBlock(result.toReturn(basePsi = null)) + FirSingleExpressionBlock(result.toReturn(baseSource = null)) } } private fun ValueArgument?.toFirExpression(): FirExpression { - this ?: return FirErrorExpressionImpl(this as? KtElement, "No argument given") + this ?: return FirErrorExpressionImpl((this as? KtElement)?.toFirSourceElement(), "No argument given") val name = this.getArgumentName()?.asName val expression = this.getArgumentExpression() val firExpression = when (expression) { @@ -178,8 +178,8 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder } val isSpread = getSpreadElement() != null return when { - name != null -> FirNamedArgumentExpressionImpl(expression, firExpression, isSpread, name) - isSpread -> FirSpreadArgumentExpressionImpl(expression, firExpression) + name != null -> FirNamedArgumentExpressionImpl(expression?.toFirSourceElement(), firExpression, isSpread, name) + isSpread -> FirSpreadArgumentExpressionImpl(expression?.toFirSourceElement(), firExpression) else -> firExpression } } @@ -190,14 +190,16 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder isGetter: Boolean ): FirPropertyAccessor { if (this == null) { + val propertySource = property.toFirSourceElement() return if (isGetter) { - FirDefaultPropertyGetter(property, session, propertyTypeRef, property.visibility) + FirDefaultPropertyGetter(propertySource, session, propertyTypeRef, property.visibility) } else { - FirDefaultPropertySetter(property, session, propertyTypeRef, property.visibility) + FirDefaultPropertySetter(propertySource, session, propertyTypeRef, property.visibility) } } + val source = this.toFirSourceElement() val firAccessor = FirPropertyAccessorImpl( - this, + source, session, if (isGetter) { returnTypeReference?.convertSafe() ?: propertyTypeRef @@ -213,7 +215,7 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder extractValueParametersTo(firAccessor, propertyTypeRef) if (!isGetter && firAccessor.valueParameters.isEmpty()) { firAccessor.valueParameters += FirDefaultSetterValueParameter( - this, + source, session, propertyTypeRef, FirVariableSymbol(NAME_FOR_DEFAULT_VALUE_PARAMETER) @@ -227,7 +229,7 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder private fun KtParameter.toFirValueParameter(defaultTypeRef: FirTypeRef? = null): FirValueParameter { val name = nameAsSafeName val firValueParameter = FirValueParameterImpl( - this, + this.toFirSourceElement(), session, when { typeReference != null -> typeReference.toFirOrErrorType() @@ -257,15 +259,17 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder isConst = false isLateInit = false } + val parameterSource = this.toFirSourceElement() + val propertySource = this@toFirProperty.toFirSourceElement() val firProperty = FirPropertyImpl( - this, + parameterSource, session, type, null, nameAsSafeName, - FirQualifiedAccessExpressionImpl(this).apply { + FirQualifiedAccessExpressionImpl(parameterSource).apply { calleeReference = FirPropertyFromParameterResolvedNamedReference( - this@toFirProperty, nameAsSafeName, firParameter.symbol + propertySource, nameAsSafeName, firParameter.symbol ) }, null, @@ -274,8 +278,8 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder false, status ).apply { - getter = FirDefaultPropertyGetter(this@toFirProperty, this@RawFirBuilder.session, type, visibility) - setter = if (isMutable) FirDefaultPropertySetter(this@toFirProperty, this@RawFirBuilder.session, type, visibility) else null + getter = FirDefaultPropertyGetter(propertySource, this@RawFirBuilder.session, type, visibility) + setter = if (isMutable) FirDefaultPropertySetter(propertySource, this@RawFirBuilder.session, type, visibility) else null } extractAnnotationsTo(firProperty) return firProperty @@ -306,7 +310,7 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder for (argument in this.valueArguments) { val argumentExpression = argument.toFirExpression() container.arguments += when (argument) { - is KtLambdaArgument -> FirLambdaArgumentExpressionImpl(argument, argumentExpression) + is KtLambdaArgument -> FirLambdaArgumentExpressionImpl(argument.toFirSourceElement(), argumentExpression) else -> argumentExpression } } @@ -369,9 +373,10 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder delegatedSelfTypeRef: FirTypeRef, owner: KtClassOrObject ): FirConstructor { - val constructorCallee = superTypeCallEntry?.calleeExpression + val constructorCallee = superTypeCallEntry?.calleeExpression?.toFirSourceElement() + val constructorSource = (this ?: owner).toFirSourceElement() val firDelegatedCall = FirDelegatedConstructorCallImpl( - constructorCallee ?: (this ?: owner), + constructorCallee ?: constructorSource, delegatedSuperTypeRef, isThis = false ).apply { @@ -393,7 +398,7 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder isInner = owner.hasModifier(INNER_KEYWORD) } val firConstructor = FirPrimaryConstructorImpl( - this ?: owner, + constructorSource, session, delegatedSelfTypeRef, null, @@ -410,13 +415,13 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder override fun visitKtFile(file: KtFile, data: Unit): FirElement { context.packageFqName = file.packageFqName - val firFile = FirFileImpl(file, session, file.name, context.packageFqName) + val firFile = FirFileImpl(file.toFirSourceElement(), session, file.name, context.packageFqName) for (annotationEntry in file.annotationEntries) { firFile.annotations += annotationEntry.convert() } for (importDirective in file.importDirectives) { firFile.imports += FirImportImpl( - importDirective, + importDirective.toFirSourceElement(), importDirective.importedFqName, importDirective.isAllUnder, importDirective.aliasName?.let { Name.identifier(it) } @@ -431,7 +436,7 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder override fun visitEnumEntry(enumEntry: KtEnumEntry, data: Unit): FirElement { return withChildClassName(enumEntry.nameAsSafeName) { val firEnumEntry = FirEnumEntryImpl( - enumEntry, + enumEntry.toFirSourceElement(), session, enumEntry.nameAsSafeName, FirClassSymbol(context.currentClassId) @@ -476,7 +481,7 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder } val firClass = if (status.modality == Modality.SEALED) { FirSealedClassImpl( - classOrObject, + classOrObject.toFirSourceElement(), session, classOrObject.nameAsSafeName, status, @@ -485,7 +490,7 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder ) } else { FirClassImpl( - classOrObject, + classOrObject.toFirSourceElement(), session, classOrObject.nameAsSafeName, status, @@ -533,7 +538,7 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder override fun visitObjectLiteralExpression(expression: KtObjectLiteralExpression, data: Unit): FirElement { val objectDeclaration = expression.objectDeclaration - return FirAnonymousObjectImpl(expression, session).apply { + return FirAnonymousObjectImpl(expression.toFirSourceElement(), session).apply { objectDeclaration.extractAnnotationsTo(this) objectDeclaration.extractSuperTypeListEntriesTo(this, null) this.typeRef = superTypeRefs.first() // TODO @@ -554,7 +559,7 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder } return withChildClassName(typeAlias.nameAsSafeName) { val firTypeAlias = FirTypeAliasImpl( - typeAlias, + typeAlias.toFirSourceElement(), session, typeAlias.nameAsSafeName, status, @@ -576,7 +581,7 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder } val receiverType = function.receiverTypeReference.convertSafe() val firFunction = if (function.name == null) { - FirAnonymousFunctionImpl(function, session, returnType, receiverType, FirAnonymousFunctionSymbol()) + FirAnonymousFunctionImpl(function.toFirSourceElement(), session, returnType, receiverType, FirAnonymousFunctionSymbol()) } else { val status = FirDeclarationStatusImpl( if (function.isLocal) Visibilities.LOCAL else function.visibility, @@ -593,7 +598,7 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder isSuspend = function.hasModifier(SUSPEND_KEYWORD) } FirSimpleFunctionImpl( - function, + function.toFirSourceElement(), session, returnType, receiverType, @@ -617,9 +622,10 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder override fun visitLambdaExpression(expression: KtLambdaExpression, data: Unit): FirElement { val literal = expression.functionLiteral - val returnType = FirImplicitTypeRefImpl(literal) - val receiverType = FirImplicitTypeRefImpl(literal) - return FirAnonymousFunctionImpl(literal, session, returnType, receiverType, FirAnonymousFunctionSymbol()).apply { + val literalSource = literal.toFirSourceElement() + val returnType = FirImplicitTypeRefImpl(literalSource) + val receiverType = FirImplicitTypeRefImpl(literalSource) + return FirAnonymousFunctionImpl(literalSource, session, returnType, receiverType, FirAnonymousFunctionSymbol()).apply { context.firFunctions += this var destructuringBlock: FirExpression? = null for (valueParameter in literal.valueParameters) { @@ -627,9 +633,9 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder valueParameters += if (multiDeclaration != null) { val name = Name.special("") val multiParameter = FirValueParameterImpl( - valueParameter, + valueParameter.toFirSourceElement(), this@RawFirBuilder.session, - FirImplicitTypeRefImpl(multiDeclaration), + FirImplicitTypeRefImpl(multiDeclaration.toFirSourceElement()), name, FirVariableSymbol(name), defaultValue = null, @@ -646,16 +652,17 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder ) { toFirOrImplicitType() } multiParameter } else { - valueParameter.toFirValueParameter(FirImplicitTypeRefImpl(psi)) + valueParameter.toFirValueParameter(FirImplicitTypeRefImpl(source)) } } + val expressionSource = expression.toFirSourceElement() label = context.firLabels.pop() ?: context.firFunctionCalls.lastOrNull()?.calleeReference?.name?.let { - FirLabelImpl(expression, it.asString()) + FirLabelImpl(expressionSource, it.asString()) } val bodyExpression = literal.bodyExpression.toFirExpression("Lambda has no body") body = if (bodyExpression is FirBlockImpl) { if (bodyExpression.statements.isEmpty()) { - bodyExpression.statements.add(FirUnitExpression(expression)) + bodyExpression.statements.add(FirUnitExpression(expressionSource)) } if (destructuringBlock is FirBlock) { for ((index, statement) in destructuringBlock.statements.withIndex()) { @@ -683,7 +690,7 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder isInner = owner.hasModifier(INNER_KEYWORD) } val firConstructor = FirConstructorImpl( - this, + this.toFirSourceElement(), session, delegatedSelfTypeRef, null, @@ -707,12 +714,13 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder hasPrimaryConstructor: Boolean ): FirDelegatedConstructorCall { val isThis = isCallToThis || (isImplicit && hasPrimaryConstructor) + val source = this.toFirSourceElement() val delegatedType = when { isThis -> delegatedSelfTypeRef - else -> delegatedSuperTypeRef ?: FirErrorTypeRefImpl(this, "No super type") + else -> delegatedSuperTypeRef ?: FirErrorTypeRefImpl(source, "No super type") } return FirDelegatedConstructorCallImpl( - this, + source, delegatedType, isThis ).apply { @@ -724,7 +732,7 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder override fun visitAnonymousInitializer(initializer: KtAnonymousInitializer, data: Unit): FirElement { return FirAnonymousInitializerImpl( - initializer, + initializer.toFirSourceElement(), session, if (stubMode) FirEmptyExpressionBlock() else initializer.body.toFirBlock() ) @@ -738,9 +746,10 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder { property.initializer }.toFirExpression("Should have initializer") } else null val delegateExpression by lazy { property.delegate?.expression } + val propertySource = property.toFirSourceElement() val firProperty = if (property.isLocal) { FirPropertyImpl( - property, + propertySource, session, propertyType, null, @@ -748,7 +757,7 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder initializer, delegateExpression?.let { FirWrappedDelegateExpressionImpl( - it, + it.toFirSourceElement(), it.toFirExpression("Incorrect delegate expression") ) }, @@ -768,7 +777,7 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder isLateInit = property.hasModifier(LATEINIT_KEYWORD) } FirPropertyImpl( - property, + propertySource, session, propertyType, property.receiverTypeReference.convertSafe(), @@ -776,7 +785,7 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder initializer, if (property.hasDelegate()) { FirWrappedDelegateExpressionImpl( - if (stubMode) null else delegateExpression, + if (stubMode) null else delegateExpression?.toFirSourceElement(), { delegateExpression }.toFirExpression("Should have delegate") ) } else null, @@ -797,18 +806,19 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder override fun visitTypeReference(typeReference: KtTypeReference, data: Unit): FirElement { val typeElement = typeReference.typeElement + val source = typeReference.toFirSourceElement() val isNullable = typeElement is KtNullableType fun KtTypeElement?.unwrapNullable(): KtTypeElement? = if (this is KtNullableType) this.innerType.unwrapNullable() else this val firType = when (val unwrappedElement = typeElement.unwrapNullable()) { - is KtDynamicType -> FirDynamicTypeRefImpl(typeReference, isNullable) + is KtDynamicType -> FirDynamicTypeRefImpl(source, isNullable) is KtUserType -> { var referenceExpression = unwrappedElement.referenceExpression if (referenceExpression != null) { val userType = FirUserTypeRefImpl( - typeReference, isNullable + source, isNullable ) var qualifier: KtUserType? = unwrappedElement do { @@ -826,12 +836,12 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder userType } else { - FirErrorTypeRefImpl(typeReference, "Incomplete user type") + FirErrorTypeRefImpl(source, "Incomplete user type") } } is KtFunctionType -> { val functionType = FirFunctionTypeRefImpl( - typeReference, + source, isNullable, unwrappedElement.receiverTypeReference.convertSafe(), // TODO: probably implicit type should not be here @@ -842,7 +852,7 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder } functionType } - null -> FirErrorTypeRefImpl(typeReference, "Unwrapped type is null") + null -> FirErrorTypeRefImpl(source, "Unwrapped type is null") else -> throw AssertionError("Unexpected type element: ${unwrappedElement.text}") } @@ -854,7 +864,7 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder override fun visitAnnotationEntry(annotationEntry: KtAnnotationEntry, data: Unit): FirElement { val firAnnotationCall = FirAnnotationCallImpl( - annotationEntry, + annotationEntry.toFirSourceElement(), annotationEntry.useSiteTarget?.getAnnotationUseSiteTarget(), annotationEntry.typeReference.toFirOrErrorType() ) @@ -865,7 +875,7 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder override fun visitTypeParameter(parameter: KtTypeParameter, data: Unit): FirElement { val parameterName = parameter.nameAsSafeName val firTypeParameter = FirTypeParameterImpl( - parameter, + parameter.toFirSourceElement(), session, parameterName, FirTypeParameterSymbol(), @@ -890,8 +900,9 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder override fun visitTypeProjection(typeProjection: KtTypeProjection, data: Unit): FirElement { val projectionKind = typeProjection.projectionKind + val source = typeProjection.toFirSourceElement() if (projectionKind == KtProjectionKind.STAR) { - return FirStarProjectionImpl(typeProjection) + return FirStarProjectionImpl(source) } if (projectionKind == KtProjectionKind.NONE && typeProjection.text == "_") { return FirTypePlaceholderProjection @@ -899,7 +910,7 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder val typeReference = typeProjection.typeReference val firType = typeReference.toFirOrErrorType() return FirTypeProjectionWithVarianceImpl( - typeProjection, + source, firType, when (projectionKind) { KtProjectionKind.IN -> Variance.IN_VARIANCE @@ -914,7 +925,7 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder parameter.toFirValueParameter() override fun visitBlockExpression(expression: KtBlockExpression, data: Unit): FirElement { - return FirBlockImpl(expression).apply { + return FirBlockImpl(expression.toFirSourceElement()).apply { for (statement in expression.statements) { val firStatement = statement.toFirStatement("Statement expected: ${statement.text}") if (firStatement !is FirBlock || firStatement.annotations.isNotEmpty()) { @@ -927,7 +938,7 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder } override fun visitSimpleNameExpression(expression: KtSimpleNameExpression, data: Unit): FirElement { - return generateAccessExpression(expression, expression.getReferencedNameAsName()) + return generateAccessExpression(expression.toFirSourceElement(), expression.getReferencedNameAsName()) } override fun visitConstantExpression(expression: KtConstantExpression, data: Unit): FirElement = @@ -940,29 +951,30 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder } override fun visitReturnExpression(expression: KtReturnExpression, data: Unit): FirElement { + val source = expression.toFirSourceElement() val result = expression.returnedExpression?.toFirExpression("Incorrect return expression") - ?: FirUnitExpression(expression) - return result.toReturn(expression, expression.getTargetLabel()?.getReferencedName()) + ?: FirUnitExpression(source) + return result.toReturn(source, expression.getTargetLabel()?.getReferencedName()) } override fun visitTryExpression(expression: KtTryExpression, data: Unit): FirElement { val tryBlock = expression.tryBlock.toFirBlock() val finallyBlock = expression.finallyBlock?.finalExpression?.toFirBlock() - return FirTryExpressionImpl(expression, tryBlock, finallyBlock).apply { + return FirTryExpressionImpl(expression.toFirSourceElement(), tryBlock, finallyBlock).apply { for (clause in expression.catchClauses) { val parameter = clause.catchParameter?.toFirValueParameter() ?: continue val block = clause.catchBody.toFirBlock() - catches += FirCatchImpl(clause, parameter, block) + catches += FirCatchImpl(clause.toFirSourceElement(), parameter, block) } } } override fun visitIfExpression(expression: KtIfExpression, data: Unit): FirElement { - return FirWhenExpressionImpl(expression, null, null).apply { + return FirWhenExpressionImpl(expression.toFirSourceElement(), null, null).apply { val condition = expression.condition val firCondition = condition.toFirExpression("If statement should have condition") val trueBranch = expression.then.toFirBlock() - branches += FirWhenBranchImpl(condition, firCondition, trueBranch) + branches += FirWhenBranchImpl(condition?.toFirSourceElement(), firCondition, trueBranch) expression.`else`?.let { branches += FirWhenBranchImpl( null, FirElseIfTrueCondition(null), it.toFirBlock() @@ -981,7 +993,7 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder is KtVariableDeclaration -> { val name = ktSubjectExpression.nameAsSafeName FirPropertyImpl( - ktSubjectExpression, + ktSubjectExpression?.toFirSourceElement(), session, ktSubjectExpression.typeReference.toFirOrImplicitType(), null, @@ -999,7 +1011,7 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder val hasSubject = subjectExpression != null val subject = FirWhenSubject() return FirWhenExpressionImpl( - expression, + expression?.toFirSourceElement(), subjectExpression, subjectVariable ).apply { @@ -1008,24 +1020,25 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder } var thereIsElseBranch = false for (entry in expression.entries) { + val entrySource = entry.toFirSourceElement() val branch = entry.expression.toFirBlock() branches += if (!entry.isElse) { if (hasSubject) { val firCondition = entry.conditions.toFirWhenCondition( - entry, + entrySource, subject, { toFirExpression(it) }, { toFirOrErrorType() } ) - FirWhenBranchImpl(entry, firCondition, branch) + FirWhenBranchImpl(entrySource, firCondition, branch) } else { val condition = entry.conditions.first() as? KtWhenConditionWithExpression val firCondition = condition?.expression.toFirExpression("No expression in condition with expression") - FirWhenBranchImpl(entry, firCondition, branch) + FirWhenBranchImpl(entrySource, firCondition, branch) } } else { thereIsElseBranch = true - FirWhenBranchImpl(entry, FirElseIfTrueCondition(null), branch) + FirWhenBranchImpl(entrySource, FirElseIfTrueCondition(null), branch) } } // if (!thereIsElseBranch) { @@ -1036,52 +1049,54 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder override fun visitDoWhileExpression(expression: KtDoWhileExpression, data: Unit): FirElement { return FirDoWhileLoopImpl( - expression, expression.condition.toFirExpression("No condition in do-while loop") + expression.toFirSourceElement(), expression.condition.toFirExpression("No condition in do-while loop") ).configure { expression.body.toFirBlock() } } override fun visitWhileExpression(expression: KtWhileExpression, data: Unit): FirElement { return FirWhileLoopImpl( - expression, expression.condition.toFirExpression("No condition in while loop") + expression.toFirSourceElement(), expression.condition.toFirExpression("No condition in while loop") ).configure { expression.body.toFirBlock() } } override fun visitForExpression(expression: KtForExpression, data: Unit?): FirElement { val rangeExpression = expression.loopRange.toFirExpression("No range in for loop") val parameter = expression.loopParameter - return FirBlockImpl(expression).apply { + val loopSource = expression.toFirSourceElement() + return FirBlockImpl(loopSource).apply { + val rangeSource = expression.loopRange?.toFirSourceElement() val rangeVal = - generateTemporaryVariable(this@RawFirBuilder.session, expression.loopRange, Name.special(""), rangeExpression) + generateTemporaryVariable(this@RawFirBuilder.session, rangeSource, Name.special(""), rangeExpression) statements += rangeVal val iteratorVal = generateTemporaryVariable( - this@RawFirBuilder.session, expression.loopRange, Name.special(""), - FirFunctionCallImpl(expression).apply { - calleeReference = FirSimpleNamedReference(expression, Name.identifier("iterator"), null) - explicitReceiver = generateResolvedAccessExpression(expression.loopRange, rangeVal) + this@RawFirBuilder.session, rangeSource, Name.special(""), + FirFunctionCallImpl(loopSource).apply { + calleeReference = FirSimpleNamedReference(loopSource, Name.identifier("iterator"), null) + explicitReceiver = generateResolvedAccessExpression(rangeSource, rangeVal) } ) statements += iteratorVal statements += FirWhileLoopImpl( - expression, - FirFunctionCallImpl(expression).apply { - calleeReference = FirSimpleNamedReference(expression, Name.identifier("hasNext"), null) - explicitReceiver = generateResolvedAccessExpression(expression, iteratorVal) + loopSource, + FirFunctionCallImpl(loopSource).apply { + calleeReference = FirSimpleNamedReference(loopSource, Name.identifier("hasNext"), null) + explicitReceiver = generateResolvedAccessExpression(loopSource, iteratorVal) } ).configure { // NB: just body.toFirBlock() isn't acceptable here because we need to add some statements val block = when (val body = expression.body) { is KtBlockExpression -> body.accept(this@Visitor, Unit) as FirBlockImpl - null -> FirBlockImpl(body) - else -> FirBlockImpl(body).apply { statements += body.toFirStatement() } + null -> FirBlockImpl(null) + else -> FirBlockImpl(body.toFirSourceElement()).apply { statements += body.toFirStatement() } } if (parameter != null) { val multiDeclaration = parameter.destructuringDeclaration val firLoopParameter = generateTemporaryVariable( - this@RawFirBuilder.session, expression.loopParameter, + this@RawFirBuilder.session, expression.loopParameter?.toFirSourceElement(), if (multiDeclaration != null) Name.special("") else parameter.nameAsSafeName, - FirFunctionCallImpl(expression).apply { - calleeReference = FirSimpleNamedReference(expression, Name.identifier("next"), null) - explicitReceiver = generateResolvedAccessExpression(expression, iteratorVal) + FirFunctionCallImpl(loopSource).apply { + calleeReference = FirSimpleNamedReference(loopSource, Name.identifier("next"), null) + explicitReceiver = generateResolvedAccessExpression(loopSource, iteratorVal) } ) if (multiDeclaration != null) { @@ -1107,22 +1122,23 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder } override fun visitBreakExpression(expression: KtBreakExpression, data: Unit): FirElement { - return FirBreakExpressionImpl(expression).bindLabel(expression) + return FirBreakExpressionImpl(expression.toFirSourceElement()).bindLabel(expression) } override fun visitContinueExpression(expression: KtContinueExpression, data: Unit): FirElement { - return FirContinueExpressionImpl(expression).bindLabel(expression) + return FirContinueExpressionImpl(expression.toFirSourceElement()).bindLabel(expression) } override fun visitBinaryExpression(expression: KtBinaryExpression, data: Unit): FirElement { val operationToken = expression.operationToken val leftArgument = expression.left.toFirExpression("No left operand") val rightArgument = expression.right.toFirExpression("No right operand") + val source = expression.toFirSourceElement() when (operationToken) { ELVIS -> - return leftArgument.generateNotNullOrOther(session, rightArgument, "elvis", expression) + return leftArgument.generateNotNullOrOther(session, rightArgument, "elvis", source) ANDAND, OROR -> - return leftArgument.generateLazyLogicalOperation(rightArgument, operationToken == ANDAND, expression) + return leftArgument.generateLazyLogicalOperation(rightArgument, operationToken == ANDAND, source) in OperatorConventions.IN_OPERATIONS -> return rightArgument.generateContainsOperation( leftArgument, operationToken == NOT_IN, expression, expression.operationReference @@ -1130,9 +1146,9 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder } val conventionCallName = operationToken.toBinaryName() return if (conventionCallName != null || operationToken == IDENTIFIER) { - FirFunctionCallImpl(expression).apply { + FirFunctionCallImpl(source).apply { calleeReference = FirSimpleNamedReference( - expression.operationReference, + expression.operationReference.toFirSourceElement(), conventionCallName ?: expression.operationReference.getReferencedNameAsName(), null ) @@ -1142,11 +1158,11 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder } else { val firOperation = operationToken.toFirOperation() if (firOperation in FirOperation.ASSIGNMENTS) { - return expression.left.generateAssignment(expression, rightArgument, firOperation) { + return expression.left.generateAssignment(source, rightArgument, firOperation) { (this as KtExpression).toFirExpression("Incorrect expression in assignment: ${expression.text}") } } else { - FirOperatorCallImpl(expression, firOperation).apply { + FirOperatorCallImpl(source, firOperation).apply { arguments += leftArgument arguments += rightArgument } @@ -1157,7 +1173,7 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder override fun visitBinaryWithTypeRHSExpression(expression: KtBinaryExpressionWithTypeRHS, data: Unit): FirElement { val operation = expression.operationReference.getReferencedNameElementType().toFirOperation() return FirTypeOperatorCallImpl( - expression, operation, expression.right.toFirOrErrorType() + expression.toFirSourceElement(), operation, expression.right.toFirOrErrorType() ).apply { arguments += expression.left.toFirExpression("No left operand") } @@ -1165,7 +1181,7 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder override fun visitIsExpression(expression: KtIsExpression, data: Unit): FirElement { return FirTypeOperatorCallImpl( - expression, if (expression.isNegated) FirOperation.NOT_IS else FirOperation.IS, + expression.toFirSourceElement(), if (expression.isNegated) FirOperation.NOT_IS else FirOperation.IS, expression.typeReference.toFirOrErrorType() ).apply { arguments += expression.leftHandSide.toFirExpression("No left operand") @@ -1187,15 +1203,15 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder prefix = expression is KtPrefixExpression ) { (this as KtExpression).toFirExpression("Incorrect expression inside inc/dec") } } - FirFunctionCallImpl(expression).apply { + FirFunctionCallImpl(expression.toFirSourceElement()).apply { calleeReference = FirSimpleNamedReference( - expression.operationReference, conventionCallName, null + expression.operationReference.toFirSourceElement(), conventionCallName, null ) explicitReceiver = argument.toFirExpression("No operand") } } else { val firOperation = operationToken.toFirOperation() - FirOperatorCallImpl(expression, firOperation).apply { + FirOperatorCallImpl(expression.toFirSourceElement(), firOperation).apply { arguments += argument.toFirExpression("No operand") } } @@ -1203,18 +1219,19 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder override fun visitCallExpression(expression: KtCallExpression, data: Unit): FirElement { val calleeExpression = expression.calleeExpression - return FirFunctionCallImpl(expression).apply { + val source = expression.toFirSourceElement() + return FirFunctionCallImpl(source).apply { val calleeReference = when (calleeExpression) { is KtSimpleNameExpression -> FirSimpleNamedReference( - calleeExpression, calleeExpression.getReferencedNameAsName(), null + calleeExpression.toFirSourceElement(), calleeExpression.getReferencedNameAsName(), null ) null -> FirErrorNamedReferenceImpl( - calleeExpression, "Call has no callee" + null, "Call has no callee" ) else -> { arguments += calleeExpression.toFirExpression("Incorrect invoke receiver") FirSimpleNamedReference( - expression, OperatorNameConventions.INVOKE, null + source, OperatorNameConventions.INVOKE, null ) } } @@ -1230,8 +1247,9 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder override fun visitArrayAccessExpression(expression: KtArrayAccessExpression, data: Unit): FirElement { val arrayExpression = expression.arrayExpression - return FirFunctionCallImpl(expression).apply { - calleeReference = FirSimpleNamedReference(expression, OperatorNameConventions.GET, null) + val source = expression.toFirSourceElement() + return FirFunctionCallImpl(source).apply { + calleeReference = FirSimpleNamedReference(source, OperatorNameConventions.GET, null) explicitReceiver = arrayExpression.toFirExpression("No array expression") for (indexExpression in expression.indexExpressions) { arguments += indexExpression.toFirExpression("Incorrect index expression") @@ -1241,7 +1259,7 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder override fun visitQualifiedExpression(expression: KtQualifiedExpression, data: Unit): FirElement { val selector = expression.selectorExpression - ?: return FirErrorExpressionImpl(expression, "Qualified expression without selector") + ?: return FirErrorExpressionImpl(expression.toFirSourceElement(), "Qualified expression without selector") val firSelector = selector.toFirExpression("Incorrect selector expression") if (firSelector is FirModifiableQualifiedAccess) { firSelector.safe = expression is KtSafeQualifiedExpression @@ -1252,27 +1270,30 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder override fun visitThisExpression(expression: KtThisExpression, data: Unit): FirElement { val labelName = expression.getLabelName() - return FirThisReceiverExpressionImpl(expression, FirExplicitThisReference(expression, labelName)) + val source = expression.toFirSourceElement() + return FirThisReceiverExpressionImpl(source, FirExplicitThisReference(source, labelName)) } override fun visitSuperExpression(expression: KtSuperExpression, data: Unit): FirElement { val superType = expression.superTypeQualifier - return FirQualifiedAccessExpressionImpl(expression).apply { - calleeReference = FirExplicitSuperReference(expression, superType.toFirOrImplicitType()) + val source = expression.toFirSourceElement() + return FirQualifiedAccessExpressionImpl(source).apply { + calleeReference = FirExplicitSuperReference(source, superType.toFirOrImplicitType()) } } override fun visitParenthesizedExpression(expression: KtParenthesizedExpression, data: Unit): FirElement { - return expression.expression?.accept(this, data) ?: FirErrorExpressionImpl(expression, "Empty parentheses") + return expression.expression?.accept(this, data) ?: FirErrorExpressionImpl(expression.toFirSourceElement(), "Empty parentheses") } override fun visitLabeledExpression(expression: KtLabeledExpression, data: Unit): FirElement { + val source = expression.toFirSourceElement() val labelName = expression.getLabelName() val size = context.firLabels.size if (labelName != null) { - context.firLabels += FirLabelImpl(expression, labelName) + context.firLabels += FirLabelImpl(source, labelName) } - val result = expression.baseExpression?.accept(this, data) ?: FirErrorExpressionImpl(expression, "Empty label") + val result = expression.baseExpression?.accept(this, data) ?: FirErrorExpressionImpl(source, "Empty label") if (size != context.firLabels.size) { context.firLabels.removeLast() println("Unused label: ${expression.text}") @@ -1283,18 +1304,18 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder override fun visitAnnotatedExpression(expression: KtAnnotatedExpression, data: Unit): FirElement { val rawResult = expression.baseExpression?.accept(this, data) val result = rawResult as? FirAbstractAnnotatedElement - ?: FirErrorExpressionImpl(expression, "Strange annotated expression: ${rawResult?.render()}") + ?: FirErrorExpressionImpl(expression.toFirSourceElement(), "Strange annotated expression: ${rawResult?.render()}") expression.extractAnnotationsTo(result) return result } override fun visitThrowExpression(expression: KtThrowExpression, data: Unit): FirElement { - return FirThrowExpressionImpl(expression, expression.thrownExpression.toFirExpression("Nothing to throw")) + return FirThrowExpressionImpl(expression.toFirSourceElement(), expression.thrownExpression.toFirExpression("Nothing to throw")) } override fun visitDestructuringDeclaration(multiDeclaration: KtDestructuringDeclaration, data: Unit): FirElement { val baseVariable = generateTemporaryVariable( - session, multiDeclaration, "destruct", + session, multiDeclaration.toFirSourceElement(), "destruct", multiDeclaration.initializer.toFirExpression("Destructuring declaration without initializer") ) return generateDestructuringBlock( @@ -1309,22 +1330,22 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder } override fun visitClassLiteralExpression(expression: KtClassLiteralExpression, data: Unit): FirElement { - return FirGetClassCallImpl(expression).apply { + return FirGetClassCallImpl(expression.toFirSourceElement()).apply { arguments += expression.receiverExpression.toFirExpression("No receiver in class literal") } } override fun visitCallableReferenceExpression(expression: KtCallableReferenceExpression, data: Unit): FirElement { - return FirCallableReferenceAccessImpl(expression).apply { + return FirCallableReferenceAccessImpl(expression.toFirSourceElement()).apply { calleeReference = FirSimpleNamedReference( - expression.callableReference, expression.callableReference.getReferencedNameAsName(), null + expression.callableReference.toFirSourceElement(), expression.callableReference.getReferencedNameAsName(), null ) explicitReceiver = expression.receiverExpression?.toFirExpression("Incorrect receiver expression") } } override fun visitCollectionLiteralExpression(expression: KtCollectionLiteralExpression, data: Unit): FirElement { - return FirArrayOfCallImpl(expression).apply { + return FirArrayOfCallImpl(expression.toFirSourceElement()).apply { for (innerExpression in expression.getInnerExpressions()) { arguments += innerExpression.toFirExpression("Incorrect collection literal argument") } @@ -1332,7 +1353,7 @@ class RawFirBuilder(session: FirSession, val stubMode: Boolean) : BaseFirBuilder } override fun visitExpression(expression: KtExpression, data: Unit): FirElement { - return FirExpressionStub(expression) + return FirExpressionStub(expression.toFirSourceElement()) } } } diff --git a/compiler/fir/psi2fir/tests/org/jetbrains/kotlin/fir/builder/RawFirBuilderTotalKotlinTestCase.kt b/compiler/fir/psi2fir/tests/org/jetbrains/kotlin/fir/builder/RawFirBuilderTotalKotlinTestCase.kt index cae0be35090..67c51c77dc1 100644 --- a/compiler/fir/psi2fir/tests/org/jetbrains/kotlin/fir/builder/RawFirBuilderTotalKotlinTestCase.kt +++ b/compiler/fir/psi2fir/tests/org/jetbrains/kotlin/fir/builder/RawFirBuilderTotalKotlinTestCase.kt @@ -15,6 +15,7 @@ import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccess import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.expressions.impl.FirExpressionStub +import org.jetbrains.kotlin.fir.psi import org.jetbrains.kotlin.fir.references.FirErrorNamedReference import org.jetbrains.kotlin.fir.render import org.jetbrains.kotlin.fir.visitors.FirVisitorVoid diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/CopyUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/CopyUtils.kt index beb96674cd1..86101adc05e 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/CopyUtils.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/CopyUtils.kt @@ -5,7 +5,6 @@ package org.jetbrains.kotlin.fir -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.contracts.description.InvocationKind import org.jetbrains.kotlin.fir.declarations.FirAnonymousFunction import org.jetbrains.kotlin.fir.declarations.FirTypeParameter @@ -32,12 +31,12 @@ fun FirFunctionCall.copy( explicitReceiver: FirExpression? = this.explicitReceiver, dispatchReceiver: FirExpression = this.dispatchReceiver, extensionReceiver: FirExpression = this.extensionReceiver, - psi: PsiElement? = this.psi, + source: FirSourceElement? = this.source, safe: Boolean = this.safe, typeArguments: List = this.typeArguments, resultType: FirTypeRef = this.typeRef ): FirFunctionCall { - return FirFunctionCallImpl(psi).apply { + return FirFunctionCallImpl(source).apply { this.safe = safe this.annotations.addAll(annotations) this.arguments.addAll(arguments) @@ -52,7 +51,7 @@ fun FirFunctionCall.copy( fun FirAnonymousFunction.copy( receiverTypeRef: FirTypeRef? = this.receiverTypeRef, - psi: PsiElement? = this.psi, + source: FirSourceElement? = this.source, session: FirSession = this.session, returnTypeRef: FirTypeRef = this.returnTypeRef, valueParameters: List = this.valueParameters, @@ -63,7 +62,7 @@ fun FirAnonymousFunction.copy( controlFlowGraphReference: FirControlFlowGraphReference = this.controlFlowGraphReference, invocationKind: InvocationKind? = this.invocationKind ): FirAnonymousFunction { - return FirAnonymousFunctionImpl(psi, session, returnTypeRef, receiverTypeRef, symbol).apply { + return FirAnonymousFunctionImpl(source, session, returnTypeRef, receiverTypeRef, symbol).apply { this.valueParameters.addAll(valueParameters) this.body = body this.annotations.addAll(annotations) @@ -78,7 +77,7 @@ fun FirAnonymousFunction.copy( fun FirTypeRef.resolvedTypeFromPrototype( type: ConeKotlinType ): FirResolvedTypeRef { - return FirResolvedTypeRefImpl(psi, type).apply { + return FirResolvedTypeRefImpl(source, type).apply { annotations += this@resolvedTypeFromPrototype.annotations } } @@ -88,7 +87,7 @@ fun FirTypeParameter.copy( annotations: List = this.annotations ): FirTypeParameterImpl { return FirTypeParameterImpl( - psi, session, name, symbol, variance, isReified + source, session, name, symbol, variance, isReified ).apply { this.bounds += bounds this.annotations += annotations @@ -98,7 +97,7 @@ fun FirTypeParameter.copy( fun FirWhenExpression.copy( resultType: FirTypeRef = this.typeRef, calleeReference: FirReference = this.calleeReference -): FirWhenExpressionImpl = FirWhenExpressionImpl(psi, subject, subjectVariable).apply { +): FirWhenExpressionImpl = FirWhenExpressionImpl(source, subject, subjectVariable).apply { this.calleeReference = calleeReference this@apply.branches.addAll(this@copy.branches) this.typeRef = resultType @@ -108,7 +107,7 @@ fun FirWhenExpression.copy( fun FirTryExpression.copy( resultType: FirTypeRef = this.typeRef, calleeReference: FirReference = this.calleeReference -): FirTryExpressionImpl = FirTryExpressionImpl(psi, tryBlock, finallyBlock).apply { +): FirTryExpressionImpl = FirTryExpressionImpl(source, tryBlock, finallyBlock).apply { this.calleeReference = calleeReference this@apply.catches.addAll(this@copy.catches) this.typeRef = resultType diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirCallResolver.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirCallResolver.kt index d9c2a8fe83e..cc222b94585 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirCallResolver.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirCallResolver.kt @@ -203,7 +203,7 @@ class FirCallResolver( } if (referencedSymbol is FirClassLikeSymbol<*>) { val classId = referencedSymbol.classId - return FirResolvedQualifierImpl(nameReference.psi, classId.packageFqName, classId.relativeClassName).apply { + return FirResolvedQualifierImpl(nameReference.source, classId.packageFqName, classId.relativeClassName).apply { resultType = typeForQualifier(this) } } @@ -292,7 +292,7 @@ class FirCallResolver( expectedType, outerConstraintSystemBuilder, lhs, - FirExpressionStub(callableReferenceAccess.psi).apply { replaceTypeRef(FirResolvedTypeRefImpl(null, lhs.type)) }, + FirExpressionStub(callableReferenceAccess.source).apply { replaceTypeRef(FirResolvedTypeRefImpl(null, lhs.type)) }, callableReferenceAccess.explicitReceiver ) } @@ -353,14 +353,14 @@ class FirCallResolver( applicability: CandidateApplicability ): FirNamedReference { val name = namedReference.name - val psi = namedReference.psi + val source = namedReference.source return when { candidates.isEmpty() -> FirErrorNamedReferenceImpl( - psi, "Unresolved name: $name" + source, "Unresolved name: $name" ) applicability < CandidateApplicability.SYNTHETIC_RESOLVED -> { FirErrorNamedReferenceImpl( - psi, + source, "Inapplicable($applicability): ${candidates.map { describeSymbol(it.symbol) }}" ) } @@ -368,17 +368,17 @@ class FirCallResolver( val candidate = candidates.single() val coneSymbol = candidate.symbol when { - coneSymbol is FirBackingFieldSymbol -> FirBackingFieldReferenceImpl(psi, null, coneSymbol) + coneSymbol is FirBackingFieldSymbol -> FirBackingFieldReferenceImpl(source, null, coneSymbol) coneSymbol is FirVariableSymbol && ( coneSymbol !is FirPropertySymbol || (coneSymbol.phasedFir(session) as FirMemberDeclaration).typeParameters.isEmpty() ) -> - FirResolvedNamedReferenceImpl(psi, name, coneSymbol) - else -> FirNamedReferenceWithCandidate(psi, name, candidate) + FirResolvedNamedReferenceImpl(source, name, coneSymbol) + else -> FirNamedReferenceWithCandidate(source, name, candidate) } } else -> FirErrorNamedReferenceImpl( - psi, "Ambiguity: $name, ${candidates.map { describeSymbol(it.symbol) }}" + source, "Ambiguity: $name, ${candidates.map { describeSymbol(it.symbol) }}" ) } } diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt index b519bcd6a47..2fab8f081b7 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt @@ -210,7 +210,7 @@ fun FirFunction<*>.constructFunctionalTypeRef(session: FirSession): FirResolvedT val functionalType = createFunctionalType(parameters, receiverTypeRef?.coneTypeUnsafe(), rawReturnType) - return FirResolvedTypeRefImpl(psi, functionalType) + return FirResolvedTypeRefImpl(source, functionalType) } fun createFunctionalType( @@ -287,7 +287,7 @@ fun BodyResolveComponents.typeFromCallee(access: T): FirReso return when (val newCallee = access.calleeReference) { is FirErrorNamedReference -> - FirErrorTypeRefImpl(access.psi, newCallee.errorReason) + FirErrorTypeRefImpl(access.source, newCallee.errorReason) is FirNamedReferenceWithCandidate -> { typeFromSymbol(newCallee.candidateSymbol, makeNullable) } diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt index 64a43b95216..e556354c92d 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt @@ -114,7 +114,7 @@ class FirSamResolverImpl( val newTypeParameters = firRegularClass.typeParameters.map { typeParameter -> FirTypeParameterImpl( - typeParameter.psi, + typeParameter.source, firSession, typeParameter.name, FirTypeParameterSymbol(), @@ -137,7 +137,7 @@ class FirSamResolverImpl( for ((newTypeParameter, oldTypeParameter) in newTypeParameters.zip(firRegularClass.typeParameters)) { newTypeParameter.bounds += oldTypeParameter.bounds.mapNotNull { typeRef -> - FirResolvedTypeRefImpl(typeRef.psi, substitutor.substituteOrSelf(typeRef.coneTypeSafe() ?: return@mapNotNull null)) + FirResolvedTypeRefImpl(typeRef.source, substitutor.substituteOrSelf(typeRef.coneTypeSafe() ?: return@mapNotNull null)) } } @@ -170,9 +170,9 @@ class FirSamResolverImpl( ).apply { valueParameters += listOf( FirValueParameterImpl( - psi, + source, session, - FirResolvedTypeRefImpl(firRegularClass.psi, substitutedFunctionType), + FirResolvedTypeRefImpl(firRegularClass.source, substitutedFunctionType), SAM_PARAMETER_NAME, FirVariableSymbol(SAM_PARAMETER_NAME), defaultValue = null, diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/FirNamedReferenceWithCandidate.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/FirNamedReferenceWithCandidate.kt index b138a16bc42..07840e2e1da 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/FirNamedReferenceWithCandidate.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/FirNamedReferenceWithCandidate.kt @@ -5,16 +5,16 @@ package org.jetbrains.kotlin.fir.resolve.calls -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.references.impl.FirSimpleNamedReference import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol import org.jetbrains.kotlin.name.Name class FirNamedReferenceWithCandidate( - psi: PsiElement?, + source: FirSourceElement?, name: Name, val candidate: Candidate -) : FirSimpleNamedReference(psi, name, candidate.symbol) { +) : FirSimpleNamedReference(source, name, candidate.symbol) { override val candidateSymbol: AbstractFirBasedSymbol<*> get() = candidate.symbol } \ No newline at end of file diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/PostponedArgumentsAnalyzer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/PostponedArgumentsAnalyzer.kt index de3c13cacf6..1e3c731c1c3 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/PostponedArgumentsAnalyzer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/PostponedArgumentsAnalyzer.kt @@ -83,10 +83,10 @@ class PostponedArgumentsAnalyzer( val namedReference = when { candidate == null || applicability < CandidateApplicability.SYNTHETIC_RESOLVED -> FirErrorNamedReferenceImpl( - callableReferenceAccess.psi, + callableReferenceAccess.source, "Unresolved reference: ${callableReferenceAccess.calleeReference.name}" ) - else -> FirNamedReferenceWithCandidate(callableReferenceAccess.psi, callableReferenceAccess.calleeReference.name, candidate) + else -> FirNamedReferenceWithCandidate(callableReferenceAccess.source, callableReferenceAccess.calleeReference.name, candidate) } val transformedCalleeReference = callableReferenceAccess.transformCalleeReference( diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/FirControlFlowGraphReferenceImpl.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/FirControlFlowGraphReferenceImpl.kt index 54032b36806..56d03fa471d 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/FirControlFlowGraphReferenceImpl.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/FirControlFlowGraphReferenceImpl.kt @@ -5,14 +5,14 @@ package org.jetbrains.kotlin.fir.resolve.dfa -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.resolve.dfa.cfg.ControlFlowGraph import org.jetbrains.kotlin.fir.visitors.FirTransformer import org.jetbrains.kotlin.fir.visitors.FirVisitor class FirControlFlowGraphReferenceImpl(val controlFlowGraph: ControlFlowGraph) : FirControlFlowGraphReference() { - override val psi: PsiElement? get() = null + override val source: FirSourceElement? get() = null override fun acceptChildren(visitor: FirVisitor, data: D) {} diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraph.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraph.kt index 83280950941..c837f7954d4 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraph.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraph.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.resolve.dfa.cfg -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirAnonymousInitializer import org.jetbrains.kotlin.fir.declarations.FirFunction import org.jetbrains.kotlin.fir.declarations.FirProperty @@ -167,7 +167,7 @@ class AnnotationExitNode(owner: ControlFlowGraph, override val fir: FirAnnotatio // ----------------------------------- Stub ----------------------------------- object FirStub : FirElement { - override val psi: PsiElement? get() = null + override val source: FirSourceElement? get() = null override fun acceptChildren(visitor: FirVisitor, data: D) {} diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphRenderer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphRenderer.kt index 6fb63f69820..187a8371528 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphRenderer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphRenderer.kt @@ -11,6 +11,7 @@ import org.jetbrains.kotlin.fir.expressions.FirDoWhileLoop import org.jetbrains.kotlin.fir.expressions.FirLoop import org.jetbrains.kotlin.fir.expressions.FirWhileLoop import org.jetbrains.kotlin.fir.expressions.impl.FirElseIfTrueCondition +import org.jetbrains.kotlin.fir.psi import org.jetbrains.kotlin.fir.render import org.jetbrains.kotlin.utils.DFS diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirCallCompletionResultsWriterTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirCallCompletionResultsWriterTransformer.kt index eba3aa28d25..a0e0f485f95 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirCallCompletionResultsWriterTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirCallCompletionResultsWriterTransformer.kt @@ -53,7 +53,7 @@ class FirCallCompletionResultsWriterTransformer( return qualifiedAccessExpression.transformCalleeReference( StoreCalleeReference, FirResolvedNamedReferenceImpl( - calleeReference.psi, + calleeReference.source, calleeReference.name, calleeReference.candidateSymbol ) @@ -79,7 +79,7 @@ class FirCallCompletionResultsWriterTransformer( return callableReferenceAccess.transformCalleeReference( StoreCalleeReference, FirResolvedCallableReferenceImpl( - calleeReference.psi, + calleeReference.source, calleeReference.name, calleeReference.candidateSymbol ).apply { @@ -97,7 +97,7 @@ class FirCallCompletionResultsWriterTransformer( return variableAssignment.transformCalleeReference( StoreCalleeReference, FirResolvedNamedReferenceImpl( - calleeReference.psi, + calleeReference.source, calleeReference.name, calleeReference.candidateSymbol ) @@ -116,14 +116,14 @@ class FirCallCompletionResultsWriterTransformer( is FirTypeProjectionWithVariance -> { val typeRef = argument.typeRef as FirResolvedTypeRef FirTypeProjectionWithVarianceImpl( - argument.psi, + argument.source, typeRef.withReplacedConeType(type), argument.variance ) } else -> { FirTypeProjectionWithVarianceImpl( - argument?.psi, + argument?.source, FirResolvedTypeRefImpl(null, type), Variance.INVARIANT ) @@ -149,7 +149,7 @@ class FirCallCompletionResultsWriterTransformer( resultType = resultType, typeArguments = typeArguments, calleeReference = FirResolvedNamedReferenceImpl( - calleeReference.psi, + calleeReference.source, calleeReference.name, calleeReference.candidateSymbol ), @@ -215,7 +215,7 @@ class FirCallCompletionResultsWriterTransformer( return whenExpression.copy( resultType = resultType, calleeReference = FirResolvedNamedReferenceImpl( - calleeReference.psi, + calleeReference.source, calleeReference.name, calleeReference.candidateSymbol ) @@ -241,7 +241,7 @@ class FirCallCompletionResultsWriterTransformer( return tryExpression.copy( resultType = resultType, calleeReference = FirResolvedNamedReferenceImpl( - calleeReference.psi, + calleeReference.source, calleeReference.name, calleeReference.candidateSymbol ) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSpecificTypeResolverTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSpecificTypeResolverTransformer.kt index 23294ec57de..ff5926e363d 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSpecificTypeResolverTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSpecificTypeResolverTransformer.kt @@ -29,7 +29,7 @@ class FirSpecificTypeResolverTransformer( val typeResolver = FirTypeResolver.getInstance(session) functionTypeRef.transformChildren(this, data) return FirResolvedFunctionTypeRefImpl( - functionTypeRef.psi, + functionTypeRef.source, typeResolver.resolveType(functionTypeRef, towerScope), functionTypeRef.isMarkedNullable, functionTypeRef.receiverTypeRef, @@ -42,7 +42,7 @@ class FirSpecificTypeResolverTransformer( private fun transformType(typeRef: FirTypeRef, resolvedType: ConeKotlinType): CompositeTransformResult { return FirResolvedTypeRefImpl( - typeRef.psi, + typeRef.source, resolvedType ).apply { annotations += typeRef.annotations diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSupertypeResolverTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSupertypeResolverTransformer.kt index 1c1bd4fa0a4..8bfe410deeb 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSupertypeResolverTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSupertypeResolverTransformer.kt @@ -9,7 +9,9 @@ import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.render -import org.jetbrains.kotlin.fir.resolve.* +import org.jetbrains.kotlin.fir.resolve.ScopeSession +import org.jetbrains.kotlin.fir.resolve.firProvider +import org.jetbrains.kotlin.fir.resolve.firSymbolProvider import org.jetbrains.kotlin.fir.scopes.addImportingScopes import org.jetbrains.kotlin.fir.types.* import org.jetbrains.kotlin.fir.types.impl.FirErrorTypeRefImpl @@ -162,7 +164,7 @@ class FirSupertypeResolverTransformer : FirAbstractTreeTransformer(phase = FirRe val coneType = (superTypeRef as FirResolvedTypeRef).type if (coneType is ConeTypeParameterType) { resultingTypeRefs.add( - FirErrorTypeRefImpl(superTypeRef.psi, "Type parameter cannot be a super-type: ${coneType.render()}") + FirErrorTypeRefImpl(superTypeRef.source, "Type parameter cannot be a super-type: ${coneType.render()}") ) continue } @@ -171,7 +173,7 @@ class FirSupertypeResolverTransformer : FirAbstractTreeTransformer(phase = FirRe if (superTypeClassId.outerClasses().any { it.areSupertypesComputing() }) { resultingTypeRefs.add( - FirErrorTypeRefImpl(superTypeRef.psi, "Recursion detected: ${superTypeRef.render()}") + FirErrorTypeRefImpl(superTypeRef.source, "Recursion detected: ${superTypeRef.render()}") ) continue diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSyntheticCallGenerator.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSyntheticCallGenerator.kt index e5e8371dca8..612ddddd28b 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSyntheticCallGenerator.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSyntheticCallGenerator.kt @@ -164,7 +164,7 @@ class FirSyntheticCallGenerator( } return FirSimpleFunctionImpl( session = session, - psi = null, + source = null, symbol = symbol, name = name, status = status, @@ -179,7 +179,7 @@ class FirSyntheticCallGenerator( val name = Name.identifier(name) return FirValueParameterImpl( session = session, - psi = null, + source = null, name = name, returnTypeRef = this, defaultValue = null, diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt index 83d663f0ede..9bb8eafa1f1 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt @@ -326,7 +326,7 @@ class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransformer) val bodyExpectedType = returnTypeRefFromResolvedAtom ?: data af = transformFunction(af, bodyExpectedType).single as FirAnonymousFunction af = af.copy( - returnTypeRef = af.body?.resultType ?: FirErrorTypeRefImpl(af.psi, "No result type for lambda") + returnTypeRef = af.body?.resultType ?: FirErrorTypeRefImpl(af.source, "No result type for lambda") ) af.replaceTypeRef(af.constructFunctionalTypeRef(session)) af.compose() diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt index 87f360952dc..415565c0114 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt @@ -5,7 +5,8 @@ package org.jetbrains.kotlin.fir.resolve.transformers.body.resolve -import org.jetbrains.kotlin.fir.* +import org.jetbrains.kotlin.fir.BuiltinTypes +import org.jetbrains.kotlin.fir.FirCallResolver import org.jetbrains.kotlin.fir.expressions.* import org.jetbrains.kotlin.fir.expressions.impl.FirErrorExpressionImpl import org.jetbrains.kotlin.fir.expressions.impl.FirExpressionWithSmartcastImpl @@ -53,7 +54,7 @@ class FirExpressionsResolveTransformer(transformer: FirBodyResolveTransformer) : override fun transformExpression(expression: FirExpression, data: Any?): CompositeTransformResult { if (expression.resultType is FirImplicitTypeRef && expression !is FirWrappedExpression) { - val type = FirErrorTypeRefImpl(expression.psi, "Type calculating for ${expression::class} is not supported") + val type = FirErrorTypeRefImpl(expression.source, "Type calculating for ${expression::class} is not supported") expression.resultType = type } return (expression.transformChildren(transformer, data) as FirStatement).compose() @@ -81,7 +82,7 @@ class FirExpressionsResolveTransformer(transformer: FirBodyResolveTransformer) : } else { val superTypeRef = implicitReceiverStack.lastDispatchReceiver() ?.boundSymbol?.phasedFir?.superTypeRefs?.firstOrNull() - ?: FirErrorTypeRefImpl(qualifiedAccessExpression.psi, "No super type") + ?: FirErrorTypeRefImpl(qualifiedAccessExpression.source, "No super type") qualifiedAccessExpression.resultType = superTypeRef callee.replaceSuperTypeRef(superTypeRef) } @@ -123,7 +124,7 @@ class FirExpressionsResolveTransformer(transformer: FirBodyResolveTransformer) : } val intersectedType = ConeTypeIntersector.intersectTypes(inferenceComponents.ctx as ConeInferenceContext, allTypes) // TODO: add check that intersectedType is not equal to original type - val intersectedTypeRef = FirResolvedTypeRefImpl(qualifiedAccessExpression.resultType.psi, intersectedType).apply { + val intersectedTypeRef = FirResolvedTypeRefImpl(qualifiedAccessExpression.resultType.source, intersectedType).apply { annotations += qualifiedAccessExpression.resultType.annotations } return FirExpressionWithSmartcastImpl(qualifiedAccessExpression, intersectedTypeRef, typesFromSmartCast) @@ -167,7 +168,7 @@ class FirExpressionsResolveTransformer(transformer: FirBodyResolveTransformer) : else -> null } block.resultType = if (resultExpression == null) { - FirImplicitUnitTypeRef(block.psi) + FirImplicitUnitTypeRef(block.source) } else { (resultExpression.resultType as? FirResolvedTypeRef) ?: FirErrorTypeRefImpl(null, "No type for block") } @@ -197,11 +198,11 @@ class FirExpressionsResolveTransformer(transformer: FirBodyResolveTransformer) : val operatorCall = operatorCall.transformArguments(this, noExpectedType) val (leftArgument, rightArgument) = operatorCall.arguments - fun createFunctionCall(name: Name) = FirFunctionCallImpl(operatorCall.psi).apply { + fun createFunctionCall(name: Name) = FirFunctionCallImpl(operatorCall.source).apply { explicitReceiver = leftArgument arguments += rightArgument calleeReference = FirSimpleNamedReference( - operatorCall.psi, + operatorCall.source, name, candidateSymbol = null ) @@ -224,14 +225,14 @@ class FirExpressionsResolveTransformer(transformer: FirBodyResolveTransformer) : operatorCallReference == null || property?.isVal == true -> resolvedAssignCall.compose() assignCallReference == null -> { val assignment = - FirVariableAssignmentImpl(operatorCall.psi, false, resolvedOperatorCall, FirOperation.ASSIGN).apply { + FirVariableAssignmentImpl(operatorCall.source, false, resolvedOperatorCall, FirOperation.ASSIGN).apply { lValue = (leftArgument as? FirQualifiedAccess)?.calleeReference ?: FirErrorNamedReferenceImpl(null, "Unresolved reference") } assignment.transform(transformer, noExpectedType) } else -> FirErrorExpressionImpl( - operatorCall.psi, + operatorCall.source, "Operator overload ambiguity. $assignmentOperatorName and $simpleOperatorName are compatible" ).compose() } diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassSubstitutionScope.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassSubstitutionScope.kt index b96932902d4..7ec82ce1751 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassSubstitutionScope.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassSubstitutionScope.kt @@ -6,9 +6,11 @@ package org.jetbrains.kotlin.fir.scopes.impl import org.jetbrains.kotlin.fir.FirSession -import org.jetbrains.kotlin.fir.declarations.FirSimpleFunction import org.jetbrains.kotlin.fir.declarations.FirProperty -import org.jetbrains.kotlin.fir.declarations.impl.* +import org.jetbrains.kotlin.fir.declarations.FirSimpleFunction +import org.jetbrains.kotlin.fir.declarations.impl.FirPropertyImpl +import org.jetbrains.kotlin.fir.declarations.impl.FirSimpleFunctionImpl +import org.jetbrains.kotlin.fir.declarations.impl.FirValueParameterImpl import org.jetbrains.kotlin.fir.resolve.ScopeSession import org.jetbrains.kotlin.fir.resolve.substitution.substitutorByMap import org.jetbrains.kotlin.fir.resolve.transformers.ReturnTypeCalculatorWithJump @@ -116,7 +118,7 @@ class FirClassSubstitutionScope( // TODO: consider using here some light-weight functions instead of pseudo-real FirMemberFunctionImpl // As second alternative, we can invent some light-weight kind of FirRegularClass FirSimpleFunctionImpl( - psi, + source, session, baseFunction.returnTypeRef.withReplacedConeType(newReturnType), baseFunction.receiverTypeRef?.withReplacedConeType(newReceiverType), @@ -130,7 +132,7 @@ class FirClassSubstitutionScope( ) { valueParameter, newType -> with(valueParameter) { FirValueParameterImpl( - psi, + source, session, this.returnTypeRef.withReplacedConeType(newType), name, @@ -157,7 +159,7 @@ class FirClassSubstitutionScope( val symbol = FirPropertySymbol(baseSymbol.callableId, true, baseSymbol) with(baseProperty) { FirPropertyImpl( - psi, + source, session, baseProperty.returnTypeRef.withReplacedConeType(newReturnType), baseProperty.receiverTypeRef?.withReplacedConeType(newReceiverType), @@ -182,7 +184,7 @@ fun FirTypeRef.withReplacedConeType(newType: ConeKotlinType?): FirResolvedTypeRe require(this is FirResolvedTypeRef) if (newType == null) return this - return FirResolvedTypeRefImpl(psi, newType).apply { + return FirResolvedTypeRefImpl(source, newType).apply { annotations += this@withReplacedConeType.annotations } diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirAnnotationContainer.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirAnnotationContainer.kt index 40ada7f1930..e5b46cc66ba 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirAnnotationContainer.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirAnnotationContainer.kt @@ -5,7 +5,6 @@ package org.jetbrains.kotlin.fir -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.visitors.* @@ -15,7 +14,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirAnnotationContainer : FirElement { - override val psi: PsiElement? + override val source: FirSourceElement? val annotations: List override fun accept(visitor: FirVisitor, data: D): R = visitor.visitAnnotationContainer(this, data) diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirControlFlowGraphOwner.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirControlFlowGraphOwner.kt index 29113163399..c57682ca261 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirControlFlowGraphOwner.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirControlFlowGraphOwner.kt @@ -5,7 +5,6 @@ package org.jetbrains.kotlin.fir -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.visitors.* @@ -15,7 +14,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirControlFlowGraphOwner : FirElement { - override val psi: PsiElement? + override val source: FirSourceElement? val controlFlowGraphReference: FirControlFlowGraphReference override fun accept(visitor: FirVisitor, data: D): R = visitor.visitControlFlowGraphOwner(this, data) diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirElement.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirElement.kt index f9365483b52..464c32dcee1 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirElement.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirElement.kt @@ -5,7 +5,6 @@ package org.jetbrains.kotlin.fir -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.visitors.CompositeTransformResult import org.jetbrains.kotlin.fir.visitors.* @@ -15,7 +14,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirElement { - val psi: PsiElement? + val source: FirSourceElement? fun accept(visitor: FirVisitor, data: D): R = visitor.visitElement(this, data) diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirLabel.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirLabel.kt index d20470fc9ab..27ae5a252f7 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirLabel.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirLabel.kt @@ -5,7 +5,6 @@ package org.jetbrains.kotlin.fir -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.visitors.* /* @@ -14,7 +13,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirLabel : FirPureAbstractElement(), FirElement { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract val name: String override fun accept(visitor: FirVisitor, data: D): R = visitor.visitLabel(this, data) diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirSourceElement.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirSourceElement.kt new file mode 100644 index 00000000000..ee71af17b0c --- /dev/null +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirSourceElement.kt @@ -0,0 +1,19 @@ +/* + * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.fir + +import com.intellij.psi.PsiElement + +abstract class FirSourceElement + +class FirPsiSourceElement(val psi: PsiElement) : FirSourceElement() + +val FirSourceElement?.psi: PsiElement? get() = (this as? FirPsiSourceElement)?.psi + +val FirElement.psi: PsiElement? get() = (source as? FirPsiSourceElement)?.psi + +@Suppress("NOTHING_TO_INLINE") +inline fun PsiElement.toFirSourceElement(): FirPsiSourceElement = FirPsiSourceElement(this) \ No newline at end of file diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirSymbolOwner.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirSymbolOwner.kt index 0072a99f673..aa75b1b3f8d 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirSymbolOwner.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirSymbolOwner.kt @@ -5,7 +5,6 @@ package org.jetbrains.kotlin.fir -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +15,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirSymbolOwner : FirElement where E : FirSymbolOwner, E : FirDeclaration { - override val psi: PsiElement? + override val source: FirSourceElement? val symbol: AbstractFirBasedSymbol override fun accept(visitor: FirVisitor, data: D): R = visitor.visitSymbolOwner(this, data) diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirTargetElement.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirTargetElement.kt index 9dc369b2016..d6fd4c1f418 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirTargetElement.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirTargetElement.kt @@ -5,7 +5,6 @@ package org.jetbrains.kotlin.fir -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.visitors.* /* @@ -14,7 +13,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirTargetElement : FirElement { - override val psi: PsiElement? + override val source: FirSourceElement? override fun accept(visitor: FirVisitor, data: D): R = visitor.visitTargetElement(this, data) } diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/contracts/FirContractDescription.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/contracts/FirContractDescription.kt index b9540e3886b..7ec421ed572 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/contracts/FirContractDescription.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/contracts/FirContractDescription.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.contracts -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.contracts.description.ConeEffectDeclaration import org.jetbrains.kotlin.fir.visitors.* @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirContractDescription : FirPureAbstractElement(), FirElement { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract val effects: List override fun accept(visitor: FirVisitor, data: D): R = visitor.visitContractDescription(this, data) diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/contracts/impl/FirContractDescriptionImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/contracts/impl/FirContractDescriptionImpl.kt index 0f677ba4717..b656dde5e91 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/contracts/impl/FirContractDescriptionImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/contracts/impl/FirContractDescriptionImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.contracts.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.contracts.FirContractDescription import org.jetbrains.kotlin.fir.contracts.description.ConeEffectDeclaration import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirContractDescriptionImpl( - override val psi: PsiElement? + override val source: FirSourceElement? ) : FirContractDescription() { override val effects: MutableList = mutableListOf() diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/contracts/impl/FirEmptyContractDescription.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/contracts/impl/FirEmptyContractDescription.kt index 04723b12ca8..0494e784728 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/contracts/impl/FirEmptyContractDescription.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/contracts/impl/FirEmptyContractDescription.kt @@ -5,14 +5,14 @@ package org.jetbrains.kotlin.fir.contracts.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.contracts.FirContractDescription import org.jetbrains.kotlin.fir.contracts.description.ConeEffectDeclaration import org.jetbrains.kotlin.fir.visitors.FirTransformer import org.jetbrains.kotlin.fir.visitors.FirVisitor object FirEmptyContractDescription : FirContractDescription() { - override val psi: PsiElement? get() = null + override val source: FirSourceElement? get() = null override val effects: List get() = emptyList() override fun acceptChildren(visitor: FirVisitor, data: D) {} diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirAnonymousFunction.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirAnonymousFunction.kt index 64c8dc8a761..5f4b003b0e0 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirAnonymousFunction.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirAnonymousFunction.kt @@ -5,11 +5,11 @@ package org.jetbrains.kotlin.fir.declarations -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.contracts.description.InvocationKind import org.jetbrains.kotlin.fir.FirLabel import org.jetbrains.kotlin.fir.FirPureAbstractElement import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirAnonymousFunction : FirPureAbstractElement(), FirFunction, FirExpression { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val session: FirSession abstract override val resolvePhase: FirResolvePhase abstract override val annotations: List diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirAnonymousInitializer.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirAnonymousInitializer.kt index 28fa190e5d6..63c1468ed58 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirAnonymousInitializer.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirAnonymousInitializer.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirPureAbstractElement import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.visitors.* @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirAnonymousInitializer : FirPureAbstractElement(), FirDeclaration { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val session: FirSession abstract override val resolvePhase: FirResolvePhase abstract val body: FirBlock? diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirAnonymousObject.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirAnonymousObject.kt index e496407b2e3..18235973f89 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirAnonymousObject.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirAnonymousObject.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.fir.declarations -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.fir.FirPureAbstractElement import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirAnonymousObject : FirPureAbstractElement(), FirClass, FirExpression { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val session: FirSession abstract override val resolvePhase: FirResolvePhase abstract override val classKind: ClassKind diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirCallableDeclaration.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirCallableDeclaration.kt index 2926355ce7d..620d17213da 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirCallableDeclaration.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirCallableDeclaration.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.FirSymbolOwner import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirCallableDeclaration> : FirTypedDeclaration, FirSymbolOwner { - override val psi: PsiElement? + override val source: FirSourceElement? override val session: FirSession override val resolvePhase: FirResolvePhase override val annotations: List diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirCallableMemberDeclaration.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirCallableMemberDeclaration.kt index 4f140102218..f0ca73c0def 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirCallableMemberDeclaration.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirCallableMemberDeclaration.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirCallableMemberDeclaration> : FirCallableDeclaration, FirMemberDeclaration { - override val psi: PsiElement? + override val source: FirSourceElement? override val session: FirSession override val resolvePhase: FirResolvePhase override val annotations: List diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirClass.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirClass.kt index 8b9d3447e71..5526cb92b14 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirClass.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirClass.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.fir.declarations -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.fir.FirAnnotationContainer import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirClass : FirDeclaration, FirStatement, FirAnnotationContainer { - override val psi: PsiElement? + override val source: FirSourceElement? override val session: FirSession override val resolvePhase: FirResolvePhase val classKind: ClassKind diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirClassLikeDeclaration.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirClassLikeDeclaration.kt index 2f3cd1175da..85319139e1b 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirClassLikeDeclaration.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirClassLikeDeclaration.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.FirSymbolOwner import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirStatement @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirClassLikeDeclaration> : FirStatement, FirMemberDeclaration, FirSymbolOwner, FirTypeParametersOwner { - override val psi: PsiElement? + override val source: FirSourceElement? override val annotations: List override val session: FirSession override val resolvePhase: FirResolvePhase diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirConstructor.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirConstructor.kt index 165f8d09254..2814e5b76df 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirConstructor.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirConstructor.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirConstructor : FirMemberFunction { - override val psi: PsiElement? + override val source: FirSourceElement? override val session: FirSession override val resolvePhase: FirResolvePhase override val returnTypeRef: FirTypeRef diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirContractDescriptionOwner.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirContractDescriptionOwner.kt index 96ac32d6f9e..1f8a11318e7 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirContractDescriptionOwner.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirContractDescriptionOwner.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.contracts.FirContractDescription import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirContractDescriptionOwner : FirElement { - override val psi: PsiElement? + override val source: FirSourceElement? val contractDescription: FirContractDescription override fun accept(visitor: FirVisitor, data: D): R = visitor.visitContractDescriptionOwner(this, data) diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirDeclaration.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirDeclaration.kt index 8092e729452..5fb44568622 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirDeclaration.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirDeclaration.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.visitors.* /* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirDeclaration : FirElement { - override val psi: PsiElement? + override val source: FirSourceElement? val session: FirSession val resolvePhase: FirResolvePhase diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirDeclarationStatus.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirDeclarationStatus.kt index 02a4087a0a2..44a998cc27e 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirDeclarationStatus.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirDeclarationStatus.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.fir.declarations -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.fir.FirElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.visitors.* /* @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirDeclarationStatus : FirElement { - override val psi: PsiElement? + override val source: FirSourceElement? val visibility: Visibility val modality: Modality? val isExpect: Boolean diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirEnumEntry.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirEnumEntry.kt index 681e23d174b..f67aaa4d44d 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirEnumEntry.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirEnumEntry.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.fir.declarations -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.fir.FirPureAbstractElement import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirEnumEntry : FirPureAbstractElement(), FirRegularClass { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val session: FirSession abstract override val resolvePhase: FirResolvePhase abstract override val name: Name diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirErrorFunction.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirErrorFunction.kt index 2120bbe6345..dbc7b778f82 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirErrorFunction.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirErrorFunction.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirPureAbstractElement import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirErrorFunction : FirPureAbstractElement(), FirFunction { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val session: FirSession abstract override val resolvePhase: FirResolvePhase abstract override val annotations: List diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirField.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirField.kt index de444d78e7b..a9a1f95d997 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirField.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirField.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirPureAbstractElement import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.symbols.impl.FirDelegateFieldSymbol @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirField : FirPureAbstractElement(), FirVariable, FirCallableMemberDeclaration { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val session: FirSession abstract override val resolvePhase: FirResolvePhase abstract override val returnTypeRef: FirTypeRef diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirFile.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirFile.kt index 6bc6d28bd86..44a1eea90b8 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirFile.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirFile.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.fir.declarations -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirAnnotationContainer import org.jetbrains.kotlin.fir.FirPureAbstractElement import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.fir.visitors.* @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirFile : FirPureAbstractElement(), FirAnnotationContainer, FirDeclaration { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val annotations: List abstract override val session: FirSession abstract override val resolvePhase: FirResolvePhase diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirFunction.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirFunction.kt index cf77aac8ba6..520c2d7477f 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirFunction.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirFunction.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.fir.declarations -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirAnnotationContainer import org.jetbrains.kotlin.fir.FirControlFlowGraphOwner import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.FirTargetElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirBlock @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirFunction> : FirCallableDeclaration, FirControlFlowGraphOwner, FirTargetElement, FirAnnotationContainer, FirTypeParametersOwner, FirStatement { - override val psi: PsiElement? + override val source: FirSourceElement? override val session: FirSession override val resolvePhase: FirResolvePhase override val annotations: List diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirImport.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirImport.kt index 09a790d7ce6..c7be0dbd9f6 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirImport.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirImport.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.fir.visitors.* @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirImport : FirPureAbstractElement(), FirElement { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract val importedFqName: FqName? abstract val isAllUnder: Boolean abstract val aliasName: Name? diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirMemberDeclaration.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirMemberDeclaration.kt index 1ee0dae060f..8a6f2fc87cd 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirMemberDeclaration.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirMemberDeclaration.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirAnnotationContainer import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.fir.visitors.* @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirMemberDeclaration : FirNamedDeclaration, FirAnnotationContainer { - override val psi: PsiElement? + override val source: FirSourceElement? override val session: FirSession override val resolvePhase: FirResolvePhase override val name: Name diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirMemberFunction.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirMemberFunction.kt index dbd53dfe306..abbbcb75e4c 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirMemberFunction.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirMemberFunction.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirMemberFunction> : FirFunction, FirCallableMemberDeclaration { - override val psi: PsiElement? + override val source: FirSourceElement? override val session: FirSession override val resolvePhase: FirResolvePhase override val returnTypeRef: FirTypeRef diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirNamedDeclaration.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirNamedDeclaration.kt index f12dbee40b8..12a4198efdf 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirNamedDeclaration.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirNamedDeclaration.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirNamedDeclaration : FirDeclaration { - override val psi: PsiElement? + override val source: FirSourceElement? override val session: FirSession override val resolvePhase: FirResolvePhase val name: Name diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirProperty.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirProperty.kt index 19d6c7b8847..e07ea06b29d 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirProperty.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirProperty.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.fir.declarations -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirControlFlowGraphOwner import org.jetbrains.kotlin.fir.FirPureAbstractElement import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirProperty : FirPureAbstractElement(), FirVariable, FirControlFlowGraphOwner, FirTypeParametersOwner, FirCallableMemberDeclaration { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val session: FirSession abstract override val resolvePhase: FirResolvePhase abstract override val returnTypeRef: FirTypeRef diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirPropertyAccessor.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirPropertyAccessor.kt index 4dc5edecc27..713a91814bc 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirPropertyAccessor.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirPropertyAccessor.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirPureAbstractElement import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.contracts.FirContractDescription import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirBlock @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirPropertyAccessor : FirPureAbstractElement(), FirFunction, FirContractDescriptionOwner { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val session: FirSession abstract override val resolvePhase: FirResolvePhase abstract override val returnTypeRef: FirTypeRef diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirRegularClass.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirRegularClass.kt index 3aa8cc180bf..cb1481976c4 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirRegularClass.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirRegularClass.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirRegularClass : FirNamedDeclaration, FirClassLikeDeclaration, FirClass { - override val psi: PsiElement? + override val source: FirSourceElement? override val session: FirSession override val resolvePhase: FirResolvePhase override val name: Name diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolvedDeclarationStatus.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolvedDeclarationStatus.kt index 88007eaead3..6300d3e22ec 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolvedDeclarationStatus.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolvedDeclarationStatus.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.visitors.* /* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirResolvedDeclarationStatus : FirDeclarationStatus { - override val psi: PsiElement? + override val source: FirSourceElement? override val visibility: Visibility override val modality: Modality? override val isExpect: Boolean diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolvedImport.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolvedImport.kt index 50285dcc7e4..f67db24f835 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolvedImport.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolvedImport.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.declarations -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirResolvedImport : FirImport() { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val importedFqName: FqName? abstract override val isAllUnder: Boolean abstract override val aliasName: Name? diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirSealedClass.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirSealedClass.kt index d6cb2f2218b..9769ae6c56d 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirSealedClass.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirSealedClass.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.fir.declarations -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.fir.FirPureAbstractElement import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirSealedClass : FirPureAbstractElement(), FirRegularClass { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val session: FirSession abstract override val resolvePhase: FirResolvePhase abstract override val name: Name diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirSimpleFunction.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirSimpleFunction.kt index 646dfecc90d..9c217efce18 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirSimpleFunction.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirSimpleFunction.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirPureAbstractElement import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.contracts.FirContractDescription import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirBlock @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirSimpleFunction : FirPureAbstractElement(), FirMemberFunction, FirContractDescriptionOwner { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val session: FirSession abstract override val resolvePhase: FirResolvePhase abstract override val returnTypeRef: FirTypeRef diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirTypeAlias.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirTypeAlias.kt index 457ed965f51..6415ae409e6 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirTypeAlias.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirTypeAlias.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirPureAbstractElement import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.symbols.impl.FirTypeAliasSymbol import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirTypeAlias : FirPureAbstractElement(), FirClassLikeDeclaration { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val session: FirSession abstract override val resolvePhase: FirResolvePhase abstract override val name: Name diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirTypeParameter.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirTypeParameter.kt index 53629d0ed25..3755dfca821 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirTypeParameter.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirTypeParameter.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.fir.declarations -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirAnnotationContainer import org.jetbrains.kotlin.fir.FirPureAbstractElement import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.FirSymbolOwner import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirTypeParameter : FirPureAbstractElement(), FirNamedDeclaration, FirSymbolOwner, FirAnnotationContainer { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val session: FirSession abstract override val resolvePhase: FirResolvePhase abstract override val name: Name diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirTypeParametersOwner.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirTypeParametersOwner.kt index 073f32ebe97..29484a1f61c 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirTypeParametersOwner.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirTypeParametersOwner.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.visitors.* /* @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirTypeParametersOwner : FirElement { - override val psi: PsiElement? + override val source: FirSourceElement? val typeParameters: List override fun accept(visitor: FirVisitor, data: D): R = visitor.visitTypeParametersOwner(this, data) diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirTypedDeclaration.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirTypedDeclaration.kt index 5202d1aa313..a730e81c9a8 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirTypedDeclaration.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirTypedDeclaration.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirAnnotationContainer import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirTypedDeclaration : FirDeclaration, FirAnnotationContainer { - override val psi: PsiElement? + override val source: FirSourceElement? override val session: FirSession override val resolvePhase: FirResolvePhase override val annotations: List diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirValueParameter.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirValueParameter.kt index 195a982c5f7..71a87f413aa 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirValueParameter.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirValueParameter.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirPureAbstractElement import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.symbols.impl.FirDelegateFieldSymbol @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirValueParameter : FirPureAbstractElement(), FirVariable { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val session: FirSession abstract override val resolvePhase: FirResolvePhase abstract override val returnTypeRef: FirTypeRef diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirVariable.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirVariable.kt index 596f04171fb..3c0146b00cd 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirVariable.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirVariable.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirStatement @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirVariable> : FirCallableDeclaration, FirNamedDeclaration, FirStatement { - override val psi: PsiElement? + override val source: FirSourceElement? override val session: FirSession override val resolvePhase: FirResolvePhase override val returnTypeRef: FirTypeRef diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousFunctionImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousFunctionImpl.kt index bb9ed031611..d5e72dc4dec 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousFunctionImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousFunctionImpl.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.fir.declarations.impl -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.contracts.description.InvocationKind import org.jetbrains.kotlin.fir.FirLabel import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirAnonymousFunction import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirTypeParameter @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirAnonymousFunctionImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override val session: FirSession, override var returnTypeRef: FirTypeRef, override var receiverTypeRef: FirTypeRef?, diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousInitializerImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousInitializerImpl.kt index b76f464fcf9..2153c31848a 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousInitializerImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousInitializerImpl.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations.impl -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirAnonymousInitializer import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.expressions.FirBlock @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirAnonymousInitializerImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override val session: FirSession, override var body: FirBlock? ) : FirAnonymousInitializer() { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousObjectImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousObjectImpl.kt index 8ed5637291b..e306db4c077 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousObjectImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousObjectImpl.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations.impl -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirAnonymousObject import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirResolvePhase @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirAnonymousObjectImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override val session: FirSession ) : FirAnonymousObject(), FirModifiableClass, FirAbstractAnnotatedElement { override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirClassImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirClassImpl.kt index 27ec8941ce3..200a1353354 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirClassImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirClassImpl.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.fir.declarations.impl -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.fir.FirPureAbstractElement import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus import org.jetbrains.kotlin.fir.declarations.FirRegularClass @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirClassImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override val session: FirSession, override val name: Name, override var status: FirDeclarationStatus, diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirConstructorImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirConstructorImpl.kt index fda543b8c14..e0300d56f31 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirConstructorImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirConstructorImpl.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations.impl -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirConstructor import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus import org.jetbrains.kotlin.fir.declarations.FirResolvePhase @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ open class FirConstructorImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override val session: FirSession, override var returnTypeRef: FirTypeRef, override var receiverTypeRef: FirTypeRef?, diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDeclarationStatusImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDeclarationStatusImpl.kt index 04ced4bee98..082ca04e221 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDeclarationStatusImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDeclarationStatusImpl.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.fir.declarations.impl -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus import org.jetbrains.kotlin.fir.declarations.impl.FirDeclarationStatusImpl.Modifier.* import org.jetbrains.kotlin.fir.visitors.FirTransformer @@ -18,7 +18,7 @@ open class FirDeclarationStatusImpl( override val visibility: Visibility, override val modality: Modality? ) : FirPureAbstractElement(), FirDeclarationStatus { - override val psi: PsiElement? get() = null + override val source: FirSourceElement? get() = null protected var flags: Int = 0 private operator fun get(modifier: Modifier): Boolean = (flags and modifier.mask) != 0 diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyAccessor.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyAccessor.kt index f2e1c4ee18a..23857d089fc 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyAccessor.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyAccessor.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.fir.declarations.impl -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.expressions.FirBlock @@ -21,13 +21,13 @@ import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name abstract class FirDefaultPropertyAccessor( - psi: PsiElement?, + source: FirSourceElement?, session: FirSession, propertyTypeRef: FirTypeRef, isGetter: Boolean, visibility: Visibility, symbol: FirPropertyAccessorSymbol -) : FirPropertyAccessorImpl(psi, session, propertyTypeRef, symbol, isGetter, FirDeclarationStatusImpl(visibility, Modality.FINAL)) { +) : FirPropertyAccessorImpl(source, session, propertyTypeRef, symbol, isGetter, FirDeclarationStatusImpl(visibility, Modality.FINAL)) { override var resolvePhase = FirResolvePhase.BODY_RESOLVE final override var body: FirBlock? @@ -36,25 +36,25 @@ abstract class FirDefaultPropertyAccessor( } class FirDefaultPropertyGetter( - psi: PsiElement?, + source: FirSourceElement?, session: FirSession, propertyTypeRef: FirTypeRef, visibility: Visibility, symbol: FirPropertyAccessorSymbol = FirPropertyAccessorSymbol() -) : FirDefaultPropertyAccessor(psi, session, propertyTypeRef, isGetter = true, visibility = visibility, symbol = symbol) { +) : FirDefaultPropertyAccessor(source, session, propertyTypeRef, isGetter = true, visibility = visibility, symbol = symbol) { override val valueParameters: MutableList = mutableListOf() } class FirDefaultPropertySetter( - psi: PsiElement?, + source: FirSourceElement?, session: FirSession, propertyTypeRef: FirTypeRef, visibility: Visibility, symbol: FirPropertyAccessorSymbol = FirPropertyAccessorSymbol() -) : FirDefaultPropertyAccessor(psi, session, FirImplicitUnitTypeRef(psi), isGetter = false, visibility = visibility, symbol = symbol) { +) : FirDefaultPropertyAccessor(source, session, FirImplicitUnitTypeRef(source), isGetter = false, visibility = visibility, symbol = symbol) { override val valueParameters: MutableList = mutableListOf( FirDefaultSetterValueParameter( - psi, + source, session, propertyTypeRef, FirVariableSymbol( diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultSetterValueParameter.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultSetterValueParameter.kt index b7e1333c019..4754ae22ba0 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultSetterValueParameter.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultSetterValueParameter.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations.impl -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirValueParameter @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirDefaultSetterValueParameter( - override val psi: PsiElement?, + override val source: FirSourceElement?, override val session: FirSession, override var returnTypeRef: FirTypeRef, override val symbol: FirVariableSymbol diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirEnumEntryImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirEnumEntryImpl.kt index 50f82bb8923..dd48e281b1e 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirEnumEntryImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirEnumEntryImpl.kt @@ -5,11 +5,11 @@ package org.jetbrains.kotlin.fir.declarations.impl -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus import org.jetbrains.kotlin.fir.declarations.FirEnumEntry @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirEnumEntryImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override val session: FirSession, override val name: Name, override val symbol: FirClassSymbol diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirErrorFunctionImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirErrorFunctionImpl.kt index 28752506f5c..e6a826fb7b6 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirErrorFunctionImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirErrorFunctionImpl.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations.impl -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirErrorFunction import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirTypeParameter @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirErrorFunctionImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override val session: FirSession, override val reason: String, override val symbol: FirErrorFunctionSymbol diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirFileImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirFileImpl.kt index 67e8826d5c9..85fc6e15fba 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirFileImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirFileImpl.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations.impl -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirFile import org.jetbrains.kotlin.fir.declarations.FirImport @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirFileImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override val session: FirSession, override val name: String, override val packageFqName: FqName diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirImportImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirImportImpl.kt index e296d3b5c23..2bb9211c74a 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirImportImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirImportImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.declarations.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirImport import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirImportImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override val importedFqName: FqName?, override val isAllUnder: Boolean, override val aliasName: Name? diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirModifiableClass.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirModifiableClass.kt index 2745c20ea7f..5eb27d423d9 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirModifiableClass.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirModifiableClass.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations.impl -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirClass import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirResolvePhase @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirModifiableClass : FirClass, FirAbstractAnnotatedElement { - override val psi: PsiElement? + override val source: FirSourceElement? override val session: FirSession override var resolvePhase: FirResolvePhase override val classKind: ClassKind diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirModifiableConstructor.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirModifiableConstructor.kt index 5f8dab280f5..35b57821171 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirModifiableConstructor.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirModifiableConstructor.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations.impl -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirPureAbstractElement import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirConstructor import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus import org.jetbrains.kotlin.fir.declarations.FirResolvePhase @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirModifiableConstructor : FirPureAbstractElement(), FirConstructor, FirModifiableTypeParametersOwner, FirAbstractAnnotatedElement { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val session: FirSession abstract override var resolvePhase: FirResolvePhase abstract override var returnTypeRef: FirTypeRef diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirModifiableFunction.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirModifiableFunction.kt index df7a5dc8ba8..cefba0a0af6 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirModifiableFunction.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirModifiableFunction.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations.impl -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirFunction import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirTypeParameter @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirModifiableFunction> : FirFunction, FirAbstractAnnotatedElement { - override val psi: PsiElement? + override val source: FirSourceElement? override val session: FirSession override var resolvePhase: FirResolvePhase override val annotations: MutableList diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirModifiableRegularClass.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirModifiableRegularClass.kt index d82c4dfba24..fc71c546b3b 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirModifiableRegularClass.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirModifiableRegularClass.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations.impl -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus import org.jetbrains.kotlin.fir.declarations.FirRegularClass @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirModifiableRegularClass : FirRegularClass, FirModifiableClass, FirModifiableTypeParametersOwner, FirAbstractAnnotatedElement { - override val psi: PsiElement? + override val source: FirSourceElement? override val session: FirSession override var resolvePhase: FirResolvePhase override val name: Name diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirModifiableTypeParametersOwner.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirModifiableTypeParametersOwner.kt index 0a2ef07dd4d..9d15623be0b 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirModifiableTypeParametersOwner.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirModifiableTypeParametersOwner.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.declarations.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirTypeParameter import org.jetbrains.kotlin.fir.declarations.FirTypeParametersOwner import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirModifiableTypeParametersOwner : FirTypeParametersOwner { - override val psi: PsiElement? + override val source: FirSourceElement? override val typeParameters: MutableList override fun transformChildren(transformer: FirTransformer, data: D): FirModifiableTypeParametersOwner } diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirModifiableVariable.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirModifiableVariable.kt index 87001dc11d9..9f6e8cb4903 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirModifiableVariable.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirModifiableVariable.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations.impl -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirVariable @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirModifiableVariable> : FirVariable, FirAbstractAnnotatedElement { - override val psi: PsiElement? + override val source: FirSourceElement? override val session: FirSession override var resolvePhase: FirResolvePhase override var returnTypeRef: FirTypeRef diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirPrimaryConstructorImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirPrimaryConstructorImpl.kt index c684f904cee..b664affa5a5 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirPrimaryConstructorImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirPrimaryConstructorImpl.kt @@ -5,32 +5,19 @@ package org.jetbrains.kotlin.fir.declarations.impl -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirSession -import org.jetbrains.kotlin.fir.declarations.FirConstructor +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirTypeParameter -import org.jetbrains.kotlin.fir.declarations.FirValueParameter -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall -import org.jetbrains.kotlin.fir.expressions.FirBlock -import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall -import org.jetbrains.kotlin.fir.impl.FirAbstractAnnotatedElement -import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference -import org.jetbrains.kotlin.fir.references.impl.FirEmptyControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirConstructorSymbol import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource -import org.jetbrains.kotlin.fir.visitors.* class FirPrimaryConstructorImpl( - psi: PsiElement?, + source: FirSourceElement?, session: FirSession, returnTypeRef: FirTypeRef, receiverTypeRef: FirTypeRef?, status: FirDeclarationStatus, symbol: FirConstructorSymbol -) : FirConstructorImpl(psi, session, returnTypeRef, receiverTypeRef, status, symbol) { +) : FirConstructorImpl(source, session, returnTypeRef, receiverTypeRef, status, symbol) { override val isPrimary: Boolean get() = true } \ No newline at end of file diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyAccessorImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyAccessorImpl.kt index 565ee9a2b83..c6bf1729830 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyAccessorImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyAccessorImpl.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations.impl -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.contracts.FirContractDescription import org.jetbrains.kotlin.fir.contracts.impl.FirEmptyContractDescription import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ open class FirPropertyAccessorImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override val session: FirSession, override var returnTypeRef: FirTypeRef, override val symbol: FirPropertyAccessorSymbol, diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyImpl.kt index fc64899d77e..79ec0ae36e4 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyImpl.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations.impl -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus import org.jetbrains.kotlin.fir.declarations.FirProperty import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirPropertyImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override val session: FirSession, override var returnTypeRef: FirTypeRef, override var receiverTypeRef: FirTypeRef?, diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirResolvedImportImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirResolvedImportImpl.kt index fa16de422ad..ac1923d19bc 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirResolvedImportImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirResolvedImportImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.declarations.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirImport import org.jetbrains.kotlin.fir.declarations.FirResolvedImport import org.jetbrains.kotlin.name.ClassId @@ -23,7 +23,7 @@ class FirResolvedImportImpl( override val packageFqName: FqName, override val relativeClassName: FqName? ) : FirResolvedImport() { - override val psi: PsiElement? get() = delegate.psi + override val source: FirSourceElement? get() = delegate.source override val importedFqName: FqName? get() = delegate.importedFqName override val isAllUnder: Boolean get() = delegate.isAllUnder override val aliasName: Name? get() = delegate.aliasName diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirSealedClassImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirSealedClassImpl.kt index 8d8eb2fafca..b3c8a1c38de 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirSealedClassImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirSealedClassImpl.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations.impl -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus import org.jetbrains.kotlin.fir.declarations.FirRegularClass @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirSealedClassImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override val session: FirSession, override val name: Name, override var status: FirDeclarationStatus, diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirSimpleFunctionImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirSimpleFunctionImpl.kt index b39cb18c0b9..057603e509f 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirSimpleFunctionImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirSimpleFunctionImpl.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations.impl -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.contracts.FirContractDescription import org.jetbrains.kotlin.fir.contracts.impl.FirEmptyContractDescription import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ open class FirSimpleFunctionImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override val session: FirSession, override var returnTypeRef: FirTypeRef, override var receiverTypeRef: FirTypeRef?, diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirTypeAliasImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirTypeAliasImpl.kt index 43832cfe484..d1b7d0220e6 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirTypeAliasImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirTypeAliasImpl.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations.impl -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirTypeAlias @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirTypeAliasImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override val session: FirSession, override val name: Name, override var status: FirDeclarationStatus, diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirTypeParameterImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirTypeParameterImpl.kt index 7380df6b292..fc84532d020 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirTypeParameterImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirTypeParameterImpl.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations.impl -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirTypeParameter import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirTypeParameterImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override val session: FirSession, override val name: Name, override val symbol: FirTypeParameterSymbol, diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirValueParameterImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirValueParameterImpl.kt index 3057a022d18..d3f662efac0 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirValueParameterImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirValueParameterImpl.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations.impl -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirValueParameter @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ open class FirValueParameterImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override val session: FirSession, override var returnTypeRef: FirTypeRef, override val name: Name, diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirAnnotationCall.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirAnnotationCall.kt index 450bae0a947..a5e541877fc 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirAnnotationCall.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirAnnotationCall.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirAnnotationCall : FirPureAbstractElement(), FirExpression, FirCall { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val arguments: List diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirArrayOfCall.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirArrayOfCall.kt index 19687caeff7..658111049eb 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirArrayOfCall.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirArrayOfCall.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirArrayOfCall : FirPureAbstractElement(), FirExpression, FirCall { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val arguments: List diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirArraySetCall.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirArraySetCall.kt index a4afdce0270..3e51018db07 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirArraySetCall.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirArraySetCall.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirArraySetCall : FirPureAbstractElement(), FirQualifiedAccess, FirCall { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val annotations: List abstract override val safe: Boolean abstract override val explicitReceiver: FirExpression? diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirBinaryLogicExpression.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirBinaryLogicExpression.kt index 72016705576..d9e519c164d 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirBinaryLogicExpression.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirBinaryLogicExpression.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirBinaryLogicExpression : FirPureAbstractElement(), FirExpression { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract val leftOperand: FirExpression diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirBlock.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirBlock.kt index 90483a04d14..498bdc5e3e7 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirBlock.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirBlock.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirBlock : FirPureAbstractElement(), FirExpression { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val annotations: List abstract val statements: List abstract override val typeRef: FirTypeRef diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirBreakExpression.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirBreakExpression.kt index a291af1c443..709223a7b68 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirBreakExpression.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirBreakExpression.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.FirTarget import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirBreakExpression : FirPureAbstractElement(), FirLoopJump { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val target: FirTarget diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirCall.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirCall.kt index 017e1ff189c..9d7a0953266 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirCall.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirCall.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.visitors.* /* @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirCall : FirStatement { - override val psi: PsiElement? + override val source: FirSourceElement? override val annotations: List val arguments: List diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirCallableReferenceAccess.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirCallableReferenceAccess.kt index 28c250c81c0..20202525cd9 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirCallableReferenceAccess.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirCallableReferenceAccess.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.references.FirNamedReference import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirCallableReferenceAccess : FirQualifiedAccessExpression() { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val safe: Boolean diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirCatch.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirCatch.kt index c3f3f651928..61ebb8bb4f1 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirCatch.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirCatch.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.visitors.* @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirCatch : FirPureAbstractElement(), FirElement { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract val parameter: FirValueParameter abstract val block: FirBlock diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirClassReferenceExpression.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirClassReferenceExpression.kt index 56b683832a1..64d105cb00c 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirClassReferenceExpression.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirClassReferenceExpression.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirClassReferenceExpression : FirPureAbstractElement(), FirExpression { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract val classTypeRef: FirTypeRef diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirComponentCall.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirComponentCall.kt index 80ca6041fb4..856ec087ed2 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirComponentCall.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirComponentCall.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.references.FirNamedReference import org.jetbrains.kotlin.fir.types.FirTypeProjection import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirComponentCall : FirFunctionCall() { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val safe: Boolean diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirConstExpression.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirConstExpression.kt index b93b270dd6c..00f66084552 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirConstExpression.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirConstExpression.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.ir.expressions.IrConstKind import org.jetbrains.kotlin.fir.visitors.* @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirConstExpression : FirPureAbstractElement(), FirExpression { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract val kind: IrConstKind diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirContinueExpression.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirContinueExpression.kt index 6b4ef1fd16b..97dd412de10 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirContinueExpression.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirContinueExpression.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.FirTarget import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirContinueExpression : FirPureAbstractElement(), FirLoopJump { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val target: FirTarget diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirDelegatedConstructorCall.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirDelegatedConstructorCall.kt index 76ad568bf6a..1dfe6310f76 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirDelegatedConstructorCall.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirDelegatedConstructorCall.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirDelegatedConstructorCall : FirPureAbstractElement(), FirCall { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val annotations: List abstract override val arguments: List abstract val constructedTypeRef: FirTypeRef diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirDoWhileLoop.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirDoWhileLoop.kt index a4b118de46f..d21887c297a 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirDoWhileLoop.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirDoWhileLoop.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirLabel import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.visitors.* /* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirDoWhileLoop : FirPureAbstractElement(), FirLoop { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val annotations: List abstract override val block: FirBlock abstract override val condition: FirExpression diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirErrorExpression.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirErrorExpression.kt index a7413dc2b4f..0bc428e872e 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirErrorExpression.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirErrorExpression.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirErrorExpression : FirPureAbstractElement(), FirExpression { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract val reason: String diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirExpression.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirExpression.kt index 22efe18b6ab..1644399e6d7 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirExpression.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirExpression.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirExpression : FirStatement { - override val psi: PsiElement? + override val source: FirSourceElement? val typeRef: FirTypeRef override val annotations: List diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirExpressionUtil.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirExpressionUtil.kt index 7431bf66d7d..c93018b61e9 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirExpressionUtil.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirExpressionUtil.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.impl.FirConstExpressionImpl import org.jetbrains.kotlin.fir.expressions.impl.FirErrorExpressionImpl import org.jetbrains.kotlin.fir.expressions.impl.FirErrorLoop @@ -23,8 +23,8 @@ inline val FirAnnotationCall.coneClassLikeType: ConeClassLikeType? inline val FirAnnotationCall.classId: ClassId? get() = coneClassLikeType?.lookupTag?.classId -fun FirConstExpressionImpl(psi: PsiElement?, kind: IrConstKind, value: T?, errorReason: String): FirExpression = - value?.let { FirConstExpressionImpl(psi, kind, it) } ?: FirErrorExpressionImpl(psi, errorReason) +fun FirConstExpressionImpl(source: FirSourceElement?, kind: IrConstKind, value: T?, errorReason: String): FirExpression = + value?.let { FirConstExpressionImpl(source, kind, it) } ?: FirErrorExpressionImpl(source, errorReason) inline val FirTypeOperatorCall.argument: FirExpression get() = arguments.first() @@ -36,6 +36,6 @@ fun FirExpression.toResolvedCallableSymbol(): FirCallableSymbol<*>? { return toResolvedCallableReference()?.resolvedSymbol as FirCallableSymbol<*>? } -fun FirErrorLoop(psi: PsiElement?, reason: String): FirErrorLoop = FirErrorLoop(psi).apply { - condition = FirErrorExpressionImpl(psi, reason) +fun FirErrorLoop(source: FirSourceElement?, reason: String): FirErrorLoop = FirErrorLoop(source).apply { + condition = FirErrorExpressionImpl(source, reason) } diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirExpressionWithSmartcast.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirExpressionWithSmartcast.kt index 191d85c126d..bfe96c1091c 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirExpressionWithSmartcast.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirExpressionWithSmartcast.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirExpressionWithSmartcast : FirQualifiedAccessExpression() { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val safe: Boolean diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirFunctionCall.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirFunctionCall.kt index 9c07141225f..3280146c499 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirFunctionCall.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirFunctionCall.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.references.FirNamedReference import org.jetbrains.kotlin.fir.types.FirTypeProjection import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirFunctionCall : FirQualifiedAccessExpression(), FirCall { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val safe: Boolean diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirGetClassCall.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirGetClassCall.kt index bde8486fd86..e15c89da59c 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirGetClassCall.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirGetClassCall.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirGetClassCall : FirPureAbstractElement(), FirExpression, FirCall { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val arguments: List diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirJump.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirJump.kt index 7964d58bd62..43ba066ed54 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirJump.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirJump.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.FirTarget import org.jetbrains.kotlin.fir.FirTargetElement import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirJump : FirExpression { - override val psi: PsiElement? + override val source: FirSourceElement? override val typeRef: FirTypeRef override val annotations: List val target: FirTarget diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirLambdaArgumentExpression.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirLambdaArgumentExpression.kt index 55bbabb9d5f..a8f1aee3ae4 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirLambdaArgumentExpression.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirLambdaArgumentExpression.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirLambdaArgumentExpression : FirWrappedArgumentExpression() { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val expression: FirExpression diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirLoop.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirLoop.kt index c368f36db7e..03d927ef5dc 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirLoop.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirLoop.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirAnnotationContainer import org.jetbrains.kotlin.fir.FirLabel +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.FirTargetElement import org.jetbrains.kotlin.fir.visitors.* @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirLoop : FirStatement, FirTargetElement, FirAnnotationContainer { - override val psi: PsiElement? + override val source: FirSourceElement? override val annotations: List val block: FirBlock val condition: FirExpression diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirLoopJump.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirLoopJump.kt index 1a407808427..4f961bfd0fe 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirLoopJump.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirLoopJump.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.FirTarget import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirLoopJump : FirJump { - override val psi: PsiElement? + override val source: FirSourceElement? override val typeRef: FirTypeRef override val annotations: List override val target: FirTarget diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirNamedArgumentExpression.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirNamedArgumentExpression.kt index d1d20f4da9d..7d4185c5890 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirNamedArgumentExpression.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirNamedArgumentExpression.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirNamedArgumentExpression : FirWrappedArgumentExpression() { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val expression: FirExpression diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirOperatorCall.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirOperatorCall.kt index c670da255cb..ca4a7cd9f73 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirOperatorCall.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirOperatorCall.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirOperatorCall : FirPureAbstractElement(), FirExpression, FirCall { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val arguments: List diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccess.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccess.kt index adc0eeabbaf..38c0c2d83b2 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccess.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccess.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.visitors.* @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirQualifiedAccess : FirQualifiedAccessWithoutCallee, FirResolvable { - override val psi: PsiElement? + override val source: FirSourceElement? override val annotations: List override val safe: Boolean override val explicitReceiver: FirExpression? diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccessExpression.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccessExpression.kt index 1d244f6b56a..120f91c4192 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccessExpression.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccessExpression.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirQualifiedAccessExpression : FirPureAbstractElement(), FirExpression, FirQualifiedAccess { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val safe: Boolean diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccessWithoutCallee.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccessWithoutCallee.kt index f6c66707b8f..8ed332cd277 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccessWithoutCallee.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccessWithoutCallee.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.visitors.* /* @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirQualifiedAccessWithoutCallee : FirStatement { - override val psi: PsiElement? + override val source: FirSourceElement? override val annotations: List val safe: Boolean val explicitReceiver: FirExpression? diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirResolvable.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirResolvable.kt index 91903cc5977..69625862410 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirResolvable.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirResolvable.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirResolvable : FirElement { - override val psi: PsiElement? + override val source: FirSourceElement? val calleeReference: FirReference override fun accept(visitor: FirVisitor, data: D): R = visitor.visitResolvable(this, data) diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirResolvedQualifier.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirResolvedQualifier.kt index e33c1813668..d37fd76bbe1 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirResolvedQualifier.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirResolvedQualifier.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirResolvedQualifier : FirPureAbstractElement(), FirExpression { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract val packageFqName: FqName diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirReturnExpression.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirReturnExpression.kt index c7c06be6711..04996c28d4d 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirReturnExpression.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirReturnExpression.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.FirTarget import org.jetbrains.kotlin.fir.declarations.FirFunction import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirReturnExpression : FirPureAbstractElement(), FirJump> { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val target: FirTarget> diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirSpreadArgumentExpression.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirSpreadArgumentExpression.kt index e1402f0d4ca..a3d22ade294 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirSpreadArgumentExpression.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirSpreadArgumentExpression.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirSpreadArgumentExpression : FirWrappedArgumentExpression() { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val expression: FirExpression diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirStatement.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirStatement.kt index 40c35fbe1de..3192cc5f7dd 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirStatement.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirStatement.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirAnnotationContainer +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.visitors.* /* @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirStatement : FirAnnotationContainer { - override val psi: PsiElement? + override val source: FirSourceElement? override val annotations: List override fun accept(visitor: FirVisitor, data: D): R = visitor.visitStatement(this, data) diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirStringConcatenationCall.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirStringConcatenationCall.kt index 21c271e2d82..bb6ae633d28 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirStringConcatenationCall.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirStringConcatenationCall.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirStringConcatenationCall : FirPureAbstractElement(), FirCall, FirExpression { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val annotations: List abstract override val arguments: List abstract override val typeRef: FirTypeRef diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirThisReceiverExpression.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirThisReceiverExpression.kt index a5e8baf22af..a0212b23de4 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirThisReceiverExpression.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirThisReceiverExpression.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.references.FirThisReference import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirThisReceiverExpression : FirQualifiedAccessExpression() { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val safe: Boolean diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirThrowExpression.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirThrowExpression.kt index b6878c0aa29..94c8a6b3ee5 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirThrowExpression.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirThrowExpression.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirThrowExpression : FirPureAbstractElement(), FirExpression { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract val exception: FirExpression diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirTryExpression.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirTryExpression.kt index 51b41e13fe1..016670f0093 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirTryExpression.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirTryExpression.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirTryExpression : FirPureAbstractElement(), FirExpression, FirResolvable { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val calleeReference: FirReference diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirTypeOperatorCall.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirTypeOperatorCall.kt index 43fead65c5b..603ee09c597 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirTypeOperatorCall.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirTypeOperatorCall.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirTypeOperatorCall : FirPureAbstractElement(), FirExpression, FirCall { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val arguments: List diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirVariableAssignment.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirVariableAssignment.kt index 201e34eeee9..6e8d7fa3f28 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirVariableAssignment.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirVariableAssignment.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirVariableAssignment : FirPureAbstractElement(), FirQualifiedAccess { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val annotations: List abstract override val safe: Boolean abstract override val explicitReceiver: FirExpression? diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirWhenBranch.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirWhenBranch.kt index 9f36526d0e5..03697db75c0 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirWhenBranch.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirWhenBranch.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.visitors.* /* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirWhenBranch : FirPureAbstractElement(), FirElement { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract val condition: FirExpression abstract val result: FirBlock diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirWhenExpression.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirWhenExpression.kt index 239361049c5..8c52b262375 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirWhenExpression.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirWhenExpression.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirVariable import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirWhenExpression : FirPureAbstractElement(), FirExpression, FirResolvable { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val calleeReference: FirReference diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirWhenSubjectExpression.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirWhenSubjectExpression.kt index 56821e1548f..6e6ec952842 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirWhenSubjectExpression.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirWhenSubjectExpression.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.FirWhenSubject import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirWhenSubjectExpression : FirPureAbstractElement(), FirExpression { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract val whenSubject: FirWhenSubject diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirWhileLoop.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirWhileLoop.kt index 55e7250d1cc..56d7f361301 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirWhileLoop.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirWhileLoop.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirLabel import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.visitors.* /* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirWhileLoop : FirPureAbstractElement(), FirLoop { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val annotations: List abstract override val label: FirLabel? abstract override val condition: FirExpression diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirWrappedArgumentExpression.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirWrappedArgumentExpression.kt index 6bdad5be3e0..c5f39fb366b 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirWrappedArgumentExpression.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirWrappedArgumentExpression.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirWrappedArgumentExpression : FirWrappedExpression() { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val expression: FirExpression diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirWrappedDelegateExpression.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirWrappedDelegateExpression.kt index 97d0459a3d0..41079379668 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirWrappedDelegateExpression.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirWrappedDelegateExpression.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirWrappedDelegateExpression : FirWrappedExpression() { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val expression: FirExpression diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirWrappedExpression.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirWrappedExpression.kt index 147eb39c77d..ea22af13827 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirWrappedExpression.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirWrappedExpression.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirWrappedExpression : FirPureAbstractElement(), FirExpression { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract val expression: FirExpression diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAbstractLoop.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAbstractLoop.kt index 169b5c24559..8abb64b9eaf 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAbstractLoop.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAbstractLoop.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirLabel +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirAbstractLoop : FirLoop, FirAbstractAnnotatedElement { - override val psi: PsiElement? + override val source: FirSourceElement? override val annotations: MutableList override var block: FirBlock override var condition: FirExpression diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAbstractLoopJump.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAbstractLoopJump.kt index e665e3da374..090edf3d0e0 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAbstractLoopJump.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAbstractLoopJump.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.FirTarget import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirLoop @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirAbstractLoopJump : FirLoopJump, FirAbstractAnnotatedElement { - override val psi: PsiElement? + override val source: FirSourceElement? override var typeRef: FirTypeRef override val annotations: MutableList override var target: FirTarget diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationCallImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationCallImpl.kt index fd8f95803d0..d3680591c0a 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationCallImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationCallImpl.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.impl.FirAbstractAnnotatedElement @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirAnnotationCallImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override val useSiteTarget: AnnotationUseSiteTarget?, override var annotationTypeRef: FirTypeRef ) : FirAnnotationCall(), FirCallWithArgumentList, FirAbstractAnnotatedElement { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirArrayOfCallImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirArrayOfCallImpl.kt index 9e67806b890..dce4d658bde 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirArrayOfCallImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirArrayOfCallImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirArrayOfCall import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirArrayOfCallImpl( - override val psi: PsiElement? + override val source: FirSourceElement? ) : FirArrayOfCall(), FirCallWithArgumentList, FirAbstractAnnotatedElement { override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) override val annotations: MutableList = mutableListOf() diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirArraySetCallImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirArraySetCallImpl.kt index bc96dc9c15e..b9d10d6a15a 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirArraySetCallImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirArraySetCallImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirArraySetCall import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirArraySetCallImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override var rValue: FirExpression, override val operation: FirOperation ) : FirArraySetCall(), FirModifiableQualifiedAccess, FirAbstractAnnotatedElement { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirBinaryLogicExpressionImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirBinaryLogicExpressionImpl.kt index e42e300dc48..00ba02318bf 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirBinaryLogicExpressionImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirBinaryLogicExpressionImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirBinaryLogicExpression import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirBinaryLogicExpressionImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override var leftOperand: FirExpression, override var rightOperand: FirExpression, override val kind: LogicOperationKind diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirBlockImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirBlockImpl.kt index 906a8475ff5..37396d1cf2f 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirBlockImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirBlockImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirStatement @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirBlockImpl( - override val psi: PsiElement? + override val source: FirSourceElement? ) : FirBlock(), FirAbstractAnnotatedElement { override val annotations: MutableList = mutableListOf() override val statements: MutableList = mutableListOf() diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirBreakExpressionImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirBreakExpressionImpl.kt index 3b8b983856c..ea422ef66c0 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirBreakExpressionImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirBreakExpressionImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.FirTarget import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirBreakExpression @@ -21,9 +21,9 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirBreakExpressionImpl( - override val psi: PsiElement? + override val source: FirSourceElement? ) : FirBreakExpression(), FirAbstractLoopJump, FirAbstractAnnotatedElement { - override var typeRef: FirTypeRef = FirImplicitNothingTypeRef(psi) + override var typeRef: FirTypeRef = FirImplicitNothingTypeRef(source) override val annotations: MutableList = mutableListOf() override lateinit var target: FirTarget diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirCallWithArgumentList.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirCallWithArgumentList.kt index 77a2d6ccd06..da651e5860a 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirCallWithArgumentList.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirCallWithArgumentList.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirCall import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirCallWithArgumentList : FirCall, FirAbstractAnnotatedElement { - override val psi: PsiElement? + override val source: FirSourceElement? override val annotations: MutableList override val arguments: MutableList override fun transformChildren(transformer: FirTransformer, data: D): FirCallWithArgumentList diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirCallableReferenceAccessImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirCallableReferenceAccessImpl.kt index 8c502638cfe..4a0fd1d2e78 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirCallableReferenceAccessImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirCallableReferenceAccessImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirCallableReferenceAccess import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirCallableReferenceAccessImpl( - override val psi: PsiElement? + override val source: FirSourceElement? ) : FirCallableReferenceAccess(), FirModifiableQualifiedAccess, FirAbstractAnnotatedElement { override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) override val annotations: MutableList = mutableListOf() diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirCatchImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirCatchImpl.kt index cbd3061de00..e75ce85e820 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirCatchImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirCatchImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirCatch @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirCatchImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override var parameter: FirValueParameter, override var block: FirBlock ) : FirCatch() { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirClassReferenceExpressionImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirClassReferenceExpressionImpl.kt index 606c7e453ca..8628e217af1 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirClassReferenceExpressionImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirClassReferenceExpressionImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirClassReferenceExpression import org.jetbrains.kotlin.fir.impl.FirAbstractAnnotatedElement @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirClassReferenceExpressionImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override var classTypeRef: FirTypeRef ) : FirClassReferenceExpression(), FirAbstractAnnotatedElement { override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirComponentCallImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirComponentCallImpl.kt index 9ddc3d851dd..28f5e52931b 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirComponentCallImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirComponentCallImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirComponentCall import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirComponentCallImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override var explicitReceiver: FirExpression, override val componentIndex: Int ) : FirComponentCall(), FirCallWithArgumentList, FirAbstractAnnotatedElement { @@ -35,7 +35,7 @@ class FirComponentCallImpl( override val extensionReceiver: FirExpression get() = FirNoReceiverExpression override val arguments: MutableList = mutableListOf() override val typeArguments: MutableList = mutableListOf() - override var calleeReference: FirNamedReference = FirSimpleNamedReference(psi, Name.identifier("component$componentIndex"), null) + override var calleeReference: FirNamedReference = FirSimpleNamedReference(source, Name.identifier("component$componentIndex"), null) override fun acceptChildren(visitor: FirVisitor, data: D) { typeRef.accept(visitor, data) diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirConstExpressionImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirConstExpressionImpl.kt index 4e1ecb12c46..9b3809628a9 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirConstExpressionImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirConstExpressionImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirConstExpression import org.jetbrains.kotlin.fir.impl.FirAbstractAnnotatedElement @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirConstExpressionImpl ( - override val psi: PsiElement?, + override val source: FirSourceElement?, override val kind: IrConstKind, override val value: T ) : FirConstExpression(), FirAbstractAnnotatedElement { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirContinueExpressionImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirContinueExpressionImpl.kt index fe5d52a7f1d..4f4cf93b64d 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirContinueExpressionImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirContinueExpressionImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.FirTarget import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirContinueExpression @@ -21,9 +21,9 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirContinueExpressionImpl( - override val psi: PsiElement? + override val source: FirSourceElement? ) : FirContinueExpression(), FirAbstractLoopJump, FirAbstractAnnotatedElement { - override var typeRef: FirTypeRef = FirImplicitNothingTypeRef(psi) + override var typeRef: FirTypeRef = FirImplicitNothingTypeRef(source) override val annotations: MutableList = mutableListOf() override lateinit var target: FirTarget diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirDelegatedConstructorCallImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirDelegatedConstructorCallImpl.kt index 8619aa4faa1..6320f36b136 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirDelegatedConstructorCallImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirDelegatedConstructorCallImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -22,14 +22,14 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirDelegatedConstructorCallImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override var constructedTypeRef: FirTypeRef, override val isThis: Boolean ) : FirDelegatedConstructorCall(), FirCallWithArgumentList, FirAbstractAnnotatedElement { override val annotations: MutableList = mutableListOf() override val arguments: MutableList = mutableListOf() override val isSuper: Boolean get() = !isThis - override var calleeReference: FirReference = if (isThis) FirExplicitThisReference(psi, null) else FirExplicitSuperReference(psi, constructedTypeRef) + override var calleeReference: FirReference = if (isThis) FirExplicitThisReference(source, null) else FirExplicitSuperReference(source, constructedTypeRef) override fun acceptChildren(visitor: FirVisitor, data: D) { annotations.forEach { it.accept(visitor, data) } diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirDoWhileLoopImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirDoWhileLoopImpl.kt index c3a80432c2c..4918aeae6e4 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirDoWhileLoopImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirDoWhileLoopImpl.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirLabel +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirDoWhileLoop @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirDoWhileLoopImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override var condition: FirExpression ) : FirDoWhileLoop(), FirAbstractLoop, FirAbstractAnnotatedElement { override val annotations: MutableList = mutableListOf() diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirElseIfTrueCondition.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirElseIfTrueCondition.kt index 254817efd5e..783a8d00145 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirElseIfTrueCondition.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirElseIfTrueCondition.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.impl.FirAbstractAnnotatedElement @@ -20,9 +20,9 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirElseIfTrueCondition( - override val psi: PsiElement? + override val source: FirSourceElement? ) : FirPureAbstractElement(), FirExpression, FirAbstractAnnotatedElement { - override var typeRef: FirTypeRef = FirImplicitBooleanTypeRef(psi) + override var typeRef: FirTypeRef = FirImplicitBooleanTypeRef(source) override val annotations: MutableList = mutableListOf() override fun acceptChildren(visitor: FirVisitor, data: D) { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirEmptyExpressionBlock.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirEmptyExpressionBlock.kt index 505e1cc86a8..ee72b06b31e 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirEmptyExpressionBlock.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirEmptyExpressionBlock.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirStatement @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirEmptyExpressionBlock : FirBlock(), FirAbstractAnnotatedElement { - override val psi: PsiElement? = null + override val source: FirSourceElement? = null override val annotations: MutableList = mutableListOf() override val statements: MutableList = mutableListOf() override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirErrorExpressionImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirErrorExpressionImpl.kt index a12b500f4af..18a5a541f6c 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirErrorExpressionImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirErrorExpressionImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirErrorExpression import org.jetbrains.kotlin.fir.impl.FirAbstractAnnotatedElement @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirErrorExpressionImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override val reason: String ) : FirErrorExpression(), FirAbstractAnnotatedElement { override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirErrorLoop.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirErrorLoop.kt index e3ebac0365d..ccff318f28f 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirErrorLoop.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirErrorLoop.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirLabel import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -21,11 +21,11 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirErrorLoop( - override val psi: PsiElement? + override val source: FirSourceElement? ) : FirPureAbstractElement(), FirLoop, FirAbstractAnnotatedElement { override val annotations: MutableList = mutableListOf() override var block: FirBlock = FirEmptyExpressionBlock() - override var condition: FirExpression = FirErrorExpressionImpl(psi, "error loop") + override var condition: FirExpression = FirErrorExpressionImpl(source, "error loop") override var label: FirLabel? = null override fun acceptChildren(visitor: FirVisitor, data: D) { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionStub.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionStub.kt index 2c849e16e86..470082cfcfe 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionStub.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionStub.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.impl.FirAbstractAnnotatedElement @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirExpressionStub( - override val psi: PsiElement? + override val source: FirSourceElement? ) : FirPureAbstractElement(), FirExpression, FirAbstractAnnotatedElement { override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) override val annotations: MutableList = mutableListOf() diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionWithSmartcastImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionWithSmartcastImpl.kt index 77dff1b02d3..72cba50d512 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionWithSmartcastImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionWithSmartcastImpl.kt @@ -5,14 +5,18 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement -import org.jetbrains.kotlin.fir.FirPureAbstractElement -import org.jetbrains.kotlin.fir.expressions.* +import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirExpression +import org.jetbrains.kotlin.fir.expressions.FirExpressionWithSmartcast +import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccessExpression import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformSingle class FirExpressionWithSmartcastImpl( override var originalExpression: FirQualifiedAccessExpression, @@ -23,7 +27,7 @@ class FirExpressionWithSmartcastImpl( assert(originalExpression.typeRef is FirResolvedTypeRef) } - override val psi: PsiElement? get() = originalExpression.psi + override val source: FirSourceElement? get() = originalExpression.source override val annotations: List get() = originalExpression.annotations override val safe: Boolean get() = originalExpression.safe override val explicitReceiver: FirExpression? get() = originalExpression.explicitReceiver diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirFunctionCallImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirFunctionCallImpl.kt index 83b787a0bb5..9fb568b4076 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirFunctionCallImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirFunctionCallImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirFunctionCall @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirFunctionCallImpl( - override val psi: PsiElement? + override val source: FirSourceElement? ) : FirFunctionCall(), FirModifiableQualifiedAccess, FirCallWithArgumentList, FirAbstractAnnotatedElement { override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) override val annotations: MutableList = mutableListOf() diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirGetClassCallImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirGetClassCallImpl.kt index e167b59fdc8..d72c1f0d211 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirGetClassCallImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirGetClassCallImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirGetClassCall @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirGetClassCallImpl( - override val psi: PsiElement? + override val source: FirSourceElement? ) : FirGetClassCall(), FirCallWithArgumentList, FirAbstractAnnotatedElement { override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) override val annotations: MutableList = mutableListOf() diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirLambdaArgumentExpressionImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirLambdaArgumentExpressionImpl.kt index f55d0997b95..379f42a044e 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirLambdaArgumentExpressionImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirLambdaArgumentExpressionImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirLambdaArgumentExpression @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirLambdaArgumentExpressionImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override var expression: FirExpression ) : FirLambdaArgumentExpression(), FirAbstractAnnotatedElement { override val typeRef: FirTypeRef get() = expression.typeRef diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirModifiableQualifiedAccess.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirModifiableQualifiedAccess.kt index c23a90d01a0..c94916977a4 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirModifiableQualifiedAccess.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirModifiableQualifiedAccess.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccessWithoutCallee @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirModifiableQualifiedAccess : FirQualifiedAccessWithoutCallee, FirAbstractAnnotatedElement { - override val psi: PsiElement? + override val source: FirSourceElement? override val annotations: MutableList override var safe: Boolean override var explicitReceiver: FirExpression? diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirNamedArgumentExpressionImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirNamedArgumentExpressionImpl.kt index 5acd0048fc9..4d13ef8dbb1 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirNamedArgumentExpressionImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirNamedArgumentExpressionImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirNamedArgumentExpression @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirNamedArgumentExpressionImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override var expression: FirExpression, override val isSpread: Boolean, override val name: Name diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirNoReceiverExpression.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirNoReceiverExpression.kt index db1795a5c51..a414c337ad8 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirNoReceiverExpression.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirNoReceiverExpression.kt @@ -5,17 +5,17 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.impl.FirAbstractAnnotatedElement import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImpl -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor object FirNoReceiverExpression : FirPureAbstractElement(), FirExpression { - override val psi: PsiElement? = null + override val source: FirSourceElement? = null override val typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) override val annotations: List get() = emptyList() diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirOperatorCallImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirOperatorCallImpl.kt index a79e6fa8ed3..fb4b887dcb1 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirOperatorCallImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirOperatorCallImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirOperation @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirOperatorCallImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override val operation: FirOperation ) : FirOperatorCall(), FirCallWithArgumentList, FirAbstractAnnotatedElement { override var typeRef: FirTypeRef = if (operation in FirOperation.BOOLEANS) { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirQualifiedAccessExpressionImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirQualifiedAccessExpressionImpl.kt index 8f215314db6..50f446adb89 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirQualifiedAccessExpressionImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirQualifiedAccessExpressionImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccessExpression @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirQualifiedAccessExpressionImpl( - override val psi: PsiElement? + override val source: FirSourceElement? ) : FirQualifiedAccessExpression(), FirModifiableQualifiedAccess, FirAbstractAnnotatedElement { override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) override val annotations: MutableList = mutableListOf() diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedQualifierImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedQualifierImpl.kt index 94a8865cae5..d46a2725e13 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedQualifierImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedQualifierImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirResolvedQualifier import org.jetbrains.kotlin.fir.impl.FirAbstractAnnotatedElement @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirResolvedQualifierImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override var packageFqName: FqName, override var relativeClassFqName: FqName? ) : FirResolvedQualifier(), FirAbstractAnnotatedElement { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirReturnExpressionImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirReturnExpressionImpl.kt index ec7c7092700..b4b0a72d30f 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirReturnExpressionImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirReturnExpressionImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.FirTarget import org.jetbrains.kotlin.fir.declarations.FirFunction import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall @@ -22,10 +22,10 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirReturnExpressionImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override var result: FirExpression ) : FirReturnExpression(), FirAbstractAnnotatedElement { - override var typeRef: FirTypeRef = FirImplicitNothingTypeRef(psi) + override var typeRef: FirTypeRef = FirImplicitNothingTypeRef(source) override val annotations: MutableList = mutableListOf() override lateinit var target: FirTarget> diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirSingleExpressionBlock.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirSingleExpressionBlock.kt index d7da9dc39cd..3bdfd49e1e2 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirSingleExpressionBlock.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirSingleExpressionBlock.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirStatement @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.transformSingle class FirSingleExpressionBlock( var statement: FirStatement ) : FirBlock(), FirAbstractAnnotatedElement { - override val psi: PsiElement? get() = statement.psi + override val source: FirSourceElement ? get() = statement.source override val annotations: MutableList = mutableListOf() override val statements: List get() = listOf(statement) override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirSpreadArgumentExpressionImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirSpreadArgumentExpressionImpl.kt index c65f0a0c64e..cc6cf5e7417 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirSpreadArgumentExpressionImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirSpreadArgumentExpressionImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirSpreadArgumentExpression @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirSpreadArgumentExpressionImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override var expression: FirExpression ) : FirSpreadArgumentExpression(), FirAbstractAnnotatedElement { override val typeRef: FirTypeRef get() = expression.typeRef diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirStringConcatenationCallImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirStringConcatenationCallImpl.kt index fe651c4f40b..d5b9c237ac6 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirStringConcatenationCallImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirStringConcatenationCallImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirStringConcatenationCall @@ -20,11 +20,11 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirStringConcatenationCallImpl( - override val psi: PsiElement? + override val source: FirSourceElement? ) : FirStringConcatenationCall(), FirCallWithArgumentList, FirAbstractAnnotatedElement { override val annotations: MutableList = mutableListOf() override val arguments: MutableList = mutableListOf() - override var typeRef: FirTypeRef = FirImplicitStringTypeRef(psi) + override var typeRef: FirTypeRef = FirImplicitStringTypeRef(source) override fun acceptChildren(visitor: FirVisitor, data: D) { annotations.forEach { it.accept(visitor, data) } diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirThisReceiverExpressionImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirThisReceiverExpressionImpl.kt index 61eae89aa44..2688b2a145f 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirThisReceiverExpressionImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirThisReceiverExpressionImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirThisReceiverExpression @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirThisReceiverExpressionImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override var calleeReference: FirThisReference ) : FirThisReceiverExpression(), FirModifiableQualifiedAccess, FirAbstractAnnotatedElement { override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirThrowExpressionImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirThrowExpressionImpl.kt index 66bd7c62e77..9f9bbaeaea9 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirThrowExpressionImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirThrowExpressionImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirThrowExpression @@ -20,10 +20,10 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirThrowExpressionImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override var exception: FirExpression ) : FirThrowExpression(), FirAbstractAnnotatedElement { - override var typeRef: FirTypeRef = FirImplicitNothingTypeRef(psi) + override var typeRef: FirTypeRef = FirImplicitNothingTypeRef(source) override val annotations: MutableList = mutableListOf() override fun acceptChildren(visitor: FirVisitor, data: D) { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirTryExpressionImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirTryExpressionImpl.kt index 0dd3bfa36ae..def7483423f 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirTryExpressionImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirTryExpressionImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirCatch @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirTryExpressionImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override var tryBlock: FirBlock, override var finallyBlock: FirBlock? ) : FirTryExpression(), FirAbstractAnnotatedElement { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirTypeOperatorCallImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirTypeOperatorCallImpl.kt index bfbce7c42b4..370986f577e 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirTypeOperatorCallImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirTypeOperatorCallImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirOperation @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirTypeOperatorCallImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override val operation: FirOperation, override var conversionTypeRef: FirTypeRef ) : FirTypeOperatorCall(), FirCallWithArgumentList, FirAbstractAnnotatedElement { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirUnitExpression.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirUnitExpression.kt index 0a022aa7e50..2d5da1bdb9f 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirUnitExpression.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirUnitExpression.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.impl.FirAbstractAnnotatedElement @@ -20,9 +20,9 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirUnitExpression( - override val psi: PsiElement? + override val source: FirSourceElement? ) : FirPureAbstractElement(), FirExpression, FirAbstractAnnotatedElement { - override var typeRef: FirTypeRef = FirImplicitUnitTypeRef(psi) + override var typeRef: FirTypeRef = FirImplicitUnitTypeRef(source) override val annotations: MutableList = mutableListOf() override fun acceptChildren(visitor: FirVisitor, data: D) { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirVariableAssignmentImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirVariableAssignmentImpl.kt index 64f91a1aa56..1af1072f46d 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirVariableAssignmentImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirVariableAssignmentImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirOperation @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirVariableAssignmentImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override var safe: Boolean, override var rValue: FirExpression, override var operation: FirOperation diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirWhenBranchImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirWhenBranchImpl.kt index 00279dbf2e6..c1c9cdb7454 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirWhenBranchImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirWhenBranchImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirWhenBranch @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirWhenBranchImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override var condition: FirExpression, override var result: FirBlock ) : FirWhenBranch() { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirWhenExpressionImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirWhenExpressionImpl.kt index 05df6d5ac56..8e0f20d3197 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirWhenExpressionImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirWhenExpressionImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirVariable import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirWhenExpressionImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override var subject: FirExpression?, override var subjectVariable: FirVariable<*>? ) : FirWhenExpression(), FirAbstractAnnotatedElement { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirWhenSubjectExpressionImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirWhenSubjectExpressionImpl.kt index 464f2b8fc73..998d7342904 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirWhenSubjectExpressionImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirWhenSubjectExpressionImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.FirWhenSubject import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirWhenSubjectExpression @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirWhenSubjectExpressionImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override val whenSubject: FirWhenSubject ) : FirWhenSubjectExpression(), FirAbstractAnnotatedElement { override val typeRef: FirTypeRef get() = whenSubject.whenExpression.subject!!.typeRef diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirWhileLoopImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirWhileLoopImpl.kt index d457c7692b3..5072120e7d3 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirWhileLoopImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirWhileLoopImpl.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirLabel +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirWhileLoopImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override var condition: FirExpression ) : FirWhileLoop(), FirAbstractLoop, FirAbstractAnnotatedElement { override val annotations: MutableList = mutableListOf() diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirWrappedDelegateExpressionImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirWrappedDelegateExpressionImpl.kt index 01dbdbfa1aa..1f78e0bcea4 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirWrappedDelegateExpressionImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirWrappedDelegateExpressionImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirWrappedDelegateExpression @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirWrappedDelegateExpressionImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override var expression: FirExpression ) : FirWrappedDelegateExpression(), FirAbstractAnnotatedElement { override val typeRef: FirTypeRef get() = expression.typeRef diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/impl/FirAbstractAnnotatedElement.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/impl/FirAbstractAnnotatedElement.kt index e018045005d..8d1127ad3c2 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/impl/FirAbstractAnnotatedElement.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/impl/FirAbstractAnnotatedElement.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.impl -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirAnnotationContainer +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirAbstractAnnotatedElement : FirAnnotationContainer { - override val psi: PsiElement? + override val source: FirSourceElement? override val annotations: MutableList override fun transformChildren(transformer: FirTransformer, data: D): FirAbstractAnnotatedElement } diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/impl/FirLabelImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/impl/FirLabelImpl.kt index b06f0e7d969..8ede5436c8a 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/impl/FirLabelImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/impl/FirLabelImpl.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.impl -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirLabel +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.visitors.* /* @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirLabelImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override val name: String ) : FirLabel() { override fun acceptChildren(visitor: FirVisitor, data: D) {} diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirBackingFieldReference.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirBackingFieldReference.kt index d571020150c..1ceaa34fca6 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirBackingFieldReference.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirBackingFieldReference.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.references -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirBackingFieldSymbol import org.jetbrains.kotlin.name.Name @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirBackingFieldReference : FirResolvedNamedReference() { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val name: Name abstract override val candidateSymbol: AbstractFirBasedSymbol<*>? abstract override val resolvedSymbol: FirBackingFieldSymbol diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirControlFlowGraphReference.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirControlFlowGraphReference.kt index f4ace55c2c7..0a9fb1c65a7 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirControlFlowGraphReference.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirControlFlowGraphReference.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.references -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.visitors.* /* @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirControlFlowGraphReference : FirReference() { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? override fun accept(visitor: FirVisitor, data: D): R = visitor.visitControlFlowGraphReference(this, data) } diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirDelegateFieldReference.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirDelegateFieldReference.kt index 1021a74fa57..46c9341fb65 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirDelegateFieldReference.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirDelegateFieldReference.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.references -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirDelegateFieldSymbol import org.jetbrains.kotlin.name.Name @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirDelegateFieldReference : FirResolvedNamedReference() { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val name: Name abstract override val candidateSymbol: AbstractFirBasedSymbol<*>? abstract override val resolvedSymbol: FirDelegateFieldSymbol<*> diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirErrorNamedReference.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirErrorNamedReference.kt index b39e2d8ceb8..449b336ee61 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirErrorNamedReference.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirErrorNamedReference.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.references -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirErrorNamedReference : FirNamedReference() { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val name: Name abstract override val candidateSymbol: AbstractFirBasedSymbol<*>? abstract val errorReason: String diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirNamedReference.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirNamedReference.kt index 595abda75ef..72e70342695 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirNamedReference.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirNamedReference.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.references -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirNamedReference : FirReference() { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract val name: Name abstract val candidateSymbol: AbstractFirBasedSymbol<*>? diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirReference.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirReference.kt index 6a387a9d085..06fbdd7c17a 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirReference.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirReference.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.references -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.visitors.* /* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirReference : FirPureAbstractElement(), FirElement { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? override fun accept(visitor: FirVisitor, data: D): R = visitor.visitReference(this, data) } diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirResolvedCallableReference.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirResolvedCallableReference.kt index d5a01851f39..f2f42e8f7ec 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirResolvedCallableReference.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirResolvedCallableReference.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.references -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.name.Name @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirResolvedCallableReference : FirResolvedNamedReference() { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val name: Name abstract override val candidateSymbol: AbstractFirBasedSymbol<*>? abstract override val resolvedSymbol: AbstractFirBasedSymbol<*> diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirResolvedNamedReference.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirResolvedNamedReference.kt index 0a1135054df..91d8ea5c0db 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirResolvedNamedReference.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirResolvedNamedReference.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.references -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirResolvedNamedReference : FirNamedReference() { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val name: Name abstract override val candidateSymbol: AbstractFirBasedSymbol<*>? abstract val resolvedSymbol: AbstractFirBasedSymbol<*> diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirSuperReference.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirSuperReference.kt index 4966d94b03e..244527ae620 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirSuperReference.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirSuperReference.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.references -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirSuperReference : FirReference() { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract val superTypeRef: FirTypeRef override fun accept(visitor: FirVisitor, data: D): R = visitor.visitSuperReference(this, data) diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirThisReference.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirThisReference.kt index 9c1d56e6e94..c30bbde9ae1 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirThisReference.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirThisReference.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.references -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol import org.jetbrains.kotlin.fir.visitors.* @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirThisReference : FirReference() { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract val labelName: String? abstract val boundSymbol: AbstractFirBasedSymbol<*>? diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirBackingFieldReferenceImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirBackingFieldReferenceImpl.kt index 27d4b097f2a..b462312d0df 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirBackingFieldReferenceImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirBackingFieldReferenceImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.references.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.references.FirBackingFieldReference import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirBackingFieldSymbol @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirBackingFieldReferenceImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override val candidateSymbol: AbstractFirBasedSymbol<*>?, override val resolvedSymbol: FirBackingFieldSymbol ) : FirBackingFieldReference() { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirDelegateFieldReferenceImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirDelegateFieldReferenceImpl.kt index cb3f864f1f4..0922e4196fa 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirDelegateFieldReferenceImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirDelegateFieldReferenceImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.references.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.references.FirDelegateFieldReference import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirDelegateFieldSymbol @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirDelegateFieldReferenceImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override val candidateSymbol: AbstractFirBasedSymbol<*>?, override val resolvedSymbol: FirDelegateFieldSymbol<*> ) : FirDelegateFieldReference() { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirEmptyControlFlowGraphReference.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirEmptyControlFlowGraphReference.kt index 963aba228f9..877e2d66ba7 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirEmptyControlFlowGraphReference.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirEmptyControlFlowGraphReference.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.references.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.visitors.* @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirEmptyControlFlowGraphReference : FirControlFlowGraphReference() { - override val psi: PsiElement? = null + override val source: FirSourceElement? = null override fun acceptChildren(visitor: FirVisitor, data: D) {} diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirErrorNamedReferenceImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirErrorNamedReferenceImpl.kt index af961b82ea9..6a9eb423805 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirErrorNamedReferenceImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirErrorNamedReferenceImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.references.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.references.FirErrorNamedReference import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol import org.jetbrains.kotlin.name.Name @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirErrorNamedReferenceImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override val errorReason: String ) : FirErrorNamedReference() { override val name: Name = Name.special("<$errorReason>") diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirExplicitSuperReference.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirExplicitSuperReference.kt index 7a01346395b..e8bfea139f3 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirExplicitSuperReference.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirExplicitSuperReference.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.references.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.references.FirSuperReference import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirExplicitSuperReference( - override val psi: PsiElement?, + override val source: FirSourceElement?, override var superTypeRef: FirTypeRef ) : FirSuperReference() { override fun acceptChildren(visitor: FirVisitor, data: D) { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirExplicitThisReference.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirExplicitThisReference.kt index 6d189a5e662..42846abd1bc 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirExplicitThisReference.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirExplicitThisReference.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.references.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.references.FirThisReference import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirExplicitThisReference( - override val psi: PsiElement?, + override val source: FirSourceElement?, override val labelName: String? ) : FirThisReference() { override var boundSymbol: AbstractFirBasedSymbol<*>? = null diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirImplicitThisReference.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirImplicitThisReference.kt index f000477cf26..4afd0a9fd25 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirImplicitThisReference.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirImplicitThisReference.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.references.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.references.FirThisReference import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol import org.jetbrains.kotlin.fir.visitors.* @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* class FirImplicitThisReference( override val boundSymbol: AbstractFirBasedSymbol<*>? ) : FirThisReference() { - override val psi: PsiElement? = null + override val source: FirSourceElement? = null override val labelName: String? get() = null override fun acceptChildren(visitor: FirVisitor, data: D) {} diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirPropertyFromParameterResolvedNamedReference.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirPropertyFromParameterResolvedNamedReference.kt index 1c9dc0813d5..3be87b0475f 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirPropertyFromParameterResolvedNamedReference.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirPropertyFromParameterResolvedNamedReference.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.references.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol import org.jetbrains.kotlin.name.Name @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirPropertyFromParameterResolvedNamedReference( - override val psi: PsiElement?, + override val source: FirSourceElement?, override val name: Name, override val resolvedSymbol: AbstractFirBasedSymbol<*> ) : FirResolvedNamedReference() { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirResolvedCallableReferenceImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirResolvedCallableReferenceImpl.kt index 49a9c48cf6b..ccf41ccc0e7 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirResolvedCallableReferenceImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirResolvedCallableReferenceImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.references.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.references.FirResolvedCallableReference import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol import org.jetbrains.kotlin.fir.types.ConeKotlinType @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirResolvedCallableReferenceImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override val name: Name, override val resolvedSymbol: AbstractFirBasedSymbol<*> ) : FirResolvedCallableReference() { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirResolvedNamedReferenceImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirResolvedNamedReferenceImpl.kt index 05c3835fb54..ce02c0158e5 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirResolvedNamedReferenceImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirResolvedNamedReferenceImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.references.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol import org.jetbrains.kotlin.name.Name @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirResolvedNamedReferenceImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override val name: Name, override val resolvedSymbol: AbstractFirBasedSymbol<*> ) : FirResolvedNamedReference() { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirSimpleNamedReference.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirSimpleNamedReference.kt index e7db0e5cfb6..e46de7072cd 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirSimpleNamedReference.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirSimpleNamedReference.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.references.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.references.FirNamedReference import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol import org.jetbrains.kotlin.name.Name @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ open class FirSimpleNamedReference( - override val psi: PsiElement?, + override val source: FirSourceElement?, override val name: Name, override val candidateSymbol: AbstractFirBasedSymbol<*>? ) : FirNamedReference() { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirStubReference.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirStubReference.kt index 283adcee8c0..27cd7c96bb5 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirStubReference.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirStubReference.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.references.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.visitors.* @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirStubReference : FirReference() { - override val psi: PsiElement? get() = null + override val source: FirSourceElement? get() = null override fun acceptChildren(visitor: FirVisitor, data: D) {} diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirDelegatedTypeRef.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirDelegatedTypeRef.kt index 821a2163dd1..e3810a841e6 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirDelegatedTypeRef.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirDelegatedTypeRef.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.types -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.visitors.* @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirDelegatedTypeRef : FirPureAbstractElement(), FirTypeRef { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val annotations: List abstract val delegate: FirExpression? abstract val typeRef: FirTypeRef diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirDynamicTypeRef.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirDynamicTypeRef.kt index c5ea067e5b4..4f4f03e4656 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirDynamicTypeRef.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirDynamicTypeRef.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.types -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirDynamicTypeRef : FirPureAbstractElement(), FirTypeRefWithNullability { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val annotations: List abstract override val isMarkedNullable: Boolean diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirErrorTypeRef.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirErrorTypeRef.kt index 680224d0150..dc7fd47331f 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirErrorTypeRef.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirErrorTypeRef.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.types -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.visitors.* @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirErrorTypeRef : FirResolvedTypeRef() { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val annotations: List abstract override val type: ConeKotlinType abstract val reason: String diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirFunctionTypeRef.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirFunctionTypeRef.kt index d409d5bbb4b..6f0ac5774ce 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirFunctionTypeRef.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirFunctionTypeRef.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.types -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirFunctionTypeRef : FirTypeRefWithNullability { - override val psi: PsiElement? + override val source: FirSourceElement? override val annotations: List override val isMarkedNullable: Boolean val receiverTypeRef: FirTypeRef? diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirImplicitTypeRef.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirImplicitTypeRef.kt index 0a6886994dc..29f23ce59f1 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirImplicitTypeRef.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirImplicitTypeRef.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.types -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirImplicitTypeRef : FirPureAbstractElement(), FirTypeRef { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val annotations: List override fun accept(visitor: FirVisitor, data: D): R = visitor.visitImplicitTypeRef(this, data) diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirResolvedFunctionTypeRef.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirResolvedFunctionTypeRef.kt index 6f8fc4e5f78..a01c72c461d 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirResolvedFunctionTypeRef.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirResolvedFunctionTypeRef.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.types -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirResolvedFunctionTypeRef : FirResolvedTypeRef(), FirFunctionTypeRef { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val annotations: List abstract override val type: ConeKotlinType abstract override val isMarkedNullable: Boolean diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirResolvedTypeRef.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirResolvedTypeRef.kt index 195baac4feb..944af832d1c 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirResolvedTypeRef.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirResolvedTypeRef.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.types -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirResolvedTypeRef : FirPureAbstractElement(), FirTypeRef { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val annotations: List abstract val type: ConeKotlinType diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirStarProjection.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirStarProjection.kt index b918ae33cc0..17092850bcd 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirStarProjection.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirStarProjection.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.types -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.visitors.* /* @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirStarProjection : FirTypeProjection() { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? override fun accept(visitor: FirVisitor, data: D): R = visitor.visitStarProjection(this, data) } diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirTypeProjection.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirTypeProjection.kt index 74430291743..324676e2129 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirTypeProjection.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirTypeProjection.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.types -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.visitors.* /* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirTypeProjection : FirPureAbstractElement(), FirElement { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? override fun accept(visitor: FirVisitor, data: D): R = visitor.visitTypeProjection(this, data) } diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirTypeProjectionWithVariance.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirTypeProjectionWithVariance.kt index c50319c456b..b79e96d9bc4 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirTypeProjectionWithVariance.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirTypeProjectionWithVariance.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.types -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.types.Variance import org.jetbrains.kotlin.fir.visitors.* @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirTypeProjectionWithVariance : FirTypeProjection() { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract val typeRef: FirTypeRef abstract val variance: Variance diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirTypeRef.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirTypeRef.kt index 5d8251b130f..936128bec14 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirTypeRef.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirTypeRef.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.types -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirAnnotationContainer +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirTypeRef : FirAnnotationContainer { - override val psi: PsiElement? + override val source: FirSourceElement? override val annotations: List override fun accept(visitor: FirVisitor, data: D): R = visitor.visitTypeRef(this, data) diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirTypeRefWithNullability.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirTypeRefWithNullability.kt index d5842f22214..b5a1839ee93 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirTypeRefWithNullability.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirTypeRefWithNullability.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.types -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.visitors.* @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirTypeRefWithNullability : FirTypeRef { - override val psi: PsiElement? + override val source: FirSourceElement? override val annotations: List val isMarkedNullable: Boolean diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirUserTypeRef.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirUserTypeRef.kt index fefcee44da2..5094409f40d 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirUserTypeRef.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirUserTypeRef.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.types -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirUserTypeRef : FirPureAbstractElement(), FirTypeRefWithNullability { - abstract override val psi: PsiElement? + abstract override val source: FirSourceElement? abstract override val annotations: List abstract override val isMarkedNullable: Boolean abstract val qualifier: List diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirComputingImplicitTypeRef.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirComputingImplicitTypeRef.kt index f11a2816580..99e0ab43ad2 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirComputingImplicitTypeRef.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirComputingImplicitTypeRef.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.types.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.impl.FirAbstractAnnotatedElement import org.jetbrains.kotlin.fir.types.FirImplicitTypeRef @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ object FirComputingImplicitTypeRef : FirImplicitTypeRef(), FirAbstractAnnotatedElement { - override val psi: PsiElement? get() = null + override val source: FirSourceElement? get() = null override val annotations: MutableList = mutableListOf() override fun acceptChildren(visitor: FirVisitor, data: D) { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirDelegatedTypeRefImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirDelegatedTypeRefImpl.kt index ead83640b5d..136b8edc894 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirDelegatedTypeRefImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirDelegatedTypeRefImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.types.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.types.FirDelegatedTypeRef @@ -21,7 +21,7 @@ class FirDelegatedTypeRefImpl( override var delegate: FirExpression?, override var typeRef: FirTypeRef ) : FirDelegatedTypeRef() { - override val psi: PsiElement? get() = typeRef.psi + override val source: FirSourceElement? get() = typeRef.source override val annotations: List get() = typeRef.annotations override fun acceptChildren(visitor: FirVisitor, data: D) { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirDynamicTypeRefImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirDynamicTypeRefImpl.kt index 290b1c5b6d7..49ad80abd78 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirDynamicTypeRefImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirDynamicTypeRefImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.types.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.impl.FirAbstractAnnotatedElement import org.jetbrains.kotlin.fir.types.FirDynamicTypeRef @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirDynamicTypeRefImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override val isMarkedNullable: Boolean ) : FirDynamicTypeRef(), FirAbstractAnnotatedElement { override val annotations: MutableList = mutableListOf() diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirErrorTypeRefImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirErrorTypeRefImpl.kt index fbaa3e5a397..907bd03eefa 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirErrorTypeRefImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirErrorTypeRefImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.types.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.impl.FirAbstractAnnotatedElement import org.jetbrains.kotlin.fir.types.ConeClassErrorType @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirErrorTypeRefImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override val reason: String ) : FirErrorTypeRef(), FirAbstractAnnotatedElement { override val annotations: MutableList = mutableListOf() diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirFunctionTypeRefImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirFunctionTypeRefImpl.kt index 978500b36e0..1f6ce6822db 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirFunctionTypeRefImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirFunctionTypeRefImpl.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.types.impl -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.impl.FirAbstractAnnotatedElement @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirFunctionTypeRefImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override val isMarkedNullable: Boolean, override var receiverTypeRef: FirTypeRef?, override var returnTypeRef: FirTypeRef diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirImplicitBuiltinTypeRef.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirImplicitBuiltinTypeRef.kt index ac3102fa4a8..26d6272a9c7 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirImplicitBuiltinTypeRef.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirImplicitBuiltinTypeRef.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.types.impl -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.symbols.StandardClassIds import org.jetbrains.kotlin.fir.symbols.impl.ConeClassLikeLookupTagImpl @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.ClassId sealed class FirImplicitBuiltinTypeRef( - override val psi: PsiElement?, + override val source: FirSourceElement?, val id: ClassId, typeArguments: Array = emptyArray(), isNullable: Boolean = false @@ -36,42 +36,42 @@ sealed class FirImplicitBuiltinTypeRef( } class FirImplicitUnitTypeRef( - psi: PsiElement? -) : FirImplicitBuiltinTypeRef(psi, StandardClassIds.Unit) + source: FirSourceElement? +) : FirImplicitBuiltinTypeRef(source, StandardClassIds.Unit) class FirImplicitAnyTypeRef( - psi: PsiElement? -) : FirImplicitBuiltinTypeRef(psi, StandardClassIds.Any) + source: FirSourceElement? +) : FirImplicitBuiltinTypeRef(source, StandardClassIds.Any) class FirImplicitNullableAnyTypeRef( - psi: PsiElement? -) : FirImplicitBuiltinTypeRef(psi, StandardClassIds.Any, isNullable = true) + source: FirSourceElement? +) : FirImplicitBuiltinTypeRef(source, StandardClassIds.Any, isNullable = true) class FirImplicitEnumTypeRef( - psi: PsiElement? -) : FirImplicitBuiltinTypeRef(psi, StandardClassIds.Enum) + source: FirSourceElement? +) : FirImplicitBuiltinTypeRef(source, StandardClassIds.Enum) class FirImplicitAnnotationTypeRef( - psi: PsiElement? -) : FirImplicitBuiltinTypeRef(psi, StandardClassIds.Annotation) + source: FirSourceElement? +) : FirImplicitBuiltinTypeRef(source, StandardClassIds.Annotation) class FirImplicitBooleanTypeRef( - psi: PsiElement? -) : FirImplicitBuiltinTypeRef(psi, StandardClassIds.Boolean) + source: FirSourceElement? +) : FirImplicitBuiltinTypeRef(source, StandardClassIds.Boolean) class FirImplicitNothingTypeRef( - psi: PsiElement? -) : FirImplicitBuiltinTypeRef(psi, StandardClassIds.Nothing) + source: FirSourceElement? +) : FirImplicitBuiltinTypeRef(source, StandardClassIds.Nothing) class FirImplicitNullableNothingTypeRef( - psi: PsiElement? -) : FirImplicitBuiltinTypeRef(psi, StandardClassIds.Nothing, isNullable = true) + source: FirSourceElement? +) : FirImplicitBuiltinTypeRef(source, StandardClassIds.Nothing, isNullable = true) class FirImplicitStringTypeRef( - psi: PsiElement? -) : FirImplicitBuiltinTypeRef(psi, StandardClassIds.String) + source: FirSourceElement? +) : FirImplicitBuiltinTypeRef(source, StandardClassIds.String) class FirImplicitKPropertyTypeRef( - psi: PsiElement?, + source: FirSourceElement?, typeArgument: ConeKotlinTypeProjection -) : FirImplicitBuiltinTypeRef(psi, StandardClassIds.KProperty, arrayOf(typeArgument)) \ No newline at end of file +) : FirImplicitBuiltinTypeRef(source, StandardClassIds.KProperty, arrayOf(typeArgument)) \ No newline at end of file diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirImplicitTypeRefImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirImplicitTypeRefImpl.kt index 70f3c8fa670..203fce5443b 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirImplicitTypeRefImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirImplicitTypeRefImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.types.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.types.FirImplicitTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirImplicitTypeRefImpl( - override val psi: PsiElement? + override val source: FirSourceElement? ) : FirImplicitTypeRef() { override val annotations: List get() = emptyList() diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirResolvedFunctionTypeRefImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirResolvedFunctionTypeRefImpl.kt index e63ceeb98e6..d52bad61c6a 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirResolvedFunctionTypeRefImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirResolvedFunctionTypeRefImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.types.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.impl.FirAbstractAnnotatedElement @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirResolvedFunctionTypeRefImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override val type: ConeKotlinType, override val isMarkedNullable: Boolean, override var receiverTypeRef: FirTypeRef?, diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirResolvedTypeRefImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirResolvedTypeRefImpl.kt index 179f482f976..b5c58c92163 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirResolvedTypeRefImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirResolvedTypeRefImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.types.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.impl.FirAbstractAnnotatedElement import org.jetbrains.kotlin.fir.types.ConeKotlinType @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirResolvedTypeRefImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override val type: ConeKotlinType ) : FirResolvedTypeRef(), FirAbstractAnnotatedElement { override val annotations: MutableList = mutableListOf() diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirStarProjectionImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirStarProjectionImpl.kt index 4f23bbdd163..893b5fee80d 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirStarProjectionImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirStarProjectionImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.types.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.types.FirStarProjection import org.jetbrains.kotlin.fir.visitors.* @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirStarProjectionImpl( - override val psi: PsiElement? + override val source: FirSourceElement? ) : FirStarProjection() { override fun acceptChildren(visitor: FirVisitor, data: D) {} diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirTypePlaceholderProjection.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirTypePlaceholderProjection.kt index e858bccbba4..6fc8e1cb3e1 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirTypePlaceholderProjection.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirTypePlaceholderProjection.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.types.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.types.FirTypeProjection import org.jetbrains.kotlin.fir.visitors.* @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ object FirTypePlaceholderProjection : FirTypeProjection() { - override val psi: PsiElement? = null + override val source: FirSourceElement? = null override fun acceptChildren(visitor: FirVisitor, data: D) {} diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirTypeProjectionWithVarianceImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirTypeProjectionWithVarianceImpl.kt index 0a05fc1d3be..3e4d266024f 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirTypeProjectionWithVarianceImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirTypeProjectionWithVarianceImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.types.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.types.FirTypeProjectionWithVariance import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.types.Variance @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirTypeProjectionWithVarianceImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override var typeRef: FirTypeRef, override val variance: Variance ) : FirTypeProjectionWithVariance() { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirUserTypeRefImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirUserTypeRefImpl.kt index 40853c48cc2..9da10dd0d88 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirUserTypeRefImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirUserTypeRefImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.types.impl -import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.impl.FirAbstractAnnotatedElement import org.jetbrains.kotlin.fir.types.FirQualifierPart @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.fir.visitors.transformInplace open class FirUserTypeRefImpl( - override val psi: PsiElement?, + override val source: FirSourceElement?, override val isMarkedNullable: Boolean ) : FirUserTypeRef(), FirAbstractAnnotatedElement { override val qualifier: MutableList = mutableListOf() diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/ImplementationConfigurator.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/ImplementationConfigurator.kt index 1571a068ab9..1b498dd6602 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/ImplementationConfigurator.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/ImplementationConfigurator.kt @@ -102,7 +102,7 @@ object ImplementationConfigurator : AbstractFirTreeImplementationConfigurator() impl(resolvedImport) { delegateFields(listOf("aliasName", "importedFqName", "isAllUnder"), "delegate") - default("psi") { + default("source") { delegate = "delegate" } @@ -182,7 +182,7 @@ object ImplementationConfigurator : AbstractFirTreeImplementationConfigurator() withGetter = true } } - default("calleeReference", "FirSimpleNamedReference(psi, Name.identifier(\"component\$componentIndex\"), null)") + default("calleeReference", "FirSimpleNamedReference(source, Name.identifier(\"component\$componentIndex\"), null)") useTypes(simpleNamedReferenceType, nameType, noReceiverExpressionType) } @@ -204,7 +204,7 @@ object ImplementationConfigurator : AbstractFirTreeImplementationConfigurator() parents += callWithArgumentList default( "calleeReference", - "if (isThis) FirExplicitThisReference(psi, null) else FirExplicitSuperReference(psi, constructedTypeRef)" + "if (isThis) FirExplicitThisReference(source, null) else FirExplicitSuperReference(source, constructedTypeRef)" ) default("isSuper") { value = "!isThis" @@ -214,22 +214,21 @@ object ImplementationConfigurator : AbstractFirTreeImplementationConfigurator() } impl(expression, "FirElseIfTrueCondition") { - default("typeRef", "FirImplicitBooleanTypeRef(psi)") + default("typeRef", "FirImplicitBooleanTypeRef(source)") useTypes(implicitBooleanTypeRefType) } impl(block) val emptyExpressionBlock = impl(block, "FirEmptyExpressionBlock") { - // TODO: make statements immutable - defaultNull("psi") + noSource() } impl(errorExpression) impl(loop, "FirErrorLoop") { default("block", "FirEmptyExpressionBlock()") - default("condition", "FirErrorExpressionImpl(psi, \"error loop\")") + default("condition", "FirErrorExpressionImpl(source, \"error loop\")") defaultNull("label") useTypes(emptyExpressionBlock) } @@ -337,18 +336,18 @@ object ImplementationConfigurator : AbstractFirTreeImplementationConfigurator() impl(returnExpression) { lateinit("target") - default("typeRef", "FirImplicitNothingTypeRef(psi)") + default("typeRef", "FirImplicitNothingTypeRef(source)") useTypes(implicitNothingTypeRefType) } impl(stringConcatenationCall) { parents += callWithArgumentList - default("typeRef", "FirImplicitStringTypeRef(psi)") + default("typeRef", "FirImplicitStringTypeRef(source)") useTypes(implicitStringTypeRefType) } impl(throwExpression) { - default("typeRef", "FirImplicitNothingTypeRef(psi)") + default("typeRef", "FirImplicitNothingTypeRef(source)") useTypes(implicitNothingTypeRefType) } @@ -367,7 +366,7 @@ object ImplementationConfigurator : AbstractFirTreeImplementationConfigurator() } impl(expression, "FirUnitExpression") { - default("typeRef", "FirImplicitUnitTypeRef(psi)") + default("typeRef", "FirImplicitUnitTypeRef(source)") useTypes(implicitUnitTypeRefType) } @@ -465,7 +464,7 @@ object ImplementationConfigurator : AbstractFirTreeImplementationConfigurator() } impl(thisReference, "FirImplicitThisReference") { - defaultNull("psi") + noSource() default("labelName") { value = "null" withGetter = true @@ -478,7 +477,7 @@ object ImplementationConfigurator : AbstractFirTreeImplementationConfigurator() impl(superReference, "FirExplicitSuperReference") impl(controlFlowGraphReference, "FirEmptyControlFlowGraphReference") { - noPsi() + noSource() } impl(resolvedTypeRef) @@ -501,11 +500,11 @@ object ImplementationConfigurator : AbstractFirTreeImplementationConfigurator() impl(implicitTypeRef, "FirComputingImplicitTypeRef") { kind = Object - defaultNull("psi", withGetter = true) + defaultNull("source", withGetter = true) } impl(reference, "FirStubReference") { - default("psi") { + default("source") { value = "null" withGetter = true } @@ -518,7 +517,7 @@ object ImplementationConfigurator : AbstractFirTreeImplementationConfigurator() impl(typeProjection, "FirTypePlaceholderProjection") { kind = Object - defaultNull("psi") + noSource() } val abstractLoopJump = impl(loopJump, "FirAbstractLoopJump") { @@ -527,13 +526,13 @@ object ImplementationConfigurator : AbstractFirTreeImplementationConfigurator() impl(breakExpression) { parents += abstractLoopJump - default("typeRef", "FirImplicitNothingTypeRef(psi)") + default("typeRef", "FirImplicitNothingTypeRef(source)") useTypes(implicitNothingTypeRefType) } impl(continueExpression) { parents += abstractLoopJump - default("typeRef", "FirImplicitNothingTypeRef(psi)") + default("typeRef", "FirImplicitNothingTypeRef(source)") useTypes(implicitNothingTypeRefType) } @@ -562,7 +561,7 @@ object ImplementationConfigurator : AbstractFirTreeImplementationConfigurator() } impl(delegatedTypeRef) { - listOf("psi", "annotations").forEach { + listOf("source", "annotations").forEach { default(it) { delegate = "typeRef" } diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt index 23ceb4935dd..b6f14c971f5 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt @@ -35,7 +35,7 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ object NodeConfigurator : AbstractFieldConfigurator() { fun configureFields() = with(FirTreeBuilder) { AbstractFirTreeBuilder.baseFirElement.configure { - +field("psi", psiElementType, nullable = true) + +field("source", sourceElementType, nullable = true) } annotationContainer.configure { diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/Types.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/Types.kt index 17555d6cf1d..34f45b81b21 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/Types.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/Types.kt @@ -5,24 +5,23 @@ package org.jetbrains.kotlin.fir.tree.generator -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.contracts.description.InvocationKind import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget -import org.jetbrains.kotlin.fir.types.ConeClassErrorType -import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.tree.generator.context.generatedType import org.jetbrains.kotlin.fir.tree.generator.context.type +import org.jetbrains.kotlin.fir.types.ConeClassErrorType +import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.ir.expressions.IrConstKind import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.types.Variance -val psiElementType = type(PsiElement::class) +val sourceElementType = type("fir", "FirSourceElement") val jumpTargetType = type("fir", "FirTarget") val constKindType = type(IrConstKind::class) val operationType = type("fir.expressions", "FirOperation") diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/context/AbstractFirTreeImplementationConfigurator.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/context/AbstractFirTreeImplementationConfigurator.kt index 90201966279..4e30bb9ac48 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/context/AbstractFirTreeImplementationConfigurator.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/context/AbstractFirTreeImplementationConfigurator.kt @@ -150,8 +150,8 @@ abstract class AbstractFirTreeImplementationConfigurator { } } - fun noPsi() { - defaultNull("psi") + fun noSource() { + defaultNull("source") } fun defaultEmptyList(field: String) { diff --git a/compiler/visualizer/render-fir/src/org/jetbrains/kotlin/compiler/visualizer/FirVisualizer.kt b/compiler/visualizer/render-fir/src/org/jetbrains/kotlin/compiler/visualizer/FirVisualizer.kt index 186534e4399..f70e6bfb56d 100644 --- a/compiler/visualizer/render-fir/src/org/jetbrains/kotlin/compiler/visualizer/FirVisualizer.kt +++ b/compiler/visualizer/render-fir/src/org/jetbrains/kotlin/compiler/visualizer/FirVisualizer.kt @@ -11,6 +11,7 @@ import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirLabel import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.expressions.* +import org.jetbrains.kotlin.fir.psi import org.jetbrains.kotlin.fir.references.FirErrorNamedReference import org.jetbrains.kotlin.fir.references.FirNamedReference import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference diff --git a/compiler/visualizer/render-fir/src/org/jetbrains/kotlin/compiler/visualizer/Psi2FirMapper.kt b/compiler/visualizer/render-fir/src/org/jetbrains/kotlin/compiler/visualizer/Psi2FirMapper.kt index e49b8ae99f1..d6e5c25b304 100644 --- a/compiler/visualizer/render-fir/src/org/jetbrains/kotlin/compiler/visualizer/Psi2FirMapper.kt +++ b/compiler/visualizer/render-fir/src/org/jetbrains/kotlin/compiler/visualizer/Psi2FirMapper.kt @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.compiler.visualizer import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirElement +import org.jetbrains.kotlin.fir.psi import org.jetbrains.kotlin.fir.visitors.FirVisitorVoid class Psi2FirMapper(val map: MutableMap>) : FirVisitorVoid() { diff --git a/idea/fir-view/src/FirExplorerToolWindow.kt b/idea/fir-view/src/FirExplorerToolWindow.kt index 7a080c54df6..4daa094230e 100644 --- a/idea/fir-view/src/FirExplorerToolWindow.kt +++ b/idea/fir-view/src/FirExplorerToolWindow.kt @@ -29,6 +29,7 @@ import com.intellij.ui.treeStructure.Tree import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirSessionBase import org.jetbrains.kotlin.fir.builder.RawFirBuilder +import org.jetbrains.kotlin.fir.psi import org.jetbrains.kotlin.idea.util.application.runReadAction import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.psiUtil.endOffset diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/fir/FirResolutionApi.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/fir/FirResolutionApi.kt index 28b249412b6..e9a055e8fdd 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/fir/FirResolutionApi.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/fir/FirResolutionApi.kt @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.idea.fir import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.declarations.* +import org.jetbrains.kotlin.fir.psi import org.jetbrains.kotlin.fir.references.* import org.jetbrains.kotlin.fir.render import org.jetbrains.kotlin.fir.resolve.FirProvider diff --git a/idea/tests/org/jetbrains/kotlin/idea/fir/AbstractFirMultiModuleResolveTest.kt b/idea/tests/org/jetbrains/kotlin/idea/fir/AbstractFirMultiModuleResolveTest.kt index 8ec1d505c06..e39b94d2542 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/fir/AbstractFirMultiModuleResolveTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/fir/AbstractFirMultiModuleResolveTest.kt @@ -24,9 +24,10 @@ import org.jetbrains.kotlin.fir.java.JavaSymbolProvider import org.jetbrains.kotlin.fir.java.declarations.FirJavaClass import org.jetbrains.kotlin.fir.java.declarations.FirJavaMethod import org.jetbrains.kotlin.fir.java.scopes.JavaClassEnhancementScope +import org.jetbrains.kotlin.fir.psi +import org.jetbrains.kotlin.fir.resolve.ScopeSession import org.jetbrains.kotlin.fir.resolve.firProvider import org.jetbrains.kotlin.fir.resolve.firSymbolProvider -import org.jetbrains.kotlin.fir.resolve.ScopeSession import org.jetbrains.kotlin.fir.resolve.impl.FirCompositeSymbolProvider import org.jetbrains.kotlin.fir.resolve.impl.FirProviderImpl import org.jetbrains.kotlin.fir.resolve.transformers.FirTotalResolveTransformer