diff --git a/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/analysis/api/fir/generator/HLDiagnosticConverter.kt b/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/analysis/api/fir/generator/HLDiagnosticConverter.kt index 06dc82943fb..2c24a76550a 100644 --- a/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/analysis/api/fir/generator/HLDiagnosticConverter.kt +++ b/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/analysis/api/fir/generator/HLDiagnosticConverter.kt @@ -6,15 +6,18 @@ package org.jetbrains.kotlin.analysis.api.fir.generator import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.analysis.api.symbols.* +import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.config.LanguageVersionSettings import org.jetbrains.kotlin.contracts.description.EventOccurrencesRange +import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.EffectiveVisibility import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.diagnostics.Severity import org.jetbrains.kotlin.diagnostics.WhenMissingCase import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.checkers.generator.diagnostics.model.* import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -23,9 +26,6 @@ import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.* import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.analysis.api.symbols.* -import org.jetbrains.kotlin.analysis.api.types.KtType -import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.lexer.KtKeywordToken import org.jetbrains.kotlin.lexer.KtModifierKeywordToken import org.jetbrains.kotlin.name.ClassId @@ -312,12 +312,12 @@ private object FirToKtConversionCreator { KtFunctionLikeSymbol::class.createType(), importsToAdd = listOf("org.jetbrains.kotlin.fir.declarations.FirSimpleFunction") ), - FirSourceElement::class to HLFunctionCallConversion( + KtSourceElement::class to HLFunctionCallConversion( "({0} as FirPsiSourceElement).psi", PsiElement::class.createType(), importsToAdd = listOf( "org.jetbrains.kotlin.fir.psi", - "org.jetbrains.kotlin.fir.FirPsiSourceElement" + "org.jetbrains.kotlin.FirPsiSourceElement" ) ) ) diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/FirIdeDeserializedDeclarationSourceProvider.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/FirIdeDeserializedDeclarationSourceProvider.kt index 4f60c76c6ca..0dd15e8c0d3 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/FirIdeDeserializedDeclarationSourceProvider.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/FirIdeDeserializedDeclarationSourceProvider.kt @@ -8,11 +8,14 @@ package org.jetbrains.kotlin.analysis.api.fir import com.intellij.openapi.project.Project import com.intellij.psi.PsiElement import com.intellij.psi.search.GlobalSearchScope +import org.jetbrains.kotlin.KtFakeSourceElement +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtRealPsiSourceElement +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.KtDeclarationAndFirDeclarationEqualityChecker +import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.FirIdeSession import org.jetbrains.kotlin.analysis.providers.createDeclarationProvider import org.jetbrains.kotlin.fir.* import org.jetbrains.kotlin.fir.declarations.* -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.KtDeclarationAndFirDeclarationEqualityChecker -import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.FirIdeSession import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name @@ -137,17 +140,17 @@ object FirIdeDeserializedDeclarationSourceProvider { private fun KtElement.isCompiled(): Boolean = containingKtFile.isCompiled private val allowedFakeElementKinds = setOf( - FirFakeSourceElementKind.FromUseSiteTarget, - FirFakeSourceElementKind.PropertyFromParameter, - FirFakeSourceElementKind.ItLambdaParameter, - FirFakeSourceElementKind.DataClassGeneratedMembers, - FirFakeSourceElementKind.ImplicitConstructor, + KtFakeSourceElementKind.FromUseSiteTarget, + KtFakeSourceElementKind.PropertyFromParameter, + KtFakeSourceElementKind.ItLambdaParameter, + KtFakeSourceElementKind.DataClassGeneratedMembers, + KtFakeSourceElementKind.ImplicitConstructor, ) private fun FirElement.getAllowedPsi() = when (val source = source) { null -> null - is FirRealPsiSourceElement -> source.psi - is FirFakeSourceElement -> if (source.kind in allowedFakeElementKinds) psi else null + is KtRealPsiSourceElement -> source.psi + is KtFakeSourceElement -> if (source.kind in allowedFakeElementKinds) psi else null else -> null } diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirAnalysisSessionComponent.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirAnalysisSessionComponent.kt index 12caf876a07..cb91691044a 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirAnalysisSessionComponent.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirAnalysisSessionComponent.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.analysis.api.fir.components +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.analysis.api.KtStarProjectionTypeArgument import org.jetbrains.kotlin.analysis.api.KtTypeArgument import org.jetbrains.kotlin.analysis.api.KtTypeArgumentWithVariance @@ -15,7 +16,6 @@ import org.jetbrains.kotlin.analysis.api.fir.types.KtFirType import org.jetbrains.kotlin.analysis.api.types.KtSubstitutor import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.fir.FirSession -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnostic import org.jetbrains.kotlin.fir.analysis.diagnostics.FirPsiDiagnostic import org.jetbrains.kotlin.fir.analysis.diagnostics.toFirDiagnostics @@ -45,8 +45,8 @@ internal interface KtFirAnalysisSessionComponent { KT_DIAGNOSTIC_CONVERTER.convert(analysisSession, this as FirDiagnostic) fun ConeDiagnostic.asKtDiagnostic( - source: FirSourceElement, - qualifiedAccessSource: FirSourceElement?, + source: KtSourceElement, + qualifiedAccessSource: KtSourceElement?, diagnosticCache: MutableList ): KtDiagnosticWithPsi<*>? { val firDiagnostic = toFirDiagnostics(analysisSession.rootModuleSession, source, qualifiedAccessSource).firstOrNull() ?: return null diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirCallResolver.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirCallResolver.kt index 69fc58e29c1..d26c374fee3 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirCallResolver.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirCallResolver.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.analysis.api.fir.components +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.calls.* import org.jetbrains.kotlin.analysis.api.diagnostics.KtNonBoundToPsiErrorDiagnostic @@ -23,7 +24,6 @@ import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken import org.jetbrains.kotlin.analysis.api.types.KtSubstitutor import org.jetbrains.kotlin.analysis.api.withValidityAssertion import org.jetbrains.kotlin.analysis.low.level.api.fir.api.getOrBuildFir -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnostic import org.jetbrains.kotlin.fir.declarations.FirConstructor import org.jetbrains.kotlin.fir.expressions.* @@ -322,13 +322,13 @@ internal class KtFirCallResolver( return ktArgumentMapping } - private fun FirErrorNamedReference.createErrorCallTarget(qualifiedAccessSource: FirSourceElement?): KtErrorCallTarget = + private fun FirErrorNamedReference.createErrorCallTarget(qualifiedAccessSource: KtSourceElement?): KtErrorCallTarget = KtErrorCallTarget( getCandidateSymbols().mapNotNull { it.fir.buildSymbol(firSymbolBuilder) as? KtFunctionLikeSymbol }, source?.let { diagnostic.asKtDiagnostic(it, qualifiedAccessSource, diagnosticCache) } ?: KtNonBoundToPsiErrorDiagnostic(factoryName = null, diagnostic.reason, token), token) - private fun FirErrorReferenceWithCandidate.createErrorCallTarget(qualifiedAccessSource: FirSourceElement?): KtErrorCallTarget = + private fun FirErrorReferenceWithCandidate.createErrorCallTarget(qualifiedAccessSource: KtSourceElement?): KtErrorCallTarget = KtErrorCallTarget( getCandidateSymbols().mapNotNull { it.fir.buildSymbol(firSymbolBuilder) as? KtFunctionLikeSymbol }, source?.let { diagnostic.asKtDiagnostic(it, qualifiedAccessSource, diagnosticCache) } @@ -337,7 +337,7 @@ internal class KtFirCallResolver( private fun FirResolvedNamedReference.getKtFunctionOrConstructorSymbol(): KtFunctionLikeSymbol? = resolvedSymbol.fir.buildSymbol(firSymbolBuilder) as? KtFunctionLikeSymbol - private fun FirSuperReference.createCallTarget(qualifiedAccessSource: FirSourceElement?): KtCallTarget? = + private fun FirSuperReference.createCallTarget(qualifiedAccessSource: KtSourceElement?): KtCallTarget? = when (val type = superTypeRef.coneType) { is ConeKotlinErrorType -> KtErrorCallTarget( diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirExpressionTypeProvider.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirExpressionTypeProvider.kt index dc27e4c8207..a67e33eeb0b 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirExpressionTypeProvider.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirExpressionTypeProvider.kt @@ -23,7 +23,6 @@ import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.utils.isSuspend import org.jetbrains.kotlin.fir.declarations.utils.superConeTypes import org.jetbrains.kotlin.fir.expressions.* -import org.jetbrains.kotlin.fir.psi import org.jetbrains.kotlin.fir.references.FirNamedReference import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference import org.jetbrains.kotlin.fir.references.FirSuperReference @@ -31,6 +30,7 @@ import org.jetbrains.kotlin.fir.resolve.constructFunctionalType import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol import org.jetbrains.kotlin.fir.types.* import org.jetbrains.kotlin.lexer.KtTokens +import org.jetbrains.kotlin.psi import org.jetbrains.kotlin.psi.* internal class KtFirExpressionTypeProvider( diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirImportOptimizer.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirImportOptimizer.kt index 0b4104de54a..9cdd494acf6 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirImportOptimizer.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirImportOptimizer.kt @@ -5,13 +5,19 @@ package org.jetbrains.kotlin.analysis.api.fir.components +import org.jetbrains.kotlin.analysis.api.assertIsValidAndAccessible +import org.jetbrains.kotlin.analysis.api.components.KtImportOptimizer +import org.jetbrains.kotlin.analysis.api.components.KtImportOptimizerResult +import org.jetbrains.kotlin.analysis.api.fir.getCandidateSymbols +import org.jetbrains.kotlin.analysis.api.fir.utils.computeImportableName +import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.getOrBuildFirFile import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.FirFile import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.expressions.* -import org.jetbrains.kotlin.fir.psi -import org.jetbrains.kotlin.fir.realPsi import org.jetbrains.kotlin.fir.references.FirNamedReference import org.jetbrains.kotlin.fir.symbols.ensureResolved import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol @@ -20,22 +26,16 @@ import org.jetbrains.kotlin.fir.types.FirErrorTypeRef import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef import org.jetbrains.kotlin.fir.types.classId import org.jetbrains.kotlin.fir.visitors.FirVisitorVoid -import org.jetbrains.kotlin.analysis.api.fir.getCandidateSymbols -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.getOrBuildFirFile -import org.jetbrains.kotlin.analysis.api.assertIsValidAndAccessible -import org.jetbrains.kotlin.analysis.api.components.KtImportOptimizer -import org.jetbrains.kotlin.analysis.api.components.KtImportOptimizerResult -import org.jetbrains.kotlin.analysis.api.fir.utils.computeImportableName -import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.parentOrNull +import org.jetbrains.kotlin.psi import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.getCallNameExpression import org.jetbrains.kotlin.psi.psiUtil.getPossiblyQualifiedCallExpression import org.jetbrains.kotlin.psi.psiUtil.unwrapNullability +import org.jetbrains.kotlin.realPsi import org.jetbrains.kotlin.resolve.ImportPath import org.jetbrains.kotlin.util.OperatorNameConventions diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSymbolContainingDeclarationProvider.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSymbolContainingDeclarationProvider.kt index cae4c996640..a1389810c24 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSymbolContainingDeclarationProvider.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSymbolContainingDeclarationProvider.kt @@ -6,6 +6,8 @@ package org.jetbrains.kotlin.analysis.api.fir.components import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtRealSourceElementKind import org.jetbrains.kotlin.analysis.api.components.KtSymbolContainingDeclarationProvider import org.jetbrains.kotlin.analysis.api.fir.KtFirAnalysisSession import org.jetbrains.kotlin.analysis.api.fir.symbols.KtFirReceiverParameterSymbol @@ -16,10 +18,8 @@ import org.jetbrains.kotlin.analysis.api.symbols.* import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolKind import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolWithKind import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind -import org.jetbrains.kotlin.fir.FirRealSourceElementKind import org.jetbrains.kotlin.fir.declarations.FirDeclaration -import org.jetbrains.kotlin.fir.psi +import org.jetbrains.kotlin.psi import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtDestructuringDeclaration import org.jetbrains.kotlin.psi.KtPrimaryConstructor @@ -89,11 +89,11 @@ internal class KtFirSymbolContainingDeclarationProvider( val source = symbol.firRef.withFir(action = FirDeclaration::source) val thisSource = when (source?.kind) { null -> error("PSI should present for declaration built by Kotlin code") - FirFakeSourceElementKind.ImplicitConstructor -> + KtFakeSourceElementKind.ImplicitConstructor -> return source.psi as KtDeclaration - FirFakeSourceElementKind.PropertyFromParameter -> return source.psi?.parentOfType()!! - FirFakeSourceElementKind.DefaultAccessor -> return source.psi as KtProperty - FirRealSourceElementKind -> source.psi!! + KtFakeSourceElementKind.PropertyFromParameter -> return source.psi?.parentOfType()!! + KtFakeSourceElementKind.DefaultAccessor -> return source.psi as KtProperty + KtRealSourceElementKind -> source.psi!! else -> error("Unexpected FirSourceElement: kind=${source.kind} element=${source.psi!!::class.simpleName}") } diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDataClassConverters.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDataClassConverters.kt index a9a9d249335..39c0b619e13 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDataClassConverters.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDataClassConverters.kt @@ -5,38 +5,12 @@ package org.jetbrains.kotlin.analysis.api.fir.diagnostics -import com.intellij.psi.PsiElement -import com.intellij.psi.impl.source.tree.LeafPsiElement -import org.jetbrains.kotlin.fir.FirPsiSourceElement +import org.jetbrains.kotlin.KtPsiSourceElement import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors import org.jetbrains.kotlin.fir.analysis.diagnostics.FirPsiDiagnostic import org.jetbrains.kotlin.fir.analysis.diagnostics.jvm.FirJvmErrors -import org.jetbrains.kotlin.fir.declarations.FirCallableDeclaration import org.jetbrains.kotlin.fir.declarations.FirClass -import org.jetbrains.kotlin.fir.declarations.FirDeclaration -import org.jetbrains.kotlin.fir.declarations.FirProperty -import org.jetbrains.kotlin.fir.declarations.FirRegularClass -import org.jetbrains.kotlin.fir.declarations.FirSimpleFunction -import org.jetbrains.kotlin.fir.declarations.FirTypeParameter -import org.jetbrains.kotlin.fir.declarations.FirVariable -import org.jetbrains.kotlin.fir.psi -import org.jetbrains.kotlin.psi.KtAnnotationEntry -import org.jetbrains.kotlin.psi.KtAnonymousInitializer -import org.jetbrains.kotlin.psi.KtArrayAccessExpression -import org.jetbrains.kotlin.psi.KtBackingField -import org.jetbrains.kotlin.psi.KtBinaryExpression -import org.jetbrains.kotlin.psi.KtBinaryExpressionWithTypeRHS -import org.jetbrains.kotlin.psi.KtCallExpression -import org.jetbrains.kotlin.psi.KtClass -import org.jetbrains.kotlin.psi.KtClassOrObject -import org.jetbrains.kotlin.psi.KtConstructor -import org.jetbrains.kotlin.psi.KtConstructorDelegationCall -import org.jetbrains.kotlin.psi.KtDeclaration -import org.jetbrains.kotlin.psi.KtDeclarationWithBody -import org.jetbrains.kotlin.psi.KtDelegatedSuperTypeEntry -import org.jetbrains.kotlin.psi.KtDestructuringDeclaration -import org.jetbrains.kotlin.psi.KtElement -import org.jetbrains.kotlin.psi.KtEnumEntry +import org.jetbrains.kotlin.psi import org.jetbrains.kotlin.psi.KtExpression import org.jetbrains.kotlin.psi.KtExpressionWithLabel import org.jetbrains.kotlin.psi.KtFunction @@ -253,7 +227,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firSymbolBuilder.variableLikeBuilder.buildVariableSymbol(firDiagnostic.a.fir), firDiagnostic.b, firDiagnostic.c, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -369,26 +343,26 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert } add(FirErrors.SUPER_IS_NOT_AN_EXPRESSION) { firDiagnostic -> SuperIsNotAnExpressionImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.SUPER_NOT_AVAILABLE) { firDiagnostic -> SuperNotAvailableImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ABSTRACT_SUPER_CALL) { firDiagnostic -> AbstractSuperCallImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.INSTANCE_ACCESS_BEFORE_SUPER_CALL) { firDiagnostic -> InstanceAccessBeforeSuperCallImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -993,19 +967,19 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert add(FirErrors.OPT_IN_MARKER_ON_WRONG_TARGET) { firDiagnostic -> OptInMarkerOnWrongTargetImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.OPT_IN_MARKER_ON_OVERRIDE) { firDiagnostic -> OptInMarkerOnOverrideImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.OPT_IN_MARKER_ON_OVERRIDE_WARNING) { firDiagnostic -> OptInMarkerOnOverrideWarningImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -2982,10 +2956,10 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert add(FirErrors.UNREACHABLE_CODE) { firDiagnostic -> UnreachableCodeImpl( firDiagnostic.a.map { firSourceElement -> - (firSourceElement as FirPsiSourceElement).psi + (firSourceElement as KtPsiSourceElement).psi }, firDiagnostic.b.map { firSourceElement -> - (firSourceElement as FirPsiSourceElement).psi + (firSourceElement as KtPsiSourceElement).psi }, firDiagnostic as FirPsiDiagnostic, token, @@ -3178,13 +3152,13 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert } add(FirErrors.CONFUSING_BRANCH_CONDITION.errorFactory) { firDiagnostic -> ConfusingBranchConditionErrorImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.CONFUSING_BRANCH_CONDITION.warningFactory) { firDiagnostic -> ConfusingBranchConditionWarningImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -3390,7 +3364,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert add(FirErrors.DSL_SCOPE_VIOLATION) { firDiagnostic -> DslScopeViolationImpl( firSymbolBuilder.buildSymbol(firDiagnostic.a.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -3517,7 +3491,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert } add(FirErrors.NOT_A_FUNCTION_LABEL) { firDiagnostic -> NotAFunctionLabelImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDiagnosticsImpl.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDiagnosticsImpl.kt index 62307f91589..2a8dfd612db 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDiagnosticsImpl.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDiagnosticsImpl.kt @@ -239,7 +239,7 @@ internal class InvisibleSetterImpl( override val property: KtVariableSymbol, override val visibility: Visibility, override val callableId: CallableId, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InvisibleSetter(), KtAbstractFirDiagnostic @@ -336,23 +336,23 @@ internal class ResolutionToClassifierImpl( ) : KtFirDiagnostic.ResolutionToClassifier(), KtAbstractFirDiagnostic internal class SuperIsNotAnExpressionImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.SuperIsNotAnExpression(), KtAbstractFirDiagnostic internal class SuperNotAvailableImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.SuperNotAvailable(), KtAbstractFirDiagnostic internal class AbstractSuperCallImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.AbstractSuperCall(), KtAbstractFirDiagnostic internal class InstanceAccessBeforeSuperCallImpl( override val target: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InstanceAccessBeforeSuperCall(), KtAbstractFirDiagnostic @@ -857,17 +857,17 @@ internal class OptInMarkerWithWrongRetentionImpl( internal class OptInMarkerOnWrongTargetImpl( override val target: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.OptInMarkerOnWrongTarget(), KtAbstractFirDiagnostic internal class OptInMarkerOnOverrideImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.OptInMarkerOnOverride(), KtAbstractFirDiagnostic internal class OptInMarkerOnOverrideWarningImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.OptInMarkerOnOverrideWarning(), KtAbstractFirDiagnostic @@ -2674,12 +2674,12 @@ internal class DuplicateLabelInWhenImpl( ) : KtFirDiagnostic.DuplicateLabelInWhen(), KtAbstractFirDiagnostic internal class ConfusingBranchConditionErrorImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ConfusingBranchConditionError(), KtAbstractFirDiagnostic internal class ConfusingBranchConditionWarningImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ConfusingBranchConditionWarning(), KtAbstractFirDiagnostic @@ -2849,7 +2849,7 @@ internal class PropertyAsOperatorImpl( internal class DslScopeViolationImpl( override val calleeSymbol: KtSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.DslScopeViolation(), KtAbstractFirDiagnostic @@ -2955,7 +2955,7 @@ internal class ReturnNotAllowedImpl( ) : KtFirDiagnostic.ReturnNotAllowed(), KtAbstractFirDiagnostic internal class NotAFunctionLabelImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NotAFunctionLabel(), KtAbstractFirDiagnostic diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/evaluate/FirCompileTimeConstantEvaluator.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/evaluate/FirCompileTimeConstantEvaluator.kt index e93e28f6fe2..8db41953c06 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/evaluate/FirCompileTimeConstantEvaluator.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/evaluate/FirCompileTimeConstantEvaluator.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.analysis.api.fir.evaluate -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.declarations.FirCallableDeclaration import org.jetbrains.kotlin.fir.declarations.FirSimpleFunction import org.jetbrains.kotlin.fir.expressions.FirConstExpression @@ -201,7 +201,7 @@ internal object FirCompileTimeConstantEvaluator { } } - private fun ConstantValueKind?.toConstExpression(source: FirSourceElement?, value: Any): FirConstExpression? = + private fun ConstantValueKind?.toConstExpression(source: KtSourceElement?, value: Any): FirConstExpression? = if (this == null) null else @Suppress("UNCHECKED_CAST") buildConstExpression(source, this, value as T) diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/references/FirReferenceResolveHelper.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/references/FirReferenceResolveHelper.kt index 8447897911c..e91239db2be 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/references/FirReferenceResolveHelper.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/references/FirReferenceResolveHelper.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.idea.references import com.intellij.psi.tree.TokenSet +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.analysis.api.fir.* import org.jetbrains.kotlin.analysis.api.fir.symbols.KtFirPackageSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol @@ -20,6 +21,7 @@ import org.jetbrains.kotlin.fir.declarations.utils.isCompanion import org.jetbrains.kotlin.fir.declarations.utils.isLocal import org.jetbrains.kotlin.fir.declarations.utils.isStatic import org.jetbrains.kotlin.fir.expressions.* +import org.jetbrains.kotlin.fir.psi import org.jetbrains.kotlin.fir.references.* import org.jetbrains.kotlin.fir.resolve.ScopeSession import org.jetbrains.kotlin.fir.resolve.diagnostics.ConeUnmatchedTypeArgumentsError @@ -39,6 +41,7 @@ import org.jetbrains.kotlin.fir.symbols.impl.FirSyntheticPropertySymbol import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.psi import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.collectDescendantsOfType import org.jetbrains.kotlin.psi.psiUtil.getQualifiedExpressionForSelector @@ -60,7 +63,7 @@ internal object FirReferenceResolveHelper { } private fun FirResolvedTypeRef.getDeclaredType() = - if (this.delegatedTypeRef?.source?.kind == FirFakeSourceElementKind.ArrayTypeFromVarargParameter) type.arrayElementType() + if (this.delegatedTypeRef?.source?.kind == KtFakeSourceElementKind.ArrayTypeFromVarargParameter) type.arrayElementType() else type private fun ClassId.toTargetPsi( diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirKotlinPropertySymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirKotlinPropertySymbol.kt index 0d108fd2a82..de773330ce6 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirKotlinPropertySymbol.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirKotlinPropertySymbol.kt @@ -6,17 +6,9 @@ package org.jetbrains.kotlin.analysis.api.fir.symbols import com.intellij.psi.PsiElement -import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibility -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind -import org.jetbrains.kotlin.fir.containingClass -import org.jetbrains.kotlin.fir.declarations.FirProperty -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticProperty -import org.jetbrains.kotlin.fir.declarations.utils.* -import org.jetbrains.kotlin.analysis.api.fir.findPsi -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.analysis.api.fir.KtSymbolByFirBuilder +import org.jetbrains.kotlin.analysis.api.fir.findPsi import org.jetbrains.kotlin.analysis.api.fir.evaluate.KtFirConstantValueConverter import org.jetbrains.kotlin.analysis.api.fir.symbols.annotations.containsAnnotation import org.jetbrains.kotlin.analysis.api.fir.symbols.annotations.getAnnotationClassIds @@ -33,9 +25,20 @@ import org.jetbrains.kotlin.analysis.api.symbols.markers.KtAnnotationCall import org.jetbrains.kotlin.analysis.api.symbols.markers.KtConstantValue import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolKind import org.jetbrains.kotlin.analysis.api.symbols.markers.KtTypeAndAnnotations -import org.jetbrains.kotlin.analysis.api.symbols.pointers.* +import org.jetbrains.kotlin.analysis.api.symbols.pointers.CanNotCreateSymbolPointerForLocalLibraryDeclarationException +import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointer +import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer +import org.jetbrains.kotlin.analysis.api.symbols.pointers.WrongSymbolForSamConstructor import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken import org.jetbrains.kotlin.analysis.api.types.KtType +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState +import org.jetbrains.kotlin.descriptors.Modality +import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.fir.containingClass +import org.jetbrains.kotlin.fir.declarations.FirProperty +import org.jetbrains.kotlin.fir.declarations.FirResolvePhase +import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticProperty +import org.jetbrains.kotlin.fir.declarations.utils.* import org.jetbrains.kotlin.name.CallableId import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.Name @@ -109,7 +112,7 @@ internal class KtFirKotlinPropertySymbol( override val isFromPrimaryConstructor: Boolean get() = firRef.withFir { - it.fromPrimaryConstructor == true || it.source?.kind == FirFakeSourceElementKind.PropertyFromParameter + it.fromPrimaryConstructor == true || it.source?.kind == KtFakeSourceElementKind.PropertyFromParameter } override val isOverride: Boolean get() = firRef.withFir { it.isOverride } override val isStatic: Boolean get() = firRef.withFir { it.isStatic } diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSymbol.kt index 5d8af09089c..254b8a6315e 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSymbol.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSymbol.kt @@ -5,7 +5,11 @@ package org.jetbrains.kotlin.analysis.api.fir.symbols -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.analysis.api.ValidityTokenOwner +import org.jetbrains.kotlin.analysis.api.fir.utils.FirRefWithValidityCheck +import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtSymbolOrigin import org.jetbrains.kotlin.fir.declarations.FirCallableDeclaration import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin @@ -13,10 +17,6 @@ import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticProperty import org.jetbrains.kotlin.fir.originalIfFakeOverride import org.jetbrains.kotlin.fir.render import org.jetbrains.kotlin.fir.scopes.impl.importedFromObjectData -import org.jetbrains.kotlin.analysis.api.ValidityTokenOwner -import org.jetbrains.kotlin.analysis.api.fir.utils.FirRefWithValidityCheck -import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol -import org.jetbrains.kotlin.analysis.api.symbols.KtSymbolOrigin internal interface KtFirSymbol : KtSymbol, ValidityTokenOwner { val firRef: FirRefWithValidityCheck @@ -35,10 +35,10 @@ internal fun KtFirSymbol<*>.symbolHashCode(): Int = firRef.hashCode() * 31 + tok internal tailrec fun FirDeclaration.ktSymbolOrigin(): KtSymbolOrigin = when (origin) { FirDeclarationOrigin.Source -> { when (source?.kind) { - FirFakeSourceElementKind.ImplicitConstructor, - FirFakeSourceElementKind.DataClassGeneratedMembers, - FirFakeSourceElementKind.EnumGeneratedDeclaration, - FirFakeSourceElementKind.ItLambdaParameter -> KtSymbolOrigin.SOURCE_MEMBER_GENERATED + KtFakeSourceElementKind.ImplicitConstructor, + KtFakeSourceElementKind.DataClassGeneratedMembers, + KtFakeSourceElementKind.EnumGeneratedDeclaration, + KtFakeSourceElementKind.ItLambdaParameter -> KtSymbolOrigin.SOURCE_MEMBER_GENERATED else -> KtSymbolOrigin.SOURCE } diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LowLevelFirApiFacadeForResolveOnAir.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LowLevelFirApiFacadeForResolveOnAir.kt index 77fe1905cb4..cfe6a74be27 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LowLevelFirApiFacadeForResolveOnAir.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LowLevelFirApiFacadeForResolveOnAir.kt @@ -9,16 +9,6 @@ import com.intellij.psi.util.PsiTreeUtil import org.jetbrains.kotlin.analysis.api.impl.barebone.parentOfType import org.jetbrains.kotlin.analysis.api.impl.barebone.parentsOfType import org.jetbrains.kotlin.analysis.low.level.api.fir.DeclarationCopyBuilder.withBodyFrom -import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.declarations.* -import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.realPsi -import org.jetbrains.kotlin.fir.resolve.ScopeSession -import org.jetbrains.kotlin.fir.resolve.transformers.FirTypeResolveTransformer -import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.FirTowerDataContextCollector -import org.jetbrains.kotlin.fir.scopes.createImportingScopes -import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef -import org.jetbrains.kotlin.fir.visitors.FirVisitorVoid import org.jetbrains.kotlin.analysis.low.level.api.fir.FirModuleResolveStateDepended import org.jetbrains.kotlin.analysis.low.level.api.fir.FirModuleResolveStateImpl import org.jetbrains.kotlin.analysis.low.level.api.fir.element.builder.FileTowerProvider @@ -33,9 +23,19 @@ import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.FirIdeSourcesSes import org.jetbrains.kotlin.analysis.low.level.api.fir.util.getElementTextInContext import org.jetbrains.kotlin.analysis.low.level.api.fir.util.originalDeclaration import org.jetbrains.kotlin.analysis.project.structure.getKtModule +import org.jetbrains.kotlin.fir.FirElement +import org.jetbrains.kotlin.fir.declarations.* +import org.jetbrains.kotlin.fir.expressions.FirAnnotation +import org.jetbrains.kotlin.fir.resolve.ScopeSession +import org.jetbrains.kotlin.fir.resolve.transformers.FirTypeResolveTransformer +import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.FirTowerDataContextCollector +import org.jetbrains.kotlin.fir.scopes.createImportingScopes +import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef +import org.jetbrains.kotlin.fir.visitors.FirVisitorVoid import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject import org.jetbrains.kotlin.psi.psiUtil.isAncestor +import org.jetbrains.kotlin.realPsi object LowLevelFirApiFacadeForResolveOnAir { diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/FileStructureElementDiagnosticRetriever.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/FileStructureElementDiagnosticRetriever.kt index 62f12fbb4a3..328f1f5da33 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/FileStructureElementDiagnosticRetriever.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/FileStructureElementDiagnosticRetriever.kt @@ -5,15 +5,15 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.diagnostics +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.analysis.low.level.api.fir.diagnostics.fir.PersistenceContextCollector +import org.jetbrains.kotlin.analysis.low.level.api.fir.diagnostics.fir.PersistentCheckerContextFactory +import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.LockProvider import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.collectors.components.AbstractDiagnosticCollectorComponent import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.resolve.SessionHolderImpl -import org.jetbrains.kotlin.analysis.low.level.api.fir.diagnostics.fir.PersistenceContextCollector -import org.jetbrains.kotlin.analysis.low.level.api.fir.diagnostics.fir.PersistentCheckerContextFactory -import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.LockProvider internal abstract class FileStructureElementDiagnosticRetriever { abstract fun retrieve( @@ -84,8 +84,8 @@ internal class SingleNonLocalDeclarationDiagnosticRetriever( companion object { fun shouldDiagnosticsAlwaysBeCheckedOn(firElement: FirElement) = when (firElement.source?.kind) { - FirFakeSourceElementKind.PropertyFromParameter -> true - FirFakeSourceElementKind.ImplicitConstructor -> true + KtFakeSourceElementKind.PropertyFromParameter -> true + KtFakeSourceElementKind.ImplicitConstructor -> true else -> false } } diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/FirIdeDiagnosticReporter.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/FirIdeDiagnosticReporter.kt index dcf330ab433..2cd8d53df2a 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/FirIdeDiagnosticReporter.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/FirIdeDiagnosticReporter.kt @@ -27,7 +27,7 @@ internal class FirIdeDiagnosticReporter : DiagnosticReporter() { } private fun FirLightDiagnostic.toPsiDiagnostic(): FirPsiDiagnostic { - val psiSourceElement = element.unwrapToFirPsiSourceElement() + val psiSourceElement = element.unwrapToKtPsiSourceElement() ?: error("Diagnostic should be created from PSI in IDE") @Suppress("UNCHECKED_CAST") return when (this) { diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/element/builder/FirTowerDataContextCollector.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/element/builder/FirTowerDataContextCollector.kt index dc0f7a73bc7..c16da562a91 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/element/builder/FirTowerDataContextCollector.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/element/builder/FirTowerDataContextCollector.kt @@ -11,8 +11,8 @@ import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirFile import org.jetbrains.kotlin.fir.declarations.FirTowerDataContext import org.jetbrains.kotlin.fir.expressions.FirStatement -import org.jetbrains.kotlin.fir.psi import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.FirTowerDataContextCollector +import org.jetbrains.kotlin.psi import org.jetbrains.kotlin.psi.* interface FirTowerContextProvider { diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/builder/ModuleFileCache.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/builder/ModuleFileCache.kt index f095d450f02..e0769f37750 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/builder/ModuleFileCache.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/builder/ModuleFileCache.kt @@ -11,11 +11,10 @@ import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.FirClassLikeDeclaration import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirFile -import org.jetbrains.kotlin.fir.psi -import org.jetbrains.kotlin.fir.render import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol import org.jetbrains.kotlin.name.CallableId import org.jetbrains.kotlin.name.ClassId +import org.jetbrains.kotlin.psi import org.jetbrains.kotlin.psi.KtFile import java.util.* import java.util.concurrent.ConcurrentHashMap diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/FileStructureElement.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/FileStructureElement.kt index a984eeb7712..3a175e9af0a 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/FileStructureElement.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/FileStructureElement.kt @@ -6,13 +6,6 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.file.structure 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.resolve.ScopeSession -import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol -import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol -import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LowLevelFirApiFacadeForResolveOnAir import org.jetbrains.kotlin.analysis.low.level.api.fir.api.collectDesignation @@ -26,6 +19,13 @@ import org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve.RawFirNonLoc import org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve.declarationCanBeLazilyResolved import org.jetbrains.kotlin.analysis.low.level.api.fir.providers.FirIdeProvider import org.jetbrains.kotlin.analysis.low.level.api.fir.providers.firIdeProvider +import org.jetbrains.kotlin.fir.FirElement +import org.jetbrains.kotlin.fir.declarations.* +import org.jetbrains.kotlin.fir.resolve.ScopeSession +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol +import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol +import org.jetbrains.kotlin.psi import org.jetbrains.kotlin.psi.* import java.util.concurrent.ConcurrentHashMap diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/FirElementsRecorder.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/FirElementsRecorder.kt index 50a732fae5c..68221902e2c 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/FirElementsRecorder.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/FirElementsRecorder.kt @@ -5,11 +5,12 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.file.structure +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtRealPsiSourceElement +import org.jetbrains.kotlin.analysis.low.level.api.fir.element.builder.DuplicatedFirSourceElementsException +import org.jetbrains.kotlin.analysis.low.level.api.fir.util.isErrorElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind -import org.jetbrains.kotlin.fir.FirRealPsiSourceElement import org.jetbrains.kotlin.fir.expressions.FirVariableAssignment -import org.jetbrains.kotlin.fir.psi import org.jetbrains.kotlin.fir.references.* import org.jetbrains.kotlin.fir.types.FirErrorTypeRef import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef @@ -17,8 +18,7 @@ import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.FirUserTypeRef import org.jetbrains.kotlin.fir.types.impl.FirResolvedTypeRefImpl import org.jetbrains.kotlin.fir.visitors.FirVisitor -import org.jetbrains.kotlin.analysis.low.level.api.fir.element.builder.DuplicatedFirSourceElementsException -import org.jetbrains.kotlin.analysis.low.level.api.fir.util.isErrorElement +import org.jetbrains.kotlin.psi import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtTypeReference @@ -93,9 +93,9 @@ internal open class FirElementsRecorder : FirVisitor) { val psi = element.source ?.takeIf { - it is FirRealPsiSourceElement || - it.kind == FirFakeSourceElementKind.ReferenceInAtomicQualifiedAccess || - it.kind == FirFakeSourceElementKind.FromUseSiteTarget + it is KtRealPsiSourceElement || + it.kind == KtFakeSourceElementKind.ReferenceInAtomicQualifiedAccess || + it.kind == KtFakeSourceElementKind.FromUseSiteTarget }.psi as? KtElement ?: return cache(psi, element, cache) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/FirLazyBodiesCalculator.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/FirLazyBodiesCalculator.kt index 0b06e39b0ad..f1ace3d1385 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/FirLazyBodiesCalculator.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/FirLazyBodiesCalculator.kt @@ -5,6 +5,8 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirDeclarationDesignation +import org.jetbrains.kotlin.analysis.low.level.api.fir.providers.firIdeProvider import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.utils.getExplicitBackingField @@ -12,11 +14,9 @@ import org.jetbrains.kotlin.fir.expressions.FirFunctionCall import org.jetbrains.kotlin.fir.expressions.FirWrappedDelegateExpression import org.jetbrains.kotlin.fir.expressions.impl.FirLazyBlock import org.jetbrains.kotlin.fir.expressions.impl.FirLazyExpression -import org.jetbrains.kotlin.fir.psi import org.jetbrains.kotlin.fir.visitors.FirTransformer import org.jetbrains.kotlin.fir.visitors.transformSingle -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirDeclarationDesignation -import org.jetbrains.kotlin.analysis.low.level.api.fir.providers.firIdeProvider +import org.jetbrains.kotlin.psi import org.jetbrains.kotlin.psi.KtNamedFunction import org.jetbrains.kotlin.psi.KtProperty import org.jetbrains.kotlin.psi.KtSecondaryConstructor diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/FirLazyDeclarationResolver.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/FirLazyDeclarationResolver.kt index 6555051aeda..8e7f76f29e1 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/FirLazyDeclarationResolver.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/FirLazyDeclarationResolver.kt @@ -24,11 +24,11 @@ import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticProperty import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticPropertyAccessor import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.realPsi import org.jetbrains.kotlin.fir.resolve.ScopeSession import org.jetbrains.kotlin.fir.resolve.providers.firProvider import org.jetbrains.kotlin.fir.resolve.transformers.FirImportResolveTransformer import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.FirTowerDataContextCollector +import org.jetbrains.kotlin.realPsi internal class FirLazyDeclarationResolver(private val firFileBuilder: FirFileBuilder) { /** diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/NonLocalDeclarationUtils.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/NonLocalDeclarationUtils.kt index eb4581851c8..8abb69fae71 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/NonLocalDeclarationUtils.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/NonLocalDeclarationUtils.kt @@ -5,11 +5,11 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve +import org.jetbrains.kotlin.KtFakeSourceElement +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.analysis.api.impl.barebone.parentOfType -import org.jetbrains.kotlin.fir.FirFakeSourceElement -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind import org.jetbrains.kotlin.fir.declarations.* -import org.jetbrains.kotlin.fir.psi +import org.jetbrains.kotlin.psi import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject import org.jetbrains.kotlin.psi.psiUtil.getParentOfType @@ -18,7 +18,7 @@ internal fun FirDeclaration.getKtDeclarationForFirElement(): KtDeclaration { require(this !is FirFile) val ktDeclaration = (psi as? KtDeclaration) ?: run { - (source as? FirFakeSourceElement).psi?.parentOfType() + (source as? KtFakeSourceElement).psi?.parentOfType() } check(ktDeclaration is KtDeclaration) { "FirDeclaration should have a PSI of type KtDeclaration" @@ -34,7 +34,7 @@ internal fun FirDeclaration.getKtDeclarationForFirElement(): KtDeclaration { if (containingDeclaration !is KtPropertyAccessor) containingDeclaration else containingDeclaration.property } is KtCallExpression -> { - check(this.source?.kind == FirFakeSourceElementKind.DefaultAccessor) + check(this.source?.kind == KtFakeSourceElementKind.DefaultAccessor) ((ktDeclaration as? KtCallExpression)?.parent as? KtPropertyDelegate)?.parent as? KtProperty } else -> ktDeclaration diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/RawFirNonLocalDeclarationBuilder.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/RawFirNonLocalDeclarationBuilder.kt index e2aa8e93044..de76002ccf2 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/RawFirNonLocalDeclarationBuilder.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/RawFirNonLocalDeclarationBuilder.kt @@ -6,17 +6,17 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirDeclarationDesignation import org.jetbrains.kotlin.fir.* -import org.jetbrains.kotlin.fir.builder.RawFirBuilder import org.jetbrains.kotlin.fir.builder.BodyBuildingMode import org.jetbrains.kotlin.fir.builder.PsiHandlingMode +import org.jetbrains.kotlin.fir.builder.RawFirBuilder import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.utils.isInner import org.jetbrains.kotlin.fir.scopes.FirScopeProvider import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirDeclarationDesignation import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.hasExpectModifier diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/FirElementFinder.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/FirElementFinder.kt index fc9fcf103e3..08b887a2354 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/FirElementFinder.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/FirElementFinder.kt @@ -7,8 +7,8 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.util import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.declarations.FirFile -import org.jetbrains.kotlin.fir.psi import org.jetbrains.kotlin.fir.visitors.FirVisitorVoid +import org.jetbrains.kotlin.psi import org.jetbrains.kotlin.psi.KtElement object FirElementFinder { diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/declarationUtils.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/declarationUtils.kt index 2ca4b897dbe..04aaab5acc8 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/declarationUtils.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/declarationUtils.kt @@ -5,19 +5,19 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.util -import org.jetbrains.kotlin.fir.declarations.FirClassLikeDeclaration -import org.jetbrains.kotlin.fir.declarations.FirDeclaration -import org.jetbrains.kotlin.fir.declarations.FirFile -import org.jetbrains.kotlin.fir.declarations.FirRegularClass -import org.jetbrains.kotlin.fir.psi -import org.jetbrains.kotlin.fir.realPsi -import org.jetbrains.kotlin.fir.resolve.providers.FirSymbolProvider import org.jetbrains.kotlin.analysis.low.level.api.fir.api.throwUnexpectedFirElementError import org.jetbrains.kotlin.analysis.low.level.api.fir.element.builder.getNonLocalContainingOrThisDeclaration import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.FirFileBuilder import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.ModuleFileCache +import org.jetbrains.kotlin.fir.declarations.FirClassLikeDeclaration +import org.jetbrains.kotlin.fir.declarations.FirDeclaration +import org.jetbrains.kotlin.fir.declarations.FirFile +import org.jetbrains.kotlin.fir.declarations.FirRegularClass +import org.jetbrains.kotlin.fir.resolve.providers.FirSymbolProvider +import org.jetbrains.kotlin.psi import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject +import org.jetbrains.kotlin.realPsi /** * 'Non-local' stands for not local classes/functions/etc. diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/utils.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/utils.kt index 58bc878b66a..d2d5b77bab0 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/utils.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/utils.kt @@ -18,8 +18,8 @@ import org.jetbrains.kotlin.cfg.containingDeclarationForPseudocode import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.diagnostics.FirDiagnosticHolder -import org.jetbrains.kotlin.fir.psi import org.jetbrains.kotlin.fir.render +import org.jetbrains.kotlin.psi import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.isObjectLiteral import java.util.concurrent.TimeUnit diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractFirLazyDeclarationResolveTest.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractFirLazyDeclarationResolveTest.kt index 506f16189b8..ab8840e3484 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractFirLazyDeclarationResolveTest.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractFirLazyDeclarationResolveTest.kt @@ -5,17 +5,17 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir -import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirRenderer -import org.jetbrains.kotlin.fir.declarations.* -import org.jetbrains.kotlin.fir.realPsi -import org.jetbrains.kotlin.fir.render -import org.jetbrains.kotlin.fir.visitors.FirVisitorVoid import org.jetbrains.kotlin.analysis.low.level.api.fir.api.withFirDeclaration import org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve.ResolveType import org.jetbrains.kotlin.analysis.low.level.api.fir.test.base.AbstractLowLevelApiSingleFileTest +import org.jetbrains.kotlin.fir.FirElement +import org.jetbrains.kotlin.fir.FirRenderer +import org.jetbrains.kotlin.fir.declarations.* +import org.jetbrains.kotlin.fir.render +import org.jetbrains.kotlin.fir.visitors.FirVisitorVoid import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtFile +import org.jetbrains.kotlin.realPsi import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives import org.jetbrains.kotlin.test.services.TestModuleStructure diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/compiler/based/LowLevelFirAnalyzerFacade.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/compiler/based/LowLevelFirAnalyzerFacade.kt index bb7d3ca4638..a9335acf336 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/compiler/based/LowLevelFirAnalyzerFacade.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/compiler/based/LowLevelFirAnalyzerFacade.kt @@ -5,21 +5,20 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.compiler.based +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.DiagnosticCheckerFilter +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.collectDiagnosticsForFile +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.resolvedFirToPhase import org.jetbrains.kotlin.fir.analysis.AbstractFirAnalyzerFacade import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnostic import org.jetbrains.kotlin.fir.backend.Fir2IrResult import org.jetbrains.kotlin.fir.declarations.FirFile import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.psi import org.jetbrains.kotlin.fir.resolve.ScopeSession import org.jetbrains.kotlin.fir.resolve.transformers.FirSealedClassInheritorsProcessor -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.DiagnosticCheckerFilter -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.collectDiagnosticsForFile -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.resolvedFirToPhase +import org.jetbrains.kotlin.psi import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi2ir.generators.GeneratorExtensions -import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives import org.jetbrains.kotlin.test.model.TestFile class LowLevelFirAnalyzerFacade( diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/AbstractDiagnosticTraversalCounterTest.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/AbstractDiagnosticTraversalCounterTest.kt index 1ed39ad54a4..aabeea22bb4 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/AbstractDiagnosticTraversalCounterTest.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/AbstractDiagnosticTraversalCounterTest.kt @@ -5,8 +5,17 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.diagnostic +import org.jetbrains.kotlin.KtRealSourceElementKind +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.DiagnosticCheckerFilter +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.collectDiagnosticsForFile +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.getOrBuildFirOfType +import org.jetbrains.kotlin.analysis.low.level.api.fir.diagnostics.BeforeElementDiagnosticCollectionHandler +import org.jetbrains.kotlin.analysis.low.level.api.fir.diagnostics.SingleNonLocalDeclarationDiagnosticRetriever +import org.jetbrains.kotlin.analysis.low.level.api.fir.diagnostics.fir.PersistentCheckerContextFactory +import org.jetbrains.kotlin.analysis.low.level.api.fir.renderWithClassName +import org.jetbrains.kotlin.analysis.low.level.api.fir.resolveWithClearCaches +import org.jetbrains.kotlin.analysis.low.level.api.fir.test.base.AbstractLowLevelApiSingleFileTest import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirRealSourceElementKind import org.jetbrains.kotlin.fir.SessionConfiguration import org.jetbrains.kotlin.fir.analysis.collectors.AbstractDiagnosticCollectorVisitor import org.jetbrains.kotlin.fir.declarations.FirDeclaration @@ -15,16 +24,6 @@ import org.jetbrains.kotlin.fir.resolve.ScopeSession import org.jetbrains.kotlin.fir.resolve.SessionHolderImpl import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.FirVisitorVoid -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.DiagnosticCheckerFilter -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.collectDiagnosticsForFile -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.getOrBuildFir -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.getOrBuildFirOfType -import org.jetbrains.kotlin.analysis.low.level.api.fir.diagnostics.BeforeElementDiagnosticCollectionHandler -import org.jetbrains.kotlin.analysis.low.level.api.fir.diagnostics.SingleNonLocalDeclarationDiagnosticRetriever -import org.jetbrains.kotlin.analysis.low.level.api.fir.diagnostics.fir.PersistentCheckerContextFactory -import org.jetbrains.kotlin.analysis.low.level.api.fir.renderWithClassName -import org.jetbrains.kotlin.analysis.low.level.api.fir.resolveWithClearCaches -import org.jetbrains.kotlin.analysis.low.level.api.fir.test.base.AbstractLowLevelApiSingleFileTest import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.services.TestModuleStructure import org.jetbrains.kotlin.test.services.TestServices @@ -82,11 +81,11 @@ abstract class AbstractDiagnosticTraversalCounterTest : AbstractLowLevelApiSing val errorElements = mutableListOf>() val nonDuplicatingElements = findNonDuplicatingFirElements(firFile).filter { element -> when { - element is FirTypeRef && element.source?.kind != FirRealSourceElementKind -> { + element is FirTypeRef && element.source?.kind != KtRealSourceElementKind -> { // AbstractDiagnosticCollectorVisitor do not visit such elements false } - element.source?.kind == FirRealSourceElementKind -> true + element.source?.kind == KtRealSourceElementKind -> true SingleNonLocalDeclarationDiagnosticRetriever.shouldDiagnosticsAlwaysBeCheckedOn(element) -> true else -> false } diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/fir/FirDiagnosticsCompilerResultsReporter.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/common/fir/FirDiagnosticsCompilerResultsReporter.kt index 045226be0fb..ea224e00094 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/common/fir/FirDiagnosticsCompilerResultsReporter.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/fir/FirDiagnosticsCompilerResultsReporter.kt @@ -5,14 +5,14 @@ package org.jetbrains.kotlin.cli.common.fir +import org.jetbrains.kotlin.KtLightSourceElement +import org.jetbrains.kotlin.KtPsiSourceElement import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSourceLocation import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.cli.common.messages.MessageUtil import org.jetbrains.kotlin.diagnostics.DiagnosticUtils import org.jetbrains.kotlin.diagnostics.Severity -import org.jetbrains.kotlin.fir.FirLightSourceElement -import org.jetbrains.kotlin.fir.FirPsiSourceElement import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDefaultErrorMessages import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnostic @@ -49,17 +49,17 @@ object FirDiagnosticsCompilerResultsReporter { } private fun FirDiagnostic.location(): CompilerMessageSourceLocation? = when (val element = element) { - is FirPsiSourceElement -> element.location(this) - is FirLightSourceElement -> element.location(this) + is KtPsiSourceElement -> element.location(this) + is KtLightSourceElement -> element.location(this) } - private fun FirPsiSourceElement.location(diagnostic: FirDiagnostic): CompilerMessageSourceLocation? { + private fun KtPsiSourceElement.location(diagnostic: FirDiagnostic): CompilerMessageSourceLocation? { val file = psi.containingFile return MessageUtil.psiFileToMessageLocation(file, file.name, DiagnosticUtils.getLineAndColumnRange(file, diagnostic.textRanges)) } @Suppress("UNUSED_PARAMETER") - private fun FirLightSourceElement.location(diagnostic: FirDiagnostic): CompilerMessageSourceLocation? { + private fun KtLightSourceElement.location(diagnostic: FirDiagnostic): CompilerMessageSourceLocation? { // TODO: support light tree return null } @@ -69,7 +69,7 @@ object FirDiagnosticsCompilerResultsReporter { val element1 = o1.element val element2 = o1.element // TODO: support light tree - if (element1 !is FirPsiSourceElement || element2 !is FirPsiSourceElement) return 0 + if (element1 !is KtPsiSourceElement || element2 !is KtPsiSourceElement) return 0 val file1 = element1.psi.containingFile val file2 = element2.psi.containingFile diff --git a/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirDiagnosticsList.kt b/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirDiagnosticsList.kt index eaa9b570b9d..c9457109394 100644 --- a/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirDiagnosticsList.kt +++ b/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirDiagnosticsList.kt @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.fir.checkers.generator.diagnostics import com.intellij.psi.PsiElement import com.intellij.psi.impl.source.tree.LeafPsiElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.config.LanguageVersionSettings import org.jetbrains.kotlin.contracts.description.EventOccurrencesRange @@ -15,7 +16,6 @@ import org.jetbrains.kotlin.descriptors.EffectiveVisibility import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.diagnostics.WhenMissingCase import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.PrivateForInline import org.jetbrains.kotlin.fir.checkers.generator.diagnostics.model.* import org.jetbrains.kotlin.fir.declarations.FirSimpleFunction @@ -1054,8 +1054,8 @@ object DIAGNOSTICS_LIST : DiagnosticList("FirErrors") { parameter("property") } val UNREACHABLE_CODE by warning(PositioningStrategy.UNREACHABLE_CODE) { - parameter>("reachable") - parameter>("unreachable") + parameter>("reachable") + parameter>("unreachable") } val SENSELESS_COMPARISON by warning { parameter("expression") diff --git a/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirJvmExternalDeclarationChecker.kt b/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirJvmExternalDeclarationChecker.kt index 6b011e8b46f..c23dcd62cec 100644 --- a/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirJvmExternalDeclarationChecker.kt +++ b/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirJvmExternalDeclarationChecker.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.analysis.jvm.checkers.declaration +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.declaration.FirBasicDeclarationChecker import org.jetbrains.kotlin.fir.analysis.checkers.getModifier @@ -32,7 +32,7 @@ object FirJvmExternalDeclarationChecker : FirBasicDeclarationChecker() { private fun checkInternal( declaration: FirDeclaration, - reportSource: FirSourceElement?, + reportSource: KtSourceElement?, modality: Modality?, context: CheckerContext, reporter: DiagnosticReporter @@ -47,7 +47,7 @@ object FirJvmExternalDeclarationChecker : FirBasicDeclarationChecker() { if (!declaration.isExternal) return val source = declaration.source ?: return - if (source.kind is FirFakeSourceElementKind) return + if (source.kind is KtFakeSourceElementKind) return // WRONG_MODIFIER_TARGET on external constructor is intentionally NOT covered in this checker. if (declaration !is FirFunction) { diff --git a/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirJvmFieldApplicabilityChecker.kt b/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirJvmFieldApplicabilityChecker.kt index e043b2a514b..2c2854e549e 100644 --- a/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirJvmFieldApplicabilityChecker.kt +++ b/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirJvmFieldApplicabilityChecker.kt @@ -5,14 +5,12 @@ package org.jetbrains.kotlin.fir.analysis.jvm.checkers.declaration +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.JvmFieldApplicabilityProblem.* -import org.jetbrains.kotlin.name.JvmNames.JVM_MULTIFILE_CLASS_SHORT -import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.analysis.checkers.classKind import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext @@ -29,7 +27,6 @@ import org.jetbrains.kotlin.fir.declarations.FirProperty import org.jetbrains.kotlin.fir.declarations.getAnnotationByClassId import org.jetbrains.kotlin.fir.declarations.utils.* import org.jetbrains.kotlin.fir.languageVersionSettings -import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference import org.jetbrains.kotlin.fir.resolve.toFirRegularClassSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol @@ -98,8 +95,8 @@ object FirJvmFieldApplicabilityChecker : FirPropertyChecker() { } private fun FirProperty.hasCustomAccessor(): Boolean { - return (getter != null && getter?.source?.kind !is FirFakeSourceElementKind) || - (setter != null && setter?.source?.kind !is FirFakeSourceElementKind) + return (getter != null && getter?.source?.kind !is KtFakeSourceElementKind) || + (setter != null && setter?.source?.kind !is KtFakeSourceElementKind) } private fun FirRegularClassSymbol.isInsideCompanionObjectOfInterface(session: FirSession): Boolean { diff --git a/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirJvmRecordChecker.kt b/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirJvmRecordChecker.kt index c4e0835e380..8d44e815f4e 100644 --- a/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirJvmRecordChecker.kt +++ b/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirJvmRecordChecker.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.fir.analysis.jvm.checkers.declaration +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtRealSourceElementKind import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.descriptors.ClassKind -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind -import org.jetbrains.kotlin.fir.FirRealSourceElementKind import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.declaration.FirRegularClassChecker import org.jetbrains.kotlin.fir.analysis.checkers.toRegularClassSymbol @@ -89,7 +89,7 @@ object FirJvmRecordChecker : FirRegularClassChecker() { declaration.declarations.forEach { decl -> if (decl is FirProperty) { - val fromConstructor = decl.source?.kind == FirFakeSourceElementKind.PropertyFromParameter + val fromConstructor = decl.source?.kind == KtFakeSourceElementKind.PropertyFromParameter if (decl.isVar && fromConstructor) { reporter.reportOn(decl.source, FirJvmErrors.JVM_RECORD_NOT_VAL_PARAMETER, context) } else if (!fromConstructor && (decl.hasBackingField || decl.delegateFieldSymbol != null)) { @@ -101,7 +101,7 @@ object FirJvmRecordChecker : FirRegularClassChecker() { } declaration.superTypeRefs.firstOrNull()?.let { typeRef -> - if (typeRef.source?.kind != FirRealSourceElementKind) return@let + if (typeRef.source?.kind != KtRealSourceElementKind) return@let if (typeRef.toRegularClassSymbol(context.session)?.classKind == ClassKind.CLASS) { reporter.reportOn(declaration.source, FirJvmErrors.JVM_RECORD_EXTENDS_CLASS, typeRef.coneType, context) } diff --git a/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirJvmStaticChecker.kt b/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirJvmStaticChecker.kt index 887dc39272e..1bb8b5dcf89 100644 --- a/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirJvmStaticChecker.kt +++ b/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirJvmStaticChecker.kt @@ -5,12 +5,12 @@ package org.jetbrains.kotlin.fir.analysis.jvm.checkers.declaration +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.descriptors.isInterface -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.analysis.checkers.classKind import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.declaration.FirAnnotatedDeclarationChecker @@ -66,7 +66,7 @@ object FirJvmStaticChecker : FirAnnotatedDeclarationChecker() { declaration: FirAnnotatedDeclaration, context: CheckerContext, reporter: DiagnosticReporter, - targetSource: FirSourceElement?, + targetSource: KtSourceElement?, outerProperty: FirProperty? = null, ) { if (declaration !is FirMemberDeclaration) { @@ -101,7 +101,7 @@ object FirJvmStaticChecker : FirAnnotatedDeclarationChecker() { context: CheckerContext, reporter: DiagnosticReporter, supportsJvmStaticInInterface: Boolean, - targetSource: FirSourceElement?, + targetSource: KtSourceElement?, ) { val properDiagnostic = if (supportsJvmStaticInInterface) { FirJvmErrors.JVM_STATIC_NOT_IN_OBJECT_OR_COMPANION @@ -116,7 +116,7 @@ object FirJvmStaticChecker : FirAnnotatedDeclarationChecker() { declaration: FirAnnotatedDeclaration, context: CheckerContext, reporter: DiagnosticReporter, - targetSource: FirSourceElement?, + targetSource: KtSourceElement?, ) { if (declaration !is FirCallableDeclaration) { return @@ -182,7 +182,7 @@ object FirJvmStaticChecker : FirAnnotatedDeclarationChecker() { declaration: FirMemberDeclaration, context: CheckerContext, reporter: DiagnosticReporter, - targetSource: FirSourceElement?, + targetSource: KtSourceElement?, outerProperty: FirProperty? = null, ) { val isOverride = outerProperty?.isOverride ?: declaration.isOverride @@ -198,7 +198,7 @@ object FirJvmStaticChecker : FirAnnotatedDeclarationChecker() { declaration: FirAnnotatedDeclaration, context: CheckerContext, reporter: DiagnosticReporter, - targetSource: FirSourceElement?, + targetSource: KtSourceElement?, ) { if ( declaration is FirProperty && declaration.isConst || diff --git a/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirRepeatableAnnotationChecker.kt b/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirRepeatableAnnotationChecker.kt index 4e310b8e8b0..c3f0b0c7f20 100644 --- a/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirRepeatableAnnotationChecker.kt +++ b/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirRepeatableAnnotationChecker.kt @@ -6,10 +6,10 @@ package org.jetbrains.kotlin.fir.analysis.jvm.checkers.declaration //import org.jetbrains.kotlin.builtins.StandardNames +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget import org.jetbrains.kotlin.descriptors.annotations.KotlinTarget -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.analysis.checkers.containsRepeatableAnnotation import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.declaration.FirAnnotatedDeclarationChecker @@ -148,7 +148,7 @@ object FirRepeatableAnnotationChecker : FirAnnotatedDeclarationChecker() { private fun checkRepeatableAnnotationContainer( annotationClass: FirRegularClass, containerClass: FirRegularClassSymbol, - annotationSource: FirSourceElement?, + annotationSource: KtSourceElement?, context: CheckerContext, reporter: DiagnosticReporter ) { @@ -160,7 +160,7 @@ object FirRepeatableAnnotationChecker : FirAnnotatedDeclarationChecker() { private fun checkContainerParameters( containerClass: FirRegularClassSymbol, annotationClass: FirRegularClass, - annotationSource: FirSourceElement?, + annotationSource: KtSourceElement?, context: CheckerContext, reporter: DiagnosticReporter ) { @@ -200,7 +200,7 @@ object FirRepeatableAnnotationChecker : FirAnnotatedDeclarationChecker() { private fun checkContainerRetention( containerClass: FirRegularClassSymbol, annotationClass: FirRegularClass, - annotationSource: FirSourceElement?, + annotationSource: KtSourceElement?, context: CheckerContext, reporter: DiagnosticReporter ) { @@ -222,7 +222,7 @@ object FirRepeatableAnnotationChecker : FirAnnotatedDeclarationChecker() { private fun checkContainerTarget( containerClass: FirRegularClassSymbol, annotationClass: FirRegularClass, - annotationSource: FirSourceElement?, + annotationSource: KtSourceElement?, context: CheckerContext, reporter: DiagnosticReporter ) { diff --git a/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirVolatileAnnotationChecker.kt b/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirVolatileAnnotationChecker.kt index f50d4caa4f0..b2d32387a11 100644 --- a/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirVolatileAnnotationChecker.kt +++ b/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirVolatileAnnotationChecker.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.analysis.jvm.checkers.declaration -import org.jetbrains.kotlin.fir.FirRealSourceElementKind +import org.jetbrains.kotlin.KtRealSourceElementKind import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.declaration.FirPropertyChecker import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.name.JvmNames.VOLATILE_ANNOTATION_CLASS_ID object FirVolatileAnnotationChecker : FirPropertyChecker() { override fun check(declaration: FirProperty, context: CheckerContext, reporter: DiagnosticReporter) { - if (declaration.source?.kind != FirRealSourceElementKind) return + if (declaration.source?.kind != KtRealSourceElementKind) return val fieldAnnotation = declaration.getAnnotationByClassId(VOLATILE_ANNOTATION_CLASS_ID) if (fieldAnnotation != null && !declaration.isVar) { diff --git a/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/expression/FirJavaAnnotationsChecker.kt b/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/expression/FirJavaAnnotationsChecker.kt index 66d555fc36e..8e0307c21a0 100644 --- a/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/expression/FirJavaAnnotationsChecker.kt +++ b/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/expression/FirJavaAnnotationsChecker.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.analysis.jvm.checkers.expression -import org.jetbrains.kotlin.fir.FirRealSourceElementKind +import org.jetbrains.kotlin.KtRealSourceElementKind import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.expression.FirAnnotationChecker import org.jetbrains.kotlin.fir.analysis.checkers.toRegularClassSymbol @@ -33,7 +33,7 @@ object FirJavaAnnotationsChecker : FirAnnotationChecker() { ) override fun check(expression: FirAnnotation, context: CheckerContext, reporter: DiagnosticReporter) { - if (context.containingDeclarations.lastOrNull()?.source?.kind != FirRealSourceElementKind) return + if (context.containingDeclarations.lastOrNull()?.source?.kind != KtRealSourceElementKind) return val callableSymbol = expression.annotationTypeRef.toRegularClassSymbol(context.session) if (callableSymbol?.origin != FirDeclarationOrigin.Java) return diff --git a/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/expression/FirJvmInconsistentOperatorFromJavaCallChecker.kt b/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/expression/FirJvmInconsistentOperatorFromJavaCallChecker.kt index aef9b2806aa..ae61c034fd7 100644 --- a/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/expression/FirJvmInconsistentOperatorFromJavaCallChecker.kt +++ b/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/expression/FirJvmInconsistentOperatorFromJavaCallChecker.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.analysis.jvm.checkers.expression -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.expression.FirFunctionCallChecker import org.jetbrains.kotlin.fir.analysis.checkers.overriddenFunctions @@ -45,7 +45,7 @@ object FirJvmInconsistentOperatorFromJavaCallChecker : FirFunctionCallChecker() callableSymbol.check(expression.calleeReference.source, context, reporter) } - fun FirNamedFunctionSymbol.check(source: FirSourceElement?, context: CheckerContext, reporter: DiagnosticReporter): Boolean { + fun FirNamedFunctionSymbol.check(source: KtSourceElement?, context: CheckerContext, reporter: DiagnosticReporter): Boolean { if (callableId == CONCURRENT_HASH_MAP_CALLABLE_ID) { reporter.reportOn(source, FirJvmErrors.CONCURRENT_HASH_MAP_CONTAINS_OPERATOR, context) return true diff --git a/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt b/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt index 39af291e7dd..5b2856c547f 100644 --- a/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt +++ b/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.fir.analysis.diagnostics import com.intellij.psi.PsiElement import com.intellij.psi.impl.source.tree.LeafPsiElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.config.LanguageFeature.ForbidExposingTypesInPrimaryConstructorProperties import org.jetbrains.kotlin.config.LanguageFeature.ProhibitAssigningSingleElementsToVarargsInNamedForm @@ -23,7 +24,6 @@ import org.jetbrains.kotlin.descriptors.EffectiveVisibility import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.diagnostics.WhenMissingCase import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.analysis.diagnostics.SourceElementPositioningStrategies import org.jetbrains.kotlin.fir.declarations.FirSimpleFunction import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -568,7 +568,7 @@ object FirErrors { val WRONG_IMPLIES_CONDITION by warning0() val VARIABLE_WITH_NO_TYPE_NO_INITIALIZER by error0(SourceElementPositioningStrategies.DECLARATION_NAME) val INITIALIZATION_BEFORE_DECLARATION by error1>() - val UNREACHABLE_CODE by warning2, Set>(SourceElementPositioningStrategies.UNREACHABLE_CODE) + val UNREACHABLE_CODE by warning2, Set>(SourceElementPositioningStrategies.UNREACHABLE_CODE) val SENSELESS_COMPARISON by warning2() val SENSELESS_NULL_IN_WHEN by warning0() diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/FirSourceUtils.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/FirSourceUtils.kt index 120a0270e70..fb8c76427b0 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/FirSourceUtils.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/FirSourceUtils.kt @@ -8,34 +8,34 @@ package org.jetbrains.kotlin.fir.analysis import com.intellij.lang.LighterASTNode import com.intellij.psi.tree.IElementType import com.intellij.psi.tree.TokenSet -import org.jetbrains.kotlin.fir.* +import org.jetbrains.kotlin.* -fun FirSourceElement.getChild(type: IElementType, index: Int = 0, depth: Int = -1): FirSourceElement? { +fun KtSourceElement.getChild(type: IElementType, index: Int = 0, depth: Int = -1): KtSourceElement? { return getChild(setOf(type), index, depth) } -fun FirSourceElement.getChild(types: TokenSet, index: Int = 0, depth: Int = -1): FirSourceElement? { +fun KtSourceElement.getChild(types: TokenSet, index: Int = 0, depth: Int = -1): KtSourceElement? { return getChild(types.types.toSet(), index, depth) } -fun FirSourceElement.getChild(types: Set, index: Int = 0, depth: Int = -1): FirSourceElement? { +fun KtSourceElement.getChild(types: Set, index: Int = 0, depth: Int = -1): KtSourceElement? { return when (this) { - is FirPsiSourceElement -> { + is KtPsiSourceElement -> { getChild(types, index, depth) } - is FirLightSourceElement -> { + is KtLightSourceElement -> { getChild(types, index, depth) } else -> null } } -private fun FirPsiSourceElement.getChild(types: Set, index: Int, depth: Int): FirSourceElement? { +private fun KtPsiSourceElement.getChild(types: Set, index: Int, depth: Int): KtSourceElement? { val visitor = PsiElementFinderByType(types, index, depth) - return visitor.find(psi)?.toFirPsiSourceElement() + return visitor.find(psi)?.toKtPsiSourceElement() } -private fun FirLightSourceElement.getChild(types: Set, index: Int, depth: Int): FirSourceElement? { +private fun KtLightSourceElement.getChild(types: Set, index: Int, depth: Int): KtSourceElement? { val visitor = LighterTreeElementFinderByType(treeStructure, types, index, depth) val childNode = visitor.find(lighterASTNode) ?: return null return buildChildSourceElement(childNode) @@ -44,9 +44,9 @@ private fun FirLightSourceElement.getChild(types: Set, index: Int, /** * Keeps 'padding' of parent node in child node */ -internal fun FirLightSourceElement.buildChildSourceElement(childNode: LighterASTNode): FirLightSourceElement { +internal fun KtLightSourceElement.buildChildSourceElement(childNode: LighterASTNode): KtLightSourceElement { val offsetDelta = startOffset - lighterASTNode.startOffset - return childNode.toFirLightSourceElement( + return childNode.toKtLightSourceElement( treeStructure, startOffset = childNode.startOffset + offsetDelta, endOffset = childNode.endOffset + offsetDelta diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/cfa/FirCallsEffectAnalyzer.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/cfa/FirCallsEffectAnalyzer.kt index 0d761321d8a..722ead2551c 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/cfa/FirCallsEffectAnalyzer.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/cfa/FirCallsEffectAnalyzer.kt @@ -7,9 +7,9 @@ package org.jetbrains.kotlin.fir.analysis.cfa import kotlinx.collections.immutable.PersistentMap import kotlinx.collections.immutable.persistentMapOf +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.contracts.description.EventOccurrencesRange import org.jetbrains.kotlin.fir.FirSession -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.analysis.cfa.util.* import org.jetbrains.kotlin.fir.analysis.checkers.cfa.FirControlFlowChecker import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext @@ -66,7 +66,7 @@ object FirCallsEffectAnalyzer : FirControlFlowChecker() { if (functionalTypeEffects.isEmpty()) return - val leakedSymbols = mutableMapOf, MutableList>() + val leakedSymbols = mutableMapOf, MutableList>() graph.traverse( TraverseDirection.Forward, CapturedLambdaFinder(function), @@ -125,7 +125,7 @@ object FirCallsEffectAnalyzer : FirControlFlowChecker() { private class IllegalScopeContext( private val functionalTypeSymbols: Set>, - private val leakedSymbols: MutableMap, MutableList>, + private val leakedSymbols: MutableMap, MutableList>, ) { private var scopeDepth: Int = 0 private var illegalScopeDepth: Int? = null @@ -144,7 +144,7 @@ object FirCallsEffectAnalyzer : FirControlFlowChecker() { inline fun checkExpressionForLeakedSymbols( fir: FirExpression?, - source: FirSourceElement? = fir?.source, + source: KtSourceElement? = fir?.source, illegalUsage: () -> Boolean = { false } ) { val symbol = referenceToSymbol(fir.toQualifiedReference()) diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirAnnotationHelpers.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirAnnotationHelpers.kt index 42627a15602..dd4f54f1da1 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirAnnotationHelpers.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirAnnotationHelpers.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.fir.analysis.checkers +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget import org.jetbrains.kotlin.descriptors.annotations.KotlinTarget diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirDeclarationInspector.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirDeclarationInspector.kt index 233bed9b9d3..016e582acc7 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirDeclarationInspector.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirDeclarationInspector.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.analysis.checkers +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.utils.isOperator import org.jetbrains.kotlin.fir.types.* @@ -221,7 +221,7 @@ private val NO_NAME_PROVIDED = Name.special("") // - see tests with `fun () {}`. // you can't redeclare something that has no name. private fun FirDeclaration.isCollectable() = when (this) { - is FirSimpleFunction -> source?.kind !is FirFakeSourceElementKind && name != NO_NAME_PROVIDED + is FirSimpleFunction -> source?.kind !is KtFakeSourceElementKind && name != NO_NAME_PROVIDED is FirRegularClass -> name != NO_NAME_PROVIDED else -> true } diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirHelpers.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirHelpers.kt index 230152a2133..d97a15662d2 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirHelpers.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirHelpers.kt @@ -6,6 +6,8 @@ package org.jetbrains.kotlin.fir.analysis.checkers import org.jetbrains.kotlin.builtins.StandardNames.HASHCODE_NAME +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibilities @@ -534,13 +536,13 @@ fun checkTypeMismatch( assignment: FirVariableAssignment?, rValue: FirExpression, context: CheckerContext, - source: FirSourceElement, + source: KtSourceElement, reporter: DiagnosticReporter, isInitializer: Boolean ) { var lValueType = lValueOriginalType var rValueType = rValue.typeRef.coneType - if (source.kind is FirFakeSourceElementKind.DesugaredIncrementOrDecrement) { + if (source.kind is KtFakeSourceElementKind.DesugaredIncrementOrDecrement) { if (!lValueType.isNullable && rValueType.isNullable) { val tempType = rValueType rValueType = lValueType @@ -584,7 +586,7 @@ fun checkTypeMismatch( context ) } - source.kind is FirFakeSourceElementKind.DesugaredIncrementOrDecrement -> { + source.kind is KtFakeSourceElementKind.DesugaredIncrementOrDecrement -> { if (!lValueType.isNullable && rValueType.isNullable) { val tempType = rValueType rValueType = lValueType @@ -660,7 +662,7 @@ fun extractArgumentTypeRefAndSource(typeRef: FirTypeRef?, index: Int): FirTypeRe return null } -data class FirTypeRefSource(val typeRef: FirTypeRef?, val source: FirSourceElement?) +data class FirTypeRefSource(val typeRef: FirTypeRef?, val source: KtSourceElement?) fun FirRegularClassSymbol.collectEnumEntries(): Collection { assert(classKind == ClassKind.ENUM_CLASS) @@ -718,13 +720,13 @@ fun getActualTargetList(annotated: FirDeclaration): AnnotationTargetList { is FirProperty -> { when { annotated.isLocal -> - if (annotated.source?.kind == FirFakeSourceElementKind.DesugaredComponentFunctionCall) { + if (annotated.source?.kind == KtFakeSourceElementKind.DesugaredComponentFunctionCall) { TargetLists.T_DESTRUCTURING_DECLARATION } else { TargetLists.T_LOCAL_VARIABLE } annotated.symbol.callableId.isMember() -> - if (annotated.source?.kind == FirFakeSourceElementKind.PropertyFromParameter) { + if (annotated.source?.kind == KtFakeSourceElementKind.PropertyFromParameter) { TargetLists.T_VALUE_PARAMETER_WITH_VAL } else { TargetLists.T_MEMBER_PROPERTY(annotated.hasBackingField, annotated.delegate != null) @@ -757,7 +759,7 @@ fun getActualTargetList(annotated: FirDeclaration): AnnotationTargetList { is FirTypeParameter -> TargetLists.T_TYPE_PARAMETER is FirAnonymousInitializer -> TargetLists.T_INITIALIZER is FirAnonymousObject -> - if (annotated.source?.kind == FirFakeSourceElementKind.EnumInitializer) { + if (annotated.source?.kind == KtFakeSourceElementKind.EnumInitializer) { AnnotationTargetList( KotlinTarget.classActualTargets( ClassKind.ENUM_ENTRY, diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirInconsistentTypeParameterHelpers.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirInconsistentTypeParameterHelpers.kt index 6b622dcf142..23cb10585e1 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirInconsistentTypeParameterHelpers.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirInconsistentTypeParameterHelpers.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.analysis.checkers -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors @@ -22,7 +22,7 @@ fun checkInconsistentTypeParameters( firTypeRefClasses: List>, context: CheckerContext, reporter: DiagnosticReporter, - source: FirSourceElement?, + source: KtSourceElement?, isValues: Boolean ) { val result = buildDeepSubstitutionMultimap(firTypeRefClasses, context) diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirKeywordUtils.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirKeywordUtils.kt index 731859a6df4..fe4e7bd54c2 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirKeywordUtils.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirKeywordUtils.kt @@ -9,8 +9,8 @@ import com.intellij.lang.ASTNode import com.intellij.lang.LighterASTNode import com.intellij.psi.tree.TokenSet import com.intellij.util.diff.FlyweightCapableTreeStructure -import org.jetbrains.kotlin.KtNodeTypes -import org.jetbrains.kotlin.fir.* +import org.jetbrains.kotlin.* +import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.analysis.diagnostics.valOrVarKeyword import org.jetbrains.kotlin.lexer.KtKeywordToken import org.jetbrains.kotlin.lexer.KtModifierKeywordToken @@ -60,8 +60,8 @@ sealed class FirModifier(val node: Node, val token: KtModifierKeywor node: ASTNode, token: KtModifierKeywordToken ) : FirModifier(node, token) { - override val source: FirSourceElement - get() = node.psi.toFirPsiSourceElement() + override val source: KtSourceElement + get() = node.psi.toKtPsiSourceElement() } class FirLightModifier( @@ -70,22 +70,22 @@ sealed class FirModifier(val node: Node, val token: KtModifierKeywor val tree: FlyweightCapableTreeStructure, private val offsetDelta: Int ) : FirModifier(node, token) { - override val source: FirSourceElement - get() = node.toFirLightSourceElement( + override val source: KtSourceElement + get() = node.toKtLightSourceElement( tree, startOffset = node.startOffset + offsetDelta, endOffset = node.endOffset + offsetDelta ) } - abstract val source: FirSourceElement + abstract val source: KtSourceElement } -fun FirSourceElement?.getModifierList(): FirModifierList? { +fun KtSourceElement?.getModifierList(): FirModifierList? { return when (this) { null -> null - is FirPsiSourceElement -> (psi as? KtModifierListOwner)?.modifierList?.let { FirModifierList.FirPsiModifierList(it) } - is FirLightSourceElement -> { + is KtPsiSourceElement -> (psi as? KtModifierListOwner)?.modifierList?.let { FirModifierList.FirPsiModifierList(it) } + is KtLightSourceElement -> { val modifierListNode = lighterASTNode.getChildren(treeStructure).find { it.tokenType == KtNodeTypes.MODIFIER_LIST } ?: return null val offsetDelta = startOffset - lighterASTNode.startOffset @@ -100,9 +100,9 @@ fun FirElement.getModifier(token: KtModifierKeywordToken): FirModifier<*>? = sou fun FirElement.hasModifier(token: KtModifierKeywordToken): Boolean = token in source.getModifierList() -internal val FirSourceElement?.valOrVarKeyword: KtKeywordToken? +internal val KtSourceElement?.valOrVarKeyword: KtKeywordToken? get() = when (this) { null -> null - is FirPsiSourceElement -> (psi as? KtValVarKeywordOwner)?.valOrVarKeyword?.let { it.node?.elementType as? KtKeywordToken } - is FirLightSourceElement -> treeStructure.valOrVarKeyword(lighterASTNode)?.tokenType as? KtKeywordToken + is KtPsiSourceElement -> (psi as? KtValVarKeywordOwner)?.valOrVarKeyword?.let { it.node?.elementType as? KtKeywordToken } + is KtLightSourceElement -> treeStructure.valOrVarKeyword(lighterASTNode)?.tokenType as? KtKeywordToken } diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirUnderscoreHelpers.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirUnderscoreHelpers.kt index d74a61d8a82..1e52ecf992e 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirUnderscoreHelpers.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirUnderscoreHelpers.kt @@ -5,21 +5,21 @@ package org.jetbrains.kotlin.fir.analysis.checkers -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind -import org.jetbrains.kotlin.fir.FirRealSourceElementKind -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtRealSourceElementKind +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors import org.jetbrains.kotlin.fir.analysis.diagnostics.reportOn fun checkUnderscoreDiagnostics( - source: FirSourceElement?, + source: KtSourceElement?, context: CheckerContext, reporter: DiagnosticReporter, isExpression: Boolean ) { - if (source != null && (source.kind is FirRealSourceElementKind || source.kind is FirFakeSourceElementKind.ReferenceInAtomicQualifiedAccess)) { + if (source != null && (source.kind is KtRealSourceElementKind || source.kind is KtFakeSourceElementKind.ReferenceInAtomicQualifiedAccess)) { with(SourceNavigator.forSource(source)) { if (source.getRawIdentifier()?.isUnderscore == true) { reporter.reportOn( diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirUpperBoundViolatedHelpers.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirUpperBoundViolatedHelpers.kt index 2d5369e278e..349c2cbc062 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirUpperBoundViolatedHelpers.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirUpperBoundViolatedHelpers.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.analysis.checkers -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors @@ -99,7 +99,7 @@ fun checkUpperBoundViolated( for (index in 0 until count) { var typeArgument: ConeKotlinType? = null var typeArgumentTypeRef: FirTypeRef? = null - var typeArgumentSource: FirSourceElement? = null + var typeArgumentSource: KtSourceElement? = null if (typeArguments != null) { val localTypeArgument = typeArguments[index] diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/SourceNavigator.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/SourceNavigator.kt index d9911008dae..93a77aa6f5e 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/SourceNavigator.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/SourceNavigator.kt @@ -9,11 +9,11 @@ import com.intellij.lang.LighterASTNode import com.intellij.psi.PsiElement import com.intellij.psi.PsiNameIdentifierOwner import com.intellij.psi.impl.source.tree.LeafPsiElement +import org.jetbrains.kotlin.KtLightSourceElement +import org.jetbrains.kotlin.KtPsiSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.KtNodeTypes import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirLightSourceElement -import org.jetbrains.kotlin.fir.FirPsiSourceElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.analysis.diagnostics.getAncestors import org.jetbrains.kotlin.fir.analysis.diagnostics.nameIdentifier import org.jetbrains.kotlin.fir.declarations.FirDeclaration @@ -34,7 +34,7 @@ interface SourceNavigator { fun FirTypeRef.isInTypeConstraint(): Boolean - fun FirSourceElement.getRawIdentifier(): String? + fun KtSourceElement.getRawIdentifier(): String? fun FirDeclaration.getRawName(): String? @@ -46,21 +46,21 @@ interface SourceNavigator { fun forElement(e: FirElement): SourceNavigator = forSource(e.source) - fun forSource(e: FirSourceElement?): SourceNavigator = when (e) { - is FirLightSourceElement -> lightTreeInstance - is FirPsiSourceElement -> PsiSourceNavigator + fun forSource(e: KtSourceElement?): SourceNavigator = when (e) { + is KtLightSourceElement -> lightTreeInstance + is KtPsiSourceElement -> PsiSourceNavigator null -> lightTreeInstance //shouldn't matter } inline fun FirElement.withNavigator(block: SourceNavigator.() -> R): R = with(forSource(this.source), block) - inline fun FirSourceElement.withNavigator(block: SourceNavigator.() -> R): R = with(forSource(this), block) + inline fun KtSourceElement.withNavigator(block: SourceNavigator.() -> R): R = with(forSource(this), block) } } open class LightTreeSourceNavigator : SourceNavigator { - private fun FirElement.withSource(f: (FirSourceElement) -> T): T? = + private fun FirElement.withSource(f: (KtSourceElement) -> T): T? = source?.let { f(it) } override fun FirTypeRef.isInConstructorCallee(): Boolean = withSource { source -> @@ -74,7 +74,7 @@ open class LightTreeSourceNavigator : SourceNavigator { ?.tokenType == KtNodeTypes.TYPE_CONSTRAINT } - override fun FirSourceElement.getRawIdentifier(): String? { + override fun KtSourceElement.getRawIdentifier(): String? { return when (elementType) { is KtNameReferenceExpressionElementType, KtTokens.IDENTIFIER -> lighterASTNode.toString() is KtTypeProjectionElementType -> lighterASTNode.getChildren(treeStructure).last().toString() @@ -90,7 +90,7 @@ open class LightTreeSourceNavigator : SourceNavigator { return source?.getParentOfParent()?.tokenType == KtNodeTypes.CATCH } - private fun FirSourceElement?.getParentOfParent(): LighterASTNode? { + private fun KtSourceElement?.getParentOfParent(): LighterASTNode? { val source = this ?: return null var parent = source.treeStructure.getParent(source.lighterASTNode) parent?.let { parent = source.treeStructure.getParent(it) } @@ -104,14 +104,14 @@ object PsiSourceNavigator : LightTreeSourceNavigator() { //Swallows incorrect casts!!! private inline fun FirElement.psi(): P? = source?.psi() - private inline fun FirSourceElement.psi(): P? { - val psi = (this as? FirPsiSourceElement)?.psi + private inline fun KtSourceElement.psi(): P? { + val psi = (this as? KtPsiSourceElement)?.psi return psi as? P } override fun FirTypeRef.isInConstructorCallee(): Boolean = psi()?.parent is KtConstructorCalleeExpression - override fun FirSourceElement.getRawIdentifier(): String? { + override fun KtSourceElement.getRawIdentifier(): String? { val psi = psi() return if (psi is KtNameReferenceExpression) { psi.getReferencedNameElement().node.text diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirAnnotationChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirAnnotationChecker.kt index 5820655cea4..2b7242c1832 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirAnnotationChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirAnnotationChecker.kt @@ -5,11 +5,11 @@ package org.jetbrains.kotlin.fir.analysis.checkers.declaration +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget import org.jetbrains.kotlin.descriptors.annotations.KotlinTarget import org.jetbrains.kotlin.fir.FirAnnotationContainer -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind import org.jetbrains.kotlin.fir.analysis.checkers.* import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.context.findClosest @@ -63,7 +63,7 @@ object FirAnnotationChecker : FirAnnotatedDeclarationChecker() { if (declaration is FirProperty) { checkRepeatedAnnotationsInProperty(declaration, context, reporter) } else if (declaration is FirCallableDeclaration) { - if (declaration.source?.kind !is FirFakeSourceElementKind) { + if (declaration.source?.kind !is KtFakeSourceElementKind) { checkRepeatedAnnotations(declaration.returnTypeRef.coneTypeSafe(), context, reporter) } } else if (declaration is FirTypeAlias) { @@ -110,7 +110,7 @@ object FirAnnotationChecker : FirAnnotatedDeclarationChecker() { context ) } else { - if (declaration is FirProperty && declaration.source?.kind == FirFakeSourceElementKind.PropertyFromParameter) return + if (declaration is FirProperty && declaration.source?.kind == KtFakeSourceElementKind.PropertyFromParameter) return reporter.reportOn( annotation.source, FirErrors.WRONG_ANNOTATION_TARGET, @@ -127,7 +127,7 @@ object FirAnnotationChecker : FirAnnotatedDeclarationChecker() { context: CheckerContext, reporter: DiagnosticReporter ) { - if (annotation.source?.kind == FirFakeSourceElementKind.FromUseSiteTarget) return + if (annotation.source?.kind == KtFakeSourceElementKind.FromUseSiteTarget) return when (target) { AnnotationUseSiteTarget.PROPERTY, AnnotationUseSiteTarget.PROPERTY_GETTER -> { @@ -161,7 +161,7 @@ object FirAnnotationChecker : FirAnnotatedDeclarationChecker() { reporter.reportOn(annotation.source, FirErrors.INAPPLICABLE_PARAM_TARGET, context) } } - annotated is FirProperty && annotated.source?.kind == FirFakeSourceElementKind.PropertyFromParameter -> { + annotated is FirProperty && annotated.source?.kind == KtFakeSourceElementKind.PropertyFromParameter -> { } else -> reporter.reportOn(annotation.source, FirErrors.INAPPLICABLE_PARAM_TARGET, context) } @@ -259,7 +259,7 @@ object FirAnnotationChecker : FirAnnotatedDeclarationChecker() { if (annotation.annotationTypeRef.coneType in existingAnnotations && !annotation.isRepeatable(context.session)) { val factory = if (isError) FirErrors.REPEATED_ANNOTATION else FirErrors.REPEATED_ANNOTATION_WARNING - if (annotation.source?.kind !is FirFakeSourceElementKind) { + if (annotation.source?.kind !is KtFakeSourceElementKind) { reporter.reportOn(annotation.source, factory, context) } } diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirClassVarianceChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirClassVarianceChecker.kt index 81446d6d1cd..fd79ab9aa3f 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirClassVarianceChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirClassVarianceChecker.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.analysis.checkers.declaration +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.extractArgumentTypeRefAndSource import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter @@ -53,7 +53,7 @@ object FirClassVarianceChecker : FirClassChecker() { ) { val memberSource = member.source if (member is FirSimpleFunction) { - if (memberSource != null && memberSource.kind !is FirFakeSourceElementKind) { + if (memberSource != null && memberSource.kind !is KtFakeSourceElementKind) { for (param in member.valueParameters) { checkVarianceConflict(param.returnTypeRef, Variance.IN_VARIANCE, context, reporter) } @@ -65,7 +65,7 @@ object FirClassVarianceChecker : FirClassChecker() { var returnSource = member.returnTypeRef.source if (returnSource != null && memberSource != null) { - if (returnSource.kind is FirFakeSourceElementKind && memberSource.kind !is FirFakeSourceElementKind) { + if (returnSource.kind is KtFakeSourceElementKind && memberSource.kind !is KtFakeSourceElementKind) { returnSource = memberSource } } @@ -94,7 +94,7 @@ object FirClassVarianceChecker : FirClassChecker() { private fun checkVarianceConflict( type: FirTypeRef, variance: Variance, context: CheckerContext, reporter: DiagnosticReporter, - source: FirSourceElement? = null + source: KtSourceElement? = null ) { checkVarianceConflict(type.coneType, variance, type, type.coneType, context, reporter, source) } @@ -106,7 +106,7 @@ object FirClassVarianceChecker : FirClassChecker() { containingType: ConeKotlinType, context: CheckerContext, reporter: DiagnosticReporter, - source: FirSourceElement? = null, + source: KtSourceElement? = null, isInAbbreviation: Boolean = false ) { if (type is ConeTypeParameterType) { diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirCommonConstructorDelegationIssuesChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirCommonConstructorDelegationIssuesChecker.kt index 124bedd6dc7..c7e0b5f2768 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirCommonConstructorDelegationIssuesChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirCommonConstructorDelegationIssuesChecker.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.analysis.checkers.declaration -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors @@ -62,7 +62,7 @@ object FirCommonConstructorDelegationIssuesChecker : FirRegularClassChecker() { // couldn't find proper super() constructor implicitly if ( callee is FirErrorNamedReference && callee.diagnostic is ConeAmbiguityError && - it.delegatedConstructor?.source?.kind is FirFakeSourceElementKind + it.delegatedConstructor?.source?.kind is KtFakeSourceElementKind ) { reporter.reportOn(it.source, FirErrors.EXPLICIT_DELEGATION_CALL_REQUIRED, context) } diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirConflictsChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirConflictsChecker.kt index de1a5317449..1165ee07780 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirConflictsChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirConflictsChecker.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.fir.analysis.checkers.declaration +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.fir.* import org.jetbrains.kotlin.fir.analysis.checkers.FirDeclarationInspector import org.jetbrains.kotlin.fir.analysis.checkers.FirDeclarationPresenter @@ -244,7 +245,7 @@ object FirConflictsChecker : FirBasicDeclarationChecker() { } } - if (declaration.source?.kind !is FirFakeSourceElementKind) { + if (declaration.source?.kind !is KtFakeSourceElementKind) { when (declaration) { is FirMemberDeclaration -> { if (declaration is FirFunction) { diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirConstPropertyChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirConstPropertyChecker.kt index 2fac0035b45..fcf17fcffee 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirConstPropertyChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirConstPropertyChecker.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.analysis.checkers.declaration +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.descriptors.ClassKind -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind import org.jetbrains.kotlin.fir.analysis.checkers.canBeUsedForConstVal import org.jetbrains.kotlin.fir.analysis.checkers.checkConstantArguments import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext @@ -40,7 +40,7 @@ object FirConstPropertyChecker : FirPropertyChecker() { } val source = declaration.getter?.source - if (source != null && source.kind !is FirFakeSourceElementKind) { + if (source != null && source.kind !is KtFakeSourceElementKind) { reporter.reportOn(source, FirErrors.CONST_VAL_WITH_GETTER, context) return } diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirContractChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirContractChecker.kt index b474aa8467a..6963d6c7107 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirContractChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirContractChecker.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.analysis.checkers.declaration -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors @@ -27,7 +27,7 @@ object FirContractChecker : FirFunctionChecker() { // Any statements that [ConeEffectExtractor] cannot extract effects will be in `unresolvedEffects`. for (statement in (declaration.contractDescription as FirResolvedContractDescription).unresolvedEffects) { - if (statement.source == null || statement.source!!.kind is FirFakeSourceElementKind) continue + if (statement.source == null || statement.source!!.kind is KtFakeSourceElementKind) continue // TODO: report on fine-grained locations, e.g., ... implies unresolved => report on unresolved, not the entire statement. // but, sometimes, it's just reported on `contract`... diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirDataClassPrimaryConstructorChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirDataClassPrimaryConstructorChecker.kt index d757b2b6bce..0edc43858f3 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirDataClassPrimaryConstructorChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirDataClassPrimaryConstructorChecker.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.analysis.checkers.declaration +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.descriptors.ClassKind -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors @@ -24,7 +24,7 @@ object FirDataClassPrimaryConstructorChecker : FirRegularClassChecker() { val primaryConstructor = declaration.primaryConstructorIfAny(context.session) - if (primaryConstructor == null || primaryConstructor.source.let { it == null || it.kind is FirFakeSourceElementKind }) { + if (primaryConstructor == null || primaryConstructor.source.let { it == null || it.kind is KtFakeSourceElementKind }) { reporter.reportOn(declaration.source, FirErrors.PRIMARY_CONSTRUCTOR_REQUIRED_FOR_DATA_CLASS, context) return } diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirDelegatedPropertyChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirDelegatedPropertyChecker.kt index eeef1ead026..fc4473755d7 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirDelegatedPropertyChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirDelegatedPropertyChecker.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.analysis.checkers.declaration +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors @@ -70,7 +70,7 @@ object FirDelegatedPropertyChecker : FirPropertyChecker() { */ private fun checkFunctionReferenceErrors(functionCall: FirFunctionCall): Boolean { val errorNamedReference = functionCall.calleeReference as? FirErrorNamedReference ?: return false - if (errorNamedReference.source?.kind != FirFakeSourceElementKind.DelegatedPropertyAccessor) return false + if (errorNamedReference.source?.kind != KtFakeSourceElementKind.DelegatedPropertyAccessor) return false val expectedFunctionSignature = (if (isGet) "getValue" else "setValue") + "(${functionCall.arguments.joinToString(", ") { it.typeRef.coneType.render() }})" val delegateDescription = if (isGet) "delegate" else "delegate for var (read-write property)" diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirDelegationSuperCallInEnumConstructorChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirDelegationSuperCallInEnumConstructorChecker.kt index 7641fd6c6da..0c145b6322e 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirDelegationSuperCallInEnumConstructorChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirDelegationSuperCallInEnumConstructorChecker.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.analysis.checkers.declaration -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors @@ -24,7 +24,7 @@ object FirDelegationSuperCallInEnumConstructorChecker : FirRegularClassChecker() if ( it is FirConstructor && !it.isPrimary && it.delegatedConstructor?.isThis == false && - it.delegatedConstructor?.source?.kind !is FirFakeSourceElementKind + it.delegatedConstructor?.source?.kind !is KtFakeSourceElementKind ) { reporter.reportOn(it.delegatedConstructor?.source, FirErrors.DELEGATION_SUPER_CALL_IN_ENUM_CONSTRUCTOR, context) } diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirDestructuringDeclarationChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirDestructuringDeclarationChecker.kt index d2da3e5c59c..1334c8093de 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirDestructuringDeclarationChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirDestructuringDeclarationChecker.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.analysis.checkers.declaration +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.KtNodeTypes -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors @@ -89,7 +89,7 @@ object FirDestructuringDeclarationChecker : FirPropertyChecker() { } private fun checkInitializer( - source: FirSourceElement, + source: KtSourceElement, initializer: FirExpression?, reporter: DiagnosticReporter, context: CheckerContext @@ -106,7 +106,7 @@ object FirDestructuringDeclarationChecker : FirPropertyChecker() { } private fun checkComponentCall( - source: FirSourceElement, + source: KtSourceElement, destructuringDeclarationType: ConeKotlinType, reference: FirErrorNamedReference, property: FirProperty, diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirExpectActualDeclarationChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirExpectActualDeclarationChecker.kt index f342aa8c729..10eae96499e 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirExpectActualDeclarationChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirExpectActualDeclarationChecker.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.fir.analysis.checkers.declaration +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.fir.FirSession -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors @@ -118,7 +118,7 @@ object FirExpectActualDeclarationChecker : FirBasicDeclarationChecker() { @Suppress("UNUSED_PARAMETER") private fun checkAnnotationConstructors( - source: FirSourceElement?, + source: KtSourceElement?, expected: FirConstructorSymbol, actual: FirConstructorSymbol, context: CheckerContext, diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirFunctionNameChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirFunctionNameChecker.kt index a25c55d0fc1..993cd14af6e 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirFunctionNameChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirFunctionNameChecker.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.analysis.checkers.declaration -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.name.SpecialNames object FirFunctionNameChecker : FirSimpleFunctionChecker() { override fun check(declaration: FirSimpleFunction, context: CheckerContext, reporter: DiagnosticReporter) { val source = declaration.source - if (source == null || source.kind is FirFakeSourceElementKind) return + if (source == null || source.kind is KtFakeSourceElementKind) return val containingDeclaration = context.containingDeclarations.lastOrNull() val isNonLocal = containingDeclaration is FirFile || containingDeclaration is FirClass if (declaration.name == SpecialNames.NO_NAME_PROVIDED && isNonLocal) { diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirFunctionParameterChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirFunctionParameterChecker.kt index 88b95e91bc8..9ff1f9c764d 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirFunctionParameterChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirFunctionParameterChecker.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.analysis.checkers.declaration +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtRealSourceElementKind import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind -import org.jetbrains.kotlin.fir.FirRealSourceElementKind import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.isInlineClass import org.jetbrains.kotlin.fir.analysis.checkers.valOrVarKeyword @@ -43,7 +43,7 @@ object FirFunctionParameterChecker : FirFunctionChecker() { val returnTypeRef = valueParameter.returnTypeRef if (returnTypeRef !is FirErrorTypeRef) continue // type problems on real source are already reported by ConeDiagnostic.toFirDiagnostics - if (returnTypeRef.source?.kind == FirRealSourceElementKind) continue + if (returnTypeRef.source?.kind == KtRealSourceElementKind) continue val diagnostic = returnTypeRef.diagnostic if (diagnostic is ConeSimpleDiagnostic && diagnostic.kind == DiagnosticKind.ValueParameterWithNoTypeAnnotation) { @@ -125,7 +125,7 @@ object FirFunctionParameterChecker : FirFunctionChecker() { for (valueParameter in function.valueParameters) { val source = valueParameter.source - if (source?.kind is FirFakeSourceElementKind) continue + if (source?.kind is KtFakeSourceElementKind) continue source.valOrVarKeyword?.let { if (function is FirConstructor) { reporter.reportOn(source, FirErrors.VAL_OR_VAR_ON_SECONDARY_CONSTRUCTOR_PARAMETER, it, context) diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirImplementationMismatchChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirImplementationMismatchChecker.kt index 3e60e60bccc..1476dff4f9e 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirImplementationMismatchChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirImplementationMismatchChecker.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.analysis.checkers.declaration +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.descriptors.ClassKind -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.unsubstitutedScope import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter @@ -41,7 +41,7 @@ object FirImplementationMismatchChecker : FirClassChecker() { override fun check(declaration: FirClass, context: CheckerContext, reporter: DiagnosticReporter) { val source = declaration.source ?: return val sourceKind = source.kind - if (sourceKind is FirFakeSourceElementKind && sourceKind != FirFakeSourceElementKind.EnumInitializer) return + if (sourceKind is KtFakeSourceElementKind && sourceKind != KtFakeSourceElementKind.EnumInitializer) return if (declaration is FirRegularClass && declaration.isExpect) return val classKind = declaration.classKind if (classKind == ClassKind.ANNOTATION_CLASS || classKind == ClassKind.ENUM_CLASS) return diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirInapplicableLateinitChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirInapplicableLateinitChecker.kt index b39e6dc9928..1d7852e14e4 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirInapplicableLateinitChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirInapplicableLateinitChecker.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.analysis.checkers.declaration -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors @@ -15,7 +15,10 @@ import org.jetbrains.kotlin.fir.declarations.impl.FirDefaultPropertyGetter import org.jetbrains.kotlin.fir.declarations.impl.FirDefaultPropertySetter import org.jetbrains.kotlin.fir.declarations.utils.hasExplicitBackingField import org.jetbrains.kotlin.fir.declarations.utils.isLateInit -import org.jetbrains.kotlin.fir.types.* +import org.jetbrains.kotlin.fir.types.ConeTypeParameterType +import org.jetbrains.kotlin.fir.types.coneType +import org.jetbrains.kotlin.fir.types.isNullable +import org.jetbrains.kotlin.fir.types.isPrimitiveOrNullablePrimitive object FirInapplicableLateinitChecker : FirPropertyChecker() { override fun check(declaration: FirProperty, context: CheckerContext, reporter: DiagnosticReporter) { @@ -61,7 +64,7 @@ object FirInapplicableLateinitChecker : FirPropertyChecker() { private fun FirProperty.hasGetter() = getter != null && getter !is FirDefaultPropertyGetter private fun FirProperty.hasSetter() = setter != null && setter !is FirDefaultPropertySetter - private fun DiagnosticReporter.reportError(source: FirSourceElement?, target: String, context: CheckerContext) { + private fun DiagnosticReporter.reportError(source: KtSourceElement?, target: String, context: CheckerContext) { reportOn(source, FirErrors.INAPPLICABLE_LATEINIT_MODIFIER, target, context) } } diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirInitializerTypeMismatchChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirInitializerTypeMismatchChecker.kt index 8d55e748297..0c66f851a28 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirInitializerTypeMismatchChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirInitializerTypeMismatchChecker.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.analysis.checkers.declaration +import org.jetbrains.kotlin.KtRealSourceElementKind import org.jetbrains.kotlin.KtNodeTypes -import org.jetbrains.kotlin.fir.FirRealSourceElementKind import org.jetbrains.kotlin.fir.analysis.checkers.checkTypeMismatch import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter @@ -20,7 +20,7 @@ object FirInitializerTypeMismatchChecker : FirPropertyChecker() { val source = declaration.source ?: return if (source.elementType == KtNodeTypes.DESTRUCTURING_DECLARATION) return if (initializer is FirComponentCall) return - if (declaration.returnTypeRef.source?.kind != FirRealSourceElementKind) return + if (declaration.returnTypeRef.source?.kind != KtRealSourceElementKind) return val propertyType = declaration.returnTypeRef.coneType checkTypeMismatch(propertyType, null, initializer, context, source, reporter, true) diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirInlineClassDeclarationChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirInlineClassDeclarationChecker.kt index f6266b6af59..4f4449f65aa 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirInlineClassDeclarationChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirInlineClassDeclarationChecker.kt @@ -5,16 +5,14 @@ package org.jetbrains.kotlin.fir.analysis.checkers.declaration +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtRealSourceElementKind import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.fir.* +import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.hasModifier import org.jetbrains.kotlin.fir.analysis.checkers.toRegularClassSymbol -import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors -import org.jetbrains.kotlin.fir.analysis.diagnostics.reportOn -import org.jetbrains.kotlin.fir.analysis.diagnostics.reportOnWithSuppression -import org.jetbrains.kotlin.fir.analysis.diagnostics.withSuppressedDiagnostics +import org.jetbrains.kotlin.fir.analysis.diagnostics.* import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.utils.* import org.jetbrains.kotlin.fir.resolve.fullyExpandedType @@ -120,7 +118,7 @@ object FirInlineClassDeclarationChecker : FirRegularClassChecker() { } innerDeclaration.hasBackingField && - innerDeclaration.source?.kind !is FirFakeSourceElementKind -> + innerDeclaration.source?.kind !is KtFakeSourceElementKind -> reporter.reportOnWithSuppression( innerDeclaration, FirErrors.PROPERTY_WITH_BACKING_FIELD_INSIDE_INLINE_CLASS, @@ -133,7 +131,7 @@ object FirInlineClassDeclarationChecker : FirRegularClassChecker() { } } - if (primaryConstructor?.source?.kind !is FirRealSourceElementKind) { + if (primaryConstructor?.source?.kind !is KtRealSourceElementKind) { reporter.reportOn(declaration.source, FirErrors.ABSENCE_OF_PRIMARY_CONSTRUCTOR_FOR_INLINE_CLASS, context) return } @@ -173,7 +171,7 @@ object FirInlineClassDeclarationChecker : FirRegularClassChecker() { } private fun FirProperty.isRelatedToParameter(parameter: FirValueParameter?) = - name == parameter?.name && source?.kind is FirFakeSourceElementKind + name == parameter?.name && source?.kind is KtFakeSourceElementKind private fun FirValueParameter.isNotFinalReadOnly(primaryConstructorProperty: FirProperty?): Boolean { if (primaryConstructorProperty == null) return true diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirInlineDeclarationChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirInlineDeclarationChecker.kt index b5efd10d619..bd62b68c546 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirInlineDeclarationChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirInlineDeclarationChecker.kt @@ -5,11 +5,13 @@ package org.jetbrains.kotlin.fir.analysis.checkers.declaration +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.builtins.StandardNames.BACKING_FIELD import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.descriptors.EffectiveVisibility import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.kotlin.fir.* +import org.jetbrains.kotlin.fir.FirElement +import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.isInlineOnly import org.jetbrains.kotlin.fir.analysis.checkers.unsubstitutedScope @@ -18,9 +20,11 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors import org.jetbrains.kotlin.fir.analysis.diagnostics.reportOn import org.jetbrains.kotlin.fir.analysis.diagnostics.withSuppressedDiagnostics +import org.jetbrains.kotlin.fir.containingClass import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.utils.* import org.jetbrains.kotlin.fir.expressions.* +import org.jetbrains.kotlin.fir.languageVersionSettings import org.jetbrains.kotlin.fir.references.FirSuperReference import org.jetbrains.kotlin.fir.types.isBuiltinFunctionalType import org.jetbrains.kotlin.fir.types.isFunctionalType @@ -229,7 +233,7 @@ object FirInlineDeclarationChecker : FirFunctionChecker() { private fun checkVisibilityAndAccess( accessExpression: FirQualifiedAccess, calledDeclaration: FirCallableSymbol<*>?, - source: FirSourceElement, + source: KtSourceElement, context: CheckerContext ) { if ( @@ -283,7 +287,7 @@ object FirInlineDeclarationChecker : FirFunctionChecker() { private fun checkPrivateClassMemberAccess( calledDeclaration: FirCallableSymbol<*>, - source: FirSourceElement, + source: KtSourceElement, context: CheckerContext ) { if (!isEffectivelyPrivateApiFunction) { @@ -331,7 +335,7 @@ object FirInlineDeclarationChecker : FirFunctionChecker() { private fun checkRecursion( targetSymbol: FirBasedSymbol<*>, - source: FirSourceElement, + source: KtSourceElement, context: CheckerContext ) { if (targetSymbol == inlineFunction.symbol) { diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirInvalidAndDangerousCharactersChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirInvalidAndDangerousCharactersChecker.kt index c109d29322a..9a625bdb5e9 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirInvalidAndDangerousCharactersChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirInvalidAndDangerousCharactersChecker.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.analysis.checkers.declaration -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors @@ -34,9 +34,9 @@ object FirInvalidAndDangerousCharactersChecker : FirBasicDeclarationChecker() { } } - private fun checkNameAndReport(name: Name, source: FirSourceElement?, context: CheckerContext, reporter: DiagnosticReporter) { + private fun checkNameAndReport(name: Name, source: KtSourceElement?, context: CheckerContext, reporter: DiagnosticReporter) { if (source != null && - source.kind !is FirFakeSourceElementKind && + source.kind !is KtFakeSourceElementKind && !name.isSpecial ) { val nameString = name.asString() diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirKClassWithIncorrectTypeArgumentChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirKClassWithIncorrectTypeArgumentChecker.kt index 855811ec650..7c965ed9964 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirKClassWithIncorrectTypeArgumentChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirKClassWithIncorrectTypeArgumentChecker.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.analysis.checkers.declaration -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors @@ -37,7 +37,7 @@ object FirKClassWithIncorrectTypeArgumentChecker : FirFileChecker() { reporter: DiagnosticReporter ) { val source = declaration.source ?: return - if (source.kind is FirFakeSourceElementKind) return + if (source.kind is KtFakeSourceElementKind) return val returnType = declaration.returnTypeRef.coneType if (!returnType.isKClassTypeWithErrorOrNullableArgument(context.session.typeContext)) return diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirMemberFunctionsChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirMemberFunctionsChecker.kt index a58578e4d8c..1f0fc334ce8 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirMemberFunctionsChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirMemberFunctionsChecker.kt @@ -5,15 +5,17 @@ package org.jetbrains.kotlin.fir.analysis.checkers.declaration +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind import org.jetbrains.kotlin.fir.analysis.checkers.contains import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.getModifierList import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors import org.jetbrains.kotlin.fir.analysis.diagnostics.reportOn -import org.jetbrains.kotlin.fir.declarations.* +import org.jetbrains.kotlin.fir.declarations.FirClass +import org.jetbrains.kotlin.fir.declarations.FirRegularClass +import org.jetbrains.kotlin.fir.declarations.FirSimpleFunction import org.jetbrains.kotlin.fir.declarations.utils.* import org.jetbrains.kotlin.lexer.KtTokens @@ -34,7 +36,7 @@ object FirMemberFunctionsChecker : FirClassChecker() { reporter: DiagnosticReporter ) { val source = function.source ?: return - if (source.kind is FirFakeSourceElementKind) return + if (source.kind is KtFakeSourceElementKind) return val functionSymbol = function.symbol // If multiple (potentially conflicting) modality modifiers are specified, not all modifiers are recorded at `status`. // So, our source of truth should be the full modifier list retrieved from the source. diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirMemberPropertiesChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirMemberPropertiesChecker.kt index a853bd3d46f..41996d1df39 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirMemberPropertiesChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirMemberPropertiesChecker.kt @@ -5,11 +5,11 @@ package org.jetbrains.kotlin.fir.analysis.checkers.declaration +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.contracts.description.EventOccurrencesRange import org.jetbrains.kotlin.contracts.description.isDefinitelyVisited import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.analysis.cfa.util.PropertyInitializationInfo import org.jetbrains.kotlin.fir.analysis.cfa.util.PropertyInitializationInfoCollector @@ -164,7 +164,7 @@ object FirMemberPropertiesChecker : FirClassChecker() { reachable: Boolean ) { val source = property.source ?: return - if (source.kind is FirFakeSourceElementKind) return + if (source.kind is KtFakeSourceElementKind) return // If multiple (potentially conflicting) modality modifiers are specified, not all modifiers are recorded at `status`. // So, our source of truth should be the full modifier list retrieved from the source. val modifierList = property.source.getModifierList() diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirModifierChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirModifierChecker.kt index b8c806f2fb3..0f6d34ddce8 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirModifierChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirModifierChecker.kt @@ -5,13 +5,16 @@ package org.jetbrains.kotlin.fir.analysis.checkers.declaration +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.annotations.KotlinTarget import org.jetbrains.kotlin.descriptors.annotations.KotlinTarget.Companion.classActualTargets -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind -import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.analysis.checkers.* +import org.jetbrains.kotlin.fir.analysis.checkers.FirModifier +import org.jetbrains.kotlin.fir.analysis.checkers.FirModifierList import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.context.findClosest +import org.jetbrains.kotlin.fir.analysis.checkers.getActualTargetList +import org.jetbrains.kotlin.fir.analysis.checkers.getModifierList import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnosticFactory2 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors @@ -31,7 +34,7 @@ object FirModifierChecker : FirBasicDeclarationChecker() { if (declaration is FirFile) return val source = declaration.source ?: return - if (source.kind is FirFakeSourceElementKind) return + if (source.kind is KtFakeSourceElementKind) return source.getModifierList()?.let { checkModifiers(it, declaration, context, reporter) } } @@ -53,7 +56,7 @@ object FirModifierChecker : FirBasicDeclarationChecker() { val parent = context.findClosest { it !is FirPrimaryConstructor && it !is FirProperty && - it.source?.kind !is FirFakeSourceElementKind + it.source?.kind !is KtFakeSourceElementKind } val actualParents = when (parent) { @@ -164,7 +167,7 @@ object FirModifierChecker : FirBasicDeclarationChecker() { } private fun checkTarget( - modifierSource: FirSourceElement, + modifierSource: KtSourceElement, modifierToken: KtModifierKeywordToken, actualTargets: List, parent: FirDeclaration?, @@ -224,7 +227,7 @@ object FirModifierChecker : FirBasicDeclarationChecker() { } private fun checkParent( - modifierSource: FirSourceElement, + modifierSource: KtSourceElement, modifierToken: KtModifierKeywordToken, actualParents: List, context: CheckerContext, diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirNotImplementedOverrideChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirNotImplementedOverrideChecker.kt index becc0b91a8d..d247bb0f128 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirNotImplementedOverrideChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirNotImplementedOverrideChecker.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.analysis.checkers.declaration +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind import org.jetbrains.kotlin.fir.analysis.checkers.* import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter @@ -38,7 +38,7 @@ object FirNotImplementedOverrideChecker : FirClassChecker() { override fun check(declaration: FirClass, context: CheckerContext, reporter: DiagnosticReporter) { val source = declaration.source ?: return val sourceKind = source.kind - if (sourceKind is FirFakeSourceElementKind && sourceKind != FirFakeSourceElementKind.EnumInitializer) return + if (sourceKind is KtFakeSourceElementKind && sourceKind != KtFakeSourceElementKind.EnumInitializer) return val modality = declaration.modality() val canHaveAbstractDeclarations = modality == Modality.ABSTRACT || modality == Modality.SEALED if (declaration is FirRegularClass && declaration.isExpect) return diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirOpenMemberChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirOpenMemberChecker.kt index eff76e92e95..0ef12cb7db6 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirOpenMemberChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirOpenMemberChecker.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.fir.analysis.checkers.declaration +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtRealSourceElementKind +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.ClassKind -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind -import org.jetbrains.kotlin.fir.FirRealSourceElementKind -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.hasModifier import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter @@ -39,10 +39,10 @@ object FirOpenMemberChecker : FirClassChecker() { } } - private val FirSourceElement.shouldReportOpenFromSource: Boolean + private val KtSourceElement.shouldReportOpenFromSource: Boolean get() = when (kind) { - FirRealSourceElementKind, - FirFakeSourceElementKind.PropertyFromParameter -> true + KtRealSourceElementKind, + KtFakeSourceElementKind.PropertyFromParameter -> true else -> false } } diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirOverrideChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirOverrideChecker.kt index fbee1a0fab1..8dc8bb9e82a 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirOverrideChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirOverrideChecker.kt @@ -6,6 +6,8 @@ package org.jetbrains.kotlin.fir.analysis.checkers.declaration import org.jetbrains.kotlin.config.LanguageFeature +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtRealSourceElementKind import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget @@ -21,11 +23,13 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors import org.jetbrains.kotlin.fir.analysis.diagnostics.reportOn import org.jetbrains.kotlin.fir.analysis.diagnostics.withSuppressedDiagnostics import org.jetbrains.kotlin.fir.analysis.overridesBackwardCompatibilityHelper +import org.jetbrains.kotlin.fir.containingClass import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.utils.isFinal import org.jetbrains.kotlin.fir.declarations.utils.isOverride import org.jetbrains.kotlin.fir.declarations.utils.modality import org.jetbrains.kotlin.fir.declarations.utils.visibility +import org.jetbrains.kotlin.fir.originalOrSelf import org.jetbrains.kotlin.fir.resolve.substitution.substitutorByMap import org.jetbrains.kotlin.fir.resolve.toFirRegularClassSymbol import org.jetbrains.kotlin.fir.resolve.toSymbol @@ -254,7 +258,7 @@ object FirOverrideChecker : FirClassChecker() { val kind = member.source?.kind // Only report if the current member has real source or it's a member property declared inside the primary constructor. - if (kind is FirFakeSourceElementKind.DataClassGeneratedMembers) { + if (kind is KtFakeSourceElementKind.DataClassGeneratedMembers) { overriddenMemberSymbols.find { it.isFinal }?.let { base -> reporter.reportOn( containingClass.source, @@ -267,7 +271,7 @@ object FirOverrideChecker : FirClassChecker() { return } - if (kind !is FirRealSourceElementKind && kind !is FirFakeSourceElementKind.PropertyFromParameter) return + if (kind !is KtRealSourceElementKind && kind !is KtFakeSourceElementKind.PropertyFromParameter) return val overridden = overriddenMemberSymbols.first().originalOrSelf() val originalContainingClassSymbol = overridden.containingClass()?.toSymbol(context.session) as? FirRegularClassSymbol ?: return diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirPrimaryConstructorSuperTypeChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirPrimaryConstructorSuperTypeChecker.kt index fd0d95edc22..248c95d2014 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirPrimaryConstructorSuperTypeChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirPrimaryConstructorSuperTypeChecker.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.analysis.checkers.declaration +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.KtNodeTypes -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind import org.jetbrains.kotlin.fir.analysis.checkers.SourceNavigator import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.toRegularClassSymbol @@ -17,9 +17,9 @@ import org.jetbrains.kotlin.fir.declarations.FirRegularClass import org.jetbrains.kotlin.fir.declarations.utils.isInterface import org.jetbrains.kotlin.fir.declarations.primaryConstructorIfAny import org.jetbrains.kotlin.fir.symbols.impl.FirConstructorSymbol -import org.jetbrains.kotlin.name.StandardClassIds import org.jetbrains.kotlin.fir.types.* import org.jetbrains.kotlin.fir.types.impl.FirImplicitAnyTypeRef +import org.jetbrains.kotlin.name.StandardClassIds import org.jetbrains.kotlin.utils.addToStdlib.lastIsInstanceOrNull /** Checker on super type declarations in the primary constructor of a class declaration. */ @@ -74,7 +74,7 @@ object FirPrimaryConstructorSuperTypeChecker : FirRegularClassChecker() { return } val delegatedCallSource = delegatedConstructorCall.source ?: return - if (delegatedCallSource.kind !is FirFakeSourceElementKind) return + if (delegatedCallSource.kind !is KtFakeSourceElementKind) return if (superClassSymbol.classId == StandardClassIds.Enum) return if (delegatedCallSource.elementType != KtNodeTypes.SUPER_TYPE_CALL_ENTRY) { reporter.reportOn(constructedTypeRef.source, FirErrors.SUPERTYPE_NOT_INITIALIZED, context) diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirProjectionRelationChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirProjectionRelationChecker.kt index 223c011eb65..32ea623903e 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirProjectionRelationChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirProjectionRelationChecker.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.analysis.checkers.declaration -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.extractArgumentTypeRefAndSource import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter @@ -74,7 +74,7 @@ object FirProjectionRelationChecker : FirBasicDeclarationChecker() { val argTypeRefSource = extractArgumentTypeRefAndSource(typeRef, it) ?: continue - if (projectionRelation != ProjectionRelation.None && typeRef.source?.kind !is FirFakeSourceElementKind) { + if (projectionRelation != ProjectionRelation.None && typeRef.source?.kind !is KtFakeSourceElementKind) { reporter.reportOn( argTypeRefSource.source ?: argTypeRefSource.typeRef?.source, if (projectionRelation == ProjectionRelation.Conflicting) diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirPropertyAccessorsTypesChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirPropertyAccessorsTypesChecker.kt index df4b91b8bd7..7a91b55e444 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirPropertyAccessorsTypesChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirPropertyAccessorsTypesChecker.kt @@ -5,15 +5,17 @@ package org.jetbrains.kotlin.fir.analysis.checkers.declaration +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.findClosestClassOrObject import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors import org.jetbrains.kotlin.fir.analysis.diagnostics.reportOn import org.jetbrains.kotlin.fir.analysis.diagnostics.withSuppressedDiagnostics -import org.jetbrains.kotlin.fir.declarations.* +import org.jetbrains.kotlin.fir.declarations.FirProperty +import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor +import org.jetbrains.kotlin.fir.declarations.FirRegularClass import org.jetbrains.kotlin.fir.declarations.utils.canHaveAbstractDeclaration import org.jetbrains.kotlin.fir.declarations.utils.isAbstract import org.jetbrains.kotlin.fir.declarations.utils.isOpen @@ -43,7 +45,7 @@ object FirPropertyAccessorsTypesChecker : FirPropertyChecker() { } } val getterReturnTypeRef = getter.returnTypeRef - if (getterReturnTypeRef.source?.kind is FirFakeSourceElementKind) { + if (getterReturnTypeRef.source?.kind is KtFakeSourceElementKind) { return } val getterReturnType = getterReturnTypeRef.coneType @@ -122,7 +124,7 @@ object FirPropertyAccessorsTypesChecker : FirPropertyChecker() { reporter: DiagnosticReporter ) { if (property.delegateFieldSymbol != null && accessor.body != null && - accessor.source?.kind != FirFakeSourceElementKind.DelegatedPropertyAccessor + accessor.source?.kind != KtFakeSourceElementKind.DelegatedPropertyAccessor ) { reporter.reportOn(accessor.source, FirErrors.ACCESSOR_FOR_DELEGATED_PROPERTY, context) } diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirPropertyFromParameterChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirPropertyFromParameterChecker.kt index 3c90223dded..d761aa90b4f 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirPropertyFromParameterChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirPropertyFromParameterChecker.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.analysis.checkers.declaration -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.fir.declarations.utils.isAbstract object FirPropertyFromParameterChecker : FirPropertyChecker() { override fun check(declaration: FirProperty, context: CheckerContext, reporter: DiagnosticReporter) { - if (declaration.source?.kind != FirFakeSourceElementKind.PropertyFromParameter) return + if (declaration.source?.kind != KtFakeSourceElementKind.PropertyFromParameter) return if (declaration.isAbstract) { reporter.reportOn( declaration.source, diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirReservedUnderscoreDeclarationChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirReservedUnderscoreDeclarationChecker.kt index 583977b0bab..afebe30b4fc 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirReservedUnderscoreDeclarationChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirReservedUnderscoreDeclarationChecker.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.analysis.checkers.declaration -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.fir.analysis.checkers.SourceNavigator import org.jetbrains.kotlin.fir.analysis.checkers.checkUnderscoreDiagnostics import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext @@ -54,7 +54,7 @@ object FirReservedUnderscoreDeclarationChecker : FirBasicDeclarationChecker() { isSingleUnderscoreAllowed: Boolean = false ) { val declarationSource = declaration.source - if (declarationSource != null && declarationSource.kind !is FirFakeSourceElementKind) { + if (declarationSource != null && declarationSource.kind !is KtFakeSourceElementKind) { with(SourceNavigator.forElement(declaration)) { val rawName = declaration.getRawName() if (rawName?.isUnderscore == true && !(isSingleUnderscoreAllowed && rawName == "_")) { diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirTopLevelFunctionsChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirTopLevelFunctionsChecker.kt index b59d1f59d77..2e91ad5fa94 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirTopLevelFunctionsChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirTopLevelFunctionsChecker.kt @@ -5,13 +5,14 @@ package org.jetbrains.kotlin.fir.analysis.checkers.declaration -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.hasModifier import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors import org.jetbrains.kotlin.fir.analysis.diagnostics.reportOn -import org.jetbrains.kotlin.fir.declarations.* +import org.jetbrains.kotlin.fir.declarations.FirFile +import org.jetbrains.kotlin.fir.declarations.FirSimpleFunction import org.jetbrains.kotlin.fir.declarations.utils.hasBody import org.jetbrains.kotlin.fir.declarations.utils.isExpect import org.jetbrains.kotlin.fir.declarations.utils.isExternal @@ -29,7 +30,7 @@ object FirTopLevelFunctionsChecker : FirFileChecker() { private fun checkFunction(function: FirSimpleFunction, reporter: DiagnosticReporter, context: CheckerContext) { val source = function.source ?: return - if (source.kind is FirFakeSourceElementKind) return + if (source.kind is KtFakeSourceElementKind) return // If multiple (potentially conflicting) modality modifiers are specified, not all modifiers are recorded at `status`. // So, our source of truth should be the full modifier list retrieved from the source. if (function.hasModifier(KtTokens.ABSTRACT_KEYWORD)) return diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirTopLevelPropertiesChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirTopLevelPropertiesChecker.kt index 790ef3f10f3..18cee66c96e 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirTopLevelPropertiesChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirTopLevelPropertiesChecker.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.analysis.checkers.declaration +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.analysis.checkers.FirModifierList import org.jetbrains.kotlin.fir.analysis.checkers.contains import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext @@ -35,7 +35,7 @@ object FirTopLevelPropertiesChecker : FirFileChecker() { private fun checkProperty(property: FirProperty, reporter: DiagnosticReporter, context: CheckerContext) { val source = property.source ?: return - if (source.kind is FirFakeSourceElementKind) return + if (source.kind is KtFakeSourceElementKind) return // If multiple (potentially conflicting) modality modifiers are specified, not all modifiers are recorded at `status`. // So, our source of truth should be the full modifier list retrieved from the source. val modifierList = source.getModifierList() @@ -57,7 +57,7 @@ object FirTopLevelPropertiesChecker : FirFileChecker() { // TODO: check class too internal fun checkExpectDeclarationVisibilityAndBody( declaration: FirMemberDeclaration, - source: FirSourceElement, + source: KtSourceElement, reporter: DiagnosticReporter, context: CheckerContext ) { diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirTypeParameterBoundsChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirTypeParameterBoundsChecker.kt index ebfde8ebbc5..2ce605e0f1d 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirTypeParameterBoundsChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirTypeParameterBoundsChecker.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.analysis.checkers.declaration +import org.jetbrains.kotlin.KtRealSourceElementKind import org.jetbrains.kotlin.descriptors.ClassKind -import org.jetbrains.kotlin.fir.FirRealSourceElementKind import org.jetbrains.kotlin.fir.analysis.checkers.* import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter @@ -77,7 +77,7 @@ object FirTypeParameterBoundsChecker : FirTypeParameterChecker() { reporter: DiagnosticReporter ) { if (containingDeclaration is FirTypeAlias) { - declaration.bounds.filter { it.source?.kind == FirRealSourceElementKind }.forEach { bound -> + declaration.bounds.filter { it.source?.kind == KtRealSourceElementKind }.forEach { bound -> reporter.reportOn(bound.source, FirErrors.BOUND_ON_TYPE_ALIAS_PARAMETER_NOT_ALLOWED, context) } } diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirUpperBoundViolatedDeclarationChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirUpperBoundViolatedDeclarationChecker.kt index 7e5d139ad79..58b418b9f4d 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirUpperBoundViolatedDeclarationChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirUpperBoundViolatedDeclarationChecker.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.analysis.checkers.declaration -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.fir.analysis.checkers.checkUpperBoundViolated import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter @@ -28,7 +28,7 @@ object FirUpperBoundViolatedDeclarationChecker : FirBasicDeclarationChecker() { } else if (declaration is FirTypeAlias) { checkUpperBoundViolated(declaration.expandedTypeRef, context, reporter, isIgnoreTypeParameters = true) } else if (declaration is FirCallableDeclaration) { - if (declaration.returnTypeRef.source?.kind !is FirFakeSourceElementKind) { + if (declaration.returnTypeRef.source?.kind !is KtFakeSourceElementKind) { checkUpperBoundViolated( declaration.returnTypeRef, context, reporter, isIgnoreTypeParameters = context.containingDeclarations.lastOrNull() is FirTypeAlias diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirAnnotationArgumentChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirAnnotationArgumentChecker.kt index ed08b67a5ec..bd03bb6914b 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirAnnotationArgumentChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirAnnotationArgumentChecker.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.analysis.checkers.expression +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.config.ApiVersion import org.jetbrains.kotlin.fir.FirSession -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.analysis.checkers.ConstantArgumentKind import org.jetbrains.kotlin.fir.analysis.checkers.checkConstantArguments import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext @@ -145,7 +145,7 @@ object FirAnnotationArgumentChecker : FirAnnotationCallChecker() { } private fun checkDeprecatedSinceKotlin( - source: FirSourceElement?, + source: KtSourceElement?, fqName: FqName?, argumentMapping: Map, context: CheckerContext, diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirCallableReferenceChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirCallableReferenceChecker.kt index ec67d1db3de..94412ec513e 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirCallableReferenceChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirCallableReferenceChecker.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.analysis.checkers.expression +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.descriptors.ClassKind -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind import org.jetbrains.kotlin.fir.analysis.checkers.classKind import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.declaration.isExtensionMember @@ -15,12 +15,11 @@ import org.jetbrains.kotlin.fir.analysis.checkers.getContainingClassSymbol import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors import org.jetbrains.kotlin.fir.analysis.diagnostics.reportOn -import org.jetbrains.kotlin.fir.declarations.FirProperty -import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.expressions.FirCallableReferenceAccess import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccessExpression import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference -import org.jetbrains.kotlin.fir.symbols.impl.* +import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol +import org.jetbrains.kotlin.fir.symbols.impl.FirConstructorSymbol object FirCallableReferenceChecker : FirQualifiedAccessExpressionChecker() { override fun check(expression: FirQualifiedAccessExpression, context: CheckerContext, reporter: DiagnosticReporter) { @@ -39,7 +38,7 @@ object FirCallableReferenceChecker : FirQualifiedAccessExpressionChecker() { val reference = callableReferenceAccess.calleeReference as? FirResolvedNamedReference ?: return val source = reference.source ?: return - if (source.kind is FirFakeSourceElementKind) return + if (source.kind is KtFakeSourceElementKind) return val referredSymbol = reference.resolvedSymbol if (referredSymbol is FirConstructorSymbol && referredSymbol.getContainingClassSymbol(context.session)?.classKind == ClassKind.ANNOTATION_CLASS) { diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirClassLiteralChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirClassLiteralChecker.kt index 6940844f35e..5252bd8931d 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirClassLiteralChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirClassLiteralChecker.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.analysis.checkers.expression -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.resolve.checkers.OptInNames object FirClassLiteralChecker : FirGetClassCallChecker() { override fun check(expression: FirGetClassCall, context: CheckerContext, reporter: DiagnosticReporter) { val source = expression.source ?: return - if (source.kind is FirFakeSourceElementKind) return + if (source.kind is KtFakeSourceElementKind) return val argument = expression.argument if (argument is FirResolvedQualifier) { val classId = argument.classId diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirConventionFunctionCallChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirConventionFunctionCallChecker.kt index e8019bb59f7..c853708a1d5 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirConventionFunctionCallChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirConventionFunctionCallChecker.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.analysis.checkers.expression -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind -import org.jetbrains.kotlin.fir.FirRealSourceElementKind +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtRealSourceElementKind import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors @@ -29,7 +29,7 @@ object FirConventionFunctionCallChecker : FirFunctionCallChecker() { val calleeReference = expression.calleeReference as? FirErrorNamedReference ?: return val diagnostic = calleeReference.diagnostic as? ConeUnresolvedNameError ?: return - if (expression.calleeReference.source?.kind == FirFakeSourceElementKind.ArrayAccessNameReference) { + if (expression.calleeReference.source?.kind == KtFakeSourceElementKind.ArrayAccessNameReference) { when (diagnostic.name) { OperatorNameConventions.GET -> reporter.reportOn(calleeReference.source, FirErrors.NO_GET_METHOD, context) OperatorNameConventions.SET -> reporter.reportOn(calleeReference.source, FirErrors.NO_SET_METHOD, context) @@ -44,9 +44,9 @@ object FirConventionFunctionCallChecker : FirFunctionCallChecker() { reporter: DiagnosticReporter ) { val sourceKind = callExpression.source?.kind - if (sourceKind !is FirRealSourceElementKind && - sourceKind !is FirFakeSourceElementKind.GeneratedComparisonExpression && - sourceKind !is FirFakeSourceElementKind.DesugaredCompoundAssignment + if (sourceKind !is KtRealSourceElementKind && + sourceKind !is KtFakeSourceElementKind.GeneratedComparisonExpression && + sourceKind !is KtFakeSourceElementKind.DesugaredCompoundAssignment ) return val unwrapped = when (receiver) { is FirExpressionWithSmartcast -> receiver.originalExpression diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirDeprecationChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirDeprecationChecker.kt index 3f08dc0b1a8..87d89cf1b63 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirDeprecationChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirDeprecationChecker.kt @@ -5,29 +5,32 @@ package org.jetbrains.kotlin.fir.analysis.checkers.expression -import org.jetbrains.kotlin.resolve.deprecation.DeprecationInfo -import org.jetbrains.kotlin.resolve.deprecation.DeprecationLevelValue +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtRealSourceElementKind +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind -import org.jetbrains.kotlin.fir.FirRealSourceElementKind -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.toRegularClassSymbol import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors import org.jetbrains.kotlin.fir.analysis.diagnostics.reportOn import org.jetbrains.kotlin.fir.declarations.getDeprecation -import org.jetbrains.kotlin.fir.expressions.* +import org.jetbrains.kotlin.fir.expressions.FirAnnotation +import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall +import org.jetbrains.kotlin.fir.expressions.FirResolvable +import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirConstructorSymbol +import org.jetbrains.kotlin.resolve.deprecation.DeprecationInfo +import org.jetbrains.kotlin.resolve.deprecation.DeprecationLevelValue import org.jetbrains.kotlin.utils.addToStdlib.safeAs object FirDeprecationChecker : FirBasicExpressionChecker() { private val allowedSourceKinds = setOf( - FirRealSourceElementKind, - FirFakeSourceElementKind.DesugaredIncrementOrDecrement + KtRealSourceElementKind, + KtFakeSourceElementKind.DesugaredIncrementOrDecrement ) override fun check(expression: FirStatement, context: CheckerContext, reporter: DiagnosticReporter) { @@ -41,7 +44,7 @@ object FirDeprecationChecker : FirBasicExpressionChecker() { } internal fun reportDeprecationIfNeeded( - source: FirSourceElement?, + source: KtSourceElement?, referencedSymbol: FirBasedSymbol<*>, callSite: FirElement?, context: CheckerContext, @@ -52,7 +55,7 @@ object FirDeprecationChecker : FirBasicExpressionChecker() { } internal fun reportDeprecation( - source: FirSourceElement?, + source: KtSourceElement?, referencedSymbol: FirBasedSymbol<*>, deprecationInfo: DeprecationInfo, reporter: DiagnosticReporter, diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirEqualityCompatibilityChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirEqualityCompatibilityChecker.kt index dac53e0c1d6..7de5d9cdf4a 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirEqualityCompatibilityChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirEqualityCompatibilityChecker.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.analysis.checkers.expression +import org.jetbrains.kotlin.KtRealSourceElementKind import org.jetbrains.kotlin.KtNodeTypes -import org.jetbrains.kotlin.fir.FirRealSourceElementKind import org.jetbrains.kotlin.fir.analysis.checkers.ConeTypeCompatibilityChecker import org.jetbrains.kotlin.fir.analysis.checkers.ConeTypeCompatibilityChecker.isCompatible import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext @@ -55,7 +55,7 @@ object FirEqualityCompatibilityChecker : FirEqualityOperatorCallChecker() { } if (compatibility != ConeTypeCompatibilityChecker.Compatibility.COMPATIBLE) { when (expression.source?.kind) { - FirRealSourceElementKind -> { + KtRealSourceElementKind -> { // Note: FE1.0 reports INCOMPATIBLE_ENUM_COMPARISON_ERROR only when TypeIntersector.isIntersectionEmpty() thinks the // given types are compatible. Exactly mimicking the behavior of FE1.0 is difficult and does not seem to provide any // value. So instead, we deterministically output INCOMPATIBLE_ENUM_COMPARISON_ERROR if at least one of the value is an diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirExhaustiveWhenChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirExhaustiveWhenChecker.kt index 7b1254239c1..6b936f3b7da 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirExhaustiveWhenChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirExhaustiveWhenChecker.kt @@ -5,12 +5,12 @@ package org.jetbrains.kotlin.fir.analysis.checkers.expression +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.KtNodeTypes import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.diagnostics.WhenMissingCase -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.toRegularClassSymbol import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter @@ -85,9 +85,9 @@ object FirExhaustiveWhenChecker : FirWhenExpressionChecker() { } } - private val FirSourceElement.isIfExpression: Boolean + private val KtSourceElement.isIfExpression: Boolean get() = elementType == KtNodeTypes.IF - private val FirSourceElement.isWhenExpression: Boolean + private val KtSourceElement.isWhenExpression: Boolean get() = elementType == KtNodeTypes.WHEN } diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirExpressionAnnotationChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirExpressionAnnotationChecker.kt index 56529b46758..e0faa9f03b7 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirExpressionAnnotationChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirExpressionAnnotationChecker.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.analysis.checkers.expression +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget import org.jetbrains.kotlin.descriptors.annotations.KotlinTarget -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind import org.jetbrains.kotlin.fir.analysis.checkers.checkRepeatedAnnotation import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.getAllowedAnnotationTargets @@ -29,7 +29,7 @@ object FirExpressionAnnotationChecker : FirBasicExpressionChecker() { // See KT-33658 about annotations on non-expression statements if (expression is FirDeclaration || expression !is FirExpression || - expression is FirBlock && expression.source?.kind == FirFakeSourceElementKind.DesugaredForLoop + expression is FirBlock && expression.source?.kind == KtFakeSourceElementKind.DesugaredForLoop ) return val annotationsMap = hashMapOf>() diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirForLoopChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirForLoopChecker.kt index 5aa474b2db5..2dfc787c69e 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirForLoopChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirForLoopChecker.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.analysis.checkers.expression -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.valOrVarKeyword import org.jetbrains.kotlin.fir.analysis.diagnostics.* @@ -37,12 +37,12 @@ import org.jetbrains.kotlin.resolve.calls.tower.isSuccess object FirForLoopChecker : FirBlockChecker() { override fun check(expression: FirBlock, context: CheckerContext, reporter: DiagnosticReporter) { - if (expression.source?.kind != FirFakeSourceElementKind.DesugaredForLoop) return + if (expression.source?.kind != KtFakeSourceElementKind.DesugaredForLoop) return val statements = expression.statements val iteratorDeclaration = statements[0] as? FirProperty ?: return val whileLoop = statements[1] as? FirWhileLoop ?: return - if (iteratorDeclaration.source?.kind != FirFakeSourceElementKind.DesugaredForLoop) return + if (iteratorDeclaration.source?.kind != KtFakeSourceElementKind.DesugaredForLoop) return val iteratorCall = iteratorDeclaration.initializer as FirFunctionCall val source = iteratorCall.explicitReceiver?.source ?: iteratorCall.source if (checkSpecialFunctionCall( @@ -70,7 +70,7 @@ object FirForLoopChecker : FirBlockChecker() { ) val loopParameter = whileLoop.block.statements.firstOrNull() as? FirProperty ?: return - if (loopParameter.initializer?.source?.kind != FirFakeSourceElementKind.DesugaredForLoop) return + if (loopParameter.initializer?.source?.kind != KtFakeSourceElementKind.DesugaredForLoop) return val nextCall = loopParameter.initializer as FirFunctionCall checkSpecialFunctionCall( nextCall, @@ -91,7 +91,7 @@ object FirForLoopChecker : FirBlockChecker() { private fun checkSpecialFunctionCall( call: FirFunctionCall, reporter: DiagnosticReporter, - reportSource: FirSourceElement?, + reportSource: KtSourceElement?, context: CheckerContext, ambiguityFactory: FirDiagnosticFactory1>>, missingFactory: FirDiagnosticFactory0, diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirOptInAnnotationCallChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirOptInAnnotationCallChecker.kt index e1547a29eb5..eba028bbe1a 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirOptInAnnotationCallChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirOptInAnnotationCallChecker.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.analysis.checkers.expression +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.config.AnalysisFlags import org.jetbrains.kotlin.config.LanguageFeature -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.extractClassesFromArgument import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter @@ -53,7 +53,7 @@ object FirOptInAnnotationCallChecker : FirAnnotationCallChecker() { } private fun checkOptInIsEnabled( - element: FirSourceElement?, + element: KtSourceElement?, context: CheckerContext, reporter: DiagnosticReporter ) { diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirOptInUsageAccessChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirOptInUsageAccessChecker.kt index b3316808782..061e4f39e34 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirOptInUsageAccessChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirOptInUsageAccessChecker.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.analysis.checkers.expression -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccess @@ -19,8 +19,8 @@ import org.jetbrains.kotlin.fir.types.coneType object FirOptInUsageAccessChecker : FirQualifiedAccessChecker() { override fun check(expression: FirQualifiedAccess, context: CheckerContext, reporter: DiagnosticReporter) { val sourceKind = expression.source?.kind - if (sourceKind is FirFakeSourceElementKind.DataClassGeneratedMembers || - sourceKind is FirFakeSourceElementKind.PropertyFromParameter + if (sourceKind is KtFakeSourceElementKind.DataClassGeneratedMembers || + sourceKind is KtFakeSourceElementKind.PropertyFromParameter ) return val reference = expression.calleeReference as? FirResolvedNamedReference ?: return val resolvedSymbol = reference.resolvedSymbol diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirReifiedChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirReifiedChecker.kt index 725aed71838..3b067cc181e 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirReifiedChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirReifiedChecker.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.analysis.checkers.expression -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.diagnostics.* import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccessExpression @@ -42,7 +42,7 @@ object FirReifiedChecker : FirQualifiedAccessExpressionChecker() { private fun checkArgumentAndReport( typeArgument: ConeKotlinType?, - source: FirSourceElement, + source: KtSourceElement, isArray: Boolean, context: CheckerContext, reporter: DiagnosticReporter diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirReturnSyntaxAndLabelChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirReturnSyntaxAndLabelChecker.kt index 6ad1a00103f..afdc122dcbe 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirReturnSyntaxAndLabelChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirReturnSyntaxAndLabelChecker.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.analysis.checkers.expression -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind -import org.jetbrains.kotlin.fir.FirRealSourceElementKind +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtRealSourceElementKind import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol object FirReturnSyntaxAndLabelChecker : FirReturnExpressionChecker() { override fun check(expression: FirReturnExpression, context: CheckerContext, reporter: DiagnosticReporter) { val source = expression.source - if (source?.kind == FirFakeSourceElementKind.ImplicitReturn) return + if (source?.kind == KtFakeSourceElementKind.ImplicitReturn) return val labeledElement = expression.target.labeledElement val targetSymbol = labeledElement.symbol @@ -36,7 +36,7 @@ object FirReturnSyntaxAndLabelChecker : FirReturnExpressionChecker() { if (targetSymbol is FirAnonymousFunctionSymbol) { val label = targetSymbol.label - if (label?.source?.kind !is FirRealSourceElementKind) { + if (label?.source?.kind !is KtRealSourceElementKind) { val functionCall = context.qualifiedAccessOrAnnotationCalls.asReversed().find { it is FirFunctionCall && ((it.calleeReference as? FirResolvedNamedReference)?.resolvedSymbol as? FirNamedFunctionSymbol)?.callableId == diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirSpreadOfNullableChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirSpreadOfNullableChecker.kt index a0ab7f37895..9f4b2268db1 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirSpreadOfNullableChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirSpreadOfNullableChecker.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.analysis.checkers.expression -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.types.coneType object FirSpreadOfNullableChecker : FirFunctionCallChecker() { override fun check(expression: FirFunctionCall, context: CheckerContext, reporter: DiagnosticReporter) { - fun checkAndReport(argument: FirExpression, source: FirSourceElement?) { + fun checkAndReport(argument: FirExpression, source: KtSourceElement?) { val argumentTypeRef = argument.typeRef if (argument is FirSpreadArgumentExpression && argumentTypeRef.coneType !is ConeFlexibleType && argumentTypeRef.canBeNull) { reporter.reportOn(source, FirErrors.SPREAD_OF_NULLABLE, context) diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirUninitializedEnumChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirUninitializedEnumChecker.kt index 81e36cbba4e..f7d82b97d84 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirUninitializedEnumChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirUninitializedEnumChecker.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.analysis.checkers.expression -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.declaration.isEnumEntryInitializer import org.jetbrains.kotlin.fir.analysis.checkers.getContainingClassSymbol @@ -13,7 +13,8 @@ import org.jetbrains.kotlin.fir.analysis.checkers.outerClassSymbol import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors import org.jetbrains.kotlin.fir.analysis.diagnostics.reportOn -import org.jetbrains.kotlin.fir.declarations.* +import org.jetbrains.kotlin.fir.declarations.FirAnonymousFunction +import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.utils.isCompanion import org.jetbrains.kotlin.fir.declarations.utils.isEnumClass import org.jetbrains.kotlin.fir.expressions.* @@ -71,7 +72,7 @@ object FirUninitializedEnumChecker : FirQualifiedAccessExpressionChecker() { // https://youtrack.jetbrains.com/issue/KT-11769 override fun check(expression: FirQualifiedAccessExpression, context: CheckerContext, reporter: DiagnosticReporter) { val source = expression.source ?: return - if (source.kind is FirFakeSourceElementKind) return + if (source.kind is KtFakeSourceElementKind) return val reference = expression.calleeReference as? FirResolvedNamedReference ?: return val calleeSymbol = reference.resolvedSymbol diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/referenceUtils.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/referenceUtils.kt index 96c2f386116..3e7cae784fb 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/referenceUtils.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/referenceUtils.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.analysis.checkers.expression -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.fir.references.FirSuperReference -fun FirSuperReference.hadExplicitTypeInSource(): Boolean = superTypeRef.source?.kind != FirFakeSourceElementKind.SuperCallImplicitType +fun FirSuperReference.hadExplicitTypeInSource(): Boolean = superTypeRef.source?.kind != KtFakeSourceElementKind.SuperCallImplicitType diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/CanBeReplacedWithOperatorAssignmentChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/CanBeReplacedWithOperatorAssignmentChecker.kt index 8c43383bd01..e5c94e818ed 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/CanBeReplacedWithOperatorAssignmentChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/CanBeReplacedWithOperatorAssignmentChecker.kt @@ -7,17 +7,21 @@ package org.jetbrains.kotlin.fir.analysis.checkers.extended import com.intellij.lang.LighterASTNode import com.intellij.psi.tree.IElementType +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtLightSourceElement +import org.jetbrains.kotlin.KtPsiSourceElement import org.jetbrains.kotlin.KtNodeTypes -import org.jetbrains.kotlin.fir.* import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.expression.FirVariableAssignmentChecker import org.jetbrains.kotlin.fir.analysis.checkers.getChildren import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors import org.jetbrains.kotlin.fir.analysis.diagnostics.reportOn +import org.jetbrains.kotlin.fir.dispatchReceiverTypeOrNull import org.jetbrains.kotlin.fir.expressions.FirFunctionCall import org.jetbrains.kotlin.fir.expressions.FirVariableAssignment import org.jetbrains.kotlin.fir.expressions.toResolvedCallableSymbol +import org.jetbrains.kotlin.fir.psi import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference import org.jetbrains.kotlin.fir.types.coneType import org.jetbrains.kotlin.fir.types.isPrimitive @@ -29,10 +33,10 @@ object CanBeReplacedWithOperatorAssignmentChecker : FirVariableAssignmentChecker override fun check(expression: FirVariableAssignment, context: CheckerContext, reporter: DiagnosticReporter) { val lValue = expression.lValue if (lValue !is FirResolvedNamedReference) return - if (expression.source?.kind is FirFakeSourceElementKind) return + if (expression.source?.kind is KtFakeSourceElementKind) return val rValue = expression.rValue as? FirFunctionCall ?: return - if (rValue.source?.kind is FirFakeSourceElementKind) return + if (rValue.source?.kind is KtFakeSourceElementKind) return if (rValue.explicitReceiver?.typeRef?.coneType?.isPrimitive != true) return val rValueResolvedSymbol = rValue.toResolvedCallableSymbol() ?: return @@ -41,14 +45,14 @@ object CanBeReplacedWithOperatorAssignmentChecker : FirVariableAssignmentChecker var needToReport = false val assignmentSource = expression.source - if (assignmentSource is FirPsiSourceElement) { + if (assignmentSource is KtPsiSourceElement) { val lValuePsi = lValue.psi as? KtNameReferenceExpression ?: return val rValuePsi = rValue.psi as? KtBinaryExpression ?: return if (rValuePsi.matcher(lValuePsi)) { needToReport = true } - } else if (assignmentSource is FirLightSourceElement) { + } else if (assignmentSource is KtLightSourceElement) { val lValueLightTree = lValue.source!!.lighterASTNode val rValueLightTree = rValue.source!!.lighterASTNode if (lightTreeMatcher(lValueLightTree, rValueLightTree, assignmentSource)) { @@ -65,7 +69,7 @@ object CanBeReplacedWithOperatorAssignmentChecker : FirVariableAssignmentChecker fun lightTreeMatcher( variable: LighterASTNode, expression: LighterASTNode, - source: FirLightSourceElement, + source: KtLightSourceElement, prevOperator: LighterASTNode? = null ): Boolean { val tree = source.treeStructure diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/CanBeValChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/CanBeValChecker.kt index b208dff7ab7..67d9a682298 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/CanBeValChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/CanBeValChecker.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.fir.analysis.checkers.extended +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.KtNodeTypes import org.jetbrains.kotlin.contracts.description.EventOccurrencesRange -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.analysis.cfa.AbstractFirPropertyInitializationChecker import org.jetbrains.kotlin.fir.analysis.cfa.util.PathAwarePropertyInitializationInfo import org.jetbrains.kotlin.fir.analysis.cfa.util.TraverseDirection @@ -40,12 +40,12 @@ object CanBeValChecker : AbstractFirPropertyInitializationChecker() { for (property in unprocessedProperties) { val source = property.source - if (source?.kind is FirFakeSourceElementKind) continue + if (source?.kind is KtFakeSourceElementKind) continue if (source?.elementType == KtNodeTypes.DESTRUCTURING_DECLARATION) continue propertiesCharacteristics[property] = EventOccurrencesRange.ZERO } - var lastDestructuringSource: FirSourceElement? = null + var lastDestructuringSource: KtSourceElement? = null var destructuringCanBeVal = false var lastDestructuredVariables = 0 diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/EmptyRangeChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/EmptyRangeChecker.kt index 530fef7a65d..72b5e856057 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/EmptyRangeChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/EmptyRangeChecker.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.analysis.checkers.extended -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.expression.FirFunctionCallChecker import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.scopes.impl.FirIntegerOperatorCall object EmptyRangeChecker : FirFunctionCallChecker() { override fun check(expression: FirFunctionCall, context: CheckerContext, reporter: DiagnosticReporter) { - if (expression.source?.kind is FirFakeSourceElementKind) return + if (expression.source?.kind is KtFakeSourceElementKind) return val left = expression.rangeLeft ?: return val right = expression.rangeRight ?: return diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/RedundantExplicitTypeChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/RedundantExplicitTypeChecker.kt index f3a43c7acbc..0acfb6e2b66 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/RedundantExplicitTypeChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/RedundantExplicitTypeChecker.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.analysis.checkers.extended +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.KtNodeTypes -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.declaration.FirPropertyChecker import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter @@ -28,7 +28,7 @@ object RedundantExplicitTypeChecker : FirPropertyChecker() { val initializer = declaration.initializer ?: return val typeReference = declaration.returnTypeRef - if (typeReference.source?.kind is FirFakeSourceElementKind) return + if (typeReference.source?.kind is KtFakeSourceElementKind) return val type = declaration.returnTypeRef.coneType diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/RedundantModalityModifierSyntaxChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/RedundantModalityModifierSyntaxChecker.kt index 641c4d0640b..7734172b96a 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/RedundantModalityModifierSyntaxChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/RedundantModalityModifierSyntaxChecker.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.fir.analysis.checkers.extended +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.implicitModality import org.jetbrains.kotlin.fir.analysis.checkers.syntax.FirDeclarationSyntaxChecker @@ -24,12 +24,12 @@ import org.jetbrains.kotlin.psi.KtDeclaration object RedundantModalityModifierSyntaxChecker : FirDeclarationSyntaxChecker() { - override fun isApplicable(element: FirDeclaration, source: FirSourceElement): Boolean = - source.kind !is FirFakeSourceElementKind && element is FirMemberDeclaration + override fun isApplicable(element: FirDeclaration, source: KtSourceElement): Boolean = + source.kind !is KtFakeSourceElementKind && element is FirMemberDeclaration override fun checkPsiOrLightTree( element: FirDeclaration, - source: FirSourceElement, + source: KtSourceElement, context: CheckerContext, reporter: DiagnosticReporter ) { diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/RedundantReturnUnitType.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/RedundantReturnUnitType.kt index 76cf8e26bac..b4f272b0ef8 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/RedundantReturnUnitType.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/RedundantReturnUnitType.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.analysis.checkers.extended -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.declaration.FirSimpleFunctionChecker import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter @@ -20,7 +20,7 @@ object RedundantReturnUnitType : FirSimpleFunctionChecker() { if (declaration.body is FirSingleExpressionBlock) return val returnType = declaration.returnTypeRef if (returnType.source == null) return - if (declaration.source?.kind is FirFakeSourceElementKind) return + if (declaration.source?.kind is KtFakeSourceElementKind) return if (returnType.annotations.isNotEmpty()) return if (returnType.isUnit) { diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/RedundantSetterParameterTypeChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/RedundantSetterParameterTypeChecker.kt index f30e49095f6..e100e040db3 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/RedundantSetterParameterTypeChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/RedundantSetterParameterTypeChecker.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.analysis.checkers.extended -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.declaration.FirPropertyChecker import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter @@ -22,7 +22,7 @@ object RedundantSetterParameterTypeChecker : FirPropertyChecker() { val propertyTypeSource = declaration.returnTypeRef.source val setterParameterTypeSource = valueParameter.returnTypeRef.source ?: return - if (setterParameterTypeSource.kind !is FirFakeSourceElementKind && setterParameterTypeSource != propertyTypeSource) { + if (setterParameterTypeSource.kind !is KtFakeSourceElementKind && setterParameterTypeSource != propertyTypeSource) { reporter.reportOn(setterParameterTypeSource, REDUNDANT_SETTER_PARAMETER_TYPE, context) } } diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/RedundantSingleExpressionStringTemplateChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/RedundantSingleExpressionStringTemplateChecker.kt index 65bdb9ad66a..4ba9182c8e5 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/RedundantSingleExpressionStringTemplateChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/RedundantSingleExpressionStringTemplateChecker.kt @@ -8,9 +8,9 @@ package org.jetbrains.kotlin.fir.analysis.checkers.extended import com.intellij.lang.LighterASTNode import com.intellij.lang.PsiBuilder import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.KtLightSourceElement +import org.jetbrains.kotlin.KtPsiSourceElement import org.jetbrains.kotlin.KtNodeTypes -import org.jetbrains.kotlin.fir.FirLightSourceElement -import org.jetbrains.kotlin.fir.FirPsiSourceElement import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.expression.FirStringConcatenationCallChecker import org.jetbrains.kotlin.fir.analysis.checkers.getChildren @@ -38,8 +38,8 @@ object RedundantSingleExpressionStringTemplateChecker : FirStringConcatenationCa private fun FirStatement.stringParentChildrenCount(): Int? { return when (val source = source) { - is FirPsiSourceElement -> source.psi.stringParentChildrenCount() - is FirLightSourceElement -> source.lighterASTNode.stringParentChildrenCount(source) + is KtPsiSourceElement -> source.psi.stringParentChildrenCount() + is KtLightSourceElement -> source.lighterASTNode.stringParentChildrenCount(source) null -> null } } @@ -49,7 +49,7 @@ object RedundantSingleExpressionStringTemplateChecker : FirStringConcatenationCa return parent.stringParentChildrenCount() } - private fun LighterASTNode.stringParentChildrenCount(source: FirLightSourceElement): Int? { + private fun LighterASTNode.stringParentChildrenCount(source: KtLightSourceElement): Int? { val parent = source.treeStructure.getParent(this) return if (parent != null && parent.tokenType == KtNodeTypes.STRING_TEMPLATE) { val childrenOfParent = parent.getChildren(source.treeStructure) diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/RedundantVisibilityModifierSyntaxChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/RedundantVisibilityModifierSyntaxChecker.kt index e54bf94dc9d..ee7ea428644 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/RedundantVisibilityModifierSyntaxChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/RedundantVisibilityModifierSyntaxChecker.kt @@ -5,10 +5,11 @@ package org.jetbrains.kotlin.fir.analysis.checkers.extended +import org.jetbrains.kotlin.KtFakeSourceElement +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.descriptors.Visibility -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.context.findClosest import org.jetbrains.kotlin.fir.analysis.checkers.findClosestClassOrObject @@ -35,12 +36,12 @@ object RedundantVisibilityModifierSyntaxChecker : FirDeclarationSyntaxChecker.skipNode(): Boolean { diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/UnusedChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/UnusedChecker.kt index 0ba9fa907ee..2df396a241b 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/UnusedChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/UnusedChecker.kt @@ -7,9 +7,9 @@ package org.jetbrains.kotlin.fir.analysis.checkers.extended import kotlinx.collections.immutable.PersistentMap import kotlinx.collections.immutable.persistentMapOf +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.KtNodeTypes import org.jetbrains.kotlin.fir.FirAnnotationContainer -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.analysis.cfa.util.* import org.jetbrains.kotlin.fir.analysis.checkers.cfa.FirControlFlowChecker @@ -185,7 +185,7 @@ object UnusedChecker : FirControlFlowChecker() { data: Collection> ): PathAwareVariableStatusInfo { val dataForNode = visitNode(node, data) - if (node.fir.source?.kind is FirFakeSourceElementKind) return dataForNode + if (node.fir.source?.kind is KtFakeSourceElementKind) return dataForNode val symbol = node.fir.symbol return update(dataForNode, symbol) { prev -> when (prev) { @@ -322,6 +322,6 @@ object UnusedChecker : FirControlFlowChecker() { private val FirPropertySymbol.isLoopIterator: Boolean get() { @OptIn(SymbolInternals::class) - return fir.initializer?.source?.kind == FirFakeSourceElementKind.DesugaredForLoop + return fir.initializer?.source?.kind == KtFakeSourceElementKind.DesugaredForLoop } } diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/syntax/FirAnonymousFunctionSyntaxChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/syntax/FirAnonymousFunctionSyntaxChecker.kt index 49f3fa46b96..2bba53b30bd 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/syntax/FirAnonymousFunctionSyntaxChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/syntax/FirAnonymousFunctionSyntaxChecker.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.analysis.checkers.syntax -import org.jetbrains.kotlin.fir.FirLightSourceElement -import org.jetbrains.kotlin.fir.FirPsiSourceElement +import org.jetbrains.kotlin.KtPsiSourceElement +import org.jetbrains.kotlin.KtLightSourceElement import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.psi.KtFunction object FirAnonymousFunctionSyntaxChecker : FirDeclarationSyntaxChecker() { override fun checkPsi( element: FirAnonymousFunction, - source: FirPsiSourceElement, + source: KtPsiSourceElement, psi: KtFunction, context: CheckerContext, reporter: DiagnosticReporter @@ -34,7 +34,7 @@ object FirAnonymousFunctionSyntaxChecker : FirDeclarationSyntaxChecker() { - override fun isApplicable(element: FirWhenExpression, source: FirSourceElement): Boolean { + override fun isApplicable(element: FirWhenExpression, source: KtSourceElement): Boolean { return element.subject == null } override fun checkPsiOrLightTree( element: FirWhenExpression, - source: FirSourceElement, + source: KtSourceElement, context: CheckerContext, reporter: DiagnosticReporter ) { diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/syntax/FirConfusingWhenBranchSyntaxChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/syntax/FirConfusingWhenBranchSyntaxChecker.kt index 8a17dd01b4a..9076e465164 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/syntax/FirConfusingWhenBranchSyntaxChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/syntax/FirConfusingWhenBranchSyntaxChecker.kt @@ -10,17 +10,16 @@ import com.intellij.psi.PsiElement import com.intellij.psi.tree.TokenSet import com.intellij.util.diff.FlyweightCapableTreeStructure import org.jetbrains.kotlin.ElementTypeUtils.getOperationSymbol +import org.jetbrains.kotlin.ElementTypeUtils.isExpression +import org.jetbrains.kotlin.KtLightSourceElement import org.jetbrains.kotlin.KtNodeTypes.* -import org.jetbrains.kotlin.fir.FirLightSourceElement -import org.jetbrains.kotlin.fir.FirPsiSourceElement -import org.jetbrains.kotlin.fir.FirRealPsiSourceElement -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtPsiSourceElement +import org.jetbrains.kotlin.KtRealPsiSourceElement +import org.jetbrains.kotlin.diagnostics.DiagnosticReporter +import org.jetbrains.kotlin.diagnostics.reportOn import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.getChildren -import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors -import org.jetbrains.kotlin.fir.analysis.diagnostics.isExpression -import org.jetbrains.kotlin.fir.analysis.diagnostics.reportOn import org.jetbrains.kotlin.fir.expressions.FirWhenExpression import org.jetbrains.kotlin.lexer.KtTokens.* import org.jetbrains.kotlin.psi.* @@ -35,7 +34,7 @@ object FirConfusingWhenBranchSyntaxChecker : FirExpressionSyntaxChecker node.getChildren(tree).firstOrNull { it.isExpression() } WHEN_CONDITION_IN_RANGE -> node.getChildren(tree) - .firstOrNull { it.tokenType != OPERATION_REFERENCE && it.isExpression()} + .firstOrNull { it.tokenType != OPERATION_REFERENCE && it.isExpression() } else -> null } ?: continue checkConditionExpression(offset, expression, tree, context, reporter) @@ -73,14 +72,15 @@ object FirConfusingWhenBranchSyntaxChecker : FirExpressionSyntaxChecker false } if (shouldReport) { - val source = FirLightSourceElement(expression, offset + expression.startOffset, offset + expression.endOffset, tree) + val source = + KtLightSourceElement(expression, offset + expression.startOffset, offset + expression.endOffset, tree) reporter.reportOn(source, FirErrors.CONFUSING_BRANCH_CONDITION, context) } } override fun checkPsi( element: FirWhenExpression, - source: FirPsiSourceElement, + source: KtPsiSourceElement, psi: PsiElement, context: CheckerContext, reporter: DiagnosticReporter @@ -111,7 +111,7 @@ object FirConfusingWhenBranchSyntaxChecker : FirExpressionSyntaxChecker false } if (shouldReport) { - val source = FirRealPsiSourceElement(rawExpression) + val source = KtRealPsiSourceElement(rawExpression) reporter.reportOn(source, FirErrors.CONFUSING_BRANCH_CONDITION, context) } } diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/syntax/FirDelegationInInterfaceSyntaxChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/syntax/FirDelegationInInterfaceSyntaxChecker.kt index 052baabe6c9..3e55e205c1a 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/syntax/FirDelegationInInterfaceSyntaxChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/syntax/FirDelegationInInterfaceSyntaxChecker.kt @@ -5,27 +5,27 @@ package org.jetbrains.kotlin.fir.analysis.checkers.syntax +import org.jetbrains.kotlin.KtLightSourceElement +import org.jetbrains.kotlin.KtPsiSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.KtNodeTypes -import org.jetbrains.kotlin.fir.FirLightSourceElement -import org.jetbrains.kotlin.fir.FirPsiSourceElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors import org.jetbrains.kotlin.fir.analysis.diagnostics.reportOn import org.jetbrains.kotlin.fir.declarations.FirRegularClass import org.jetbrains.kotlin.fir.declarations.utils.isInterface -import org.jetbrains.kotlin.fir.psi +import org.jetbrains.kotlin.psi import org.jetbrains.kotlin.psi.KtClass import org.jetbrains.kotlin.psi.KtDelegatedSuperTypeEntry object FirDelegationInInterfaceSyntaxChecker : FirDeclarationSyntaxChecker() { - override fun isApplicable(element: FirRegularClass, source: FirSourceElement): Boolean = element.isInterface + override fun isApplicable(element: FirRegularClass, source: KtSourceElement): Boolean = element.isInterface override fun checkPsi( element: FirRegularClass, - source: FirPsiSourceElement, + source: KtPsiSourceElement, psi: KtClass, context: CheckerContext, reporter: DiagnosticReporter @@ -40,7 +40,7 @@ object FirDelegationInInterfaceSyntaxChecker : FirDeclarationSyntaxChecker() { - override fun isApplicable(element: FirSimpleFunction, source: FirSourceElement): Boolean = - source.kind !is FirFakeSourceElementKind + override fun isApplicable(element: FirSimpleFunction, source: KtSourceElement): Boolean = + source.kind !is KtFakeSourceElementKind override fun checkPsi( element: FirSimpleFunction, - source: FirPsiSourceElement, + source: KtPsiSourceElement, psi: KtFunction, context: CheckerContext, reporter: DiagnosticReporter @@ -40,7 +40,7 @@ object FirFunctionTypeParametersSyntaxChecker : FirDeclarationSyntaxChecker() { - override fun isApplicable(element: FirProperty, source: FirSourceElement): Boolean = - source.kind !is FirFakeSourceElementKind && element.isLocal + override fun isApplicable(element: FirProperty, source: KtSourceElement): Boolean = + source.kind !is KtFakeSourceElementKind && element.isLocal override fun checkPsi( element: FirProperty, - source: FirPsiSourceElement, + source: KtPsiSourceElement, psi: KtExpression, context: CheckerContext, reporter: DiagnosticReporter @@ -38,7 +40,7 @@ object FirLocalVariableTypeParametersSyntaxChecker : FirDeclarationSyntaxChecker override fun checkLightTree( element: FirProperty, - source: FirLightSourceElement, + source: KtLightSourceElement, context: CheckerContext, reporter: DiagnosticReporter ) { diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/syntax/FirSyntaxChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/syntax/FirSyntaxChecker.kt index 950c5ec6761..01655ffa512 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/syntax/FirSyntaxChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/syntax/FirSyntaxChecker.kt @@ -6,10 +6,10 @@ package org.jetbrains.kotlin.fir.analysis.checkers.syntax import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.KtLightSourceElement +import org.jetbrains.kotlin.KtPsiSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirLightSourceElement -import org.jetbrains.kotlin.fir.FirPsiSourceElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.declaration.FirDeclarationChecker import org.jetbrains.kotlin.fir.analysis.checkers.expression.FirExpressionChecker @@ -30,25 +30,25 @@ interface FirSyntaxChecker { if (!isApplicable(element, source)) return @Suppress("UNCHECKED_CAST") when (source) { - is FirPsiSourceElement -> checkPsi(element, source, source.psi as P, context, reporter) - is FirLightSourceElement -> checkLightTree(element, source, context, reporter) + is KtPsiSourceElement -> checkPsi(element, source, source.psi as P, context, reporter) + is KtLightSourceElement -> checkLightTree(element, source, context, reporter) } } - fun isApplicable(element: D, source: FirSourceElement): Boolean = true + fun isApplicable(element: D, source: KtSourceElement): Boolean = true - fun checkPsi(element: D, source: FirPsiSourceElement, psi: P, context: CheckerContext, reporter: DiagnosticReporter) { + fun checkPsi(element: D, source: KtPsiSourceElement, psi: P, context: CheckerContext, reporter: DiagnosticReporter) { checkPsiOrLightTree(element, source, context, reporter) } - fun checkLightTree(element: D, source: FirLightSourceElement, context: CheckerContext, reporter: DiagnosticReporter) { + fun checkLightTree(element: D, source: KtLightSourceElement, context: CheckerContext, reporter: DiagnosticReporter) { checkPsiOrLightTree(element, source, context, reporter) } /** * By default psi tree should be equivalent to light tree and can be processed the same way. */ - fun checkPsiOrLightTree(element: D, source: FirSourceElement, context: CheckerContext, reporter: DiagnosticReporter) {} + fun checkPsiOrLightTree(element: D, source: KtSourceElement, context: CheckerContext, reporter: DiagnosticReporter) {} } abstract class FirDeclarationSyntaxChecker : diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/syntax/FirTypeParameterSyntaxChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/syntax/FirTypeParameterSyntaxChecker.kt index cfe74f9635b..e9182809709 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/syntax/FirTypeParameterSyntaxChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/syntax/FirTypeParameterSyntaxChecker.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.analysis.checkers.syntax -import org.jetbrains.kotlin.fir.FirPsiSourceElement -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtPsiSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.analysis.checkers.SourceNavigator.Companion.withNavigator import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter @@ -19,12 +19,12 @@ import org.jetbrains.kotlin.psi.KtTypeParameter object FirTypeParameterSyntaxChecker : FirDeclarationSyntaxChecker() { - override fun isApplicable(element: FirTypeParameter, source: FirSourceElement): Boolean = + override fun isApplicable(element: FirTypeParameter, source: KtSourceElement): Boolean = element.bounds.size >= 2 override fun checkPsi( element: FirTypeParameter, - source: FirPsiSourceElement, + source: KtPsiSourceElement, psi: KtTypeParameter, context: CheckerContext, reporter: DiagnosticReporter @@ -37,7 +37,7 @@ object FirTypeParameterSyntaxChecker : FirDeclarationSyntaxChecker() ?: return val symbol = resolved.lookupTag.toSymbol(context.session) ?: return diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/type/FirOptInUsageTypeRefChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/type/FirOptInUsageTypeRefChecker.kt index 07abcec71da..eca7ea8ed1c 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/type/FirOptInUsageTypeRefChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/type/FirOptInUsageTypeRefChecker.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.analysis.checkers.type import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget -import org.jetbrains.kotlin.fir.FirRealSourceElementKind +import org.jetbrains.kotlin.KtRealSourceElementKind import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.expression.FirOptInUsageBaseChecker import org.jetbrains.kotlin.fir.analysis.checkers.getAnnotationClassForOptInMarker @@ -32,7 +32,7 @@ object FirOptInUsageTypeRefChecker : FirTypeRefChecker() { @OptIn(SymbolInternals::class) override fun check(typeRef: FirTypeRef, context: CheckerContext, reporter: DiagnosticReporter) { val source = typeRef.source - if (source?.kind !is FirRealSourceElementKind) return + if (source?.kind !is KtRealSourceElementKind) return // coneTypeSafe filters out all delegatedTypeRefs from here val coneType = typeRef.coneTypeSafe() ?: return diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/AbstractDiagnosticCollectorVisitor.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/AbstractDiagnosticCollectorVisitor.kt index ca4438ceb64..eaf4929068f 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/AbstractDiagnosticCollectorVisitor.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/AbstractDiagnosticCollectorVisitor.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.analysis.collectors +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.fir.FirAnnotationContainer import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind import org.jetbrains.kotlin.fir.PrivateForInline import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.declarations.* @@ -160,7 +160,7 @@ abstract class AbstractDiagnosticCollectorVisitor( } override fun visitTypeRef(typeRef: FirTypeRef, data: Nothing?) { - if (typeRef.source != null && typeRef.source?.kind !is FirFakeSourceElementKind) { + if (typeRef.source != null && typeRef.source?.kind !is KtFakeSourceElementKind) { withAnnotationContainer(typeRef) { checkElement(typeRef) visitNestedElements(typeRef) @@ -179,7 +179,7 @@ abstract class AbstractDiagnosticCollectorVisitor( if (resolvedTypeRef.type is ConeClassErrorType) { super.visitResolvedTypeRef(resolvedTypeRef, data) } - if (resolvedTypeRef.source?.kind is FirFakeSourceElementKind) return + if (resolvedTypeRef.source?.kind is KtFakeSourceElementKind) return //the note about is just wrong //if we don't visit resolved type we can't make any diagnostics on them diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/components/ErrorNodeDiagnosticCollectorComponent.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/components/ErrorNodeDiagnosticCollectorComponent.kt index 7c34c5d2625..00c1e2c84b9 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/components/ErrorNodeDiagnosticCollectorComponent.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/components/ErrorNodeDiagnosticCollectorComponent.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.fir.analysis.collectors.components +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.KtNodeTypes -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind import org.jetbrains.kotlin.fir.FirSession -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter import org.jetbrains.kotlin.fir.analysis.diagnostics.toFirDiagnostics @@ -59,7 +59,7 @@ class ErrorNodeDiagnosticCollectorComponent( // Don't report duplicated unresolved reference on annotation entry (already reported on its type) if (source.elementType == KtNodeTypes.ANNOTATION_ENTRY && errorNamedReference.diagnostic is ConeUnresolvedNameError) return // Already reported in FirConventionFunctionCallChecker - if (source.kind == FirFakeSourceElementKind.ArrayAccessNameReference && + if (source.kind == KtFakeSourceElementKind.ArrayAccessNameReference && errorNamedReference.diagnostic is ConeUnresolvedNameError ) return @@ -106,10 +106,10 @@ class ErrorNodeDiagnosticCollectorComponent( private fun reportFirDiagnostic( diagnostic: ConeDiagnostic, - source: FirSourceElement, + source: KtSourceElement, reporter: DiagnosticReporter, context: CheckerContext, - qualifiedAccessSource: FirSourceElement? = null + qualifiedAccessSource: KtSourceElement? = null ) { // Will be handled by [FirDestructuringDeclarationChecker] if (source.elementType == KtNodeTypes.DESTRUCTURING_DECLARATION_ENTRY) { @@ -117,13 +117,13 @@ class ErrorNodeDiagnosticCollectorComponent( } // Will be handled by [FirDelegatedPropertyChecker] - if (source.kind == FirFakeSourceElementKind.DelegatedPropertyAccessor && + if (source.kind == KtFakeSourceElementKind.DelegatedPropertyAccessor && (diagnostic is ConeUnresolvedNameError || diagnostic is ConeAmbiguityError || diagnostic is ConeInapplicableWrongReceiver || diagnostic is ConeInapplicableCandidateError) ) { return } - if (source.kind == FirFakeSourceElementKind.ImplicitConstructor || source.kind == FirFakeSourceElementKind.DesugaredForLoop) { + if (source.kind == KtFakeSourceElementKind.ImplicitConstructor || source.kind == KtFakeSourceElementKind.DesugaredForLoop) { // See FirForLoopChecker return } diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/DiagnosticReporter.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/DiagnosticReporter.kt index 8ae0a1f417a..e77f44c1d74 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/DiagnosticReporter.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/DiagnosticReporter.kt @@ -5,9 +5,8 @@ package org.jetbrains.kotlin.fir.analysis.diagnostics +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirAnnotationContainer -import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.collectors.AbstractDiagnosticCollector import org.jetbrains.kotlin.fir.languageVersionSettings @@ -18,7 +17,7 @@ abstract class DiagnosticReporter { @OptIn(InternalDiagnosticFactoryMethod::class) fun DiagnosticReporter.reportOn( - source: FirSourceElement?, + source: KtSourceElement?, factory: FirDiagnosticFactory0, context: CheckerContext, positioningStrategy: SourceElementPositioningStrategy? = null @@ -28,7 +27,7 @@ fun DiagnosticReporter.reportOn( @OptIn(InternalDiagnosticFactoryMethod::class) fun DiagnosticReporter.reportOn( - source: FirSourceElement?, + source: KtSourceElement?, factory: FirDiagnosticFactory1, a: A, context: CheckerContext, @@ -39,7 +38,7 @@ fun DiagnosticReporter.reportOn( @OptIn(InternalDiagnosticFactoryMethod::class) fun DiagnosticReporter.reportOn( - source: FirSourceElement?, + source: KtSourceElement?, factory: FirDiagnosticFactory2, a: A, b: B, @@ -51,7 +50,7 @@ fun DiagnosticReporter.reportOn( @OptIn(InternalDiagnosticFactoryMethod::class) fun DiagnosticReporter.reportOn( - source: FirSourceElement?, + source: KtSourceElement?, factory: FirDiagnosticFactory3, a: A, b: B, @@ -64,7 +63,7 @@ fun DiagnosticReporter.reportOn( @OptIn(InternalDiagnosticFactoryMethod::class) fun DiagnosticReporter.reportOn( - source: FirSourceElement?, + source: KtSourceElement?, factory: FirDiagnosticFactory4, a: A, b: B, @@ -78,7 +77,7 @@ fun DiagnosticReporter.reportOn( @OptIn(InternalDiagnosticFactoryMethod::class) fun DiagnosticReporter.reportOn( - source: FirSourceElement?, + source: KtSourceElement?, factory: FirDiagnosticFactoryForDeprecation0, context: CheckerContext, positioningStrategy: SourceElementPositioningStrategy? = null @@ -88,7 +87,7 @@ fun DiagnosticReporter.reportOn( @OptIn(InternalDiagnosticFactoryMethod::class) fun DiagnosticReporter.reportOn( - source: FirSourceElement?, + source: KtSourceElement?, factory: FirDiagnosticFactoryForDeprecation1, a: A, context: CheckerContext, @@ -99,7 +98,7 @@ fun DiagnosticReporter.reportOn( @OptIn(InternalDiagnosticFactoryMethod::class) fun DiagnosticReporter.reportOn( - source: FirSourceElement?, + source: KtSourceElement?, factory: FirDiagnosticFactoryForDeprecation2, a: A, b: B, @@ -111,7 +110,7 @@ fun DiagnosticReporter.reportOn( @OptIn(InternalDiagnosticFactoryMethod::class) fun DiagnosticReporter.reportOn( - source: FirSourceElement?, + source: KtSourceElement?, factory: FirDiagnosticFactoryForDeprecation3, a: A, b: B, @@ -124,7 +123,7 @@ fun DiagnosticReporter.reportOn( @OptIn(InternalDiagnosticFactoryMethod::class) fun DiagnosticReporter.reportOn( - source: FirSourceElement?, + source: KtSourceElement?, factory: FirDiagnosticFactoryForDeprecation4, a: A, b: B, diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnostic.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnostic.kt index c2d730110d8..644d9df119f 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnostic.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnostic.kt @@ -8,15 +8,15 @@ package org.jetbrains.kotlin.fir.analysis.diagnostics import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiElement import com.intellij.psi.PsiFile +import org.jetbrains.kotlin.KtLightSourceElement +import org.jetbrains.kotlin.KtPsiSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.diagnostics.* -import org.jetbrains.kotlin.fir.FirLightSourceElement -import org.jetbrains.kotlin.fir.FirPsiSourceElement -import org.jetbrains.kotlin.fir.FirSourceElement // ------------------------------ diagnostics ------------------------------ sealed class FirDiagnostic : DiagnosticMarker { - abstract val element: FirSourceElement + abstract val element: KtSourceElement abstract val severity: Severity abstract val factory: AbstractFirDiagnosticFactory abstract val positioningStrategy: SourceElementPositioningStrategy @@ -65,7 +65,7 @@ sealed class FirDiagnosticWithParameters4 : FirDiagnostic(), Diagnos interface FirPsiDiagnostic : DiagnosticMarker { val factory: AbstractFirDiagnosticFactory - val element: FirPsiSourceElement + val element: KtPsiSourceElement val textRanges: List val severity: Severity @@ -87,7 +87,7 @@ private fun FirPsiDiagnostic.checkPsiTypeConsistency() { } data class FirPsiSimpleDiagnostic( - override val element: FirPsiSourceElement, + override val element: KtPsiSourceElement, override val severity: Severity, override val factory: FirDiagnosticFactory0, override val positioningStrategy: SourceElementPositioningStrategy @@ -98,7 +98,7 @@ data class FirPsiSimpleDiagnostic( } data class FirPsiDiagnosticWithParameters1( - override val element: FirPsiSourceElement, + override val element: KtPsiSourceElement, override val a: A, override val severity: Severity, override val factory: FirDiagnosticFactory1, @@ -111,7 +111,7 @@ data class FirPsiDiagnosticWithParameters1( data class FirPsiDiagnosticWithParameters2( - override val element: FirPsiSourceElement, + override val element: KtPsiSourceElement, override val a: A, override val b: B, override val severity: Severity, @@ -124,7 +124,7 @@ data class FirPsiDiagnosticWithParameters2( } data class FirPsiDiagnosticWithParameters3( - override val element: FirPsiSourceElement, + override val element: KtPsiSourceElement, override val a: A, override val b: B, override val c: C, @@ -138,7 +138,7 @@ data class FirPsiDiagnosticWithParameters3( } data class FirPsiDiagnosticWithParameters4( - override val element: FirPsiSourceElement, + override val element: KtPsiSourceElement, override val a: A, override val b: B, override val c: C, @@ -155,7 +155,7 @@ data class FirPsiDiagnosticWithParameters4( // ------------------------------ light tree diagnostics ------------------------------ interface FirLightDiagnostic : DiagnosticMarker { - val element: FirLightSourceElement + val element: KtLightSourceElement @Deprecated("Should not be called", level = DeprecationLevel.HIDDEN) override val psiElement: PsiElement @@ -163,14 +163,14 @@ interface FirLightDiagnostic : DiagnosticMarker { } data class FirLightSimpleDiagnostic( - override val element: FirLightSourceElement, + override val element: KtLightSourceElement, override val severity: Severity, override val factory: FirDiagnosticFactory0, override val positioningStrategy: SourceElementPositioningStrategy ) : FirSimpleDiagnostic(), FirLightDiagnostic data class FirLightDiagnosticWithParameters1( - override val element: FirLightSourceElement, + override val element: KtLightSourceElement, override val a: A, override val severity: Severity, override val factory: FirDiagnosticFactory1, @@ -178,7 +178,7 @@ data class FirLightDiagnosticWithParameters1( ) : FirDiagnosticWithParameters1(), FirLightDiagnostic data class FirLightDiagnosticWithParameters2( - override val element: FirLightSourceElement, + override val element: KtLightSourceElement, override val a: A, override val b: B, override val severity: Severity, @@ -187,7 +187,7 @@ data class FirLightDiagnosticWithParameters2( ) : FirDiagnosticWithParameters2(), FirLightDiagnostic data class FirLightDiagnosticWithParameters3( - override val element: FirLightSourceElement, + override val element: KtLightSourceElement, override val a: A, override val b: B, override val c: C, @@ -197,7 +197,7 @@ data class FirLightDiagnosticWithParameters3( ) : FirDiagnosticWithParameters3(), FirLightDiagnostic data class FirLightDiagnosticWithParameters4( - override val element: FirLightSourceElement, + override val element: KtLightSourceElement, override val a: A, override val b: B, override val c: C, diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticFactory.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticFactory.kt index 315549792bc..38f22ec8149 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticFactory.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticFactory.kt @@ -2,11 +2,11 @@ package org.jetbrains.kotlin.fir.analysis.diagnostics +import org.jetbrains.kotlin.KtLightSourceElement +import org.jetbrains.kotlin.KtPsiSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.diagnostics.Severity -import org.jetbrains.kotlin.fir.FirLightSourceElement -import org.jetbrains.kotlin.fir.FirPsiSourceElement -import org.jetbrains.kotlin.fir.FirSourceElement import kotlin.reflect.KClass @RequiresOptIn("Please use DiagnosticReporter.reportOn method if possible") @@ -35,14 +35,14 @@ class FirDiagnosticFactory0( @InternalDiagnosticFactoryMethod fun on( - element: FirSourceElement, + element: KtSourceElement, positioningStrategy: SourceElementPositioningStrategy? ): FirSimpleDiagnostic { return when (element) { - is FirPsiSourceElement -> FirPsiSimpleDiagnostic( + is KtPsiSourceElement -> FirPsiSimpleDiagnostic( element, severity, this, positioningStrategy ?: defaultPositioningStrategy ) - is FirLightSourceElement -> FirLightSimpleDiagnostic(element, severity, this, positioningStrategy ?: defaultPositioningStrategy) + is KtLightSourceElement -> FirLightSimpleDiagnostic(element, severity, this, positioningStrategy ?: defaultPositioningStrategy) else -> incorrectElement(element) } } @@ -61,15 +61,15 @@ class FirDiagnosticFactory1( @InternalDiagnosticFactoryMethod fun on( - element: FirSourceElement, + element: KtSourceElement, a: A, positioningStrategy: SourceElementPositioningStrategy? ): FirDiagnosticWithParameters1 { return when (element) { - is FirPsiSourceElement -> FirPsiDiagnosticWithParameters1( + is KtPsiSourceElement -> FirPsiDiagnosticWithParameters1( element, a, severity, this, positioningStrategy ?: defaultPositioningStrategy ) - is FirLightSourceElement -> FirLightDiagnosticWithParameters1( + is KtLightSourceElement -> FirLightDiagnosticWithParameters1( element, a, severity, @@ -95,16 +95,16 @@ class FirDiagnosticFactory2( @InternalDiagnosticFactoryMethod fun on( - element: FirSourceElement, + element: KtSourceElement, a: A, b: B, positioningStrategy: SourceElementPositioningStrategy? ): FirDiagnosticWithParameters2 { return when (element) { - is FirPsiSourceElement -> FirPsiDiagnosticWithParameters2( + is KtPsiSourceElement -> FirPsiDiagnosticWithParameters2( element, a, b, severity, this, positioningStrategy ?: defaultPositioningStrategy ) - is FirLightSourceElement -> FirLightDiagnosticWithParameters2( + is KtLightSourceElement -> FirLightDiagnosticWithParameters2( element, a, b, @@ -132,17 +132,17 @@ class FirDiagnosticFactory3( @InternalDiagnosticFactoryMethod fun on( - element: FirSourceElement, + element: KtSourceElement, a: A, b: B, c: C, positioningStrategy: SourceElementPositioningStrategy? ): FirDiagnosticWithParameters3 { return when (element) { - is FirPsiSourceElement -> FirPsiDiagnosticWithParameters3( + is KtPsiSourceElement -> FirPsiDiagnosticWithParameters3( element, a, b, c, severity, this, positioningStrategy ?: defaultPositioningStrategy ) - is FirLightSourceElement -> FirLightDiagnosticWithParameters3( + is KtLightSourceElement -> FirLightDiagnosticWithParameters3( element, a, b, @@ -172,7 +172,7 @@ class FirDiagnosticFactory4( @InternalDiagnosticFactoryMethod fun on( - element: FirSourceElement, + element: KtSourceElement, a: A, b: B, c: C, @@ -180,10 +180,10 @@ class FirDiagnosticFactory4( positioningStrategy: SourceElementPositioningStrategy? ): FirDiagnosticWithParameters4 { return when (element) { - is FirPsiSourceElement -> FirPsiDiagnosticWithParameters4( + is KtPsiSourceElement -> FirPsiDiagnosticWithParameters4( element, a, b, c, d, severity, this, positioningStrategy ?: defaultPositioningStrategy ) - is FirLightSourceElement -> FirLightDiagnosticWithParameters4( + is KtLightSourceElement -> FirLightDiagnosticWithParameters4( element, a, b, @@ -198,7 +198,7 @@ class FirDiagnosticFactory4( } } -private fun incorrectElement(element: FirSourceElement): Nothing { +private fun incorrectElement(element: KtSourceElement): Nothing { throw IllegalArgumentException("Unknown element type: ${element::class}") } diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirPsiPositioningStrategy.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirPsiPositioningStrategy.kt index d5977b28c1b..ba99cee894a 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirPsiPositioningStrategy.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirPsiPositioningStrategy.kt @@ -7,12 +7,12 @@ package org.jetbrains.kotlin.fir.analysis.diagnostics import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.KtPsiSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.cfg.UnreachableCode import org.jetbrains.kotlin.diagnostics.DiagnosticMarker import org.jetbrains.kotlin.diagnostics.PositioningStrategy -import org.jetbrains.kotlin.fir.FirPsiSourceElement -import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.psi +import org.jetbrains.kotlin.psi import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtNamedDeclaration @@ -22,8 +22,8 @@ object FirPsiPositioningStrategies { override fun markDiagnostic(diagnostic: DiagnosticMarker): List { //todo it is better to implement arguments extraction in FirDiagnosticFactory, but kotlin struggle with checking types in it atm @Suppress("UNCHECKED_CAST") - val typed = diagnostic as FirDiagnosticWithParameters2, Set> - val source = diagnostic.element as FirPsiSourceElement + val typed = diagnostic as FirDiagnosticWithParameters2, Set> + val source = diagnostic.element as KtPsiSourceElement return UnreachableCode.getUnreachableTextRanges( source.psi as KtElement, typed.a.mapNotNull { it.psi as? KtElement }.toSet(), diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/LightTreePositioningStrategies.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/LightTreePositioningStrategies.kt index 9fc4d9a97a2..827fccda975 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/LightTreePositioningStrategies.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/LightTreePositioningStrategies.kt @@ -11,10 +11,10 @@ import com.intellij.openapi.util.TextRange import com.intellij.psi.tree.IElementType import com.intellij.psi.tree.TokenSet import com.intellij.util.diff.FlyweightCapableTreeStructure +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.KtNodeType import org.jetbrains.kotlin.KtNodeTypes import org.jetbrains.kotlin.diagnostics.PositioningStrategies -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.lexer.KtTokens.MODALITY_MODIFIERS import org.jetbrains.kotlin.lexer.KtTokens.VISIBILITY_MODIFIERS @@ -968,9 +968,9 @@ object LightTreePositioningStrategies { } val UNREACHABLE_CODE: LightTreePositioningStrategy = object : LightTreePositioningStrategy() { - override fun markFirDiagnostic(element: FirSourceElement, diagnostic: FirDiagnostic): List { + override fun markFirDiagnostic(element: KtSourceElement, diagnostic: FirDiagnostic): List { @Suppress("UNCHECKED_CAST") - val typed = diagnostic as FirDiagnosticWithParameters2, Set> + val typed = diagnostic as FirDiagnosticWithParameters2, Set> with(UnreachableCodeLightTreeHelper(element.treeStructure)) { val reachable = typed.a.map { it.lighterASTNode }.toSet() val unreachable = typed.b.map { it.lighterASTNode }.toSet() @@ -1055,13 +1055,13 @@ object LightTreePositioningStrategies { ) } -fun FirSourceElement.hasValOrVar(): Boolean = +fun KtSourceElement.hasValOrVar(): Boolean = treeStructure.valOrVarKeyword(lighterASTNode) != null -fun FirSourceElement.hasVar(): Boolean = +fun KtSourceElement.hasVar(): Boolean = treeStructure.findChildByType(lighterASTNode, KtTokens.VAR_KEYWORD) != null -fun FirSourceElement.hasPrimaryConstructor(): Boolean = +fun KtSourceElement.hasPrimaryConstructor(): Boolean = treeStructure.primaryConstructor(lighterASTNode) != null private fun FlyweightCapableTreeStructure.companionKeyword(node: LighterASTNode): LighterASTNode? = diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/LightTreePositioningStrategy.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/LightTreePositioningStrategy.kt index 1e3fcc59e9e..adff810badc 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/LightTreePositioningStrategy.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/LightTreePositioningStrategy.kt @@ -10,14 +10,14 @@ import com.intellij.openapi.util.Ref import com.intellij.openapi.util.TextRange import com.intellij.psi.TokenType import com.intellij.util.diff.FlyweightCapableTreeStructure -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.analysis.checkers.getChildren import org.jetbrains.kotlin.lexer.KtSingleValueToken import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.lexer.KtTokens.WHITE_SPACE open class LightTreePositioningStrategy { - open fun markFirDiagnostic(element: FirSourceElement, diagnostic: FirDiagnostic): List { + open fun markFirDiagnostic(element: KtSourceElement, diagnostic: FirDiagnostic): List { return mark(element.lighterASTNode, element.startOffset, element.endOffset, element.treeStructure) } diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/SourceElementPositioningStrategy.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/SourceElementPositioningStrategy.kt index 6459660e973..fc598f82603 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/SourceElementPositioningStrategy.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/SourceElementPositioningStrategy.kt @@ -7,11 +7,10 @@ package org.jetbrains.kotlin.fir.analysis.diagnostics import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.KtLightSourceElement +import org.jetbrains.kotlin.KtPsiSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.diagnostics.PositioningStrategy -import org.jetbrains.kotlin.fir.FirLightSourceElement -import org.jetbrains.kotlin.fir.FirPsiSourceElement -import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.psi class SourceElementPositioningStrategy( private val lightTreeStrategy: LightTreePositioningStrategy, @@ -19,15 +18,15 @@ class SourceElementPositioningStrategy( ) { fun markDiagnostic(diagnostic: FirDiagnostic): List { return when (val element = diagnostic.element) { - is FirPsiSourceElement -> psiStrategy.markDiagnostic(diagnostic) - is FirLightSourceElement -> lightTreeStrategy.markFirDiagnostic(element, diagnostic) + is KtPsiSourceElement -> psiStrategy.markDiagnostic(diagnostic) + is KtLightSourceElement -> lightTreeStrategy.markFirDiagnostic(element, diagnostic) } } - fun isValid(element: FirSourceElement): Boolean { + fun isValid(element: KtSourceElement): Boolean { return when (element) { - is FirPsiSourceElement -> psiStrategy.hackyIsValid(element.psi) - is FirLightSourceElement -> lightTreeStrategy.isValid(element.lighterASTNode, element.treeStructure) + is KtPsiSourceElement -> psiStrategy.hackyIsValid(element.psi) + is KtLightSourceElement -> lightTreeStrategy.isValid(element.lighterASTNode, element.treeStructure) } } diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/coneDiagnosticToFirDiagnostic.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/coneDiagnosticToFirDiagnostic.kt index f24f00e2813..8891c837c40 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/coneDiagnosticToFirDiagnostic.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/coneDiagnosticToFirDiagnostic.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.fir.analysis.diagnostics +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.KtNodeTypes -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind import org.jetbrains.kotlin.fir.FirSession -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.analysis.checkers.declaration.isLocalMember import org.jetbrains.kotlin.fir.analysis.getChild import org.jetbrains.kotlin.fir.declarations.utils.isInfix @@ -36,8 +36,8 @@ import org.jetbrains.kotlin.utils.addToStdlib.runIf import org.jetbrains.kotlin.utils.addToStdlib.safeAs private fun ConeDiagnostic.toFirDiagnostic( - source: FirSourceElement, - qualifiedAccessSource: FirSourceElement? + source: KtSourceElement, + qualifiedAccessSource: KtSourceElement? ): FirDiagnostic? = when (this) { is ConeUnresolvedReferenceError -> FirErrors.UNRESOLVED_REFERENCE.createOn( source, @@ -95,7 +95,7 @@ private fun ConeDiagnostic.toFirDiagnostic( is ConeNoTypeArgumentsOnRhsError -> FirErrors.NO_TYPE_ARGUMENTS_ON_RHS.createOn(qualifiedAccessSource ?: source, this.desiredCount, this.candidateSymbol) is ConeSimpleDiagnostic -> when { - source.kind is FirFakeSourceElementKind && source.kind != FirFakeSourceElementKind.ReferenceInAtomicQualifiedAccess -> null + source.kind is KtFakeSourceElementKind && source.kind != KtFakeSourceElementKind.ReferenceInAtomicQualifiedAccess -> null else -> this.getFactory(source).createOn(qualifiedAccessSource ?: source) } is ConeInstanceAccessBeforeSuperCall -> FirErrors.INSTANCE_ACCESS_BEFORE_SUPER_CALL.createOn(source, this.target) @@ -117,8 +117,8 @@ private fun ConeDiagnostic.toFirDiagnostic( fun ConeDiagnostic.toFirDiagnostics( session: FirSession, - source: FirSourceElement, - qualifiedAccessSource: FirSourceElement? + source: KtSourceElement, + qualifiedAccessSource: KtSourceElement? ): List { return when (this) { is ConeInapplicableCandidateError -> mapInapplicableCandidateError(session, this, source, qualifiedAccessSource) @@ -130,8 +130,8 @@ fun ConeDiagnostic.toFirDiagnostics( private fun mapUnsafeCallError( candidate: AbstractCandidate, rootCause: UnsafeCall, - source: FirSourceElement, - qualifiedAccessSource: FirSourceElement?, + source: KtSourceElement, + qualifiedAccessSource: KtSourceElement?, ): FirDiagnostic? { if (candidate.callInfo.isImplicitInvoke) { return FirErrors.UNSAFE_IMPLICIT_INVOKE_CALL.createOn(source, rootCause.actualType) @@ -169,7 +169,7 @@ private fun mapUnsafeCallError( ) } } - return if (source.kind == FirFakeSourceElementKind.ArrayAccessNameReference) { + return if (source.kind == KtFakeSourceElementKind.ArrayAccessNameReference) { FirErrors.UNSAFE_CALL.createOn(source, rootCause.actualType, receiverExpression) } else { FirErrors.UNSAFE_CALL.createOn(qualifiedAccessSource ?: source, rootCause.actualType, receiverExpression) @@ -179,8 +179,8 @@ private fun mapUnsafeCallError( private fun mapInapplicableCandidateError( session: FirSession, diagnostic: ConeInapplicableCandidateError, - source: FirSourceElement, - qualifiedAccessSource: FirSourceElement?, + source: KtSourceElement, + qualifiedAccessSource: KtSourceElement?, ): List { val genericDiagnostic = FirErrors.INAPPLICABLE_CANDIDATE.createOn(source, diagnostic.candidate.symbol) val diagnostics = diagnostic.candidate.diagnostics.filter { it.applicability == diagnostic.applicability }.mapNotNull { rootCause -> @@ -243,8 +243,8 @@ private fun mapInapplicableCandidateError( private fun mapSystemHasContradictionError( session: FirSession, diagnostic: ConeConstraintSystemHasContradiction, - source: FirSourceElement, - qualifiedAccessSource: FirSourceElement?, + source: KtSourceElement, + qualifiedAccessSource: KtSourceElement?, ): List { val errorsToIgnore = mutableSetOf() return buildList { @@ -285,8 +285,8 @@ private fun mapSystemHasContradictionError( } private fun ConstraintSystemError.toDiagnostic( - source: FirSourceElement, - qualifiedAccessSource: FirSourceElement?, + source: KtSourceElement, + qualifiedAccessSource: KtSourceElement?, typeContext: ConeTypeContext, errorsToIgnore: MutableSet, candidate: AbstractCandidate, @@ -365,7 +365,7 @@ private fun ConstraintSystemError.toDiagnostic( private val NewConstraintError.lowerConeType: ConeKotlinType get() = lowerType as ConeKotlinType private val NewConstraintError.upperConeType: ConeKotlinType get() = upperType as ConeKotlinType -private fun ConeSimpleDiagnostic.getFactory(source: FirSourceElement): FirDiagnosticFactory0 { +private fun ConeSimpleDiagnostic.getFactory(source: KtSourceElement): FirDiagnosticFactory0 { @Suppress("UNCHECKED_CAST") return when (kind) { DiagnosticKind.Syntax -> FirErrors.SYNTAX @@ -417,14 +417,14 @@ private fun ConeSimpleDiagnostic.getFactory(source: FirSourceElement): FirDiagno @OptIn(InternalDiagnosticFactoryMethod::class) private fun FirDiagnosticFactory0.createOn( - element: FirSourceElement? + element: KtSourceElement? ): FirSimpleDiagnostic? { return element?.let { on(it, positioningStrategy = null) } } @OptIn(InternalDiagnosticFactoryMethod::class) private fun FirDiagnosticFactory1.createOn( - element: FirSourceElement?, + element: KtSourceElement?, a: A ): FirDiagnosticWithParameters1? { return element?.let { on(it, a, positioningStrategy = null) } @@ -432,7 +432,7 @@ private fun FirDiagnosticFactory1.createOn( @OptIn(InternalDiagnosticFactoryMethod::class) private fun FirDiagnosticFactory2.createOn( - element: FirSourceElement?, + element: KtSourceElement?, a: A, b: B ): FirDiagnosticWithParameters2? { @@ -441,7 +441,7 @@ private fun FirDiagnosticFactory2.createOn( @OptIn(InternalDiagnosticFactoryMethod::class) private fun FirDiagnosticFactory3.createOn( - element: FirSourceElement?, + element: KtSourceElement?, a: A, b: B, c: C @@ -451,7 +451,7 @@ private fun FirDiagnosticFactory3.createOn( @OptIn(InternalDiagnosticFactoryMethod::class) private fun FirDiagnosticFactory4.createOn( - element: FirSourceElement?, + element: KtSourceElement?, a: A, b: B, c: C, diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/impl/DeduplicatingDiagnosticReporter.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/impl/DeduplicatingDiagnosticReporter.kt index 637dbd71171..993f019d772 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/impl/DeduplicatingDiagnosticReporter.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/impl/DeduplicatingDiagnosticReporter.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.analysis.diagnostics.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.diagnostics.AbstractFirDiagnosticFactory import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnostic class DeduplicatingDiagnosticReporter(private val inner: DiagnosticReporter) : DiagnosticReporter() { - private val reported = mutableSetOf>() + private val reported = mutableSetOf>() override fun report(diagnostic: FirDiagnostic?, context: CheckerContext) { if (diagnostic != null && reported.add(Pair(diagnostic.element, diagnostic.factory))) { diff --git a/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/IncrementalPassThroughLookupTrackerComponent.kt b/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/IncrementalPassThroughLookupTrackerComponent.kt index f57187caa70..1b0e6c108b1 100644 --- a/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/IncrementalPassThroughLookupTrackerComponent.kt +++ b/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/IncrementalPassThroughLookupTrackerComponent.kt @@ -5,6 +5,8 @@ package org.jetbrains.kotlin.fir +import org.jetbrains.kotlin.KtPsiSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.diagnostics.DiagnosticUtils.getLineAndColumnInPsiFile import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.incremental.components.Position @@ -15,18 +17,18 @@ import java.util.concurrent.ConcurrentHashMap class IncrementalPassThroughLookupTrackerComponent( private val lookupTracker: LookupTracker, - private val sourceToFilePath: (FirSourceElement) -> String + private val sourceToFilePath: (KtSourceElement) -> String ) : FirLookupTrackerComponent() { private val requiresPosition = lookupTracker.requiresPosition - private val sourceToFilePathsCache = ConcurrentHashMap() + private val sourceToFilePathsCache = ConcurrentHashMap() - override fun recordLookup(name: Name, inScopes: List, source: FirSourceElement?, fileSource: FirSourceElement?) { + override fun recordLookup(name: Name, inScopes: List, source: KtSourceElement?, fileSource: KtSourceElement?) { val definedSource = fileSource ?: source ?: throw AssertionError("Cannot record lookup for \"$name\" without a source") val path = sourceToFilePathsCache.getOrPut(definedSource) { sourceToFilePath(definedSource) } - val position = if (requiresPosition && source != null && source is FirPsiSourceElement) { + val position = if (requiresPosition && source != null && source is KtPsiSourceElement) { getLineAndColumnInPsiFile(source.psi.containingFile, source.psi.textRange).let { Position(it.line, it.column) } } else Position.NO_POSITION @@ -35,7 +37,7 @@ class IncrementalPassThroughLookupTrackerComponent( } } - override fun recordLookup(name: Name, inScope: String, source: FirSourceElement?, fileSource: FirSourceElement?) { + override fun recordLookup(name: Name, inScope: String, source: KtSourceElement?, fileSource: KtSourceElement?) { recordLookup(name, SmartList(inScope), source, fileSource) } } diff --git a/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/ComponentsContainers.kt b/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/ComponentsContainers.kt index 91f78d57a9c..af100de5570 100644 --- a/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/ComponentsContainers.kt +++ b/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/ComponentsContainers.kt @@ -6,6 +6,8 @@ package org.jetbrains.kotlin.fir.session import com.intellij.psi.PsiFile +import org.jetbrains.kotlin.KtPsiSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.config.JvmAnalysisFlags import org.jetbrains.kotlin.config.LanguageVersionSettings import org.jetbrains.kotlin.fir.* @@ -93,8 +95,8 @@ fun FirSession.registerResolveComponents(lookupTracker: LookupTracker? = null) { register(FirNameConflictsTrackerComponent::class, FirNameConflictsTracker()) register(FirModuleVisibilityChecker::class, FirModuleVisibilityChecker.Standard(this)) if (lookupTracker != null) { - val firFileToPath: (FirSourceElement) -> String = { - val psiSource = (it as? FirPsiSourceElement) ?: TODO("Not implemented for non-FirPsiSourceElement") + val firFileToPath: (KtSourceElement) -> String = { + val psiSource = (it as? KtPsiSourceElement) ?: TODO("Not implemented for non-FirPsiSourceElement") ((psiSource.psi as? PsiFile) ?: psiSource.psi.containingFile).virtualFile.path } register( 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 38b965e0aa8..dcaab3264d3 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 @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.fir.backend +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.KtNodeTypes import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.Modality @@ -46,6 +47,7 @@ import org.jetbrains.kotlin.ir.util.parentClassOrNull import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.SpecialNames +import org.jetbrains.kotlin.psi import org.jetbrains.kotlin.psi.KtBinaryExpression import org.jetbrains.kotlin.psi.KtForExpression import org.jetbrains.kotlin.util.OperatorNameConventions @@ -494,7 +496,7 @@ class Fir2IrVisitor( internal fun convertToIrExpression(expression: FirExpression, annotationMode: Boolean = false): IrExpression { return when (expression) { is FirBlock -> expression.convertToIrExpressionOrBlock( - if (expression.source?.kind == FirFakeSourceElementKind.DesugaredForLoop) IrStatementOrigin.FOR_LOOP else null + if (expression.source?.kind == KtFakeSourceElementKind.DesugaredForLoop) IrStatementOrigin.FOR_LOOP else null ) is FirUnitExpression -> expression.convertWithOffsets { startOffset, endOffset -> IrGetObjectValueImpl( @@ -629,7 +631,7 @@ class Fir2IrVisitor( if (size == 1) { val firStatement = single() if (firStatement is FirExpression && - (firStatement !is FirBlock || firStatement.source?.kind != FirFakeSourceElementKind.DesugaredForLoop) + (firStatement !is FirBlock || firStatement.source?.kind != KtFakeSourceElementKind.DesugaredForLoop) ) { return convertToIrExpression(firStatement) } diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/AnnotationGenerator.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/AnnotationGenerator.kt index 4eba482d5f4..adac213b915 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/AnnotationGenerator.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/AnnotationGenerator.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.backend.generators +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget import org.jetbrains.kotlin.fir.FirAnnotationContainer -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind import org.jetbrains.kotlin.fir.backend.Fir2IrComponents import org.jetbrains.kotlin.fir.declarations.FirProperty import org.jetbrains.kotlin.fir.declarations.FirValueParameter @@ -62,7 +62,7 @@ class AnnotationGenerator(private val components: Fir2IrComponents) : Fir2IrComp fun generate(irProperty: IrProperty, property: FirProperty) { val applicableTargets = when { - property.source?.kind == FirFakeSourceElementKind.PropertyFromParameter -> constructorPropertyTargets + property.source?.kind == KtFakeSourceElementKind.PropertyFromParameter -> constructorPropertyTargets irProperty.isDelegated -> delegatedPropertyTargets else -> propertyTargets } @@ -74,7 +74,7 @@ class AnnotationGenerator(private val components: Fir2IrComponents) : Fir2IrComp fun generate(irField: IrField, property: FirProperty) { val irProperty = irField.correspondingPropertySymbol?.owner ?: throw AssertionError("$irField is not a property field") val applicableTargets = when { - property.source?.kind == FirFakeSourceElementKind.PropertyFromParameter -> constructorPropertyTargets + property.source?.kind == KtFakeSourceElementKind.PropertyFromParameter -> constructorPropertyTargets irProperty.isDelegated -> delegatedPropertyTargets else -> propertyTargets } diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/CallAndReferenceGenerator.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/CallAndReferenceGenerator.kt index d7826ba3ea9..90406c92eba 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/CallAndReferenceGenerator.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/CallAndReferenceGenerator.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.backend.generators +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.backend.common.ir.isMethodOfAny -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind import org.jetbrains.kotlin.fir.backend.* import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.utils.isCompanion @@ -77,7 +77,7 @@ class CallAndReferenceGenerator( // val `x$delegate` = y // val x get() = `x$delegate`.getValue(this, ::x) // The reference here (like the rest of the accessor) has DefaultAccessor source kind. - val isForDelegate = callableReferenceAccess.source?.kind == FirFakeSourceElementKind.DelegatedPropertyAccessor + val isForDelegate = callableReferenceAccess.source?.kind == KtFakeSourceElementKind.DelegatedPropertyAccessor val origin = if (isForDelegate) IrStatementOrigin.PROPERTY_REFERENCE_FOR_DELEGATE else null return callableReferenceAccess.convertWithOffsets { startOffset, endOffset -> when (symbol) { diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaFacade.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaFacade.kt index 3e14c27e503..ca0363c6e82 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaFacade.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaFacade.kt @@ -6,6 +6,8 @@ package org.jetbrains.kotlin.fir.java import com.intellij.openapi.progress.ProcessCanceledException +import org.jetbrains.kotlin.KtFakeSourceElement +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.builtins.jvm.JavaToKotlinClassMap import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.EffectiveVisibility @@ -37,6 +39,7 @@ import org.jetbrains.kotlin.load.java.JvmAnnotationNames import org.jetbrains.kotlin.load.java.structure.* import org.jetbrains.kotlin.load.java.structure.impl.JavaElementImpl import org.jetbrains.kotlin.name.* +import org.jetbrains.kotlin.toKtPsiSourceElement import org.jetbrains.kotlin.types.Variance.INVARIANT import org.jetbrains.kotlin.util.OperatorNameConventions @@ -160,7 +163,7 @@ class FirJavaFacade( val valueParametersForAnnotationConstructor = ValueParametersForAnnotationConstructor() val classIsAnnotation = javaClass.classKind == ClassKind.ANNOTATION_CLASS return buildJavaClass { - source = (javaClass as? JavaElementImpl<*>)?.psi?.toFirPsiSourceElement() + source = (javaClass as? JavaElementImpl<*>)?.psi?.toKtPsiSourceElement() moduleData = baseModuleData symbol = classSymbol name = javaClass.name @@ -276,7 +279,7 @@ class FirJavaFacade( if (classIsAnnotation) { declarations += buildConstructorForAnnotationClass( - classSource = (javaClass as? JavaElementImpl<*>)?.psi?.toFirPsiSourceElement(FirFakeSourceElementKind.ImplicitConstructor) as? FirFakeSourceElement, + classSource = (javaClass as? JavaElementImpl<*>)?.psi?.toKtPsiSourceElement(KtFakeSourceElementKind.ImplicitConstructor) as? KtFakeSourceElement, constructorId = constructorId, ownerClassBuilder = this, valueParametersForAnnotationConstructor = valueParametersForAnnotationConstructor @@ -314,7 +317,7 @@ class FirJavaFacade( val returnType = javaField.type return when { javaField.isEnumEntry -> buildEnumEntry { - source = (javaField as? JavaElementImpl<*>)?.psi?.toFirPsiSourceElement() + source = (javaField as? JavaElementImpl<*>)?.psi?.toKtPsiSourceElement() moduleData = baseModuleData symbol = FirEnumEntrySymbol(fieldId) name = fieldName @@ -337,7 +340,7 @@ class FirJavaFacade( containingClassForStaticMemberAttr = ConeClassLikeLookupTagImpl(classId) } else -> buildJavaField { - source = (javaField as? JavaElementImpl<*>)?.psi?.toFirPsiSourceElement() + source = (javaField as? JavaElementImpl<*>)?.psi?.toKtPsiSourceElement() moduleData = baseModuleData symbol = FirFieldSymbol(fieldId) name = fieldName @@ -387,7 +390,7 @@ class FirJavaFacade( val returnType = javaMethod.returnType return buildJavaMethod { moduleData = baseModuleData - source = (javaMethod as? JavaElementImpl<*>)?.psi?.toFirPsiSourceElement() + source = (javaMethod as? JavaElementImpl<*>)?.psi?.toKtPsiSourceElement() symbol = methodSymbol name = methodName returnTypeRef = returnType.toFirJavaTypeRef(session, javaTypeParameterStack) @@ -429,7 +432,7 @@ class FirJavaFacade( private fun convertJavaAnnotationMethodToValueParameter(javaMethod: JavaMethod, firJavaMethod: FirJavaMethod): FirJavaValueParameter = buildJavaValueParameter { source = (javaMethod as? JavaElementImpl<*>)?.psi - ?.toFirPsiSourceElement(FirFakeSourceElementKind.ImplicitJavaAnnotationConstructor) + ?.toKtPsiSourceElement(KtFakeSourceElementKind.ImplicitJavaAnnotationConstructor) moduleData = baseModuleData returnTypeRef = firJavaMethod.returnTypeRef name = javaMethod.name @@ -448,7 +451,7 @@ class FirJavaFacade( ): FirJavaConstructor { val constructorSymbol = FirConstructorSymbol(constructorId) return buildJavaConstructor { - source = (javaConstructor as? JavaElementImpl<*>)?.psi?.toFirPsiSourceElement() + source = (javaConstructor as? JavaElementImpl<*>)?.psi?.toKtPsiSourceElement() moduleData = baseModuleData symbol = constructorSymbol isInner = javaClass.outerClass != null && !javaClass.isStatic @@ -487,7 +490,7 @@ class FirJavaFacade( } private fun buildConstructorForAnnotationClass( - classSource: FirFakeSourceElement?, + classSource: KtFakeSourceElement?, constructorId: CallableId, ownerClassBuilder: FirJavaClassBuilder, valueParametersForAnnotationConstructor: ValueParametersForAnnotationConstructor 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 e2b788d18fe..51f688ed9f4 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 org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.* @@ -31,7 +31,7 @@ import kotlin.properties.Delegates @OptIn(FirImplementationDetail::class) class FirJavaClass @FirImplementationDetail internal constructor( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val moduleData: FirModuleData, @Volatile override var resolvePhase: FirResolvePhase, @@ -137,7 +137,7 @@ internal class FirJavaClassBuilder : FirRegularClassBuilder(), FirAnnotationCont lateinit var javaTypeParameterStack: JavaTypeParameterStack val existingNestedClassifierNames: MutableList = mutableListOf() - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR override val annotations: MutableList = mutableListOf() override val typeParameters: MutableList = mutableListOf() 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 d5f65680e00..596ac5a59dc 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,10 +5,10 @@ package org.jetbrains.kotlin.fir.java.declarations +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.builder.FirConstructorBuilder @@ -28,7 +28,7 @@ import kotlin.properties.Delegates @OptIn(FirImplementationDetail::class) class FirJavaConstructor @FirImplementationDetail constructor( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val moduleData: FirModuleData, override val symbol: FirConstructorSymbol, override val isPrimary: Boolean, 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 02e7eae4079..f185d09ad5f 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,11 +5,11 @@ package org.jetbrains.kotlin.fir.java.declarations +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.builder.FirFieldBuilder @@ -32,7 +32,7 @@ import kotlin.properties.Delegates @OptIn(FirImplementationDetail::class) class FirJavaField @FirImplementationDetail constructor( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val moduleData: FirModuleData, 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 1a70f16d264..97efea997eb 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,9 +5,9 @@ package org.jetbrains.kotlin.fir.java.declarations +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.contracts.FirContractDescription @@ -48,7 +48,7 @@ import kotlin.properties.Delegates @OptIn(FirImplementationDetail::class) class FirJavaMethod @FirImplementationDetail constructor( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val moduleData: FirModuleData, @Volatile override var resolvePhase: FirResolvePhase, @@ -186,7 +186,7 @@ val ALL_JAVA_OPERATION_NAMES = @FirBuilderDsl class FirJavaMethodBuilder : FirFunctionBuilder, FirTypeParametersOwnerBuilder, FirAnnotationContainerBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override lateinit var moduleData: FirModuleData override var attributes: FirDeclarationAttributes = FirDeclarationAttributes() override lateinit var returnTypeRef: FirTypeRef 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 accd07979ad..2afb46fa48b 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,9 +5,9 @@ package org.jetbrains.kotlin.fir.java.declarations +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedDeclarationStatusImpl @@ -28,7 +28,7 @@ import kotlin.contracts.contract @OptIn(FirImplementationDetail::class) class FirJavaValueParameter @FirImplementationDetail constructor( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val moduleData: FirModuleData, @Volatile override var resolvePhase: FirResolvePhase, @@ -185,7 +185,7 @@ class FirJavaValueParameter @FirImplementationDetail constructor( @FirBuilderDsl class FirJavaValueParameterBuilder { - var source: FirSourceElement? = null + var source: KtSourceElement? = null lateinit var moduleData: FirModuleData var attributes: FirDeclarationAttributes = FirDeclarationAttributes() lateinit var returnTypeRef: FirTypeRef diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/javaAnnotationsMapping.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/javaAnnotationsMapping.kt index bbc1be65e66..70b8ac0227d 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/javaAnnotationsMapping.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/javaAnnotationsMapping.kt @@ -25,7 +25,6 @@ import org.jetbrains.kotlin.fir.resolve.diagnostics.ConeUnresolvedReferenceError import org.jetbrains.kotlin.fir.resolve.providers.getClassDeclaredPropertySymbols import org.jetbrains.kotlin.fir.resolve.providers.symbolProvider import org.jetbrains.kotlin.fir.symbols.impl.ConeClassLikeLookupTagImpl -import org.jetbrains.kotlin.fir.toFirPsiSourceElement import org.jetbrains.kotlin.fir.types.* import org.jetbrains.kotlin.fir.types.builder.buildErrorTypeRef import org.jetbrains.kotlin.fir.types.builder.buildResolvedTypeRef @@ -35,6 +34,7 @@ import org.jetbrains.kotlin.load.java.structure.impl.JavaElementImpl import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.StandardClassIds +import org.jetbrains.kotlin.toKtPsiSourceElement import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull import java.util.* @@ -58,7 +58,7 @@ internal fun JavaValueParameter.toFirValueParameter( session: FirSession, moduleData: FirModuleData, index: Int, javaTypeParameterStack: JavaTypeParameterStack ): FirValueParameter { return buildJavaValueParameter { - source = (this@toFirValueParameter as? JavaElementImpl<*>)?.psi?.toFirPsiSourceElement() + source = (this@toFirValueParameter as? JavaElementImpl<*>)?.psi?.toKtPsiSourceElement() this.moduleData = moduleData name = this@toFirValueParameter.name ?: Name.identifier("p$index") returnTypeRef = type.toFirJavaTypeRef(session, javaTypeParameterStack) diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/types/jvm/FirJavaTypeRef.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/types/jvm/FirJavaTypeRef.kt index 6a3733c0364..85b81d2fb5a 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/types/jvm/FirJavaTypeRef.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/types/jvm/FirJavaTypeRef.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.types.jvm -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.FirQualifierPart @@ -30,7 +30,7 @@ class FirJavaTypeRef( override val isMarkedNullable: Boolean get() = false - override val source: FirSourceElement? + override val source: KtSourceElement? get() = null override val annotations: List by lazy { annotationBuilder() } diff --git a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/CopyUtils.kt b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/CopyUtils.kt index e79d052ab6f..8e7e191c5dc 100644 --- a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/CopyUtils.kt +++ b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/CopyUtils.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.fir +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.contracts.description.EventOccurrencesRange import org.jetbrains.kotlin.descriptors.EffectiveVisibility import org.jetbrains.kotlin.descriptors.Modality @@ -32,7 +33,7 @@ fun FirFunctionCall.copy( explicitReceiver: FirExpression? = this.explicitReceiver, dispatchReceiver: FirExpression = this.dispatchReceiver, extensionReceiver: FirExpression = this.extensionReceiver, - source: FirSourceElement? = this.source, + source: KtSourceElement? = this.source, typeArguments: List = this.typeArguments, resultType: FirTypeRef = this.typeRef ): FirFunctionCall { @@ -79,7 +80,7 @@ inline fun FirFunctionCall.copyAsImplicitInvokeCall( fun FirAnonymousFunction.copy( receiverTypeRef: FirTypeRef? = this.receiverTypeRef, - source: FirSourceElement? = this.source, + source: KtSourceElement? = this.source, moduleData: FirModuleData = this.moduleData, origin: FirDeclarationOrigin = this.origin, returnTypeRef: FirTypeRef = this.returnTypeRef, diff --git a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/resolve/LookupTagUtils.kt b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/resolve/LookupTagUtils.kt index fd36ec3137d..b5dc045fb57 100644 --- a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/resolve/LookupTagUtils.kt +++ b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/resolve/LookupTagUtils.kt @@ -5,8 +5,9 @@ package org.jetbrains.kotlin.fir.resolve +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.builtins.StandardNames -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind +import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.FirRegularClass import org.jetbrains.kotlin.fir.declarations.FirValueParameter @@ -14,7 +15,6 @@ import org.jetbrains.kotlin.fir.declarations.getAnnotationsByClassId import org.jetbrains.kotlin.fir.expressions.builder.buildAnnotation import org.jetbrains.kotlin.fir.expressions.builder.buildAnnotationArgumentMapping import org.jetbrains.kotlin.fir.expressions.builder.buildConstExpression -import org.jetbrains.kotlin.fir.fakeElement import org.jetbrains.kotlin.fir.resolve.providers.FirSymbolProvider import org.jetbrains.kotlin.fir.resolve.providers.symbolProvider import org.jetbrains.kotlin.fir.symbols.ConeClassLikeLookupTag @@ -80,7 +80,7 @@ fun ConeKotlinType.withParameterNameAnnotation(valueParameter: FirValueParameter // Existing @ParameterName annotation takes precedence if (attributes.customAnnotations.getAnnotationsByClassId(StandardNames.FqNames.parameterNameClassId).isNotEmpty()) return this - val fakeSource = valueParameter.source?.fakeElement(FirFakeSourceElementKind.ParameterNameAnnotationCall) + val fakeSource = valueParameter.source?.fakeElement(KtFakeSourceElementKind.ParameterNameAnnotationCall) val parameterNameAnnotationCall = buildAnnotation { source = fakeSource annotationTypeRef = diff --git a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirIntegerOperatorCall.kt b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirIntegerOperatorCall.kt index c258dd99e4d..b89d59136a3 100644 --- a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirIntegerOperatorCall.kt +++ b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirIntegerOperatorCall.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.scopes.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.fir.types.builder.buildImplicitTypeRef @OptIn(FirImplementationDetail::class) class FirIntegerOperatorCall @FirImplementationDetail constructor( - source: FirSourceElement?, + source: KtSourceElement?, typeRef: FirTypeRef, annotations: MutableList, typeArguments: MutableList, @@ -49,7 +49,7 @@ class FirIntegerOperatorCall @FirImplementationDetail constructor( @FirBuilderDsl class FirIntegerOperatorCallBuilder : FirQualifiedAccessBuilder, FirCallBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override var typeRef: FirTypeRef = buildImplicitTypeRef() override val annotations: MutableList = mutableListOf() override val typeArguments: MutableList = mutableListOf() diff --git a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/types/TypeUtils.kt b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/types/TypeUtils.kt index 7d1d9feb4fc..4960c8b95b9 100644 --- a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/types/TypeUtils.kt +++ b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/types/TypeUtils.kt @@ -5,14 +5,19 @@ package org.jetbrains.kotlin.fir.types +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.descriptors.Visibility -import org.jetbrains.kotlin.fir.* +import org.jetbrains.kotlin.fakeElement +import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.copyWithNewSourceKind import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.utils.visibility import org.jetbrains.kotlin.fir.resolve.fullyExpandedType import org.jetbrains.kotlin.fir.resolve.substitution.substitutorByMap import org.jetbrains.kotlin.fir.resolve.toSymbol +import org.jetbrains.kotlin.fir.resolvedTypeFromPrototype import org.jetbrains.kotlin.fir.symbols.ConeTypeParameterLookupTag import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.ConeClassLookupTagWithFixedSymbol @@ -205,7 +210,7 @@ fun ConeKotlinType.toSymbol(session: FirSession): FirBasedSymbol<*>? { } fun ConeKotlinType.toFirResolvedTypeRef( - source: FirSourceElement? = null, + source: KtSourceElement? = null, delegatedTypeRef: FirTypeRef? = null ): FirResolvedTypeRef { return if (this is ConeKotlinErrorType) { @@ -256,7 +261,7 @@ fun FirTypeRef.withReplacedReturnType(newType: ConeKotlinType?): FirTypeRef { fun FirTypeRef.withReplacedConeType( newType: ConeKotlinType?, - firFakeSourceElementKind: FirFakeSourceElementKind? = null + firFakeSourceElementKind: KtFakeSourceElementKind? = null ): FirResolvedTypeRef { require(this is FirResolvedTypeRef) if (newType == null) return this @@ -352,7 +357,7 @@ private fun FirTypeRef.hideLocalTypeIfNeeded( val superType = firClass.superTypeRefs.single() if (superType is FirResolvedTypeRef) { val newKind = source?.kind - return if (newKind is FirFakeSourceElementKind) superType.copyWithNewSourceKind(newKind) else superType + return if (newKind is KtFakeSourceElementKind) superType.copyWithNewSourceKind(newKind) else superType } return this } diff --git a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/BaseConverter.kt b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/BaseConverter.kt index 2e89c81e28e..e364e607cba 100644 --- a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/BaseConverter.kt +++ b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/BaseConverter.kt @@ -12,7 +12,8 @@ import com.intellij.psi.tree.IElementType import com.intellij.util.diff.FlyweightCapableTreeStructure import org.jetbrains.kotlin.ElementTypeUtils.isExpression import org.jetbrains.kotlin.KtNodeTypes -import org.jetbrains.kotlin.fir.* +import org.jetbrains.kotlin.* +import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.builder.BaseFirBuilder import org.jetbrains.kotlin.fir.builder.Context import org.jetbrains.kotlin.fir.builder.escapedStringToCharacter @@ -31,10 +32,10 @@ abstract class BaseConverter( protected val implicitType = buildImplicitTypeRef() - override fun LighterASTNode.toFirSourceElement(kind: FirFakeSourceElementKind?): FirLightSourceElement { + override fun LighterASTNode.toFirSourceElement(kind: KtFakeSourceElementKind?): KtLightSourceElement { val startOffset = offset + tree.getStartOffset(this) val endOffset = offset + tree.getEndOffset(this) - return toFirLightSourceElement(tree, kind ?: context.forcedElementSourceKind ?: FirRealSourceElementKind, startOffset, endOffset) + return toKtLightSourceElement(tree, kind ?: context.forcedElementSourceKind ?: KtRealSourceElementKind, startOffset, endOffset) } override val LighterASTNode.elementType: IElementType diff --git a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/ConverterUtil.kt b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/ConverterUtil.kt index 042b87e6938..e97a58bece1 100644 --- a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/ConverterUtil.kt +++ b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/ConverterUtil.kt @@ -6,10 +6,11 @@ package org.jetbrains.kotlin.fir.lightTree.converter import com.intellij.lang.LighterASTNode +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.KtNodeTypes.* import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind +import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.builder.generateResolvedAccessExpression import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin @@ -22,7 +23,6 @@ import org.jetbrains.kotlin.fir.expressions.builder.FirCallBuilder import org.jetbrains.kotlin.fir.expressions.builder.buildArgumentList import org.jetbrains.kotlin.fir.expressions.builder.buildBlock import org.jetbrains.kotlin.fir.expressions.builder.buildComponentCall -import org.jetbrains.kotlin.fir.fakeElement import org.jetbrains.kotlin.fir.lightTree.fir.DestructuringDeclaration import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol import org.jetbrains.kotlin.name.Name @@ -93,7 +93,7 @@ fun generateDestructuringBlock( returnTypeRef = entry.returnTypeRef name = entry.name initializer = buildComponentCall { - val componentCallSource = entry.source?.fakeElement(FirFakeSourceElementKind.DesugaredComponentFunctionCall) + val componentCallSource = entry.source?.fakeElement(KtFakeSourceElementKind.DesugaredComponentFunctionCall) source = componentCallSource explicitReceiver = generateResolvedAccessExpression(componentCallSource, container) componentIndex = index + 1 diff --git a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt index f969a30c6e9..04e300c7977 100644 --- a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt +++ b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt @@ -9,6 +9,9 @@ import com.intellij.lang.LighterASTNode import com.intellij.psi.TokenType import com.intellij.util.diff.FlyweightCapableTreeStructure import org.jetbrains.kotlin.ElementTypeUtils.isExpression +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtLightSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.KtNodeTypes import org.jetbrains.kotlin.KtNodeTypes.* import org.jetbrains.kotlin.builtins.StandardNames @@ -19,6 +22,7 @@ import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget.* +import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.* import org.jetbrains.kotlin.fir.builder.* import org.jetbrains.kotlin.fir.contracts.FirContractDescription @@ -143,7 +147,7 @@ class DeclarationsConverter( return FirBlockBuilder().apply { source = block.toFirSourceElement() firStatements.forEach { firStatement -> - val isForLoopBlock = firStatement is FirBlock && firStatement.source?.kind == FirFakeSourceElementKind.DesugaredForLoop + val isForLoopBlock = firStatement is FirBlock && firStatement.source?.kind == KtFakeSourceElementKind.DesugaredForLoop if (firStatement !is FirBlock || isForLoopBlock || firStatement.annotations.isNotEmpty()) { statements += firStatement } else { @@ -171,7 +175,7 @@ class DeclarationsConverter( } } - private fun convertImportAlias(importAlias: LighterASTNode): Pair? { + private fun convertImportAlias(importAlias: LighterASTNode): Pair? { importAlias.forEachChildren { when (it.tokenType) { IDENTIFIER -> return Pair(it.asText, it.toFirSourceElement()) @@ -188,7 +192,7 @@ class DeclarationsConverter( var importedFqName: FqName? = null var isAllUnder = false var aliasName: String? = null - var aliasSource: FirSourceElement? = null + var aliasSource: KtSourceElement? = null importDirective.forEachChildren { when (it.tokenType) { DOT_QUALIFIED_EXPRESSION, REFERENCE_EXPRESSION -> importedFqName = FqName(it.asText) @@ -455,7 +459,7 @@ class DeclarationsConverter( val delegationSpecifiers = superTypeList?.let { convertDelegationSpecifiers(it) } var delegatedSuperTypeRef: FirTypeRef? = delegationSpecifiers?.delegatedSuperTypeRef - val delegatedConstructorSource: FirLightSourceElement? = delegationSpecifiers?.delegatedConstructorSource + val delegatedConstructorSource: KtLightSourceElement? = delegationSpecifiers?.delegatedConstructorSource val superTypeCallEntry = delegationSpecifiers?.delegatedConstructorArguments.orEmpty() val superTypeRefs = mutableListOf() @@ -597,7 +601,7 @@ class DeclarationsConverter( val superTypeCallEntry = mutableListOf() var delegatedSuperTypeRef: FirTypeRef? = null var classBody: LighterASTNode? = null - var delegatedConstructorSource: FirLightSourceElement? = null + var delegatedConstructorSource: KtLightSourceElement? = null var delegateFields: List? = null objectDeclaration.forEachChildren { @@ -695,7 +699,7 @@ class DeclarationsConverter( annotations += modifiers.annotations initializer = withChildClassName(enumEntryName, isExpect = false) { buildAnonymousObjectExpression { - val entrySource = enumEntry.toFirSourceElement(FirFakeSourceElementKind.EnumInitializer) + val entrySource = enumEntry.toFirSourceElement(KtFakeSourceElementKind.EnumInitializer) source = entrySource anonymousObject = buildAnonymousObject { source = entrySource @@ -784,9 +788,9 @@ class DeclarationsConverter( */ private fun convertPrimaryConstructor( primaryConstructor: LighterASTNode?, - selfTypeSource: FirSourceElement?, + selfTypeSource: KtSourceElement?, classWrapper: ClassWrapper, - delegatedConstructorSource: FirLightSourceElement?, + delegatedConstructorSource: KtLightSourceElement?, isEnumEntry: Boolean = false, containingClassIsExpectClass: Boolean ): PrimaryConstructor? { @@ -806,19 +810,19 @@ class DeclarationsConverter( val defaultVisibility = classWrapper.defaultConstructorVisibility() val firDelegatedCall = buildDelegatedConstructorCall { - source = delegatedConstructorSource ?: selfTypeSource?.fakeElement(FirFakeSourceElementKind.DelegatingConstructorCall) - constructedTypeRef = classWrapper.delegatedSuperTypeRef.copyWithNewSourceKind(FirFakeSourceElementKind.ImplicitTypeRef) + source = delegatedConstructorSource ?: selfTypeSource?.fakeElement(KtFakeSourceElementKind.DelegatingConstructorCall) + constructedTypeRef = classWrapper.delegatedSuperTypeRef.copyWithNewSourceKind(KtFakeSourceElementKind.ImplicitTypeRef) isThis = false calleeReference = buildExplicitSuperReference { //[dirty] in case of enum classWrapper.delegatedSuperTypeRef.source is whole enum source source = if (!isEnumEntry) { - classWrapper.delegatedSuperTypeRef.source?.fakeElement(FirFakeSourceElementKind.DelegatingConstructorCall) - ?: this@buildDelegatedConstructorCall.source?.fakeElement(FirFakeSourceElementKind.DelegatingConstructorCall) + classWrapper.delegatedSuperTypeRef.source?.fakeElement(KtFakeSourceElementKind.DelegatingConstructorCall) + ?: this@buildDelegatedConstructorCall.source?.fakeElement(KtFakeSourceElementKind.DelegatingConstructorCall) } else { delegatedConstructorSource ?.lighterASTNode ?.getChildNodeByType(CONSTRUCTOR_CALLEE) - ?.toFirSourceElement(FirFakeSourceElementKind.DelegatingConstructorCall) + ?.toFirSourceElement(KtFakeSourceElementKind.DelegatingConstructorCall) ?: this@buildDelegatedConstructorCall.source } @@ -841,7 +845,7 @@ class DeclarationsConverter( return PrimaryConstructor( buildPrimaryConstructor { source = primaryConstructor?.toFirSourceElement() - ?: selfTypeSource?.fakeElement(FirFakeSourceElementKind.ImplicitConstructor) + ?: selfTypeSource?.fakeElement(KtFakeSourceElementKind.ImplicitConstructor) moduleData = baseModuleData origin = FirDeclarationOrigin.Source returnTypeRef = classWrapper.delegatedSelfTypeRef @@ -962,14 +966,14 @@ class DeclarationsConverter( return buildDelegatedConstructorCall { source = if (isImplicit) { - constructorDelegationCall.toFirSourceElement().fakeElement(FirFakeSourceElementKind.ImplicitConstructor) + constructorDelegationCall.toFirSourceElement().fakeElement(KtFakeSourceElementKind.ImplicitConstructor) } else { constructorDelegationCall.toFirSourceElement() } - constructedTypeRef = delegatedType.copyWithNewSourceKind(FirFakeSourceElementKind.ImplicitTypeRef) + constructedTypeRef = delegatedType.copyWithNewSourceKind(KtFakeSourceElementKind.ImplicitTypeRef) this.isThis = isThis val calleeKind = - if (isImplicit) FirFakeSourceElementKind.ImplicitConstructor else FirFakeSourceElementKind.DelegatingConstructorCall + if (isImplicit) KtFakeSourceElementKind.ImplicitConstructor else KtFakeSourceElementKind.DelegatingConstructorCall val calleeSource = constructorDelegationCall.getChildNodeByType(CONSTRUCTOR_DELEGATION_REFERENCE) ?.toFirSourceElement(calleeKind) ?: this@buildDelegatedConstructorCall.source?.fakeElement(calleeKind) @@ -1145,10 +1149,10 @@ class DeclarationsConverter( } this.getter = convertedAccessors.find { it.isGetter } ?: FirDefaultPropertyGetter( - property.toFirSourceElement(FirFakeSourceElementKind.DefaultAccessor), + property.toFirSourceElement(KtFakeSourceElementKind.DefaultAccessor), moduleData, FirDeclarationOrigin.Source, - returnType.copyWithNewSourceKind(FirFakeSourceElementKind.DefaultAccessor), + returnType.copyWithNewSourceKind(KtFakeSourceElementKind.DefaultAccessor), propertyVisibility, symbol, ).also { @@ -1160,10 +1164,10 @@ class DeclarationsConverter( this.setter = convertedAccessors.find { it.isSetter } ?: if (isVar) { FirDefaultPropertySetter( - property.toFirSourceElement(FirFakeSourceElementKind.DefaultAccessor), + property.toFirSourceElement(KtFakeSourceElementKind.DefaultAccessor), moduleData, FirDeclarationOrigin.Source, - returnType.copyWithNewSourceKind(FirFakeSourceElementKind.DefaultAccessor), + returnType.copyWithNewSourceKind(KtFakeSourceElementKind.DefaultAccessor), propertyVisibility, symbol, parameterAnnotations = modifiers.annotations.filterUseSiteTarget(SETTER_PARAMETER) @@ -1281,7 +1285,7 @@ class DeclarationsConverter( var modifiers = Modifier() var isGetter = true var returnType: FirTypeRef? = null - val propertyTypeRefToUse = propertyTypeRef.copyWithNewSourceKind(FirFakeSourceElementKind.ImplicitTypeRef) + val propertyTypeRefToUse = propertyTypeRef.copyWithNewSourceKind(KtFakeSourceElementKind.ImplicitTypeRef) var firValueParameters: FirValueParameter = buildDefaultSetterValueParameter { moduleData = baseModuleData origin = FirDeclarationOrigin.Source @@ -1417,7 +1421,7 @@ class DeclarationsConverter( FirDefaultPropertyBackingField( moduleData = baseModuleData, annotations = mutableListOf(), - returnTypeRef = propertyReturnType.copyWithNewSourceKind(FirFakeSourceElementKind.DefaultAccessor), + returnTypeRef = propertyReturnType.copyWithNewSourceKind(KtFakeSourceElementKind.DefaultAccessor), isVar = isVar, propertySymbol = propertySymbol, status = status, @@ -1694,7 +1698,7 @@ class DeclarationsConverter( val delegatedSuperTypeRef: FirTypeRef?, val superTypesRef: List, val delegatedConstructorArguments: List, - val delegatedConstructorSource: FirLightSourceElement?, + val delegatedConstructorSource: KtLightSourceElement?, val delegateFields: List, ) @@ -1702,7 +1706,7 @@ class DeclarationsConverter( val superTypeRefs = mutableListOf() val superTypeCallEntry = mutableListOf() var delegatedSuperTypeRef: FirTypeRef? = null - var delegateConstructorSource: FirLightSourceElement? = null + var delegateConstructorSource: KtLightSourceElement? = null val delegateFields = mutableListOf() delegationSpecifiers.forEachChildren { when (it.tokenType) { @@ -1713,7 +1717,7 @@ class DeclarationsConverter( delegatedSuperTypeRef = first superTypeRefs += first superTypeCallEntry += second - delegateConstructorSource = it.toFirSourceElement(FirFakeSourceElementKind.DelegatingConstructorCall) + delegateConstructorSource = it.toFirSourceElement(KtFakeSourceElementKind.DelegatingConstructorCall) } DELEGATED_SUPER_TYPE_ENTRY -> { superTypeRefs += convertExplicitDelegation(it, delegateFields) @@ -1768,7 +1772,7 @@ class DeclarationsConverter( val delegateName = Name.special("<\$\$delegate_${delegateFields.size}>") delegateFields.add( buildField { - source = calculatedFirExpression.source?.fakeElement(FirFakeSourceElementKind.ClassDelegationField) + source = calculatedFirExpression.source?.fakeElement(KtFakeSourceElementKind.ClassDelegationField) moduleData = baseModuleData origin = FirDeclarationOrigin.Synthetic name = delegateName @@ -1956,7 +1960,7 @@ class DeclarationsConverter( * @see org.jetbrains.kotlin.parsing.KotlinParsing.parseNullableTypeSuffix */ private fun convertNullableType( - typeRefSource: FirSourceElement, + typeRefSource: KtSourceElement, nullableType: LighterASTNode, allTypeModifiers: MutableList, isNullable: Boolean = true @@ -1987,15 +1991,15 @@ class DeclarationsConverter( * @see org.jetbrains.kotlin.parsing.KotlinParsing.parseUserType */ private fun convertUserType( - typeRefSource: FirSourceElement, + typeRefSource: KtSourceElement, userType: LighterASTNode, isNullable: Boolean = false ): FirTypeRef { var simpleFirUserType: FirUserTypeRef? = null var identifier: String? = null - var identifierSource: FirSourceElement? = null + var identifierSource: KtSourceElement? = null val firTypeArguments = mutableListOf() - var typeArgumentsSource: FirSourceElement? = null + var typeArgumentsSource: KtSourceElement? = null userType.forEachChildren { when (it.tokenType) { USER_TYPE -> simpleFirUserType = convertUserType(typeRefSource, it) as? FirUserTypeRef //simple user type @@ -2071,7 +2075,7 @@ class DeclarationsConverter( * @see org.jetbrains.kotlin.parsing.KotlinParsing.parseFunctionType */ private fun convertFunctionType( - typeRefSource: FirSourceElement, + typeRefSource: KtSourceElement, functionType: LighterASTNode, isNullable: Boolean = false, isSuspend: Boolean = false diff --git a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/ExpressionsConverter.kt b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/ExpressionsConverter.kt index f10d393ca7d..f21ee85ab92 100644 --- a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/ExpressionsConverter.kt +++ b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/ExpressionsConverter.kt @@ -10,9 +10,13 @@ import com.intellij.psi.TokenType import com.intellij.util.diff.FlyweightCapableTreeStructure import org.jetbrains.kotlin.ElementTypeUtils.getOperationSymbol import org.jetbrains.kotlin.ElementTypeUtils.isExpression +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtLightSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.KtNodeTypes.* import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.* import org.jetbrains.kotlin.fir.builder.* import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin @@ -149,7 +153,7 @@ class ExpressionsConverter( hasExplicitParameterList = hasArrow label = context.getLastLabel(lambdaExpression) ?: context.calleeNamesForLambda.lastOrNull()?.let { buildLabel { - source = expressionSource.fakeElement(FirFakeSourceElementKind.GeneratedLambdaLabel) + source = expressionSource.fakeElement(KtFakeSourceElementKind.GeneratedLambdaLabel) name = it.asString() } } @@ -190,10 +194,10 @@ class ExpressionsConverter( if (statements.isEmpty()) { statements.add( buildReturnExpression { - source = expressionSource.fakeElement(FirFakeSourceElementKind.ImplicitReturn) + source = expressionSource.fakeElement(KtFakeSourceElementKind.ImplicitReturn) this.target = target result = buildUnitExpression { - source = expressionSource.fakeElement(FirFakeSourceElementKind.ImplicitUnit) + source = expressionSource.fakeElement(KtFakeSourceElementKind.ImplicitUnit) } } ) @@ -223,7 +227,7 @@ class ExpressionsConverter( lateinit var operationTokenName: String var leftArgNode: LighterASTNode? = null var rightArg: LighterASTNode? = null - var operationReferenceSource: FirLightSourceElement? = null + var operationReferenceSource: KtLightSourceElement? = null binaryExpression.forEachChildren { when (it.tokenType) { OPERATION_REFERENCE -> { @@ -337,7 +341,7 @@ class ExpressionsConverter( */ private fun convertLabeledExpression(labeledExpression: LighterASTNode): FirElement { var firExpression: FirElement? = null - var errorLabelSource: FirSourceElement? = null + var errorLabelSource: KtSourceElement? = null labeledExpression.forEachChildren { context.setNewLabelUserNode(it) @@ -548,7 +552,7 @@ class ExpressionsConverter( (firSelector as? FirQualifiedAccess)?.let { if (isSafe) { @OptIn(FirImplementationDetail::class) - it.replaceSource(dotQualifiedExpression.toFirSourceElement(FirFakeSourceElementKind.DesugaredSafeCallExpression)) + it.replaceSource(dotQualifiedExpression.toFirSourceElement(KtFakeSourceElementKind.DesugaredSafeCallExpression)) return it.wrapWithSafeCall( firReceiver!!, dotQualifiedExpression.toFirSourceElement() @@ -813,7 +817,7 @@ class ExpressionsConverter( return if (whenRefWithSubject != null) { buildEqualityOperatorCall { - source = whenCondition.toFirSourceElement(FirFakeSourceElementKind.WhenCondition) + source = whenCondition.toFirSourceElement(KtFakeSourceElementKind.WhenCondition) operation = FirOperation.EQ argumentList = buildBinaryArgumentList( buildWhenSubjectExpression { @@ -832,7 +836,7 @@ class ExpressionsConverter( ): FirExpression { var isNegate = false var firExpression: FirExpression? = null - var conditionSource: FirLightSourceElement? = null + var conditionSource: KtLightSourceElement? = null whenCondition.forEachChildren { when { it.tokenType == OPERATION_REFERENCE && it.asText == NOT_IN.value -> { @@ -928,7 +932,7 @@ class ExpressionsConverter( val isGet = getArgument == null source = (if (isGet) arrayAccess else arrayAccess.getParent()!!).toFirSourceElement() calleeReference = buildSimpleNamedReference { - source = arrayAccess.toFirSourceElement().fakeElement(FirFakeSourceElementKind.ArrayAccessNameReference) + source = arrayAccess.toFirSourceElement().fakeElement(KtFakeSourceElementKind.ArrayAccessNameReference) name = if (isGet) OperatorNameConventions.GET else OperatorNameConventions.SET } explicitReceiver = @@ -976,10 +980,10 @@ class ExpressionsConverter( */ private fun convertSimpleNameExpression(referenceExpression: LighterASTNode): FirQualifiedAccessExpression { val nameSource = referenceExpression.toFirSourceElement() - val referenceSourceElement = if (nameSource.kind is FirFakeSourceElementKind) { + val referenceSourceElement = if (nameSource.kind is KtFakeSourceElementKind) { nameSource } else { - nameSource.fakeElement(FirFakeSourceElementKind.ReferenceInAtomicQualifiedAccess) + nameSource.fakeElement(KtFakeSourceElementKind.ReferenceInAtomicQualifiedAccess) } return buildPropertyAccessExpression { val rawText = referenceExpression.asText @@ -992,7 +996,7 @@ class ExpressionsConverter( } private fun createSimpleNamedReference( - sourceElement: FirSourceElement, + sourceElement: KtSourceElement, referenceExpression: LighterASTNode ): FirNamedReference { return buildSimpleNamedReference { @@ -1068,14 +1072,14 @@ class ExpressionsConverter( val calculatedRangeExpression = rangeExpression ?: buildErrorExpression(null, ConeSimpleDiagnostic("No range in for loop", DiagnosticKind.Syntax)) - val fakeSource = forLoop.toFirSourceElement(FirFakeSourceElementKind.DesugaredForLoop) + val fakeSource = forLoop.toFirSourceElement(KtFakeSourceElementKind.DesugaredForLoop) val target: FirLoopTarget // NB: FirForLoopChecker relies on this block existence and structure return buildBlock { source = fakeSource val iteratorVal = generateTemporaryVariable( baseModuleData, - calculatedRangeExpression.source?.fakeElement(FirFakeSourceElementKind.DesugaredForLoop), + calculatedRangeExpression.source?.fakeElement(KtFakeSourceElementKind.DesugaredForLoop), SpecialNames.ITERATOR, buildFunctionCall { source = fakeSource @@ -1309,7 +1313,7 @@ class ExpressionsConverter( } val calculatedFirExpression = firExpression ?: buildUnitExpression { - source = returnExpression.toFirSourceElement(FirFakeSourceElementKind.ImplicitUnit) + source = returnExpression.toFirSourceElement(KtFakeSourceElementKind.ImplicitUnit) } return calculatedFirExpression.toReturn( baseSource = returnExpression.toFirSourceElement(), diff --git a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/fir/DestructuringDeclaration.kt b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/fir/DestructuringDeclaration.kt index 90a137dc28d..bf0f5606bff 100644 --- a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/fir/DestructuringDeclaration.kt +++ b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/fir/DestructuringDeclaration.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.lightTree.fir +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.generateTemporaryVariable import org.jetbrains.kotlin.fir.declarations.FirVariable import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -17,7 +17,7 @@ data class DestructuringDeclaration( val isVar: Boolean, val entries: List, val initializer: FirExpression, - val source: FirSourceElement, + val source: KtSourceElement, val modifier: Modifier, ) { fun toFirDestructingDeclaration(moduleData: FirModuleData): FirExpression { diff --git a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/fir/TypeConstraint.kt b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/fir/TypeConstraint.kt index f0dfd7e33c5..f19ca677299 100644 --- a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/fir/TypeConstraint.kt +++ b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/fir/TypeConstraint.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.lightTree.fir -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -13,5 +13,5 @@ class TypeConstraint( val annotations: List, val identifier: String, val firTypeRef: FirTypeRef, - val source: FirSourceElement + val source: KtSourceElement ) diff --git a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/fir/ValueParameter.kt b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/fir/ValueParameter.kt index a2be2998de9..33eeaf6b183 100644 --- a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/fir/ValueParameter.kt +++ b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/fir/ValueParameter.kt @@ -5,7 +5,9 @@ package org.jetbrains.kotlin.fir.lightTree.fir +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget +import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.* import org.jetbrains.kotlin.fir.builder.Context import org.jetbrains.kotlin.fir.builder.filterUseSiteTarget @@ -55,11 +57,11 @@ class ValueParameter( } return buildProperty { - val propertySource = firValueParameter.source?.fakeElement(FirFakeSourceElementKind.PropertyFromParameter) + val propertySource = firValueParameter.source?.fakeElement(KtFakeSourceElementKind.PropertyFromParameter) source = propertySource this.moduleData = moduleData origin = FirDeclarationOrigin.Source - returnTypeRef = type.copyWithNewSourceKind(FirFakeSourceElementKind.PropertyFromParameter) + returnTypeRef = type.copyWithNewSourceKind(KtFakeSourceElementKind.PropertyFromParameter) this.name = name initializer = buildPropertyAccessExpression { source = propertySource @@ -86,12 +88,12 @@ class ValueParameter( it.useSiteTarget == AnnotationUseSiteTarget.FIELD || it.useSiteTarget == AnnotationUseSiteTarget.PROPERTY_DELEGATE_FIELD } - val defaultAccessorSource = propertySource?.fakeElement(FirFakeSourceElementKind.DefaultAccessor) + val defaultAccessorSource = propertySource?.fakeElement(KtFakeSourceElementKind.DefaultAccessor) getter = FirDefaultPropertyGetter( defaultAccessorSource, moduleData, FirDeclarationOrigin.Source, - type.copyWithNewSourceKind(FirFakeSourceElementKind.DefaultAccessor), + type.copyWithNewSourceKind(KtFakeSourceElementKind.DefaultAccessor), modifiers.getVisibility(), symbol, ).also { @@ -102,7 +104,7 @@ class ValueParameter( defaultAccessorSource, moduleData, FirDeclarationOrigin.Source, - type.copyWithNewSourceKind(FirFakeSourceElementKind.DefaultAccessor), + type.copyWithNewSourceKind(KtFakeSourceElementKind.DefaultAccessor), modifiers.getVisibility(), symbol, parameterAnnotations = modifiers.annotations.filterUseSiteTarget(AnnotationUseSiteTarget.SETTER_PARAMETER) diff --git a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/fir/modifier/TypeProjectionModifier.kt b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/fir/modifier/TypeProjectionModifier.kt index e290df08ae0..e48d59c2424 100644 --- a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/fir/modifier/TypeProjectionModifier.kt +++ b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/fir/modifier/TypeProjectionModifier.kt @@ -5,9 +5,8 @@ package org.jetbrains.kotlin.fir.lightTree.fir.modifier -import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.types.Variance +import org.jetbrains.kotlin.KtSourceElement -class TypeProjectionModifier(val source: FirSourceElement? = null, varianceModifiers: Long = ModifierFlag.NONE.value) : +class TypeProjectionModifier(val source: KtSourceElement? = null, varianceModifiers: Long = ModifierFlag.NONE.value) : Modifier(varianceModifiers) { } diff --git a/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/PsiConversionUtils.kt b/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/PsiConversionUtils.kt index 7e571b200ee..acde1028bfc 100644 --- a/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/PsiConversionUtils.kt +++ b/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/PsiConversionUtils.kt @@ -5,9 +5,11 @@ package org.jetbrains.kotlin.fir.builder +import org.jetbrains.kotlin.* import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.kotlin.fir.* +import org.jetbrains.kotlin.fir.FirExpressionRef +import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirVariable import org.jetbrains.kotlin.fir.declarations.builder.buildProperty @@ -27,7 +29,7 @@ internal fun KtWhenCondition.toFirWhenCondition( convert: KtExpression?.(String) -> FirExpression, toFirOrErrorTypeRef: KtTypeReference?.() -> FirTypeRef, ): FirExpression { - val firSubjectSource = this.toFirPsiSourceElement(FirFakeSourceElementKind.WhenGeneratedSubject) + val firSubjectSource = this.toKtPsiSourceElement(KtFakeSourceElementKind.WhenGeneratedSubject) val firSubjectExpression = buildWhenSubjectExpression { source = firSubjectSource whenRef = whenRefWithSibject @@ -35,7 +37,7 @@ internal fun KtWhenCondition.toFirWhenCondition( return when (this) { is KtWhenConditionWithExpression -> { buildEqualityOperatorCall { - source = expression?.toFirPsiSourceElement(FirFakeSourceElementKind.WhenCondition) + source = expression?.toKtPsiSourceElement(KtFakeSourceElementKind.WhenCondition) operation = FirOperation.EQ argumentList = buildBinaryArgumentList( firSubjectExpression, expression.convert("No expression in condition with expression") @@ -47,13 +49,13 @@ internal fun KtWhenCondition.toFirWhenCondition( firRange.generateContainsOperation( firSubjectExpression, isNegated, - this@toFirWhenCondition.toFirPsiSourceElement(FirFakeSourceElementKind.WhenCondition), - operationReference.toFirPsiSourceElement() + this@toFirWhenCondition.toKtPsiSourceElement(KtFakeSourceElementKind.WhenCondition), + operationReference.toKtPsiSourceElement() ) } is KtWhenConditionIsPattern -> { buildTypeOperatorCall { - source = this@toFirWhenCondition.toFirPsiSourceElement() + source = this@toFirWhenCondition.toKtPsiSourceElement() operation = if (isNegated) FirOperation.NOT_IS else FirOperation.IS conversionTypeRef = typeReference.toFirOrErrorTypeRef() argumentList = buildUnaryArgumentList(firSubjectExpression) @@ -76,7 +78,7 @@ internal fun Array.toFirWhenCondition( firCondition = when (firCondition) { null -> firConditionElement else -> firCondition.generateLazyLogicalOperation( - firConditionElement, false, condition.toFirPsiSourceElement(FirFakeSourceElementKind.WhenCondition), + firConditionElement, false, condition.toKtPsiSourceElement(KtFakeSourceElementKind.WhenCondition), ) } } @@ -85,7 +87,7 @@ internal fun Array.toFirWhenCondition( internal fun generateTemporaryVariable( moduleData: FirModuleData, - source: FirSourceElement?, + source: KtSourceElement?, name: Name, initializer: FirExpression, typeRef: FirTypeRef? = null, @@ -109,7 +111,7 @@ internal fun generateTemporaryVariable( internal fun generateTemporaryVariable( moduleData: FirModuleData, - source: FirSourceElement?, + source: KtSourceElement?, specialName: String, initializer: FirExpression, extractAnnotationsTo: (KtAnnotated.(FirAnnotationContainerBuilder) -> Unit), @@ -132,14 +134,14 @@ internal fun generateDestructuringBlock( toFirOrImplicitTypeRef: KtTypeReference?.() -> FirTypeRef, ): FirBlock { return buildBlock { - source = multiDeclaration.toFirPsiSourceElement() + source = multiDeclaration.toKtPsiSourceElement() if (tmpVariable) { statements += container } val isVar = multiDeclaration.isVar for ((index, entry) in multiDeclaration.entries.withIndex()) { if (entry.nameIdentifier?.text == "_") continue - val entrySource = entry.toFirPsiSourceElement() + val entrySource = entry.toKtPsiSourceElement() val name = entry.nameAsSafeName statements += buildProperty { source = entrySource @@ -148,7 +150,7 @@ internal fun generateDestructuringBlock( returnTypeRef = entry.typeReference.toFirOrImplicitTypeRef() this.name = name initializer = buildComponentCall { - val componentCallSource = entrySource.fakeElement(FirFakeSourceElementKind.DesugaredComponentFunctionCall) + val componentCallSource = entrySource.fakeElement(KtFakeSourceElementKind.DesugaredComponentFunctionCall) source = componentCallSource explicitReceiver = generateResolvedAccessExpression(componentCallSource, container) componentIndex = index + 1 diff --git a/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt b/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt index b3682199600..9fbd98993cf 100644 --- a/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt +++ b/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt @@ -7,7 +7,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.* import org.jetbrains.kotlin.builtins.StandardNames.BACKING_FIELD import org.jetbrains.kotlin.builtins.StandardNames.DEFAULT_VALUE_PARAMETER import org.jetbrains.kotlin.descriptors.* @@ -82,9 +82,9 @@ open class RawFirBuilder( return reference.accept(Visitor(), Unit) as FirTypeRef } - override fun PsiElement.toFirSourceElement(kind: FirFakeSourceElementKind?): FirPsiSourceElement { - val actualKind = kind ?: this@RawFirBuilder.context.forcedElementSourceKind ?: FirRealSourceElementKind - return this.toFirPsiSourceElement(actualKind) + override fun PsiElement.toFirSourceElement(kind: KtFakeSourceElementKind?): KtPsiSourceElement { + val actualKind = kind ?: this@RawFirBuilder.context.forcedElementSourceKind ?: KtRealSourceElementKind + return this.toKtPsiSourceElement(actualKind) } override val PsiElement.elementType: IElementType @@ -186,7 +186,7 @@ open class RawFirBuilder( private fun KtTypeReference?.toFirOrImplicitType(): FirTypeRef = convertSafe() ?: buildImplicitTypeRef { - source = this@toFirOrImplicitType?.toFirSourceElement(FirFakeSourceElementKind.ImplicitTypeRef) + source = this@toFirOrImplicitType?.toFirSourceElement(KtFakeSourceElementKind.ImplicitTypeRef) } private fun KtTypeReference?.toFirOrUnitType(): FirTypeRef = @@ -376,7 +376,7 @@ open class RawFirBuilder( isExternal = property.hasModifier(EXTERNAL_KEYWORD) || this@toFirPropertyAccessor?.hasModifier(EXTERNAL_KEYWORD) == true } - val propertyTypeRefToUse = propertyTypeRef.copyWithNewSourceKind(FirFakeSourceElementKind.ImplicitTypeRef) + val propertyTypeRefToUse = propertyTypeRef.copyWithNewSourceKind(KtFakeSourceElementKind.ImplicitTypeRef) return when { this != null && hasBody() -> { // Property has a non-default getter or setter. @@ -402,7 +402,7 @@ open class RawFirBuilder( ) if (!isGetter && valueParameters.isEmpty()) { valueParameters += buildDefaultSetterValueParameter { - this.source = source.fakeElement(FirFakeSourceElementKind.DefaultAccessor) + this.source = source.fakeElement(KtFakeSourceElementKind.DefaultAccessor) moduleData = baseModuleData origin = FirDeclarationOrigin.Source returnTypeRef = propertyTypeRefToUse @@ -428,7 +428,7 @@ open class RawFirBuilder( isGetter || property.isVar -> { // Default getter for val/var properties, and default setter for var properties. val propertySource = - this?.toFirSourceElement() ?: property.toFirPsiSourceElement(FirFakeSourceElementKind.DefaultAccessor) + this?.toFirSourceElement() ?: property.toKtPsiSourceElement(KtFakeSourceElementKind.DefaultAccessor) FirDefaultPropertyAccessor .createGetterOrSetter( propertySource, @@ -509,7 +509,7 @@ open class RawFirBuilder( FirDefaultPropertyBackingField( moduleData = baseModuleData, annotations = mutableListOf(), - returnTypeRef = propertyReturnType.copyWithNewSourceKind(FirFakeSourceElementKind.DefaultAccessor), + returnTypeRef = propertyReturnType.copyWithNewSourceKind(KtFakeSourceElementKind.DefaultAccessor), isVar = property.isVar, propertySymbol = propertySymbol, status = status, @@ -565,7 +565,7 @@ open class RawFirBuilder( isConst = hasModifier(CONST_KEYWORD) isLateInit = false } - val propertySource = toFirSourceElement(FirFakeSourceElementKind.PropertyFromParameter) + val propertySource = toFirSourceElement(KtFakeSourceElementKind.PropertyFromParameter) val propertyName = nameAsSafeName val parameterAnnotations = mutableListOf() for (annotationEntry in annotationEntries) { @@ -575,7 +575,7 @@ open class RawFirBuilder( source = propertySource moduleData = baseModuleData origin = FirDeclarationOrigin.Source - returnTypeRef = type.copyWithNewSourceKind(FirFakeSourceElementKind.PropertyFromParameter) + returnTypeRef = type.copyWithNewSourceKind(KtFakeSourceElementKind.PropertyFromParameter) receiverTypeRef = null name = propertyName initializer = buildPropertyAccessExpression { @@ -590,12 +590,12 @@ open class RawFirBuilder( symbol = FirPropertySymbol(callableIdForName(propertyName)) isLocal = false this.status = status - val defaultAccessorSource = propertySource.fakeElement(FirFakeSourceElementKind.DefaultAccessor) + val defaultAccessorSource = propertySource.fakeElement(KtFakeSourceElementKind.DefaultAccessor) getter = FirDefaultPropertyGetter( defaultAccessorSource, baseModuleData, FirDeclarationOrigin.Source, - type.copyWithNewSourceKind(FirFakeSourceElementKind.DefaultAccessor), + type.copyWithNewSourceKind(KtFakeSourceElementKind.DefaultAccessor), visibility, symbol, ).also { getter -> @@ -606,7 +606,7 @@ open class RawFirBuilder( defaultAccessorSource, baseModuleData, FirDeclarationOrigin.Source, - type.copyWithNewSourceKind(FirFakeSourceElementKind.DefaultAccessor), + type.copyWithNewSourceKind(KtFakeSourceElementKind.DefaultAccessor), visibility, symbol, parameterAnnotations = parameterAnnotations.filterUseSiteTarget(SETTER_PARAMETER) @@ -767,7 +767,7 @@ open class RawFirBuilder( container.superTypeRefs += type val delegateName = Name.special("<\$\$delegate_${delegateFields.size}>") val delegateSource = - superTypeListEntry.delegateExpression?.toFirSourceElement(FirFakeSourceElementKind.ClassDelegationField) + superTypeListEntry.delegateExpression?.toFirSourceElement(KtFakeSourceElementKind.ClassDelegationField) val delegateField = buildField { source = delegateSource moduleData = baseModuleData @@ -851,14 +851,14 @@ open class RawFirBuilder( ): FirConstructor { val constructorCall = superTypeCallEntry?.toFirSourceElement() val constructorSource = this?.toFirSourceElement() - ?: owner.toFirPsiSourceElement(FirFakeSourceElementKind.ImplicitConstructor) + ?: owner.toKtPsiSourceElement(KtFakeSourceElementKind.ImplicitConstructor) val firDelegatedCall = buildDelegatedConstructorCall { - source = constructorCall ?: constructorSource.fakeElement(FirFakeSourceElementKind.DelegatingConstructorCall) - constructedTypeRef = delegatedSuperTypeRef.copyWithNewSourceKind(FirFakeSourceElementKind.ImplicitTypeRef) + source = constructorCall ?: constructorSource.fakeElement(KtFakeSourceElementKind.DelegatingConstructorCall) + constructedTypeRef = delegatedSuperTypeRef.copyWithNewSourceKind(KtFakeSourceElementKind.ImplicitTypeRef) isThis = false calleeReference = buildExplicitSuperReference { - source = superTypeCallEntry?.calleeExpression?.toFirSourceElement(FirFakeSourceElementKind.DelegatingConstructorCall) - ?: this@buildDelegatedConstructorCall.source?.fakeElement(FirFakeSourceElementKind.DelegatingConstructorCall) + source = superTypeCallEntry?.calleeExpression?.toFirSourceElement(KtFakeSourceElementKind.DelegatingConstructorCall) + ?: this@buildDelegatedConstructorCall.source?.fakeElement(KtFakeSourceElementKind.DelegatingConstructorCall) superTypeRef = this@buildDelegatedConstructorCall.constructedTypeRef } superTypeCallEntry?.extractArgumentsTo(this) @@ -909,7 +909,7 @@ open class RawFirBuilder( name = file.name packageDirective = buildPackageDirective { packageFqName = context.packageFqName - source = file.packageDirective?.toFirPsiSourceElement() + source = file.packageDirective?.toKtPsiSourceElement() } for (annotationEntry in file.annotationEntries) { annotations += annotationEntry.convert() @@ -955,7 +955,7 @@ open class RawFirBuilder( extractAnnotationsTo(this) initializer = withChildClassName(nameAsSafeName, isExpect = false) { buildAnonymousObjectExpression { - val enumEntrySource = toFirSourceElement(FirFakeSourceElementKind.EnumInitializer) + val enumEntrySource = toFirSourceElement(KtFakeSourceElementKind.EnumInitializer) source = enumEntrySource anonymousObject = buildAnonymousObject { source = enumEntrySource @@ -1322,7 +1322,7 @@ open class RawFirBuilder( override fun visitLambdaExpression(expression: KtLambdaExpression, data: Unit): FirElement { val literal = expression.functionLiteral val literalSource = literal.toFirSourceElement() - val implicitTypeRefSource = literal.toFirSourceElement(FirFakeSourceElementKind.ImplicitTypeRef) + val implicitTypeRefSource = literal.toFirSourceElement(KtFakeSourceElementKind.ImplicitTypeRef) val returnType = buildImplicitTypeRef { source = implicitTypeRefSource } @@ -1351,7 +1351,7 @@ open class RawFirBuilder( moduleData = baseModuleData origin = FirDeclarationOrigin.Source returnTypeRef = valueParameter.typeReference?.convertSafe() ?: buildImplicitTypeRef { - source = multiDeclaration.toFirSourceElement(FirFakeSourceElementKind.ImplicitTypeRef) + source = multiDeclaration.toFirSourceElement(KtFakeSourceElementKind.ImplicitTypeRef) } this.name = name symbol = FirValueParameterSymbol(name) @@ -1377,7 +1377,7 @@ open class RawFirBuilder( val expressionSource = expression.toFirSourceElement() label = context.getLastLabel(expression) ?: context.calleeNamesForLambda.lastOrNull()?.let { buildLabel { - source = expressionSource.fakeElement(FirFakeSourceElementKind.GeneratedLambdaLabel) + source = expressionSource.fakeElement(KtFakeSourceElementKind.GeneratedLambdaLabel) name = it.asString() } } @@ -1393,10 +1393,10 @@ open class RawFirBuilder( if (statements.isEmpty()) { statements.add( buildReturnExpression { - source = expressionSource.fakeElement(FirFakeSourceElementKind.ImplicitReturn) + source = expressionSource.fakeElement(KtFakeSourceElementKind.ImplicitReturn) this.target = target result = buildUnitExpression { - source = expressionSource.fakeElement(FirFakeSourceElementKind.ImplicitUnit) + source = expressionSource.fakeElement(KtFakeSourceElementKind.ImplicitUnit) } } ) @@ -1409,7 +1409,7 @@ open class RawFirBuilder( bindFunctionTarget(target, it) } return buildAnonymousFunctionExpression { - source = expression.toFirPsiSourceElement() + source = expression.toKtPsiSourceElement() this.anonymousFunction = anonymousFunction } } @@ -1461,7 +1461,7 @@ open class RawFirBuilder( ): FirDelegatedConstructorCall { val isThis = isCallToThis //|| (isImplicit && hasPrimaryConstructor) val source = if (isImplicit) { - this.toFirSourceElement(FirFakeSourceElementKind.ImplicitConstructor) + this.toFirSourceElement(KtFakeSourceElementKind.ImplicitConstructor) } else { this.toFirSourceElement() } @@ -1471,10 +1471,10 @@ open class RawFirBuilder( } return buildDelegatedConstructorCall { this.source = source - constructedTypeRef = delegatedType.copyWithNewSourceKind(FirFakeSourceElementKind.ImplicitTypeRef) + constructedTypeRef = delegatedType.copyWithNewSourceKind(KtFakeSourceElementKind.ImplicitTypeRef) this.isThis = isThis val calleeKind = - if (isImplicit) FirFakeSourceElementKind.ImplicitConstructor else FirFakeSourceElementKind.DelegatingConstructorCall + if (isImplicit) KtFakeSourceElementKind.ImplicitConstructor else KtFakeSourceElementKind.DelegatingConstructorCall val calleeSource = this@convert.calleeExpression?.toFirSourceElement(calleeKind) ?: source.fakeElement(calleeKind) this.calleeReference = if (isThis) { @@ -1544,7 +1544,7 @@ open class RawFirBuilder( val delegateBuilder = FirWrappedDelegateExpressionBuilder().apply { val delegateFirExpression = extractDelegateExpression() - source = delegateFirExpression.source?.fakeElement(FirFakeSourceElementKind.WrappedDelegate) + source = delegateFirExpression.source?.fakeElement(KtFakeSourceElementKind.WrappedDelegate) expression = delegateFirExpression } @@ -1609,7 +1609,7 @@ open class RawFirBuilder( val delegateBuilder = FirWrappedDelegateExpressionBuilder().apply { val delegateExpression = extractDelegateExpression() - source = delegateExpression.source?.fakeElement(FirFakeSourceElementKind.WrappedDelegate) + source = delegateExpression.source?.fakeElement(KtFakeSourceElementKind.WrappedDelegate) expression = extractDelegateExpression() } @@ -1704,7 +1704,7 @@ open class RawFirBuilder( val firQualifier = FirQualifierPartImpl( referenceExpression!!.toFirSourceElement(), referenceExpression!!.getReferencedNameAsName(), - FirTypeArgumentListImpl(ktQualifier?.typeArgumentList?.toFirPsiSourceElement() ?: source).apply { + FirTypeArgumentListImpl(ktQualifier?.typeArgumentList?.toKtPsiSourceElement() ?: source).apply { for (typeArgument in ktQualifier!!.typeArguments) { typeArguments += typeArgument.convert() } @@ -1815,7 +1815,7 @@ open class RawFirBuilder( source = expression.toFirSourceElement() for (statement in expression.statements) { val firStatement = statement.toFirStatement { "Statement expected: ${statement.text}" } - val isForLoopBlock = firStatement is FirBlock && firStatement.source?.kind == FirFakeSourceElementKind.DesugaredForLoop + val isForLoopBlock = firStatement is FirBlock && firStatement.source?.kind == KtFakeSourceElementKind.DesugaredForLoop if (firStatement !is FirBlock || isForLoopBlock || firStatement.annotations.isNotEmpty()) { statements += firStatement } else { @@ -1868,7 +1868,7 @@ open class RawFirBuilder( } override fun visitReturnExpression(expression: KtReturnExpression, data: Unit): FirElement { - val source = expression.toFirSourceElement(FirFakeSourceElementKind.ImplicitUnit) + val source = expression.toFirSourceElement(KtFakeSourceElementKind.ImplicitUnit) val result = expression.returnedExpression?.toFirExpression("Incorrect return expression") ?: buildUnitExpression { this.source = source } return result.toReturn(source, expression.getTargetLabel()?.getReferencedName(), fromKtReturnExpression = true) @@ -1900,13 +1900,13 @@ open class RawFirBuilder( source = expression.toFirSourceElement() val ktCondition = expression.condition branches += buildWhenBranch { - source = ktCondition?.toFirSourceElement(FirFakeSourceElementKind.WhenCondition) + source = ktCondition?.toFirSourceElement(KtFakeSourceElementKind.WhenCondition) condition = ktCondition.toFirExpression("If statement should have condition") result = expression.then.toFirBlock() } if (expression.elseKeyword != null) { branches += buildWhenBranch { - source = expression.elseKeyword?.toFirPsiSourceElement() + source = expression.elseKeyword?.toKtPsiSourceElement() condition = buildElseIfTrueCondition() result = expression.`else`.toFirBlock() } @@ -2035,12 +2035,12 @@ open class RawFirBuilder( override fun visitForExpression(expression: KtForExpression, data: Unit?): FirElement { val rangeExpression = expression.loopRange.toFirExpression("No range in for loop") val ktParameter = expression.loopParameter - val fakeSource = expression.toFirPsiSourceElement(FirFakeSourceElementKind.DesugaredForLoop) + val fakeSource = expression.toKtPsiSourceElement(KtFakeSourceElementKind.DesugaredForLoop) val target: FirLoopTarget // NB: FirForLoopChecker relies on this block existence and structure return buildBlock { source = fakeSource - val rangeSource = expression.loopRange?.toFirSourceElement(FirFakeSourceElementKind.DesugaredForLoop) + val rangeSource = expression.loopRange?.toFirSourceElement(KtFakeSourceElementKind.DesugaredForLoop) val iteratorVal = generateTemporaryVariable( baseModuleData, rangeSource, SpecialNames.ITERATOR, buildFunctionCall { @@ -2072,7 +2072,7 @@ open class RawFirBuilder( is KtBlockExpression -> configureBlockWithoutBuilding(body) null -> FirBlockBuilder() else -> FirBlockBuilder().apply { - source = body.toFirSourceElement(FirFakeSourceElementKind.DesugaredForLoop) + source = body.toFirSourceElement(KtFakeSourceElementKind.DesugaredForLoop) statements += body.toFirStatement() } } @@ -2228,7 +2228,7 @@ open class RawFirBuilder( else -> error("Should not be here") } return buildConstExpression( - expression.toFirPsiSourceElement(), + expression.toKtPsiSourceElement(), ConstantValueKind.IntegerLiteral, convertedValue ) @@ -2250,7 +2250,7 @@ open class RawFirBuilder( private fun splitToCalleeAndReceiver( calleeExpression: KtExpression?, - defaultSource: FirPsiSourceElement, + defaultSource: KtPsiSourceElement, ): CalleeAndReceiver { return when (calleeExpression) { is KtSimpleNameExpression -> @@ -2281,7 +2281,7 @@ open class RawFirBuilder( else -> { CalleeAndReceiver( buildSimpleNamedReference { - source = defaultSource.fakeElement(FirFakeSourceElementKind.ImplicitInvokeCall) + source = defaultSource.fakeElement(KtFakeSourceElementKind.ImplicitInvokeCall) name = OperatorNameConventions.INVOKE }, receiverExpression = calleeExpression.toFirExpression("Incorrect invoke receiver"), @@ -2326,7 +2326,7 @@ open class RawFirBuilder( val isGet = setArgument == null source = (if (isGet) expression else expression.parent).toFirSourceElement() calleeReference = buildSimpleNamedReference { - source = expression.toFirSourceElement().fakeElement(FirFakeSourceElementKind.ArrayAccessNameReference) + source = expression.toFirSourceElement().fakeElement(KtFakeSourceElementKind.ArrayAccessNameReference) name = if (isGet) OperatorNameConventions.GET else OperatorNameConventions.SET } explicitReceiver = arrayExpression.toFirExpression("No array expression") @@ -2353,7 +2353,7 @@ open class RawFirBuilder( if (expression is KtSafeQualifiedExpression) { @OptIn(FirImplementationDetail::class) - firSelector.replaceSource(expression.toFirSourceElement(FirFakeSourceElementKind.DesugaredSafeCallExpression)) + firSelector.replaceSource(expression.toFirSourceElement(KtFakeSourceElementKind.DesugaredSafeCallExpression)) return firSelector.wrapWithSafeCall( receiver, expression.toFirSourceElement() @@ -2373,7 +2373,7 @@ open class RawFirBuilder( val sourceElement = expression.toFirSourceElement() source = sourceElement calleeReference = buildExplicitThisReference { - source = sourceElement.fakeElement(FirFakeSourceElementKind.ReferenceInAtomicQualifiedAccess) + source = sourceElement.fakeElement(KtFakeSourceElementKind.ReferenceInAtomicQualifiedAccess) labelName = expression.getLabelName() } } @@ -2385,7 +2385,7 @@ open class RawFirBuilder( return buildPropertyAccessExpression { this.source = theSource calleeReference = buildExplicitSuperReference { - source = theSource.fakeElement(FirFakeSourceElementKind.ReferenceInAtomicQualifiedAccess) + source = theSource.fakeElement(KtFakeSourceElementKind.ReferenceInAtomicQualifiedAccess) labelName = expression.getLabelName() superTypeRef = superType.toFirOrImplicitType() } @@ -2400,11 +2400,11 @@ open class RawFirBuilder( override fun visitLabeledExpression(expression: KtLabeledExpression, data: Unit): FirElement { val label = expression.getTargetLabel() - var errorLabelSource: FirSourceElement? = null + var errorLabelSource: KtSourceElement? = null val result = if (label != null) { val rawName = label.getReferencedNameElement().node!!.text - val labelAndErrorSource = buildLabelAndErrorSource(rawName, label.toFirPsiSourceElement()) + val labelAndErrorSource = buildLabelAndErrorSource(rawName, label.toKtPsiSourceElement()) errorLabelSource = labelAndErrorSource.second context.withNewLabel(labelAndErrorSource.first, expression.baseExpression) { expression.baseExpression?.accept(this, data) diff --git a/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/BaseFirBuilder.kt b/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/BaseFirBuilder.kt index 1d1a2969acd..c0a002a84ba 100644 --- a/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/BaseFirBuilder.kt +++ b/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/BaseFirBuilder.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.fir.builder import com.intellij.psi.tree.IElementType +import org.jetbrains.kotlin.* import org.jetbrains.kotlin.KtNodeTypes.* import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.descriptors.Modality @@ -46,7 +47,7 @@ import org.jetbrains.kotlin.util.OperatorNameConventions abstract class BaseFirBuilder(val baseSession: FirSession, val context: Context = Context()) { val baseModuleData: FirModuleData = baseSession.moduleData - abstract fun T.toFirSourceElement(kind: FirFakeSourceElementKind? = null): FirSourceElement + abstract fun T.toFirSourceElement(kind: KtFakeSourceElementKind? = null): KtSourceElement protected val implicitUnitType = baseSession.builtinTypes.unitType protected val implicitAnyType = baseSession.builtinTypes.anyType @@ -158,7 +159,7 @@ abstract class BaseFirBuilder(val baseSession: FirSession, val context: Conte } fun FirExpression.toReturn( - baseSource: FirSourceElement? = source, + baseSource: KtSourceElement? = source, labelName: String? = null, fromKtReturnExpression: Boolean = false ): FirReturnExpression { @@ -177,7 +178,7 @@ abstract class BaseFirBuilder(val baseSession: FirSession, val context: Conte source = if (fromKtReturnExpression) baseSource?.realElement() - else baseSource?.fakeElement(FirFakeSourceElementKind.ImplicitReturn) + else baseSource?.fakeElement(KtFakeSourceElementKind.ImplicitReturn) result = this@toReturn if (labelName == null) { target = context.firFunctionTargets.lastOrNull { !it.isLambda } ?: FirFunctionTarget(labelName, isLambda = false).apply { @@ -209,7 +210,7 @@ abstract class BaseFirBuilder(val baseSession: FirSession, val context: Conte protected fun T?.toDelegatedSelfType(typeParameters: List, symbol: FirClassLikeSymbol<*>): FirResolvedTypeRef { return buildResolvedTypeRef { - source = this@toDelegatedSelfType?.toFirSourceElement(FirFakeSourceElementKind.ClassSelfTypeRef) + source = this@toDelegatedSelfType?.toFirSourceElement(KtFakeSourceElementKind.ClassSelfTypeRef) type = ConeClassLikeTypeImpl( symbol.toLookupTag(), typeParameters.map { ConeTypeParameterTypeImpl(it.symbol.toLookupTag(), false) }.toTypedArray(), @@ -498,7 +499,7 @@ abstract class BaseFirBuilder(val baseSession: FirSession, val context: Conte return buildBlock { val baseSource = baseExpression?.toFirSourceElement() - val desugaredSource = baseSource?.fakeElement(FirFakeSourceElementKind.DesugaredIncrementOrDecrement) + val desugaredSource = baseSource?.fakeElement(KtFakeSourceElementKind.DesugaredIncrementOrDecrement) source = desugaredSource // initialValueVar is only used for postfix increment/decrement (stores the argument value before increment/decrement). @@ -615,7 +616,7 @@ abstract class BaseFirBuilder(val baseSession: FirSession, val context: Conte ): FirExpression { return buildBlock { val baseSource = baseExpression?.toFirSourceElement() - val desugaredSource = baseSource?.fakeElement(FirFakeSourceElementKind.DesugaredIncrementOrDecrement) + val desugaredSource = baseSource?.fakeElement(KtFakeSourceElementKind.DesugaredIncrementOrDecrement) source = desugaredSource val argumentReceiver = argument.receiverExpression @@ -738,7 +739,7 @@ abstract class BaseFirBuilder(val baseSession: FirSession, val context: Conte ): FirExpression { return buildBlock { val baseSource = baseExpression?.toFirSourceElement() - val desugaredSource = baseSource?.fakeElement(FirFakeSourceElementKind.DesugaredIncrementOrDecrement) + val desugaredSource = baseSource?.fakeElement(KtFakeSourceElementKind.DesugaredIncrementOrDecrement) source = desugaredSource val array = argument.arrayExpression @@ -884,7 +885,7 @@ abstract class BaseFirBuilder(val baseSession: FirSession, val context: Conte } fun T?.generateAssignment( - baseSource: FirSourceElement?, + baseSource: KtSourceElement?, rhs: T?, value: FirExpression, // value is FIR for rhs operation: FirOperation, @@ -910,7 +911,7 @@ abstract class BaseFirBuilder(val baseSession: FirSession, val context: Conte return buildAssignmentOperatorStatement { source = baseSource this.operation = operation - leftArgument = withDefaultSourceElementKind(FirFakeSourceElementKind.DesugaredCompoundAssignment) { + leftArgument = withDefaultSourceElementKind(KtFakeSourceElementKind.DesugaredCompoundAssignment) { this@generateAssignment?.convert() } ?: buildErrorExpression { source = null @@ -940,7 +941,7 @@ abstract class BaseFirBuilder(val baseSession: FirSession, val context: Conte // gets a?.{ $subj.x } and turns it to a?.{ $subj.x = v } private fun putAssignmentToSafeCall( safeCallNonAssignment: FirSafeCallExpression, - baseSource: FirSourceElement?, + baseSource: KtSourceElement?, value: FirExpression ): FirSafeCallExpression { val nestedAccess = safeCallNonAssignment.regularQualifiedAccess @@ -961,7 +962,7 @@ abstract class BaseFirBuilder(val baseSession: FirSession, val context: Conte private fun generateAugmentedArraySetCall( unwrappedReceiver: T, - baseSource: FirSourceElement?, + baseSource: KtSourceElement?, operation: FirOperation, rhs: T?, convert: T.() -> FirExpression @@ -1002,7 +1003,7 @@ abstract class BaseFirBuilder(val baseSession: FirSession, val context: Conte private fun generateSetGetBlockForAugmentedArraySetCall( unwrappedReceiver: T, - baseSource: FirSourceElement?, + baseSource: KtSourceElement?, operation: FirOperation, rhs: T?, convert: T.() -> FirExpression @@ -1086,8 +1087,8 @@ abstract class BaseFirBuilder(val baseSession: FirSession, val context: Conte private val zippedParameters: List>, private val packageFqName: FqName, private val classFqName: FqName, - private val createClassTypeRefWithSourceKind: (FirFakeSourceElementKind) -> FirTypeRef, - private val createParameterTypeRefWithSourceKind: (FirProperty, FirFakeSourceElementKind) -> FirTypeRef, + private val createClassTypeRefWithSourceKind: (KtFakeSourceElementKind) -> FirTypeRef, + private val createParameterTypeRefWithSourceKind: (FirProperty, KtFakeSourceElementKind) -> FirTypeRef, ) { fun generate() { generateComponentFunctions() @@ -1096,7 +1097,7 @@ abstract class BaseFirBuilder(val baseSession: FirSession, val context: Conte } private fun generateComponentAccess( - parameterSource: FirSourceElement?, + parameterSource: KtSourceElement?, firProperty: FirProperty, classTypeRefWithCorrectSourceKind: FirTypeRef, firPropertyReturnTypeRefWithCorrectSourceKind: FirTypeRef @@ -1126,7 +1127,7 @@ abstract class BaseFirBuilder(val baseSession: FirSession, val context: Conte componentIndex++ val parameterSource = sourceNode?.toFirSourceElement() val componentFunction = buildSimpleFunction { - source = parameterSource?.fakeElement(FirFakeSourceElementKind.DataClassGeneratedMembers) + source = parameterSource?.fakeElement(KtFakeSourceElementKind.DataClassGeneratedMembers) moduleData = baseModuleData origin = FirDeclarationOrigin.Source returnTypeRef = firProperty.returnTypeRef @@ -1148,8 +1149,8 @@ abstract class BaseFirBuilder(val baseSession: FirSession, val context: Conte private fun generateCopyFunction() { classBuilder.addDeclaration( buildSimpleFunction { - val classTypeRef = createClassTypeRefWithSourceKind(FirFakeSourceElementKind.DataClassGeneratedMembers) - source = this@DataClassMembersGenerator.source.toFirSourceElement(FirFakeSourceElementKind.DataClassGeneratedMembers) + val classTypeRef = createClassTypeRefWithSourceKind(KtFakeSourceElementKind.DataClassGeneratedMembers) + source = this@DataClassMembersGenerator.source.toFirSourceElement(KtFakeSourceElementKind.DataClassGeneratedMembers) moduleData = baseModuleData origin = FirDeclarationOrigin.Source returnTypeRef = classTypeRef @@ -1159,9 +1160,9 @@ abstract class BaseFirBuilder(val baseSession: FirSession, val context: Conte dispatchReceiverType = currentDispatchReceiverType() for ((ktParameter, firProperty) in zippedParameters) { val propertyName = firProperty.name - val parameterSource = ktParameter?.toFirSourceElement(FirFakeSourceElementKind.DataClassGeneratedMembers) + val parameterSource = ktParameter?.toFirSourceElement(KtFakeSourceElementKind.DataClassGeneratedMembers) val propertyReturnTypeRef = - createParameterTypeRefWithSourceKind(firProperty, FirFakeSourceElementKind.DataClassGeneratedMembers) + createParameterTypeRefWithSourceKind(firProperty, KtFakeSourceElementKind.DataClassGeneratedMembers) valueParameters += buildValueParameter { source = parameterSource moduleData = baseModuleData @@ -1196,13 +1197,13 @@ abstract class BaseFirBuilder(val baseSession: FirSession, val context: Conte private fun FirVariable.toQualifiedAccess(): FirQualifiedAccessExpression = buildPropertyAccessExpression { calleeReference = buildResolvedNamedReference { - source = this@toQualifiedAccess.source?.fakeElement(FirFakeSourceElementKind.ReferenceInAtomicQualifiedAccess) + source = this@toQualifiedAccess.source?.fakeElement(KtFakeSourceElementKind.ReferenceInAtomicQualifiedAccess) name = this@toQualifiedAccess.name resolvedSymbol = this@toQualifiedAccess.symbol } } - protected inline fun withDefaultSourceElementKind(newDefault: FirSourceElementKind, action: () -> R): R { + protected inline fun withDefaultSourceElementKind(newDefault: KtSourceElementKind, action: () -> R): R { val currentForced = context.forcedElementSourceKind context.forcedElementSourceKind = newDefault try { @@ -1212,7 +1213,7 @@ abstract class BaseFirBuilder(val baseSession: FirSession, val context: Conte } } - protected fun buildLabelAndErrorSource(rawName: String, source: FirSourceElement): Pair { + protected fun buildLabelAndErrorSource(rawName: String, source: KtSourceElement): Pair { val firLabel = buildLabel { name = KtPsiUtil.unquoteIdentifier(rawName) this.source = source @@ -1223,8 +1224,8 @@ abstract class BaseFirBuilder(val baseSession: FirSession, val context: Conte protected fun buildExpressionWithErrorLabel( element: FirElement?, - errorLabelSource: FirSourceElement?, - elementSource: FirSourceElement + errorLabelSource: KtSourceElement?, + elementSource: KtSourceElement ): FirElement { return if (element != null) { if (errorLabelSource != null) { diff --git a/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/Context.kt b/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/Context.kt index dc514cd1a50..0af186c72e0 100644 --- a/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/Context.kt +++ b/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/Context.kt @@ -5,7 +5,11 @@ package org.jetbrains.kotlin.fir.builder -import org.jetbrains.kotlin.fir.* +import org.jetbrains.kotlin.KtSourceElementKind +import org.jetbrains.kotlin.fir.FirFunctionTarget +import org.jetbrains.kotlin.fir.FirLabel +import org.jetbrains.kotlin.fir.FirLoopTarget +import org.jetbrains.kotlin.fir.PrivateForInline import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol @@ -40,7 +44,7 @@ class Context { val capturedTypeParameters = mutableListOf() val arraySetArgument = mutableMapOf() - var forcedElementSourceKind: FirSourceElementKind? = null + var forcedElementSourceKind: KtSourceElementKind? = null val dispatchReceiverTypesStack = mutableListOf() var containerIsExpect: Boolean = false diff --git a/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt b/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt index 6346e70d8d4..d76d43a558a 100644 --- a/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt +++ b/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt @@ -6,9 +6,12 @@ package org.jetbrains.kotlin.fir.builder import com.intellij.psi.tree.IElementType +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget +import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.* import org.jetbrains.kotlin.fir.contracts.FirContractDescription import org.jetbrains.kotlin.fir.contracts.builder.buildLegacyRawContractDescription @@ -163,7 +166,7 @@ fun IElementType.toFirOperation(): FirOperation = } fun FirExpression.generateNotNullOrOther( - other: FirExpression, baseSource: FirSourceElement?, + other: FirExpression, baseSource: KtSourceElement?, ): FirElvisExpression { return buildElvisExpression { source = baseSource @@ -173,7 +176,7 @@ fun FirExpression.generateNotNullOrOther( } fun FirExpression.generateLazyLogicalOperation( - other: FirExpression, isAnd: Boolean, baseSource: FirSourceElement?, + other: FirExpression, isAnd: Boolean, baseSource: KtSourceElement?, ): FirBinaryLogicExpression { return buildBinaryLogicExpression { source = baseSource @@ -186,16 +189,16 @@ fun FirExpression.generateLazyLogicalOperation( fun FirExpression.generateContainsOperation( argument: FirExpression, inverted: Boolean, - baseSource: FirSourceElement?, - operationReferenceSource: FirSourceElement? + baseSource: KtSourceElement?, + operationReferenceSource: KtSourceElement? ): FirFunctionCall { val containsCall = createConventionCall(operationReferenceSource, baseSource, argument, OperatorNameConventions.CONTAINS) if (!inverted) return containsCall return buildFunctionCall { - source = baseSource?.fakeElement(FirFakeSourceElementKind.DesugaredInvertedContains) + source = baseSource?.fakeElement(KtFakeSourceElementKind.DesugaredInvertedContains) calleeReference = buildSimpleNamedReference { - source = operationReferenceSource?.fakeElement(FirFakeSourceElementKind.DesugaredInvertedContains) + source = operationReferenceSource?.fakeElement(KtFakeSourceElementKind.DesugaredInvertedContains) name = OperatorNameConventions.NOT } explicitReceiver = containsCall @@ -206,8 +209,8 @@ fun FirExpression.generateContainsOperation( fun FirExpression.generateComparisonExpression( argument: FirExpression, operatorToken: IElementType, - baseSource: FirSourceElement?, - operationReferenceSource: FirSourceElement?, + baseSource: KtSourceElement?, + operationReferenceSource: KtSourceElement?, ): FirComparisonExpression { require(operatorToken in OperatorConventions.COMPARISON_OPERATIONS) { "$operatorToken is not in ${OperatorConventions.COMPARISON_OPERATIONS}" @@ -215,7 +218,7 @@ fun FirExpression.generateComparisonExpression( val compareToCall = createConventionCall( operationReferenceSource, - baseSource?.fakeElement(FirFakeSourceElementKind.GeneratedComparisonExpression), + baseSource?.fakeElement(KtFakeSourceElementKind.GeneratedComparisonExpression), argument, OperatorNameConventions.COMPARE_TO ) @@ -236,8 +239,8 @@ fun FirExpression.generateComparisonExpression( } private fun FirExpression.createConventionCall( - operationReferenceSource: FirSourceElement?, - baseSource: FirSourceElement?, + operationReferenceSource: KtSourceElement?, + baseSource: KtSourceElement?, argument: FirExpression, conventionName: Name ): FirFunctionCall { @@ -254,8 +257,8 @@ private fun FirExpression.createConventionCall( } fun generateAccessExpression( - qualifiedSource: FirSourceElement?, - calleeReferenceSource: FirSourceElement?, + qualifiedSource: KtSourceElement?, + calleeReferenceSource: KtSourceElement?, name: Name, diagnostic: ConeDiagnostic? = null ): FirQualifiedAccessExpression = @@ -263,7 +266,7 @@ fun generateAccessExpression( this.source = qualifiedSource calleeReference = buildSimpleNamedReference { this.source = if (calleeReferenceSource == qualifiedSource) - calleeReferenceSource?.fakeElement(FirFakeSourceElementKind.ReferenceInAtomicQualifiedAccess) + calleeReferenceSource?.fakeElement(KtFakeSourceElementKind.ReferenceInAtomicQualifiedAccess) else calleeReferenceSource this.name = name @@ -273,7 +276,7 @@ fun generateAccessExpression( } } -fun generateResolvedAccessExpression(source: FirSourceElement?, variable: FirVariable): FirQualifiedAccessExpression = +fun generateResolvedAccessExpression(source: KtSourceElement?, variable: FirVariable): FirQualifiedAccessExpression = buildPropertyAccessExpression { this.source = source calleeReference = buildResolvedNamedReference { @@ -285,7 +288,7 @@ fun generateResolvedAccessExpression(source: FirSourceElement?, variable: FirVar fun generateTemporaryVariable( moduleData: FirModuleData, - source: FirSourceElement?, + source: KtSourceElement?, name: Name, initializer: FirExpression, typeRef: FirTypeRef? = null, @@ -313,7 +316,7 @@ fun generateTemporaryVariable( fun generateTemporaryVariable( moduleData: FirModuleData, - source: FirSourceElement?, + source: KtSourceElement?, specialName: String, initializer: FirExpression, extractedAnnotations: Collection? = null, @@ -352,7 +355,7 @@ fun FirPropertyBuilder.generateAccessorsByDelegate( } val isMember = ownerRegularOrAnonymousObjectSymbol != null - val fakeSource = delegateBuilder.source?.fakeElement(FirFakeSourceElementKind.DelegatedPropertyAccessor) + val fakeSource = delegateBuilder.source?.fakeElement(KtFakeSourceElementKind.DelegatedPropertyAccessor) /* * If we have delegation with provide delegate then we generate call like @@ -563,13 +566,13 @@ private fun FirExpression.checkReceiver(name: String?): Boolean { return receiverName == name } -fun FirQualifiedAccess.wrapWithSafeCall(receiver: FirExpression, source: FirSourceElement): FirSafeCallExpression { +fun FirQualifiedAccess.wrapWithSafeCall(receiver: FirExpression, source: KtSourceElement): FirSafeCallExpression { val checkedSafeCallSubject = buildCheckedSafeCallSubject { @OptIn(FirContractViolation::class) this.originalReceiverRef = FirExpressionRef().apply { bind(receiver) } - this.source = receiver.source?.fakeElement(FirFakeSourceElementKind.CheckedSafeCallSubject) + this.source = receiver.source?.fakeElement(KtFakeSourceElementKind.CheckedSafeCallSubject) } replaceExplicitReceiver(checkedSafeCallSubject) @@ -588,7 +591,7 @@ fun List.filterUseSiteTarget(target: AnnotationUseSiteTarget) mapNotNull { if (it.useSiteTarget != target) null else buildAnnotationCall { - source = it.source?.fakeElement(FirFakeSourceElementKind.FromUseSiteTarget) + source = it.source?.fakeElement(KtFakeSourceElementKind.FromUseSiteTarget) useSiteTarget = it.useSiteTarget annotationTypeRef = it.annotationTypeRef argumentList = it.argumentList 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 d0755c9c074..14ac5f28932 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirCallResolver.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirCallResolver.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.fir +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.utils.hasExplicitBackingField @@ -776,7 +777,7 @@ class FirCallResolver( private fun buildErrorReference( callInfo: CallInfo, diagnostic: ConeDiagnostic, - source: FirSourceElement? + source: KtSourceElement? ): FirErrorReferenceWithCandidate { return createErrorReferenceWithErrorCandidate( callInfo, diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/QualifiedNameResolution.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/QualifiedNameResolution.kt index e72d9fb4164..fc0d8f940e4 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/QualifiedNameResolution.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/QualifiedNameResolution.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.fir +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.declarations.FirClass import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -28,7 +29,7 @@ const val ROOT_PREFIX_FOR_IDE_RESOLUTION_MODE = "_root_ide_package_" fun BodyResolveComponents.resolveRootPartOfQualifier( namedReference: FirSimpleNamedReference, - source: FirSourceElement?, + source: KtSourceElement?, typeArguments: List, nonFatalDiagnosticsFromExpression: List?, ): FirResolvedQualifier? { @@ -73,7 +74,7 @@ fun BodyResolveComponents.resolveRootPartOfQualifier( fun FirResolvedQualifier.continueQualifier( namedReference: FirSimpleNamedReference, - source: FirSourceElement?, + source: KtSourceElement?, typeArguments: List, nonFatalDiagnosticsFromExpression: List?, components: BodyResolveComponents, @@ -119,7 +120,7 @@ private fun FqName.continueQualifierInPackage( typeArguments: List, nonFatalDiagnosticsFromExpression: List?, components: BodyResolveComponents, - source: FirSourceElement? + source: KtSourceElement? ): FirResolvedQualifier? { val childFqName = this.child(name) if (components.symbolProvider.getPackage(childFqName) != null) { @@ -156,7 +157,7 @@ private fun FqName.continueQualifierInPackage( } internal fun extractNonFatalDiagnostics( - source: FirSourceElement?, + source: KtSourceElement?, explicitReceiver: FirExpression?, symbol: FirClassLikeSymbol<*>, extraNotFatalDiagnostics: List? 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 6cc37494591..e7295951584 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 @@ -5,9 +5,12 @@ package org.jetbrains.kotlin.fir.resolve +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.builtins.functions.FunctionClassKind import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.descriptors.ClassKind +import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.* import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.utils.canNarrowDownGetterType @@ -71,7 +74,7 @@ fun FirFunction.constructFunctionalType(isSuspend: Boolean = false): ConeLookupT fun FirFunction.constructFunctionalTypeRef(isSuspend: Boolean = false): FirResolvedTypeRef { return buildResolvedTypeRef { - source = this@constructFunctionalTypeRef.source?.fakeElement(FirFakeSourceElementKind.ImplicitTypeRef) + source = this@constructFunctionalTypeRef.source?.fakeElement(KtFakeSourceElementKind.ImplicitTypeRef) type = constructFunctionalType(isSuspend) } } @@ -113,7 +116,7 @@ fun createKPropertyType( fun BodyResolveComponents.buildResolvedQualifierForClass( regularClass: FirClassLikeSymbol<*>, - sourceElement: FirSourceElement? = null, + sourceElement: KtSourceElement? = null, // TODO: Clarify if we actually need type arguments for qualifier? typeArgumentsForQualifier: List = emptyList(), diagnostic: ConeDiagnostic? = null, @@ -214,7 +217,7 @@ fun BodyResolveComponents.typeFromCallee(access: T): FirReso return when (val newCallee = access.calleeReference) { is FirErrorNamedReference -> buildErrorTypeRef { - source = access.source?.fakeElement(FirFakeSourceElementKind.ErrorTypeRef) + source = access.source?.fakeElement(KtFakeSourceElementKind.ErrorTypeRef) diagnostic = ConeStubDiagnostic(newCallee.diagnostic) } is FirNamedReferenceWithCandidate -> { @@ -264,11 +267,11 @@ private fun BodyResolveComponents.typeFromSymbol(symbol: FirBasedSymbol<*>, make if (makeNullable) { returnTypeRef.withReplacedConeType( returnTypeRef.type.withNullability(ConeNullability.NULLABLE, session.typeContext), - FirFakeSourceElementKind.ImplicitTypeRef + KtFakeSourceElementKind.ImplicitTypeRef ) } else { buildResolvedTypeRef { - source = returnTypeRef.source?.fakeElement(FirFakeSourceElementKind.ImplicitTypeRef) + source = returnTypeRef.source?.fakeElement(KtFakeSourceElementKind.ImplicitTypeRef) type = returnTypeRef.type annotations += returnTypeRef.annotations } @@ -304,7 +307,7 @@ fun BodyResolveComponents.transformQualifiedAccessUsingSmartcastInfo( val intersectedType = ConeTypeIntersector.intersectTypes(session.typeContext, allTypes) if (intersectedType == originalType) return qualifiedAccessExpression val intersectedTypeRef = buildResolvedTypeRef { - source = qualifiedAccessExpression.resultType.source?.fakeElement(FirFakeSourceElementKind.SmartCastedTypeRef) + source = qualifiedAccessExpression.resultType.source?.fakeElement(KtFakeSourceElementKind.SmartCastedTypeRef) type = intersectedType annotations += qualifiedAccessExpression.resultType.annotations delegatedTypeRef = qualifiedAccessExpression.resultType @@ -319,7 +322,7 @@ fun BodyResolveComponents.transformQualifiedAccessUsingSmartcastInfo( val intersectedTypeWithoutNullableNothing = ConeTypeIntersector.intersectTypes(session.typeContext, typesFromSmartcastWithoutNullableNothing) val intersectedTypeRefWithoutNullableNothing = buildResolvedTypeRef { - source = qualifiedAccessExpression.resultType.source?.fakeElement(FirFakeSourceElementKind.SmartCastedTypeRef) + source = qualifiedAccessExpression.resultType.source?.fakeElement(KtFakeSourceElementKind.SmartCastedTypeRef) type = intersectedTypeWithoutNullableNothing annotations += qualifiedAccessExpression.resultType.annotations delegatedTypeRef = qualifiedAccessExpression.resultType diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CallableReferenceResolution.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CallableReferenceResolution.kt index cbceabf9266..c8f72872f68 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CallableReferenceResolution.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CallableReferenceResolution.kt @@ -5,7 +5,10 @@ package org.jetbrains.kotlin.fir.resolve.calls -import org.jetbrains.kotlin.fir.* +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fir.FirElement +import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.utils.isSuspend import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -21,6 +24,8 @@ import org.jetbrains.kotlin.fir.resolve.inference.extractInputOutputTypesFromCal import org.jetbrains.kotlin.fir.types.isSuspendFunctionType import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol import org.jetbrains.kotlin.fir.types.* +import org.jetbrains.kotlin.fir.unwrapFakeOverrides +import org.jetbrains.kotlin.fir.visibilityChecker import org.jetbrains.kotlin.fir.visitors.FirTransformer import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.StandardClassIds @@ -356,7 +361,7 @@ private fun createFakeArgumentsForReference( class FirFakeArgumentForCallableReference( val index: Int ) : FirExpression() { - override val source: FirSourceElement? + override val source: KtSourceElement? get() = null override val typeRef: FirTypeRef @@ -404,7 +409,7 @@ private fun FirVariable.canBeMutableReference(candidate: Candidate): Boolean { if (!isVar) return false if (this is FirField) return true val original = this.unwrapFakeOverrides() - return original.source?.kind == FirFakeSourceElementKind.PropertyFromParameter || + return original.source?.kind == KtFakeSourceElementKind.PropertyFromParameter || (original.setter is FirMemberDeclaration && candidate.callInfo.session.visibilityChecker.isVisible(original.setter!!, candidate)) } 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 b9c15f26e7c..f9425f9eac1 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,8 +5,8 @@ package org.jetbrains.kotlin.fir.resolve.calls +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference import org.jetbrains.kotlin.fir.references.impl.FirSimpleNamedReference @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.name.Name @OptIn(FirImplementationDetail::class) open class FirNamedReferenceWithCandidate( - source: FirSourceElement?, + source: KtSourceElement?, name: Name, val candidate: Candidate ) : FirSimpleNamedReference(source, name, candidate.symbol) { @@ -28,7 +28,7 @@ open class FirNamedReferenceWithCandidate( } class FirErrorReferenceWithCandidate( - source: FirSourceElement?, + source: KtSourceElement?, name: Name, candidate: Candidate, val diagnostic: ConeDiagnostic @@ -37,7 +37,7 @@ class FirErrorReferenceWithCandidate( } class FirPropertyWithExplicitBackingFieldResolvedNamedReference( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val name: Name, override val resolvedSymbol: FirBasedSymbol<*>, val hasVisibleBackingField: Boolean, diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/errorCandidateUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/errorCandidateUtils.kt index 44206f02f95..a8c07aa2e19 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/errorCandidateUtils.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/errorCandidateUtils.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.resolve -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.resolve.calls.* @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.fir.resolve.calls.* fun createErrorReferenceWithErrorCandidate( callInfo: CallInfo, diagnostic: ConeDiagnostic, - source: FirSourceElement?, + source: KtSourceElement?, resolutionContext: ResolutionContext, resolutionStageRunner: ResolutionStageRunner ): FirErrorReferenceWithCandidate { @@ -28,7 +28,7 @@ fun createErrorReferenceWithErrorCandidate( fun createErrorReferenceWithExistingCandidate( candidate: Candidate, diagnostic: ConeDiagnostic, - source: FirSourceElement?, + source: KtSourceElement?, resolutionContext: ResolutionContext, resolutionStageRunner: ResolutionStageRunner, ): FirErrorReferenceWithCandidate { diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirCallCompleter.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirCallCompleter.kt index 56c9a3c5a61..7642484cecf 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirCallCompleter.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirCallCompleter.kt @@ -5,6 +5,8 @@ package org.jetbrains.kotlin.fir.resolve.inference +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.* import org.jetbrains.kotlin.fir.declarations.FirAnonymousFunction import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin @@ -256,7 +258,7 @@ class FirCallCompleter( val name = Name.identifier("it") val itType = parameters.single() buildValueParameter { - source = lambdaAtom.atom.source?.fakeElement(FirFakeSourceElementKind.ItLambdaParameter) + source = lambdaAtom.atom.source?.fakeElement(KtFakeSourceElementKind.ItLambdaParameter) moduleData = session.moduleData origin = FirDeclarationOrigin.Source returnTypeRef = itType.approximateLambdaInputType().toFirResolvedTypeRef() diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirTypeResolverImpl.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirTypeResolverImpl.kt index 332ad0db40d..3885f5797d2 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirTypeResolverImpl.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirTypeResolverImpl.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.fir.resolve.providers.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.* import org.jetbrains.kotlin.fir.declarations.FirEnumEntry import org.jetbrains.kotlin.fir.declarations.FirRegularClass @@ -338,7 +339,7 @@ class FirTypeResolverImpl(private val session: FirSession) : FirTypeResolver() { return null } - private fun getTypeArgumentsOrNameSource(typeRef: FirUserTypeRef, qualifierIndex: Int?): FirSourceElement? { + private fun getTypeArgumentsOrNameSource(typeRef: FirUserTypeRef, qualifierIndex: Int?): KtSourceElement? { val qualifierPart = if (qualifierIndex != null) typeRef.qualifier.elementAtOrNull(qualifierIndex) else null val typeArgumentsList = qualifierPart?.typeArgumentList return if (typeArgumentsList == null || typeArgumentsList.typeArguments.isEmpty()) { 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 e873ecb5719..f30d761c6b7 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 @@ -5,8 +5,10 @@ package org.jetbrains.kotlin.fir.resolve.transformers +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.* import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.utils.isInline @@ -98,13 +100,13 @@ class FirCallCompletionResultsWriterTransformer( val calculated = typeCalculator.tryCalculateReturnType(declaration) if (calculated !is FirErrorTypeRef) { buildResolvedTypeRef { - source = calculated.source?.fakeElement(FirFakeSourceElementKind.ImplicitTypeRef) + source = calculated.source?.fakeElement(KtFakeSourceElementKind.ImplicitTypeRef) annotations += calculated.annotations type = calculated.type } } else { buildErrorTypeRef { - source = calculated.source?.fakeElement(FirFakeSourceElementKind.ImplicitTypeRef) + source = calculated.source?.fakeElement(KtFakeSourceElementKind.ImplicitTypeRef) diagnostic = calculated.diagnostic } } @@ -115,7 +117,7 @@ class FirCallCompletionResultsWriterTransformer( // in these cases we should report an error on // the calleeReference.source which is not a fake source. buildErrorTypeRef { - source = calleeReference.source?.fakeElement(FirFakeSourceElementKind.ImplicitTypeRef) + source = calleeReference.source?.fakeElement(KtFakeSourceElementKind.ImplicitTypeRef) diagnostic = when (declaration) { is FirTypeParameter -> ConeTypeParameterInQualifiedAccess(declaration.symbol) 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 5131f0e06ee..209c0578d28 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 @@ -5,6 +5,9 @@ package org.jetbrains.kotlin.fir.resolve.transformers +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.* import org.jetbrains.kotlin.fir.declarations.FirFile import org.jetbrains.kotlin.fir.declarations.FirResolvePhase @@ -110,10 +113,10 @@ class FirSpecificTypeResolverTransformer( buildErrorTypeRef { val typeRefSourceKind = typeRef.source?.kind val diagnosticSource = resolvedType.diagnostic.safeAs() - ?.source.safeAs() + ?.source.safeAs() source = if (diagnosticSource != null) { - if (typeRefSourceKind is FirFakeSourceElementKind) { + if (typeRefSourceKind is KtFakeSourceElementKind) { diagnosticSource.fakeElement(typeRefSourceKind) } else { diagnosticSource diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/TransformUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/TransformUtils.kt index 03725fa6dba..b1ef9358069 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/TransformUtils.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/TransformUtils.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.resolve.transformers +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind import org.jetbrains.kotlin.fir.copyWithNewSourceKind import org.jetbrains.kotlin.fir.declarations.FirRegularClass import org.jetbrains.kotlin.fir.declarations.FirTypedDeclaration @@ -105,7 +105,7 @@ internal fun FirTypedDeclaration.transformTypeToArrayType() { // If the delegated type is already resolved, it means we have already created a resolved array type for this vararg type declaration. // This is because in the buildResolvedTypeRef call below, we set the delegated type ref to the previous (non-vararg) resolved type ref. if (returnTypeRef.delegatedTypeRef is FirResolvedTypeRef && - returnTypeRef.delegatedTypeRef?.source?.kind == FirFakeSourceElementKind.ArrayTypeFromVarargParameter + returnTypeRef.delegatedTypeRef?.source?.kind == KtFakeSourceElementKind.ArrayTypeFromVarargParameter ) return val returnType = returnTypeRef.coneType @@ -116,7 +116,7 @@ internal fun FirTypedDeclaration.transformTypeToArrayType() { type = ConeKotlinTypeProjectionOut(returnType).createArrayType() annotations += returnTypeRef.annotations // ? do we really need replacing source of nested delegatedTypeRef ? - delegatedTypeRef = returnTypeRef.copyWithNewSourceKind(FirFakeSourceElementKind.ArrayTypeFromVarargParameter) + delegatedTypeRef = returnTypeRef.copyWithNewSourceKind(KtFakeSourceElementKind.ArrayTypeFromVarargParameter) } ) } diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/BodyResolveContext.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/BodyResolveContext.kt index e9dcadb79bf..b06c63f41a7 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/BodyResolveContext.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/BodyResolveContext.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.resolve.transformers.body.resolve +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.descriptors.ClassKind -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind import org.jetbrains.kotlin.fir.PrivateForInline import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.impl.FirDefaultPropertyAccessor @@ -481,7 +481,7 @@ class BodyResolveContext( for (parameter in valueParameters) { allScope = allScope.storeVariable(parameter) val property = properties[parameter.name] - if (property?.source?.kind != FirFakeSourceElementKind.PropertyFromParameter) { + if (property?.source?.kind != KtFakeSourceElementKind.PropertyFromParameter) { parameterScope = parameterScope.storeVariable(parameter) } } diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/BodyResolveUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/BodyResolveUtils.kt index aef646a0711..83b21942601 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/BodyResolveUtils.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/BodyResolveUtils.kt @@ -5,7 +5,9 @@ package org.jetbrains.kotlin.fir.resolve.transformers.body.resolve -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.fakeElement +import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.diagnostics.ConeSimpleDiagnostic @@ -14,9 +16,10 @@ import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirNamedArgumentExpression import org.jetbrains.kotlin.fir.expressions.builder.buildVarargArgumentsExpression -import org.jetbrains.kotlin.fir.fakeElement +import org.jetbrains.kotlin.fir.renderWithType import org.jetbrains.kotlin.fir.resolve.providers.symbolProvider import org.jetbrains.kotlin.fir.resolvedTypeFromPrototype +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.types.* import org.jetbrains.kotlin.fir.types.builder.buildErrorTypeRef import org.jetbrains.kotlin.fir.types.builder.buildResolvedTypeRef @@ -55,7 +58,7 @@ internal fun remapArgumentsWithVararg( ) { arguments += arg if (this.source == null) { - this.source = arg.source?.fakeElement(FirFakeSourceElementKind.VarargArgument) + this.source = arg.source?.fakeElement(KtFakeSourceElementKind.VarargArgument) } } else if (arguments.isEmpty()) { // `arg` is BEFORE the vararg arguments. @@ -88,7 +91,7 @@ fun FirBlock.writeResultType(session: FirSession) { val theType = resultExpression.resultType if (theType is FirResolvedTypeRef) { buildResolvedTypeRef { - source = theType.source?.fakeElement(FirFakeSourceElementKind.ImplicitTypeRef) + source = theType.source?.fakeElement(KtFakeSourceElementKind.ImplicitTypeRef) type = theType.type annotations += theType.annotations } 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 fa7fcd11c6f..3e3dd983949 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 @@ -5,8 +5,10 @@ package org.jetbrains.kotlin.fir.resolve.transformers.body.resolve +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.* import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.builder.buildValueParameter @@ -814,7 +816,7 @@ open class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransfor lambda.valueParameters.isEmpty() && singleParameterType != null -> { val name = Name.identifier("it") val itParam = buildValueParameter { - source = lambda.source?.fakeElement(FirFakeSourceElementKind.ItLambdaParameter) + source = lambda.source?.fakeElement(KtFakeSourceElementKind.ItLambdaParameter) moduleData = session.moduleData origin = FirDeclarationOrigin.Source returnTypeRef = singleParameterType.toFirResolvedTypeRef() @@ -858,7 +860,7 @@ open class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransfor override fun transformElement(element: E, data: FirExpression): E { if (element == lastStatement) { val returnExpression = buildReturnExpression { - source = element.source?.fakeElement(FirFakeSourceElementKind.ImplicitReturn) + source = element.source?.fakeElement(KtFakeSourceElementKind.ImplicitReturn) result = lastStatement target = FirFunctionTarget(null, isLambda = this@addReturn.isLambda).also { it.bind(this@addReturn) @@ -979,7 +981,7 @@ open class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransfor } is FirErrorTypeRef -> buildErrorTypeRef { diagnostic = this@toExpectedTypeRef.diagnostic - this@toExpectedTypeRef.source?.fakeElement(FirFakeSourceElementKind.ImplicitTypeRef)?.let { + this@toExpectedTypeRef.source?.fakeElement(KtFakeSourceElementKind.ImplicitTypeRef)?.let { source = it } } @@ -987,7 +989,7 @@ open class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransfor buildResolvedTypeRef { type = this@toExpectedTypeRef.coneType annotations.addAll(this@toExpectedTypeRef.annotations) - this@toExpectedTypeRef.source?.fakeElement(FirFakeSourceElementKind.PropertyFromParameter)?.let { + this@toExpectedTypeRef.source?.fakeElement(KtFakeSourceElementKind.PropertyFromParameter)?.let { source = it } } 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 b149778cfff..272f1e0aeff 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,9 @@ package org.jetbrains.kotlin.fir.resolve.transformers.body.resolve +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.descriptors.ClassKind +import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.* import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.diagnostics.* @@ -214,7 +216,7 @@ open class FirExpressionsResolveTransformer(transformer: FirBodyResolveTransform return markSuperReferenceError(diagnostic, superReferenceContainer, superReference) } superTypeRef is FirResolvedTypeRef -> { - superReferenceContainer.resultType = superTypeRef.copyWithNewSourceKind(FirFakeSourceElementKind.SuperCallExplicitType) + superReferenceContainer.resultType = superTypeRef.copyWithNewSourceKind(KtFakeSourceElementKind.SuperCallExplicitType) } superTypeRef !is FirImplicitTypeRef -> { components.typeResolverTransformer.withAllowedBareTypes { @@ -246,7 +248,7 @@ open class FirExpressionsResolveTransformer(transformer: FirBodyResolveTransform diagnostic = ConeSimpleDiagnostic("Not a super type", DiagnosticKind.NotASupertype) } superReferenceContainer.resultType = - actualSuperTypeRef.copyWithNewSourceKind(FirFakeSourceElementKind.SuperCallExplicitType) + actualSuperTypeRef.copyWithNewSourceKind(KtFakeSourceElementKind.SuperCallExplicitType) superReference.replaceSuperTypeRef(actualSuperTypeRef) } else -> { @@ -258,7 +260,7 @@ open class FirExpressionsResolveTransformer(transformer: FirBodyResolveTransform diagnostic = ConeStubDiagnostic(ConeSimpleDiagnostic("Unresolved super method", DiagnosticKind.Other)) } 1 -> buildResolvedTypeRef { - source = superReferenceContainer.source?.fakeElement(FirFakeSourceElementKind.SuperCallImplicitType) + source = superReferenceContainer.source?.fakeElement(KtFakeSourceElementKind.SuperCallImplicitType) type = types.single() } else -> buildErrorTypeRef { @@ -267,7 +269,7 @@ open class FirExpressionsResolveTransformer(transformer: FirBodyResolveTransform } } superReferenceContainer.resultType = - resultType.copyWithNewSourceKind(FirFakeSourceElementKind.SuperCallExplicitType) + resultType.copyWithNewSourceKind(KtFakeSourceElementKind.SuperCallExplicitType) superReference.replaceSuperTypeRef(resultType) } } @@ -285,7 +287,7 @@ open class FirExpressionsResolveTransformer(transformer: FirBodyResolveTransform superReferenceContainer.resultType = resultType superReference.replaceSuperTypeRef(resultType) superReferenceContainer.replaceCalleeReference(buildErrorNamedReference { - source = superReferenceContainer.source?.fakeElement(FirFakeSourceElementKind.ReferenceInAtomicQualifiedAccess) + source = superReferenceContainer.source?.fakeElement(KtFakeSourceElementKind.ReferenceInAtomicQualifiedAccess) diagnostic = superNotAvailableDiagnostic }) return superReferenceContainer @@ -444,12 +446,12 @@ open class FirExpressionsResolveTransformer(transformer: FirBodyResolveTransform val rightArgument = assignmentOperatorStatement.rightArgument.transformSingle(transformer, ResolutionMode.ContextDependent) fun createFunctionCall(name: Name): FirFunctionCall = buildFunctionCall { - source = assignmentOperatorStatement.source?.fakeElement(FirFakeSourceElementKind.DesugaredCompoundAssignment) + source = assignmentOperatorStatement.source?.fakeElement(KtFakeSourceElementKind.DesugaredCompoundAssignment) explicitReceiver = leftArgument argumentList = buildUnaryArgumentList(rightArgument) calleeReference = buildSimpleNamedReference { // TODO: Use source of operator for callee reference source - source = assignmentOperatorStatement.source?.fakeElement(FirFakeSourceElementKind.DesugaredCompoundAssignment) + source = assignmentOperatorStatement.source?.fakeElement(KtFakeSourceElementKind.DesugaredCompoundAssignment) this.name = name candidateSymbol = null } @@ -650,7 +652,7 @@ open class FirExpressionsResolveTransformer(transformer: FirBodyResolveTransform } FirOperation.AS -> { resolved.resultType = buildResolvedTypeRef { - source = conversionTypeRef.source?.fakeElement(FirFakeSourceElementKind.ImplicitTypeRef) + source = conversionTypeRef.source?.fakeElement(KtFakeSourceElementKind.ImplicitTypeRef) type = conversionTypeRef.coneType annotations += conversionTypeRef.annotations } @@ -1118,7 +1120,7 @@ open class FirExpressionsResolveTransformer(transformer: FirBodyResolveTransform anonymousObjectExpression.transformAnonymousObject(transformer, data) if (anonymousObjectExpression.typeRef !is FirResolvedTypeRef) { anonymousObjectExpression.resultType = buildResolvedTypeRef { - source = anonymousObjectExpression.source?.fakeElement(FirFakeSourceElementKind.ImplicitTypeRef) + source = anonymousObjectExpression.source?.fakeElement(KtFakeSourceElementKind.ImplicitTypeRef) this.type = anonymousObjectExpression.anonymousObject.defaultType() } } diff --git a/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/FirLookupTrackerComponent.kt b/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/FirLookupTrackerComponent.kt index b0e8bcf2b02..e8b55dd4c23 100644 --- a/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/FirLookupTrackerComponent.kt +++ b/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/FirLookupTrackerComponent.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.fir +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.resolve.calls.AbstractCallInfo import org.jetbrains.kotlin.fir.types.* import org.jetbrains.kotlin.name.Name @@ -12,9 +13,9 @@ import org.jetbrains.kotlin.utils.SmartList abstract class FirLookupTrackerComponent : FirSessionComponent { - abstract fun recordLookup(name: Name, inScopes: List, source: FirSourceElement?, fileSource: FirSourceElement?) + abstract fun recordLookup(name: Name, inScopes: List, source: KtSourceElement?, fileSource: KtSourceElement?) - abstract fun recordLookup(name: Name, inScope: String, source: FirSourceElement?, fileSource: FirSourceElement?) + abstract fun recordLookup(name: Name, inScope: String, source: KtSourceElement?, fileSource: KtSourceElement?) } fun FirLookupTrackerComponent.recordCallLookup(callInfo: AbstractCallInfo, inType: ConeKotlinType) { @@ -30,11 +31,11 @@ fun FirLookupTrackerComponent.recordCallLookup(callInfo: AbstractCallInfo, inSco recordLookup(callInfo.name, inScopes, callInfo.callSite.source, callInfo.containingFile.source) } -fun FirLookupTrackerComponent.recordTypeLookup(typeRef: FirTypeRef, inScopes: List, fileSource: FirSourceElement?) { +fun FirLookupTrackerComponent.recordTypeLookup(typeRef: FirTypeRef, inScopes: List, fileSource: KtSourceElement?) { if (typeRef is FirUserTypeRef) recordLookup(typeRef.qualifier.first().name, inScopes, typeRef.source, fileSource) } -fun FirLookupTrackerComponent.recordTypeResolveAsLookup(typeRef: FirTypeRef, source: FirSourceElement?, fileSource: FirSourceElement?) { +fun FirLookupTrackerComponent.recordTypeResolveAsLookup(typeRef: FirTypeRef, source: KtSourceElement?, fileSource: KtSourceElement?) { if (typeRef !is FirResolvedTypeRef) return // TODO: check if this is the correct behavior if (source == null && fileSource == null) return // TODO: investigate all cases diff --git a/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/calls/ResolutionDiagnostic.kt b/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/calls/ResolutionDiagnostic.kt index 5b3c0e17416..3716d0aa3e5 100644 --- a/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/calls/ResolutionDiagnostic.kt +++ b/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/calls/ResolutionDiagnostic.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.resolve.calls -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.declarations.FirFunction import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -101,7 +101,7 @@ class ManyLambdaExpressionArguments( class InfixCallOfNonInfixFunction(val function: FirNamedFunctionSymbol) : ResolutionDiagnostic(INAPPLICABLE_MODIFIER) class OperatorCallOfNonOperatorFunction(val function: FirNamedFunctionSymbol) : ResolutionDiagnostic(INAPPLICABLE_MODIFIER) -class Unsupported(val message: String, val source: FirSourceElement? = null) : ResolutionDiagnostic(UNSUPPORTED) +class Unsupported(val message: String, val source: KtSourceElement? = null) : ResolutionDiagnostic(UNSUPPORTED) object PropertyAsOperator : ResolutionDiagnostic(PROPERTY_AS_OPERATOR) diff --git a/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/FirControlFlowGraphReferenceImpl.kt b/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/FirControlFlowGraphReferenceImpl.kt index 959cca726ad..3687800dbc2 100644 --- a/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/FirControlFlowGraphReferenceImpl.kt +++ b/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/FirControlFlowGraphReferenceImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.resolve.dfa -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.resolve.dfa.cfg.CFGNode import org.jetbrains.kotlin.fir.resolve.dfa.cfg.ControlFlowGraph @@ -16,7 +16,7 @@ class FirControlFlowGraphReferenceImpl( val controlFlowGraph: ControlFlowGraph, val dataFlowInfo: DataFlowInfo? = null ) : FirControlFlowGraphReference() { - override val source: FirSourceElement? get() = null + override val source: KtSourceElement? get() = null override fun acceptChildren(visitor: FirVisitor, data: D) {} diff --git a/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/CFGNode.kt b/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/CFGNode.kt index 49a403b066c..9ab4691bda2 100644 --- a/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/CFGNode.kt +++ b/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/CFGNode.kt @@ -7,8 +7,8 @@ package org.jetbrains.kotlin.fir.resolve.dfa.cfg +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.expressions.* import org.jetbrains.kotlin.fir.resolve.dfa.controlFlowGraph @@ -823,7 +823,7 @@ class AnnotationExitNode(owner: ControlFlowGraph, override val fir: FirAnnotatio // ----------------------------------- Stub ----------------------------------- object FirStub : FirElement { - override val source: FirSourceElement? get() = null + override val source: KtSourceElement? get() = null override fun acceptChildren(visitor: FirVisitor, data: D) {} diff --git a/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/diagnostics/ConeDiagnostics.kt b/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/diagnostics/ConeDiagnostics.kt index d369ab1e752..91a120b7e92 100644 --- a/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/diagnostics/ConeDiagnostics.kt +++ b/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/diagnostics/ConeDiagnostics.kt @@ -6,8 +6,7 @@ package org.jetbrains.kotlin.fir.resolve.diagnostics import kotlinx.collections.immutable.ImmutableList -import org.jetbrains.kotlin.resolve.deprecation.DeprecationInfo -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.declarations.FirCallableDeclaration import org.jetbrains.kotlin.fir.declarations.FirVariable import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic @@ -21,6 +20,7 @@ import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.calls.tower.CandidateApplicability +import org.jetbrains.kotlin.resolve.deprecation.DeprecationInfo sealed interface ConeUnresolvedError : ConeDiagnostic { val qualifier: String? @@ -153,7 +153,7 @@ interface ConeUnmatchedTypeArgumentsError : ConeDiagnosticWithSingleCandidate { class ConeWrongNumberOfTypeArgumentsError( override val desiredCount: Int, override val candidateSymbol: FirRegularClassSymbol, - source: FirSourceElement + source: KtSourceElement ) : ConeDiagnosticWithSource(source), ConeUnmatchedTypeArgumentsError { override val reason: String get() = "Wrong number of type arguments" } @@ -196,12 +196,12 @@ class ConeImportFromSingleton(val name: Name) : ConeDiagnostic { override val reason: String get() = "Import from singleton $name is not allowed" } -open class ConeUnsupported(override val reason: String, val source: FirSourceElement? = null) : ConeDiagnostic +open class ConeUnsupported(override val reason: String, val source: KtSourceElement? = null) : ConeDiagnostic class ConeUnsupportedDynamicType : ConeUnsupported("Dynamic types are not supported in this context") class ConeDeprecated( - val source: FirSourceElement?, + val source: KtSourceElement?, override val candidateSymbol: FirBasedSymbol<*>, val deprecationInfo: DeprecationInfo ) : ConeDiagnosticWithSingleCandidate { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirAnnotationContainer.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirAnnotationContainer.kt index b9cdf23d26d..2f05cc94b61 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirAnnotationContainer.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirAnnotationContainer.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.fir +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.visitors.* @@ -14,7 +15,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirAnnotationContainer : FirElement { - override val source: FirSourceElement? + override val source: KtSourceElement? val annotations: List override fun accept(visitor: FirVisitor, data: D): R = visitor.visitAnnotationContainer(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirElement.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirElement.kt index 37573839e93..3facc8007f2 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirElement.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirElement.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.fir +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.visitors.* /* @@ -13,7 +14,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirElement { - val source: FirSourceElement? + val source: KtSourceElement? fun accept(visitor: FirVisitor, data: D): R = visitor.visitElement(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirLabel.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirLabel.kt index c816c53ebc0..cb40df15bfa 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirLabel.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirLabel.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.fir +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.visitors.* /* @@ -13,7 +14,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirLabel : FirPureAbstractElement(), FirElement { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract val name: String override fun accept(visitor: FirVisitor, data: D): R = visitor.visitLabel(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirPackageDirective.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirPackageDirective.kt index 9feab29586b..fe3590f8c99 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirPackageDirective.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirPackageDirective.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.fir +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.fir.visitors.* @@ -14,7 +15,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirPackageDirective : FirPureAbstractElement(), FirElement { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract val packageFqName: FqName override fun accept(visitor: FirVisitor, data: D): R = visitor.visitPackageDirective(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirTargetElement.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirTargetElement.kt index 1ba188db46c..139aaee0744 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirTargetElement.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirTargetElement.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.fir +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.visitors.* /* @@ -13,7 +14,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirTargetElement : FirElement { - override val source: FirSourceElement? + override val source: KtSourceElement? override fun accept(visitor: FirVisitor, data: D): R = visitor.visitTargetElement(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/builder/FirAnnotationContainerBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/builder/FirAnnotationContainerBuilder.kt index 9ad9b212526..6dbee37e70e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/builder/FirAnnotationContainerBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/builder/FirAnnotationContainerBuilder.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.builder +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirAnnotationContainer -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.visitors.* @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl interface FirAnnotationContainerBuilder { - abstract var source: FirSourceElement? + abstract var source: KtSourceElement? abstract val annotations: MutableList fun build(): FirAnnotationContainer diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/builder/FirLabelBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/builder/FirLabelBuilder.kt index a28bb3a66b8..32d80c869b4 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/builder/FirLabelBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/builder/FirLabelBuilder.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.fir.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirLabel -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.impl.FirLabelImpl import org.jetbrains.kotlin.fir.visitors.* @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirLabelBuilder { - var source: FirSourceElement? = null + var source: KtSourceElement? = null lateinit var name: String fun build(): FirLabel { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/builder/FirPackageDirectiveBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/builder/FirPackageDirectiveBuilder.kt index ff95ac0e5ed..90764ccd8e3 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/builder/FirPackageDirectiveBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/builder/FirPackageDirectiveBuilder.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.fir.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirPackageDirective -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.impl.FirPackageDirectiveImpl import org.jetbrains.kotlin.fir.visitors.* @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.name.FqName @FirBuilderDsl class FirPackageDirectiveBuilder { - var source: FirSourceElement? = null + var source: KtSourceElement? = null lateinit var packageFqName: FqName fun build(): FirPackageDirective { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirContractDescription.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirContractDescription.kt index d3fc2235451..fd1c7f01524 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirContractDescription.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirContractDescription.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.contracts +import org.jetbrains.kotlin.KtSourceElement 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 FirContractDescription : FirPureAbstractElement(), FirElement { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? override fun accept(visitor: FirVisitor, data: D): R = visitor.visitContractDescription(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirEffectDeclaration.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirEffectDeclaration.kt index 7038a15215a..8b60965e074 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirEffectDeclaration.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirEffectDeclaration.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.contracts +import org.jetbrains.kotlin.KtSourceElement 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 FirEffectDeclaration : FirPureAbstractElement(), FirElement { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract val effect: ConeEffectDeclaration override fun accept(visitor: FirVisitor, data: D): R = visitor.visitEffectDeclaration(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirLegacyRawContractDescription.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirLegacyRawContractDescription.kt index 681b83cfb32..b37cb6eae0f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirLegacyRawContractDescription.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirLegacyRawContractDescription.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.contracts +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirFunctionCall import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirLegacyRawContractDescription : FirContractDescription() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract val contractCall: FirFunctionCall override fun accept(visitor: FirVisitor, data: D): R = visitor.visitLegacyRawContractDescription(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirRawContractDescription.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirRawContractDescription.kt index 2118022df74..3c5801d8617 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirRawContractDescription.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirRawContractDescription.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.contracts +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirRawContractDescription : FirContractDescription() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract val rawEffects: List override fun accept(visitor: FirVisitor, data: D): R = visitor.visitRawContractDescription(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirResolvedContractDescription.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirResolvedContractDescription.kt index 60ef4b74536..5b3e19b5c7d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirResolvedContractDescription.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirResolvedContractDescription.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.contracts +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirResolvedContractDescription : FirContractDescription() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract val effects: List abstract val unresolvedEffects: List diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/builder/FirEffectDeclarationBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/builder/FirEffectDeclarationBuilder.kt index 73a0f22d601..62c8345ff6f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/builder/FirEffectDeclarationBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/builder/FirEffectDeclarationBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.contracts.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.contracts.FirEffectDeclaration import org.jetbrains.kotlin.fir.contracts.description.ConeEffectDeclaration @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirEffectDeclarationBuilder { - var source: FirSourceElement? = null + var source: KtSourceElement? = null lateinit var effect: ConeEffectDeclaration fun build(): FirEffectDeclaration { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/builder/FirLegacyRawContractDescriptionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/builder/FirLegacyRawContractDescriptionBuilder.kt index 81ce9162011..536f19551d8 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/builder/FirLegacyRawContractDescriptionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/builder/FirLegacyRawContractDescriptionBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.contracts.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.contracts.FirLegacyRawContractDescription import org.jetbrains.kotlin.fir.contracts.impl.FirLegacyRawContractDescriptionImpl @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirLegacyRawContractDescriptionBuilder { - var source: FirSourceElement? = null + var source: KtSourceElement? = null lateinit var contractCall: FirFunctionCall fun build(): FirLegacyRawContractDescription { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/builder/FirRawContractDescriptionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/builder/FirRawContractDescriptionBuilder.kt index ba633334a3d..e6996e9ff1f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/builder/FirRawContractDescriptionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/builder/FirRawContractDescriptionBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.contracts.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.contracts.FirRawContractDescription import org.jetbrains.kotlin.fir.contracts.impl.FirRawContractDescriptionImpl @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirRawContractDescriptionBuilder { - var source: FirSourceElement? = null + var source: KtSourceElement? = null val rawEffects: MutableList = mutableListOf() fun build(): FirRawContractDescription { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/builder/FirResolvedContractDescriptionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/builder/FirResolvedContractDescriptionBuilder.kt index 73376740045..9ea47117918 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/builder/FirResolvedContractDescriptionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/builder/FirResolvedContractDescriptionBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.contracts.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.contracts.FirEffectDeclaration import org.jetbrains.kotlin.fir.contracts.FirResolvedContractDescription @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirResolvedContractDescriptionBuilder { - var source: FirSourceElement? = null + var source: KtSourceElement? = null val effects: MutableList = mutableListOf() val unresolvedEffects: MutableList = mutableListOf() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/impl/FirEffectDeclarationImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/impl/FirEffectDeclarationImpl.kt index edfeecc2c00..33324a264b5 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/impl/FirEffectDeclarationImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/impl/FirEffectDeclarationImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.contracts.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.contracts.FirEffectDeclaration import org.jetbrains.kotlin.fir.contracts.description.ConeEffectDeclaration import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirEffectDeclarationImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val effect: ConeEffectDeclaration, ) : FirEffectDeclaration() { override fun acceptChildren(visitor: FirVisitor, data: D) {} diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/impl/FirLegacyRawContractDescriptionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/impl/FirLegacyRawContractDescriptionImpl.kt index b167dea58aa..f39093cb40c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/impl/FirLegacyRawContractDescriptionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/impl/FirLegacyRawContractDescriptionImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.contracts.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.contracts.FirLegacyRawContractDescription import org.jetbrains.kotlin.fir.expressions.FirFunctionCall import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirLegacyRawContractDescriptionImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override var contractCall: FirFunctionCall, ) : FirLegacyRawContractDescription() { override fun acceptChildren(visitor: FirVisitor, data: D) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/impl/FirRawContractDescriptionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/impl/FirRawContractDescriptionImpl.kt index a99cc84bb39..8f300176016 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/impl/FirRawContractDescriptionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/impl/FirRawContractDescriptionImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.contracts.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.contracts.FirRawContractDescription import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirRawContractDescriptionImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val rawEffects: MutableList, ) : FirRawContractDescription() { override fun acceptChildren(visitor: FirVisitor, data: D) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/impl/FirResolvedContractDescriptionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/impl/FirResolvedContractDescriptionImpl.kt index 992f5fe73a8..2c9176a3e6a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/impl/FirResolvedContractDescriptionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/impl/FirResolvedContractDescriptionImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.contracts.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.contracts.FirEffectDeclaration import org.jetbrains.kotlin.fir.contracts.FirResolvedContractDescription import org.jetbrains.kotlin.fir.expressions.FirStatement @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirResolvedContractDescriptionImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val effects: MutableList, override val unresolvedEffects: MutableList, ) : FirResolvedContractDescription() { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnnotatedDeclaration.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnnotatedDeclaration.kt index 487b67c3b89..3dcc84ce241 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnnotatedDeclaration.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnnotatedDeclaration.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.fir.declarations +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirAnnotationContainer import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.visitors.* @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ sealed class FirAnnotatedDeclaration : FirDeclaration(), FirAnnotationContainer { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val symbol: FirBasedSymbol abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousFunction.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousFunction.kt index 6733106c569..4745e4da00f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousFunction.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousFunction.kt @@ -5,11 +5,11 @@ package org.jetbrains.kotlin.fir.declarations +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.contracts.description.EventOccurrencesRange import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirLabel import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirAnonymousFunction : FirFunction(), FirTypeParametersOwner { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousInitializer.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousInitializer.kt index d1efda5d328..ea56c68db8c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousInitializer.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousInitializer.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirAnonymousInitializerSymbol @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirAnonymousInitializer : FirDeclaration(), FirControlFlowGraphOwner { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousObject.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousObject.kt index 884fd11904c..9fb5be0d205 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousObject.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousObject.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.fir.declarations +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.scopes.FirScopeProvider @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirAnonymousObject : FirClass(), FirControlFlowGraphOwner { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirBackingField.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirBackingField.kt index 7a97cd45275..b1d4500bff9 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirBackingField.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirBackingField.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirStatement @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirBackingField : FirVariable(), FirTypeParametersOwner, FirStatement { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirCallableDeclaration.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirCallableDeclaration.kt index a524f800664..3f783bce3fa 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirCallableDeclaration.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirCallableDeclaration.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol import org.jetbrains.kotlin.fir.types.ConeKotlinType @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ sealed class FirCallableDeclaration : FirTypedDeclaration() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirClass.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirClass.kt index 865c6549888..5b1bdf39a92 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirClass.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirClass.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.fir.declarations +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.scopes.FirScopeProvider @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ sealed class FirClass : FirClassLikeDeclaration(), FirStatement, FirTypeParameterRefsOwner { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirClassLikeDeclaration.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirClassLikeDeclaration.kt index 9a9165fb973..45ea0766471 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirClassLikeDeclaration.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirClassLikeDeclaration.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ sealed class FirClassLikeDeclaration : FirMemberDeclaration(), FirStatement { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirConstructor.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirConstructor.kt index 9235c49fcd4..e22ba78d041 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirConstructor.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirConstructor.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirConstructor : FirFunction(), FirTypeParameterRefsOwner { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirContractDescriptionOwner.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirContractDescriptionOwner.kt index da02950e532..2c8a3a22cc1 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirContractDescriptionOwner.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirContractDescriptionOwner.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations +import org.jetbrains.kotlin.KtSourceElement 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.* */ sealed interface FirContractDescriptionOwner : FirElement { - override val source: FirSourceElement? + override val source: KtSourceElement? val contractDescription: FirContractDescription override fun accept(visitor: FirVisitor, data: D): R = visitor.visitContractDescriptionOwner(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirControlFlowGraphOwner.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirControlFlowGraphOwner.kt index f0ddccb95ff..5aa0ba55b50 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirControlFlowGraphOwner.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirControlFlowGraphOwner.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirControlFlowGraphOwner : FirElement { - override val source: FirSourceElement? + override val source: KtSourceElement? val controlFlowGraphReference: FirControlFlowGraphReference? override fun accept(visitor: FirVisitor, data: D): R = visitor.visitControlFlowGraphOwner(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirDeclaration.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirDeclaration.kt index e4ee6e93831..ecbb5ad4e48 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirDeclaration.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirDeclaration.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.fir.declarations +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.FirPureAbstractElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.visitors.* @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ sealed class FirDeclaration : FirPureAbstractElement(), FirElement { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract val symbol: FirBasedSymbol abstract val moduleData: FirModuleData abstract val resolvePhase: FirResolvePhase diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirDeclarationStatus.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirDeclarationStatus.kt index 225a453bbc2..c6766736280 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirDeclarationStatus.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirDeclarationStatus.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.fir.declarations +import org.jetbrains.kotlin.KtSourceElement 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 source: FirSourceElement? + override val source: KtSourceElement? val visibility: Visibility val modality: Modality? val isExpect: Boolean diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirEnumEntry.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirEnumEntry.kt index 52214658462..a93909fad1e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirEnumEntry.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirEnumEntry.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.symbols.impl.FirEnumEntrySymbol @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirEnumEntry : FirVariable() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorFunction.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorFunction.kt index 764e76598c0..637fccac234 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorFunction.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorFunction.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.diagnostics.FirDiagnosticHolder import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirErrorFunction : FirFunction(), FirDiagnosticHolder { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorImport.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorImport.kt index 63bbbba9082..904c79b6d38 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorImport.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorImport.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirPureAbstractElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.diagnostics.FirDiagnosticHolder import org.jetbrains.kotlin.name.FqName @@ -20,11 +20,11 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirErrorImport : FirPureAbstractElement(), FirImport, FirDiagnosticHolder { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val importedFqName: FqName? abstract override val isAllUnder: Boolean abstract override val aliasName: Name? - abstract override val aliasSource: FirSourceElement? + abstract override val aliasSource: KtSourceElement? abstract override val diagnostic: ConeDiagnostic abstract val delegate: FirImport diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorProperty.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorProperty.kt index 8458a829878..11a83ff48bc 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorProperty.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorProperty.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.diagnostics.FirDiagnosticHolder import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirErrorProperty : FirVariable(), FirDiagnosticHolder { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirField.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirField.kt index 98b7292aa8c..76f1bc54e12 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirField.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirField.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.symbols.impl.FirFieldSymbol @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirField : FirVariable() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFile.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFile.kt index 01f37e3418e..97e5e8dda46 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFile.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFile.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.fir.declarations +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.FirPackageDirective -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.symbols.impl.FirFileSymbol import org.jetbrains.kotlin.fir.visitors.* @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirFile : FirAnnotatedDeclaration() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFunction.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFunction.kt index 46a2d9a99c1..31d02d920d8 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFunction.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFunction.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.FirTargetElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ sealed class FirFunction : FirCallableDeclaration(), FirTargetElement, FirControlFlowGraphOwner, FirStatement { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirImport.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirImport.kt index 08b5b85ca91..939e07e6195 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirImport.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirImport.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.fir.visitors.* @@ -17,11 +17,11 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirImport : FirElement { - override val source: FirSourceElement? + override val source: KtSourceElement? val importedFqName: FqName? val isAllUnder: Boolean val aliasName: Name? - val aliasSource: FirSourceElement? + val aliasSource: KtSourceElement? override fun accept(visitor: FirVisitor, data: D): R = visitor.visitImport(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirMemberDeclaration.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirMemberDeclaration.kt index c0156234d8c..4e0273ab226 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirMemberDeclaration.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirMemberDeclaration.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.visitors.* @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ sealed class FirMemberDeclaration : FirAnnotatedDeclaration(), FirTypeParameterRefsOwner { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val symbol: FirBasedSymbol abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirProperty.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirProperty.kt index da54a7f2322..1b43f3f2518 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirProperty.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirProperty.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirProperty : FirVariable(), FirTypeParametersOwner, FirControlFlowGraphOwner { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirPropertyAccessor.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirPropertyAccessor.kt index e620370b450..62a7da3cb76 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirPropertyAccessor.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirPropertyAccessor.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.contracts.FirContractDescription import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirPropertyAccessor : FirFunction(), FirContractDescriptionOwner, FirTypeParametersOwner { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirRegularClass.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirRegularClass.kt index 0b1ad9dc383..f0544c696cb 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirRegularClass.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirRegularClass.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.fir.declarations +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.scopes.FirScopeProvider @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirRegularClass : FirClass(), FirControlFlowGraphOwner { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirResolvedDeclarationStatus.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirResolvedDeclarationStatus.kt index aeaef3e4bb2..2d967ea253b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirResolvedDeclarationStatus.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirResolvedDeclarationStatus.kt @@ -5,11 +5,11 @@ package org.jetbrains.kotlin.fir.declarations +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.EffectiveVisibility 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.* /* @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirResolvedDeclarationStatus : FirDeclarationStatus { - override val source: FirSourceElement? + override val source: KtSourceElement? override val visibility: Visibility override val modality: Modality? override val isExpect: Boolean diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirResolvedImport.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirResolvedImport.kt index c0c7ebea318..463686e8471 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirResolvedImport.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirResolvedImport.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirPureAbstractElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name @@ -19,11 +19,11 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirResolvedImport : FirPureAbstractElement(), FirImport { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val importedFqName: FqName? abstract override val isAllUnder: Boolean abstract override val aliasName: Name? - abstract override val aliasSource: FirSourceElement? + abstract override val aliasSource: KtSourceElement? abstract val delegate: FirImport abstract val packageFqName: FqName abstract val relativeParentClassName: FqName? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirSimpleFunction.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirSimpleFunction.kt index b1f88a1a028..38ef4c15161 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirSimpleFunction.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirSimpleFunction.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.contracts.FirContractDescription import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirSimpleFunction : FirFunction(), FirContractDescriptionOwner, FirTypeParametersOwner { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeAlias.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeAlias.kt index c7ce719284a..d5b90b05ec6 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeAlias.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeAlias.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation 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 : FirClassLikeDeclaration(), FirTypeParametersOwner { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParameter.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParameter.kt index 8ced2ba8860..fb483ea60cb 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParameter.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParameter.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirTypeParameter : FirTypeParameterRef, FirAnnotatedDeclaration() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParameterRef.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParameterRef.kt index 100323f9897..102f8a9d6bc 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParameterRef.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParameterRef.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirTypeParameterRef : FirElement { - override val source: FirSourceElement? + override val source: KtSourceElement? val symbol: FirTypeParameterSymbol override fun accept(visitor: FirVisitor, data: D): R = visitor.visitTypeParameterRef(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParameterRefsOwner.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParameterRefsOwner.kt index 791c19c96a6..4234d97bde2 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParameterRefsOwner.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParameterRefsOwner.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations +import org.jetbrains.kotlin.KtSourceElement 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.* */ sealed interface FirTypeParameterRefsOwner : FirElement { - override val source: FirSourceElement? + override val source: KtSourceElement? val typeParameters: List override fun accept(visitor: FirVisitor, data: D): R = visitor.visitTypeParameterRefsOwner(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParametersOwner.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParametersOwner.kt index 4527862f90d..9ba6caf313e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParametersOwner.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParametersOwner.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations +import org.jetbrains.kotlin.KtSourceElement 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.* */ sealed interface FirTypeParametersOwner : FirTypeParameterRefsOwner { - override val source: FirSourceElement? + override val source: KtSourceElement? override val typeParameters: List override fun accept(visitor: FirVisitor, data: D): R = visitor.visitTypeParametersOwner(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypedDeclaration.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypedDeclaration.kt index 3a8b3347dcd..a9aa8a261b5 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypedDeclaration.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypedDeclaration.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ sealed class FirTypedDeclaration : FirMemberDeclaration() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val symbol: FirBasedSymbol abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirValueParameter.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirValueParameter.kt index 0b06aa10ad7..66699657ad8 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirValueParameter.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirValueParameter.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirValueParameter : FirVariable(), FirControlFlowGraphOwner { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirVariable.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirVariable.kt index 4b8c515d040..bc3e198e67c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirVariable.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirVariable.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirStatement @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ sealed class FirVariable : FirCallableDeclaration(), FirStatement { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val moduleData: FirModuleData abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAbstractConstructorBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAbstractConstructorBuilder.kt index aa80a464c7a..13aae3b2e3a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAbstractConstructorBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAbstractConstructorBuilder.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations.builder +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.DeprecationsPerUseSite import org.jetbrains.kotlin.fir.declarations.FirConstructor @@ -34,7 +34,7 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ @FirBuilderDsl interface FirAbstractConstructorBuilder : FirFunctionBuilder { - abstract override var source: FirSourceElement? + abstract override var source: KtSourceElement? abstract override var moduleData: FirModuleData abstract override var resolvePhase: FirResolvePhase abstract override var origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousFunctionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousFunctionBuilder.kt index 01c270e7e70..eca78b6c2c3 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousFunctionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousFunctionBuilder.kt @@ -6,10 +6,10 @@ package org.jetbrains.kotlin.fir.declarations.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.contracts.description.EventOccurrencesRange import org.jetbrains.kotlin.fir.FirLabel import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.DeprecationsPerUseSite @@ -41,7 +41,7 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ @FirBuilderDsl class FirAnonymousFunctionBuilder : FirFunctionBuilder, FirAnnotationContainerBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override lateinit var moduleData: FirModuleData override lateinit var origin: FirDeclarationOrigin override var attributes: FirDeclarationAttributes = FirDeclarationAttributes() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousInitializerBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousInitializerBuilder.kt index f99d1d3210a..3f35dc1e422 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousInitializerBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousInitializerBuilder.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.fir.declarations.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.FirAnonymousInitializer import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirAnonymousInitializerBuilder : FirDeclarationBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override lateinit var moduleData: FirModuleData override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR override lateinit var origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousObjectBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousObjectBuilder.kt index 36b1bc7969e..0cfc2e4ddd6 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousObjectBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousObjectBuilder.kt @@ -6,9 +6,9 @@ package org.jetbrains.kotlin.fir.declarations.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.DeprecationsPerUseSite @@ -36,7 +36,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirAnonymousObjectBuilder : FirDeclarationBuilder, FirClassBuilder, FirAnnotationContainerBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override lateinit var moduleData: FirModuleData override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR override lateinit var origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirBackingFieldBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirBackingFieldBuilder.kt index 602036ab861..f2ecf9fa5de 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirBackingFieldBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirBackingFieldBuilder.kt @@ -6,9 +6,9 @@ package org.jetbrains.kotlin.fir.declarations.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.DeprecationsPerUseSite @@ -37,7 +37,7 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ @FirBuilderDsl class FirBackingFieldBuilder : FirAnnotationContainerBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null lateinit var moduleData: FirModuleData var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR lateinit var origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirClassBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirClassBuilder.kt index cddcfa55648..37ae2eb3bd1 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirClassBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirClassBuilder.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations.builder +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.DeprecationsPerUseSite @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl interface FirClassBuilder : FirDeclarationBuilder, FirAnnotationContainerBuilder { - abstract override var source: FirSourceElement? + abstract override var source: KtSourceElement? abstract override var moduleData: FirModuleData abstract override var resolvePhase: FirResolvePhase abstract override var origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirConstructedClassTypeParameterRefBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirConstructedClassTypeParameterRefBuilder.kt index 5ff108d3924..a39ecae5c83 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirConstructedClassTypeParameterRefBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirConstructedClassTypeParameterRefBuilder.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.fir.declarations.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirPureAbstractElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef import org.jetbrains.kotlin.fir.declarations.impl.FirConstructedClassTypeParameterRef @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirConstructedClassTypeParameterRefBuilder { - var source: FirSourceElement? = null + var source: KtSourceElement? = null lateinit var symbol: FirTypeParameterSymbol fun build(): FirTypeParameterRef { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirConstructorBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirConstructorBuilder.kt index a1af7e45d83..f611c8218af 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirConstructorBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirConstructorBuilder.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.fir.declarations.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.DeprecationsPerUseSite @@ -37,7 +37,7 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ @FirBuilderDsl open class FirConstructorBuilder : FirAbstractConstructorBuilder, FirAnnotationContainerBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override lateinit var moduleData: FirModuleData override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR override lateinit var origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDeclarationBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDeclarationBuilder.kt index 5805b59a3ed..39b36f33e99 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDeclarationBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDeclarationBuilder.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations.builder +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl interface FirDeclarationBuilder { - abstract var source: FirSourceElement? + abstract var source: KtSourceElement? abstract var moduleData: FirModuleData abstract var resolvePhase: FirResolvePhase abstract var origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDefaultSetterValueParameterBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDefaultSetterValueParameterBuilder.kt index 34a71b2b4f5..24e1ef5f80e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDefaultSetterValueParameterBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDefaultSetterValueParameterBuilder.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.fir.declarations.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.DeprecationsPerUseSite @@ -38,7 +38,7 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ @FirBuilderDsl class FirDefaultSetterValueParameterBuilder : FirAnnotationContainerBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null lateinit var moduleData: FirModuleData var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR lateinit var origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirEnumEntryBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirEnumEntryBuilder.kt index 0f717058dbe..4f748192b2f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirEnumEntryBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirEnumEntryBuilder.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.fir.declarations.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.DeprecationsPerUseSite @@ -36,7 +36,7 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ @FirBuilderDsl class FirEnumEntryBuilder : FirAnnotationContainerBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null lateinit var moduleData: FirModuleData var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR lateinit var origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorFunctionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorFunctionBuilder.kt index 663494c2d2c..5b5c139545f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorFunctionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorFunctionBuilder.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.fir.declarations.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.DeprecationsPerUseSite @@ -38,7 +38,7 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ @FirBuilderDsl class FirErrorFunctionBuilder : FirAnnotationContainerBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null lateinit var moduleData: FirModuleData var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR lateinit var origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorImportBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorImportBuilder.kt index e2fd17b2012..38e3edfdc61 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorImportBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorImportBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.declarations.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.FirErrorImport import org.jetbrains.kotlin.fir.declarations.FirImport @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.name.Name @FirBuilderDsl class FirErrorImportBuilder { - var aliasSource: FirSourceElement? = null + var aliasSource: KtSourceElement? = null lateinit var diagnostic: ConeDiagnostic lateinit var delegate: FirImport diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorPropertyBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorPropertyBuilder.kt index 9aa37de9c09..c6bf32a4b6f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorPropertyBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorPropertyBuilder.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.fir.declarations.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.DeprecationsPerUseSite @@ -39,7 +39,7 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ @FirBuilderDsl class FirErrorPropertyBuilder : FirAnnotationContainerBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null lateinit var moduleData: FirModuleData var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR lateinit var origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFieldBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFieldBuilder.kt index fe1ca45d077..21b6cc1754a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFieldBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFieldBuilder.kt @@ -6,9 +6,9 @@ package org.jetbrains.kotlin.fir.declarations.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.DeprecationsPerUseSite @@ -38,7 +38,7 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ @FirBuilderDsl open class FirFieldBuilder : FirDeclarationBuilder, FirAnnotationContainerBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override lateinit var moduleData: FirModuleData override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR override lateinit var origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFileBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFileBuilder.kt index 068b8ead4bf..32a1c967822 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFileBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFileBuilder.kt @@ -6,9 +6,9 @@ package org.jetbrains.kotlin.fir.declarations.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.FirPackageDirective -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.FirDeclaration @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirFileBuilder : FirAnnotationContainerBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null lateinit var moduleData: FirModuleData var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR lateinit var origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFunctionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFunctionBuilder.kt index eb478fb4fbc..1ea8b6ad8e1 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFunctionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFunctionBuilder.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations.builder +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.DeprecationsPerUseSite @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ @FirBuilderDsl interface FirFunctionBuilder : FirDeclarationBuilder, FirAnnotationContainerBuilder { - abstract override var source: FirSourceElement? + abstract override var source: KtSourceElement? abstract override var moduleData: FirModuleData abstract override var resolvePhase: FirResolvePhase abstract override var origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirImportBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirImportBuilder.kt index a1f20f45eaa..214c4cf0f07 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirImportBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirImportBuilder.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.fir.declarations.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirPureAbstractElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.FirImport import org.jetbrains.kotlin.fir.declarations.impl.FirImportImpl @@ -22,11 +22,11 @@ import org.jetbrains.kotlin.name.Name @FirBuilderDsl class FirImportBuilder { - var source: FirSourceElement? = null + var source: KtSourceElement? = null var importedFqName: FqName? = null var isAllUnder: Boolean by kotlin.properties.Delegates.notNull() var aliasName: Name? = null - var aliasSource: FirSourceElement? = null + var aliasSource: KtSourceElement? = null fun build(): FirImport { return FirImportImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirOuterClassTypeParameterRefBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirOuterClassTypeParameterRefBuilder.kt index 973970ea80c..c6081b48959 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirOuterClassTypeParameterRefBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirOuterClassTypeParameterRefBuilder.kt @@ -6,9 +6,9 @@ package org.jetbrains.kotlin.fir.declarations.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirPureAbstractElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef import org.jetbrains.kotlin.fir.declarations.impl.FirOuterClassTypeParameterRef @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirOuterClassTypeParameterRefBuilder { - var source: FirSourceElement? = null + var source: KtSourceElement? = null lateinit var symbol: FirTypeParameterSymbol @OptIn(FirImplementationDetail::class) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPrimaryConstructorBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPrimaryConstructorBuilder.kt index aaf0a134c26..c47f89bb64d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPrimaryConstructorBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPrimaryConstructorBuilder.kt @@ -6,9 +6,9 @@ package org.jetbrains.kotlin.fir.declarations.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.DeprecationsPerUseSite @@ -38,7 +38,7 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ @FirBuilderDsl class FirPrimaryConstructorBuilder : FirAbstractConstructorBuilder, FirAnnotationContainerBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override lateinit var moduleData: FirModuleData override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR override lateinit var origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyAccessorBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyAccessorBuilder.kt index 282815f5ad9..b4b31b2133e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyAccessorBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyAccessorBuilder.kt @@ -6,10 +6,10 @@ package org.jetbrains.kotlin.fir.declarations.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.contracts.FirContractDescription @@ -41,7 +41,7 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ @FirBuilderDsl class FirPropertyAccessorBuilder : FirFunctionBuilder, FirAnnotationContainerBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override lateinit var moduleData: FirModuleData override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR override lateinit var origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyBuilder.kt index 28e982319a8..0bf4a6dd6dd 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyBuilder.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.fir.declarations.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.DeprecationsPerUseSite @@ -42,7 +42,7 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ @FirBuilderDsl class FirPropertyBuilder : FirDeclarationBuilder, FirTypeParametersOwnerBuilder, FirAnnotationContainerBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override lateinit var moduleData: FirModuleData override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR override lateinit var origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirRegularClassBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirRegularClassBuilder.kt index 0bb26b44126..88fc581c1e0 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirRegularClassBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirRegularClassBuilder.kt @@ -6,9 +6,9 @@ package org.jetbrains.kotlin.fir.declarations.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.DeprecationsPerUseSite @@ -37,7 +37,7 @@ import org.jetbrains.kotlin.name.Name @FirBuilderDsl open class FirRegularClassBuilder : FirClassBuilder, FirTypeParameterRefsOwnerBuilder, FirAnnotationContainerBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override lateinit var moduleData: FirModuleData override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR override lateinit var origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirResolvedImportBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirResolvedImportBuilder.kt index 182fb12dc38..a9342cb176d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirResolvedImportBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirResolvedImportBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.declarations.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.FirImport import org.jetbrains.kotlin.fir.declarations.FirResolvedImport diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirSimpleFunctionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirSimpleFunctionBuilder.kt index e1d82cc80a9..ff0cebc0553 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirSimpleFunctionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirSimpleFunctionBuilder.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.fir.declarations.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.contracts.FirContractDescription @@ -40,7 +40,7 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ @FirBuilderDsl open class FirSimpleFunctionBuilder : FirFunctionBuilder, FirTypeParametersOwnerBuilder, FirAnnotationContainerBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override lateinit var moduleData: FirModuleData override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR override lateinit var origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeAliasBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeAliasBuilder.kt index 19267c8d0f3..92eb8a22951 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeAliasBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeAliasBuilder.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.fir.declarations.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.DeprecationsPerUseSite @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.name.Name @FirBuilderDsl class FirTypeAliasBuilder : FirDeclarationBuilder, FirTypeParametersOwnerBuilder, FirAnnotationContainerBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override lateinit var moduleData: FirModuleData override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR override lateinit var origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeParameterBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeParameterBuilder.kt index 6abc4a24e45..30178036bcb 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeParameterBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeParameterBuilder.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.fir.declarations.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.types.Variance @FirBuilderDsl class FirTypeParameterBuilder : FirAnnotationContainerBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null lateinit var moduleData: FirModuleData var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR lateinit var origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeParameterRefsOwnerBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeParameterRefsOwnerBuilder.kt index 60f84778002..92e59867514 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeParameterRefsOwnerBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeParameterRefsOwnerBuilder.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.declarations.builder -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRefsOwner @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl interface FirTypeParameterRefsOwnerBuilder { - abstract var source: FirSourceElement? + abstract var source: KtSourceElement? abstract val typeParameters: MutableList fun build(): FirTypeParameterRefsOwner diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeParametersOwnerBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeParametersOwnerBuilder.kt index 6a61f2b8a58..7d2a156c601 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeParametersOwnerBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeParametersOwnerBuilder.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.declarations.builder -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.FirTypeParameter import org.jetbrains.kotlin.fir.declarations.FirTypeParametersOwner @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl interface FirTypeParametersOwnerBuilder { - abstract var source: FirSourceElement? + abstract var source: KtSourceElement? abstract val typeParameters: MutableList fun build(): FirTypeParametersOwner diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirValueParameterBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirValueParameterBuilder.kt index 3d16fe030f2..2f2c8d6ace8 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirValueParameterBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirValueParameterBuilder.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.fir.declarations.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.DeprecationsPerUseSite @@ -38,7 +38,7 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ @FirBuilderDsl open class FirValueParameterBuilder : FirAnnotationContainerBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null open lateinit var moduleData: FirModuleData open var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR open lateinit var origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousFunctionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousFunctionImpl.kt index cdf3e3db5c2..ec576a5b364 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousFunctionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousFunctionImpl.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.fir.declarations.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.contracts.description.EventOccurrencesRange import org.jetbrains.kotlin.fir.FirLabel import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.DeprecationsPerUseSite import org.jetbrains.kotlin.fir.declarations.FirAnonymousFunction import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes @@ -34,7 +34,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirAnonymousFunctionImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val moduleData: FirModuleData, override val origin: FirDeclarationOrigin, override val attributes: FirDeclarationAttributes, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousInitializerImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousInitializerImpl.kt index 8ba4062dace..eb6de3aba1d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousInitializerImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousInitializerImpl.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirAnonymousInitializer import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirAnonymousInitializerImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val moduleData: FirModuleData, @Volatile override var resolvePhase: FirResolvePhase, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousObjectImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousObjectImpl.kt index 7a7aa0f013d..001e9e02cea 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousObjectImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousObjectImpl.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.DeprecationsPerUseSite import org.jetbrains.kotlin.fir.declarations.FirAnonymousObject import org.jetbrains.kotlin.fir.declarations.FirDeclaration @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirAnonymousObjectImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val moduleData: FirModuleData, @Volatile override var resolvePhase: FirResolvePhase, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirBackingFieldImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirBackingFieldImpl.kt index 0bca0404906..8cfa2fede12 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirBackingFieldImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirBackingFieldImpl.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.DeprecationsPerUseSite import org.jetbrains.kotlin.fir.declarations.FirBackingField import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ open class FirBackingFieldImpl @FirImplementationDetail constructor( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val moduleData: FirModuleData, @Volatile override var resolvePhase: FirResolvePhase, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirConstructedClassTypeParameterRef.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirConstructedClassTypeParameterRef.kt index fb1b8082bd7..d5b2f532e7d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirConstructedClassTypeParameterRef.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirConstructedClassTypeParameterRef.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirPureAbstractElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol import org.jetbrains.kotlin.fir.visitors.* @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirConstructedClassTypeParameterRef( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val symbol: FirTypeParameterSymbol, ) : FirPureAbstractElement(), FirTypeParameterRef { override fun acceptChildren(visitor: FirVisitor, data: D) {} diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirConstructorImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirConstructorImpl.kt index dd7b7e6357e..0151e9176c6 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirConstructorImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirConstructorImpl.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.DeprecationsPerUseSite import org.jetbrains.kotlin.fir.declarations.FirConstructor import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirConstructorImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val moduleData: FirModuleData, @Volatile override var resolvePhase: FirResolvePhase, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultSetterValueParameter.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultSetterValueParameter.kt index 0256ff3a3c5..b27e976aa91 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultSetterValueParameter.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultSetterValueParameter.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.DeprecationsPerUseSite import org.jetbrains.kotlin.fir.declarations.FirBackingField import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirDefaultSetterValueParameter( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val moduleData: FirModuleData, @Volatile override var resolvePhase: FirResolvePhase, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirEnumEntryImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirEnumEntryImpl.kt index 34321375464..d5a819acb5d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirEnumEntryImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirEnumEntryImpl.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.DeprecationsPerUseSite import org.jetbrains.kotlin.fir.declarations.FirBackingField import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirEnumEntryImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val moduleData: FirModuleData, @Volatile override var resolvePhase: FirResolvePhase, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorFunctionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorFunctionImpl.kt index d50233cf025..ef4d64fe625 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorFunctionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorFunctionImpl.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.DeprecationsPerUseSite import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirErrorFunctionImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val moduleData: FirModuleData, @Volatile override var resolvePhase: FirResolvePhase, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorImportImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorImportImpl.kt index 8b396792d5b..f2ee081fa91 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorImportImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorImportImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.declarations.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.declarations.FirErrorImport import org.jetbrains.kotlin.fir.declarations.FirImport import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic @@ -19,11 +19,11 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirErrorImportImpl( - override val aliasSource: FirSourceElement?, + override val aliasSource: KtSourceElement?, override val diagnostic: ConeDiagnostic, override var delegate: FirImport, ) : FirErrorImport() { - override val source: FirSourceElement? get() = delegate.source + override val source: KtSourceElement? 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/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorPropertyImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorPropertyImpl.kt index ec01f39f3e9..f9818cff72b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorPropertyImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorPropertyImpl.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.DeprecationsPerUseSite import org.jetbrains.kotlin.fir.declarations.FirBackingField import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes @@ -34,7 +34,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirErrorPropertyImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val moduleData: FirModuleData, @Volatile override var resolvePhase: FirResolvePhase, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFieldImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFieldImpl.kt index c076f67ae1f..d464beea3d4 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFieldImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFieldImpl.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.DeprecationsPerUseSite import org.jetbrains.kotlin.fir.declarations.FirBackingField import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirFieldImpl @FirImplementationDetail constructor( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val moduleData: FirModuleData, @Volatile override var resolvePhase: FirResolvePhase, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFileImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFileImpl.kt index 411af90dae1..c34af9c605d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFileImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFileImpl.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.FirPackageDirective -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirFileImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val moduleData: FirModuleData, @Volatile override var resolvePhase: FirResolvePhase, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirImportImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirImportImpl.kt index 0ea806c61f5..d87adf4c3ce 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirImportImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirImportImpl.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirPureAbstractElement -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 @@ -18,11 +18,11 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirImportImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val importedFqName: FqName?, override val isAllUnder: Boolean, override val aliasName: Name?, - override val aliasSource: FirSourceElement?, + override val aliasSource: KtSourceElement?, ) : FirPureAbstractElement(), FirImport { override fun acceptChildren(visitor: FirVisitor, data: D) {} diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirOuterClassTypeParameterRef.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirOuterClassTypeParameterRef.kt index a1a23bd3f04..16202a3a81a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirOuterClassTypeParameterRef.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirOuterClassTypeParameterRef.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirPureAbstractElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol import org.jetbrains.kotlin.fir.visitors.* @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirOuterClassTypeParameterRef @FirImplementationDetail constructor( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val symbol: FirTypeParameterSymbol, ) : FirPureAbstractElement(), FirTypeParameterRef { override fun acceptChildren(visitor: FirVisitor, data: D) {} diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPrimaryConstructor.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPrimaryConstructor.kt index 1553d10735b..bedce7605ba 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPrimaryConstructor.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPrimaryConstructor.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.DeprecationsPerUseSite import org.jetbrains.kotlin.fir.declarations.FirConstructor import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirPrimaryConstructor @FirImplementationDetail constructor( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val moduleData: FirModuleData, @Volatile override var resolvePhase: FirResolvePhase, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyAccessorImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyAccessorImpl.kt index 48f9b37c5fd..55517717301 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyAccessorImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyAccessorImpl.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.fir.declarations.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.contracts.FirContractDescription import org.jetbrains.kotlin.fir.declarations.DeprecationsPerUseSite import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes @@ -34,7 +34,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ open class FirPropertyAccessorImpl @FirImplementationDetail constructor( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val moduleData: FirModuleData, @Volatile override var resolvePhase: FirResolvePhase, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyImpl.kt index 0da6ca14500..586081422da 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyImpl.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.DeprecationsPerUseSite import org.jetbrains.kotlin.fir.declarations.FirBackingField import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes @@ -35,7 +35,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirPropertyImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val moduleData: FirModuleData, @Volatile override var resolvePhase: FirResolvePhase, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirRegularClassImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirRegularClassImpl.kt index 3b4e72b6eaf..9cfb8e50bb2 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirRegularClassImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirRegularClassImpl.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.declarations.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.DeprecationsPerUseSite import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirRegularClassImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val moduleData: FirModuleData, @Volatile override var resolvePhase: FirResolvePhase, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirResolvedImportImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirResolvedImportImpl.kt index e488ec66d95..b6e4b9f8e22 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirResolvedImportImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirResolvedImportImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.declarations.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.declarations.FirImport import org.jetbrains.kotlin.fir.declarations.FirResolvedImport import org.jetbrains.kotlin.name.ClassId @@ -23,11 +23,11 @@ internal class FirResolvedImportImpl( override val packageFqName: FqName, override val relativeParentClassName: FqName?, ) : FirResolvedImport() { - override val source: FirSourceElement? get() = delegate.source + override val source: KtSourceElement? get() = delegate.source override val importedFqName: FqName? get() = delegate.importedFqName override val isAllUnder: Boolean get() = delegate.isAllUnder override val aliasName: Name? get() = delegate.aliasName - override val aliasSource: FirSourceElement? get() = delegate.aliasSource + override val aliasSource: KtSourceElement? get() = delegate.aliasSource override val resolvedParentClassId: ClassId? get() = relativeParentClassName?.let { ClassId(packageFqName, it, false) } override val importedName: Name? get() = importedFqName?.shortName() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirSimpleFunctionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirSimpleFunctionImpl.kt index 2cd3f6e4d37..1f1515e7248 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirSimpleFunctionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirSimpleFunctionImpl.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.contracts.FirContractDescription import org.jetbrains.kotlin.fir.declarations.DeprecationsPerUseSite import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirSimpleFunctionImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val moduleData: FirModuleData, @Volatile override var resolvePhase: FirResolvePhase, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirTypeAliasImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirTypeAliasImpl.kt index 0335064e9ad..316c5641ba3 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirTypeAliasImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirTypeAliasImpl.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.DeprecationsPerUseSite import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirTypeAliasImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val moduleData: FirModuleData, @Volatile override var resolvePhase: FirResolvePhase, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirTypeParameterImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirTypeParameterImpl.kt index 1b8d9e9d9a9..b490152e947 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirTypeParameterImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirTypeParameterImpl.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirResolvePhase @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirTypeParameterImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val moduleData: FirModuleData, @Volatile override var resolvePhase: FirResolvePhase, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirValueParameterImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirValueParameterImpl.kt index 1cec2f6c33b..30763993c23 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirValueParameterImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirValueParameterImpl.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.DeprecationsPerUseSite import org.jetbrains.kotlin.fir.declarations.FirBackingField import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirValueParameterImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val moduleData: FirModuleData, @Volatile override var resolvePhase: FirResolvePhase, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/diagnostics/FirDiagnosticHolder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/diagnostics/FirDiagnosticHolder.kt index ca301dc03af..ecad96b0bb2 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/diagnostics/FirDiagnosticHolder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/diagnostics/FirDiagnosticHolder.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.diagnostics +import org.jetbrains.kotlin.KtSourceElement 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 FirDiagnosticHolder : FirElement { - override val source: FirSourceElement? + override val source: KtSourceElement? val diagnostic: ConeDiagnostic override fun accept(visitor: FirVisitor, data: D): R = visitor.visitDiagnosticHolder(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotation.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotation.kt index 877a5ff1390..55657f031c8 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotation.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotation.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget import org.jetbrains.kotlin.fir.FirElement -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 FirAnnotation : FirExpression() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract val useSiteTarget: AnnotationUseSiteTarget? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotationArgumentMapping.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotationArgumentMapping.kt index 5e0bbdc5f91..f79fc8f2a87 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotationArgumentMapping.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotationArgumentMapping.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirPureAbstractElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.fir.visitors.* @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirAnnotationArgumentMapping : FirPureAbstractElement(), FirElement { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract val mapping: Map override fun accept(visitor: FirVisitor, data: D): R = visitor.visitAnnotationArgumentMapping(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotationCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotationCall.kt index 17dd56d86e5..f75a6647997 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotationCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotationCall.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget import org.jetbrains.kotlin.fir.FirElement -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.* @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirAnnotationCall : FirAnnotation(), FirCall, FirResolvable { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val useSiteTarget: AnnotationUseSiteTarget? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnonymousFunctionExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnonymousFunctionExpression.kt index 1e51bf7ecce..f27e038040c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnonymousFunctionExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnonymousFunctionExpression.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirAnonymousFunction 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 FirAnonymousFunctionExpression : FirExpression() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract val anonymousFunction: FirAnonymousFunction diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnonymousObjectExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnonymousObjectExpression.kt index 22e1d4b676b..89d6604f54a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnonymousObjectExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnonymousObjectExpression.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirAnonymousObject 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 FirAnonymousObjectExpression : FirExpression() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract val anonymousObject: FirAnonymousObject diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirArgumentList.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirArgumentList.kt index 224d4673f34..30f25c88736 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirArgumentList.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirArgumentList.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement 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 FirArgumentList : FirPureAbstractElement(), FirElement { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract val arguments: List override fun accept(visitor: FirVisitor, data: D): R = visitor.visitArgumentList(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirArrayOfCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirArrayOfCall.kt index 5d2a34c5465..28ab4dfbd98 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirArrayOfCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirArrayOfCall.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -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 : FirExpression(), FirCall { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val argumentList: FirArgumentList diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAssignmentOperatorStatement.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAssignmentOperatorStatement.kt index 6df4122cc99..e0ce4ce3758 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAssignmentOperatorStatement.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAssignmentOperatorStatement.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement 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 FirAssignmentOperatorStatement : FirPureAbstractElement(), FirStatement { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val annotations: List abstract val operation: FirOperation abstract val leftArgument: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAugmentedArraySetCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAugmentedArraySetCall.kt index 1d781100fba..bde1e2418b4 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAugmentedArraySetCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAugmentedArraySetCall.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement 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.* @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirAugmentedArraySetCall : FirPureAbstractElement(), FirStatement { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val annotations: List abstract val assignCall: FirFunctionCall abstract val setGetBlock: FirBlock diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBinaryLogicExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBinaryLogicExpression.kt index 5e5124d7a58..ef9b4d8523c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBinaryLogicExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBinaryLogicExpression.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -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 : FirExpression() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract val leftOperand: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBlock.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBlock.kt index b4e10ffa96f..a34d9ff4525 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBlock.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBlock.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -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 : FirExpression() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val annotations: List abstract val statements: List abstract override val typeRef: FirTypeRef diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBreakExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBreakExpression.kt index 54edef2dd57..032c54184e5 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBreakExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBreakExpression.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -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 : FirLoopJump() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val target: FirTarget diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCall.kt index 8a5ae7b2dec..57fad06d170 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCall.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement 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.* */ sealed interface FirCall : FirStatement { - override val source: FirSourceElement? + override val source: KtSourceElement? override val annotations: List val argumentList: FirArgumentList diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCallableReferenceAccess.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCallableReferenceAccess.kt index 642a11318b1..8216eecc20a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCallableReferenceAccess.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCallableReferenceAccess.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.references.FirNamedReference import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.FirTypeProjection @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail */ abstract class FirCallableReferenceAccess : FirQualifiedAccessExpression() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val typeArguments: List @@ -37,7 +37,7 @@ abstract class FirCallableReferenceAccess : FirQualifiedAccessExpression() { transformer.transformCallableReferenceAccess(this, data) as E @FirImplementationDetail - abstract override fun replaceSource(newSource: FirSourceElement?) + abstract override fun replaceSource(newSource: KtSourceElement?) abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCatch.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCatch.kt index 17086479f4b..01a06e20d4e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCatch.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCatch.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement 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 source: FirSourceElement? + abstract override val source: KtSourceElement? abstract val parameter: FirValueParameter abstract val block: FirBlock diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCheckNotNullCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCheckNotNullCall.kt index a9fd2a240c7..e5b95b6de5c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCheckNotNullCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCheckNotNullCall.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -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 FirCheckNotNullCall : FirExpression(), FirCall, FirResolvable { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val argumentList: FirArgumentList diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCheckedSafeCallSubject.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCheckedSafeCallSubject.kt index 7f7e1833289..15112b942e6 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCheckedSafeCallSubject.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCheckedSafeCallSubject.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirExpressionRef -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 FirCheckedSafeCallSubject : FirExpression() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract val originalReceiverRef: FirExpressionRef diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirClassReferenceExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirClassReferenceExpression.kt index 9e4985ed3f5..6a92066463e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirClassReferenceExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirClassReferenceExpression.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -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 : FirExpression() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract val classTypeRef: FirTypeRef diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComparisonExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComparisonExpression.kt index 7f153150861..1a9b85a1fba 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComparisonExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComparisonExpression.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -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 FirComparisonExpression : FirExpression() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract val operation: FirOperation diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComponentCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComponentCall.kt index c6b0c96279a..e4e835d3873 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComponentCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComponentCall.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.references.FirNamedReference import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.FirTypeProjection @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail */ abstract class FirComponentCall : FirFunctionCall() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val typeArguments: List @@ -39,7 +39,7 @@ abstract class FirComponentCall : FirFunctionCall() { transformer.transformComponentCall(this, data) as E @FirImplementationDetail - abstract override fun replaceSource(newSource: FirSourceElement?) + abstract override fun replaceSource(newSource: KtSourceElement?) abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirConstExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirConstExpression.kt index d67456fa6a6..5b3cde67222 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirConstExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirConstExpression.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.types.ConstantValueKind import org.jetbrains.kotlin.fir.visitors.* @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirConstExpression : FirExpression() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract val kind: ConstantValueKind diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirContinueExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirContinueExpression.kt index 45028c67df7..df07b86f586 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirContinueExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirContinueExpression.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -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 : FirLoopJump() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val target: FirTarget diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirDelegatedConstructorCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirDelegatedConstructorCall.kt index 7e052ca3bab..fa4088c54ea 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirDelegatedConstructorCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirDelegatedConstructorCall.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement 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.* @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirDelegatedConstructorCall : FirPureAbstractElement(), FirResolvable, FirCall { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val annotations: List abstract override val argumentList: FirArgumentList abstract val constructedTypeRef: FirTypeRef diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirDoWhileLoop.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirDoWhileLoop.kt index c3da0151ba9..dcc52116f90 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirDoWhileLoop.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirDoWhileLoop.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirLabel -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 : FirLoop() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val annotations: List abstract override val block: FirBlock abstract override val condition: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirElvisExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirElvisExpression.kt index 127bd4a8bfb..dfe87f7337f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirElvisExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirElvisExpression.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -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 FirElvisExpression : FirExpression(), FirResolvable { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val calleeReference: FirReference diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirEqualityOperatorCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirEqualityOperatorCall.kt index 4bd0ebbca9d..e897238fba3 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirEqualityOperatorCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirEqualityOperatorCall.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -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 FirEqualityOperatorCall : FirExpression(), FirCall { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val argumentList: FirArgumentList diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorExpression.kt index 3873a8337dc..97579f36831 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorExpression.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.diagnostics.FirDiagnosticHolder import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirErrorExpression : FirExpression(), FirDiagnosticHolder { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val diagnostic: ConeDiagnostic diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorLoop.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorLoop.kt index cd7b35c2510..d8f93ba5d69 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorLoop.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorLoop.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirLabel -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.diagnostics.FirDiagnosticHolder import org.jetbrains.kotlin.fir.visitors.* @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirErrorLoop : FirLoop(), FirDiagnosticHolder { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val annotations: List abstract override val block: FirBlock abstract override val condition: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorResolvedQualifier.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorResolvedQualifier.kt index d9f90e3828e..008ac6bcd4f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorResolvedQualifier.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorResolvedQualifier.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.diagnostics.FirDiagnosticHolder import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirErrorResolvedQualifier : FirResolvedQualifier(), FirDiagnosticHolder { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val packageFqName: FqName diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirExpression.kt index d34964c389e..9302ad67c7f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirExpression.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement 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 FirExpression : FirPureAbstractElement(), FirStatement { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract val typeRef: FirTypeRef abstract override val annotations: List diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirExpressionWithSmartcast.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirExpressionWithSmartcast.kt index c5da8060b44..cf5939907ff 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirExpressionWithSmartcast.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirExpressionWithSmartcast.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -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.FirTypeProjection @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail */ abstract class FirExpressionWithSmartcast : FirQualifiedAccessExpression() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val calleeReference: FirReference @@ -43,7 +43,7 @@ abstract class FirExpressionWithSmartcast : FirQualifiedAccessExpression() { transformer.transformExpressionWithSmartcast(this, data) as E @FirImplementationDetail - abstract override fun replaceSource(newSource: FirSourceElement?) + abstract override fun replaceSource(newSource: KtSourceElement?) abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirExpressionWithSmartcastToNull.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirExpressionWithSmartcastToNull.kt index 7747e0ca65c..506637080bc 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirExpressionWithSmartcastToNull.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirExpressionWithSmartcastToNull.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -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.FirTypeProjection @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail */ abstract class FirExpressionWithSmartcastToNull : FirExpressionWithSmartcast() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val calleeReference: FirReference @@ -44,7 +44,7 @@ abstract class FirExpressionWithSmartcastToNull : FirExpressionWithSmartcast() { transformer.transformExpressionWithSmartcastToNull(this, data) as E @FirImplementationDetail - abstract override fun replaceSource(newSource: FirSourceElement?) + abstract override fun replaceSource(newSource: KtSourceElement?) abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirFunctionCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirFunctionCall.kt index bfe63613630..a8b9ebb7057 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirFunctionCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirFunctionCall.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.references.FirNamedReference import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.FirTypeProjection @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail */ abstract class FirFunctionCall : FirQualifiedAccessExpression(), FirCall { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val typeArguments: List @@ -38,7 +38,7 @@ abstract class FirFunctionCall : FirQualifiedAccessExpression(), FirCall { transformer.transformFunctionCall(this, data) as E @FirImplementationDetail - abstract override fun replaceSource(newSource: FirSourceElement?) + abstract override fun replaceSource(newSource: KtSourceElement?) abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirGetClassCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirGetClassCall.kt index b9b5e0793a7..cf29cc6f979 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirGetClassCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirGetClassCall.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -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 : FirExpression(), FirCall { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val argumentList: FirArgumentList diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirImplicitInvokeCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirImplicitInvokeCall.kt index 82aa3c70fe1..11ea5c2c1b5 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirImplicitInvokeCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirImplicitInvokeCall.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.references.FirNamedReference import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.FirTypeProjection @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail */ abstract class FirImplicitInvokeCall : FirFunctionCall() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val typeArguments: List @@ -38,7 +38,7 @@ abstract class FirImplicitInvokeCall : FirFunctionCall() { transformer.transformImplicitInvokeCall(this, data) as E @FirImplementationDetail - abstract override fun replaceSource(newSource: FirSourceElement?) + abstract override fun replaceSource(newSource: KtSourceElement?) abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirJump.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirJump.kt index 18283f29688..f7828336abf 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirJump.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirJump.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -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 @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ sealed class FirJump : FirExpression() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract val target: FirTarget diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLambdaArgumentExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLambdaArgumentExpression.kt index 8d56a5d2cad..15c913d2f7c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLambdaArgumentExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLambdaArgumentExpression.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -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 FirLambdaArgumentExpression : FirWrappedArgumentExpression() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val expression: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLoop.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLoop.kt index 928dbe40c00..b4065c837d3 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLoop.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLoop.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirLabel import org.jetbrains.kotlin.fir.FirPureAbstractElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.FirTargetElement import org.jetbrains.kotlin.fir.visitors.* @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ sealed class FirLoop : FirPureAbstractElement(), FirStatement, FirTargetElement { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val annotations: List abstract val block: FirBlock abstract val condition: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLoopJump.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLoopJump.kt index fe87e7dacb1..1880e22a7a2 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLoopJump.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLoopJump.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -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 FirLoopJump : FirJump() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val target: FirTarget diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirNamedArgumentExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirNamedArgumentExpression.kt index ef806c087bb..cc08b3c47e2 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirNamedArgumentExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirNamedArgumentExpression.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -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.* @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirNamedArgumentExpression : FirWrappedArgumentExpression() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val expression: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirPropertyAccessExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirPropertyAccessExpression.kt index c0ac601a815..25874e2d04c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirPropertyAccessExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirPropertyAccessExpression.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.FirTypeProjection @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail */ abstract class FirPropertyAccessExpression : FirQualifiedAccessExpression() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val calleeReference: FirReference @@ -37,7 +37,7 @@ abstract class FirPropertyAccessExpression : FirQualifiedAccessExpression() { transformer.transformPropertyAccessExpression(this, data) as E @FirImplementationDetail - abstract override fun replaceSource(newSource: FirSourceElement?) + abstract override fun replaceSource(newSource: KtSourceElement?) abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccess.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccess.kt index ad11c4480ab..16fd4efacd5 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccess.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccess.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.FirTypeProjection import org.jetbrains.kotlin.fir.visitors.* @@ -24,7 +24,7 @@ interface FirQualifiedAccess : FirResolvable, FirStatement { val explicitReceiver: FirExpression? val dispatchReceiver: FirExpression val extensionReceiver: FirExpression - override val source: FirSourceElement? + override val source: KtSourceElement? override fun accept(visitor: FirVisitor, data: D): R = visitor.visitQualifiedAccess(this, data) @@ -39,7 +39,7 @@ interface FirQualifiedAccess : FirResolvable, FirStatement { fun replaceExplicitReceiver(newExplicitReceiver: FirExpression?) @FirImplementationDetail - fun replaceSource(newSource: FirSourceElement?) + fun replaceSource(newSource: KtSourceElement?) override fun transformCalleeReference(transformer: FirTransformer, data: D): FirQualifiedAccess diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccessExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccessExpression.kt index 2269facae9b..eabb300bf22 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccessExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccessExpression.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.FirTypeProjection import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail */ abstract class FirQualifiedAccessExpression : FirExpression(), FirQualifiedAccess { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val calleeReference: FirReference @@ -35,7 +35,7 @@ abstract class FirQualifiedAccessExpression : FirExpression(), FirQualifiedAcces transformer.transformQualifiedAccessExpression(this, data) as E @FirImplementationDetail - abstract override fun replaceSource(newSource: FirSourceElement?) + abstract override fun replaceSource(newSource: KtSourceElement?) abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvable.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvable.kt index 1d8a06a51c8..44beb17702c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvable.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvable.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement 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.* */ sealed interface FirResolvable : FirElement { - override val source: FirSourceElement? + override val source: KtSourceElement? val calleeReference: FirReference override fun accept(visitor: FirVisitor, data: D): R = visitor.visitResolvable(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvedQualifier.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvedQualifier.kt index f6b49d2e5f9..7ff63225864 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvedQualifier.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvedQualifier.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol import org.jetbrains.kotlin.fir.types.FirTypeProjection @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirResolvedQualifier : FirExpression() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract val packageFqName: FqName diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvedReifiedParameterReference.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvedReifiedParameterReference.kt index 3a4948565f6..b888e50e5bc 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvedReifiedParameterReference.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvedReifiedParameterReference.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol 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 FirResolvedReifiedParameterReference : FirExpression() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract val symbol: FirTypeParameterSymbol diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirReturnExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirReturnExpression.kt index 647a29576c7..2f7ccb458d7 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirReturnExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirReturnExpression.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -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 : FirJump() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val target: FirTarget diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSafeCallExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSafeCallExpression.kt index c3585a3b9c9..5f98197754a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSafeCallExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSafeCallExpression.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirExpressionRef -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 FirSafeCallExpression : FirExpression() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract val receiver: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSpreadArgumentExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSpreadArgumentExpression.kt index 44852c61c7e..7a0c76ba654 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSpreadArgumentExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSpreadArgumentExpression.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -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 FirSpreadArgumentExpression : FirWrappedArgumentExpression() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val expression: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirStatement.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirStatement.kt index d81d878b706..95c9cad27c8 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirStatement.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirStatement.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirAnnotationContainer import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.visitors.* /* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ interface FirStatement : FirAnnotationContainer { - override val source: FirSourceElement? + override val source: KtSourceElement? override val annotations: List override fun accept(visitor: FirVisitor, data: D): R = visitor.visitStatement(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirStringConcatenationCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirStringConcatenationCall.kt index acbff9da646..4e8905602e2 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirStringConcatenationCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirStringConcatenationCall.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -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 : FirCall, FirExpression() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val annotations: List abstract override val argumentList: FirArgumentList abstract override val typeRef: FirTypeRef diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThisReceiverExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThisReceiverExpression.kt index dda40e56949..2f7e243cb28 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThisReceiverExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThisReceiverExpression.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.references.FirThisReference import org.jetbrains.kotlin.fir.types.FirTypeProjection @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail */ abstract class FirThisReceiverExpression : FirQualifiedAccessExpression() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val typeArguments: List @@ -37,7 +37,7 @@ abstract class FirThisReceiverExpression : FirQualifiedAccessExpression() { transformer.transformThisReceiverExpression(this, data) as E @FirImplementationDetail - abstract override fun replaceSource(newSource: FirSourceElement?) + abstract override fun replaceSource(newSource: KtSourceElement?) abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThrowExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThrowExpression.kt index 34745be7794..3eb55af4392 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThrowExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThrowExpression.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -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 : FirExpression() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract val exception: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirTryExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirTryExpression.kt index fb7aa0a32a6..b36250e9505 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirTryExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirTryExpression.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -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 : FirExpression(), FirResolvable { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val calleeReference: FirReference diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirTypeOperatorCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirTypeOperatorCall.kt index 8df243a5409..994ce47d3dd 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirTypeOperatorCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirTypeOperatorCall.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -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 : FirExpression(), FirCall { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val argumentList: FirArgumentList diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirVarargArgumentsExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirVarargArgumentsExpression.kt index 2c8e96b8249..5f97fc07f57 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirVarargArgumentsExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirVarargArgumentsExpression.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -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 FirVarargArgumentsExpression : FirExpression() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract val arguments: List diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirVariableAssignment.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirVariableAssignment.kt index 6b09c24abcc..e6f3e1c052d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirVariableAssignment.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirVariableAssignment.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement 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.FirTypeProjection import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -26,7 +26,7 @@ abstract class FirVariableAssignment : FirPureAbstractElement(), FirQualifiedAcc abstract override val explicitReceiver: FirExpression? abstract override val dispatchReceiver: FirExpression abstract override val extensionReceiver: FirExpression - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract val lValue: FirReference abstract val lValueTypeRef: FirTypeRef abstract val rValue: FirExpression @@ -44,7 +44,7 @@ abstract class FirVariableAssignment : FirPureAbstractElement(), FirQualifiedAcc abstract override fun replaceExplicitReceiver(newExplicitReceiver: FirExpression?) @FirImplementationDetail - abstract override fun replaceSource(newSource: FirSourceElement?) + abstract override fun replaceSource(newSource: KtSourceElement?) abstract fun replaceLValueTypeRef(newLValueTypeRef: FirTypeRef) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenBranch.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenBranch.kt index ce37b521b58..5ed4d045024 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenBranch.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenBranch.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement 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 source: FirSourceElement? + abstract override val source: KtSourceElement? abstract val condition: FirExpression abstract val result: FirBlock diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenExpression.kt index f5ba91ce664..8cea6e77b88 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenExpression.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -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 : FirExpression(), FirResolvable { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val calleeReference: FirReference diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenSubjectExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenSubjectExpression.kt index 0f375a86083..f343ee3a777 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenSubjectExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenSubjectExpression.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirExpressionRef -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 FirWhenSubjectExpression : FirExpression() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract val whenRef: FirExpressionRef diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhileLoop.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhileLoop.kt index 0c1e077f15c..30e05d0f4f9 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhileLoop.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhileLoop.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirLabel -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 : FirLoop() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val annotations: List abstract override val label: FirLabel? abstract override val condition: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedArgumentExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedArgumentExpression.kt index e495943868d..d07e5b3369c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedArgumentExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedArgumentExpression.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -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 FirWrappedArgumentExpression : FirWrappedExpression() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val expression: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedDelegateExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedDelegateExpression.kt index b13322f4c66..a4bf3710e70 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedDelegateExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedDelegateExpression.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -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 FirWrappedDelegateExpression : FirWrappedExpression() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract override val expression: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedExpression.kt index d25517aff6a..489b07c2f24 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedExpression.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -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 : FirExpression() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val typeRef: FirTypeRef abstract override val annotations: List abstract val expression: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAbstractFunctionCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAbstractFunctionCallBuilder.kt index 7b92a0a4817..b8aff733612 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAbstractFunctionCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAbstractFunctionCallBuilder.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.builder -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList @@ -31,7 +31,7 @@ interface FirAbstractFunctionCallBuilder : FirQualifiedAccessBuilder, FirCallBui abstract override var explicitReceiver: FirExpression? abstract override var dispatchReceiver: FirExpression abstract override var extensionReceiver: FirExpression - abstract override var source: FirSourceElement? + abstract override var source: KtSourceElement? abstract override var argumentList: FirArgumentList abstract var typeRef: FirTypeRef abstract var calleeReference: FirNamedReference diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAbstractResolvedQualifierBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAbstractResolvedQualifierBuilder.kt index 87619eab58b..87ea3dc93bc 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAbstractResolvedQualifierBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAbstractResolvedQualifierBuilder.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.builder -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.name.FqName @FirBuilderDsl interface FirAbstractResolvedQualifierBuilder { - abstract var source: FirSourceElement? + abstract var source: KtSourceElement? abstract var typeRef: FirTypeRef abstract val annotations: MutableList abstract var packageFqName: FqName diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAnnotationBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAnnotationBuilder.kt index c426df25cd4..c1938ff4e67 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAnnotationBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAnnotationBuilder.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirAnnotationBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null var useSiteTarget: AnnotationUseSiteTarget? = null lateinit var annotationTypeRef: FirTypeRef lateinit var argumentMapping: FirAnnotationArgumentMapping diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAnnotationCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAnnotationCallBuilder.kt index 249c07947fc..0d1b645c566 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAnnotationCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAnnotationCallBuilder.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirAnnotationCallBuilder : FirCallBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null var useSiteTarget: AnnotationUseSiteTarget? = null var annotationTypeRef: FirTypeRef = FirImplicitTypeRefImpl(null) override var argumentList: FirArgumentList = FirEmptyArgumentList diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirArrayOfCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirArrayOfCallBuilder.kt index 79af7e59789..4e230869ef4 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirArrayOfCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirArrayOfCallBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirArrayOfCallBuilder : FirCallBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) override val annotations: MutableList = mutableListOf() override lateinit var argumentList: FirArgumentList diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAssignmentOperatorStatementBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAssignmentOperatorStatementBuilder.kt index a0200cdb4a3..c1d6340350b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAssignmentOperatorStatementBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAssignmentOperatorStatementBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirAssignmentOperatorStatementBuilder : FirAnnotationContainerBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override val annotations: MutableList = mutableListOf() lateinit var operation: FirOperation lateinit var leftArgument: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAugmentedArraySetCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAugmentedArraySetCallBuilder.kt index f2397dc73b3..93ea6af4550 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAugmentedArraySetCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAugmentedArraySetCallBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirAugmentedArraySetCallBuilder : FirAnnotationContainerBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override val annotations: MutableList = mutableListOf() lateinit var assignCall: FirFunctionCall lateinit var setGetBlock: FirBlock diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBinaryLogicExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBinaryLogicExpressionBuilder.kt index 7b18aff4bbb..34400c8b81d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBinaryLogicExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBinaryLogicExpressionBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirBinaryLogicExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override val annotations: MutableList = mutableListOf() lateinit var leftOperand: FirExpression lateinit var rightOperand: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBlockBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBlockBuilder.kt index f4126badc65..d3f5db9921f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBlockBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBlockBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirBlockBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override val annotations: MutableList = mutableListOf() val statements: MutableList = mutableListOf() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBreakExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBreakExpressionBuilder.kt index 6b9532d3cd1..805c5d001c0 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBreakExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBreakExpressionBuilder.kt @@ -6,8 +6,9 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.FirTarget import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl @@ -17,7 +18,6 @@ import org.jetbrains.kotlin.fir.expressions.FirLoop import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.builder.FirLoopJumpBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirBreakExpressionImpl -import org.jetbrains.kotlin.fir.fakeElement import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitNothingTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirBreakExpressionBuilder : FirLoopJumpBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override val annotations: MutableList = mutableListOf() override lateinit var target: FirTarget diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCallBuilder.kt index c2a6934f5f7..0fabe18ad3b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCallBuilder.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.builder -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl interface FirCallBuilder { - abstract var source: FirSourceElement? + abstract var source: KtSourceElement? abstract val annotations: MutableList abstract var argumentList: FirArgumentList fun build(): FirCall diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCallableReferenceAccessBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCallableReferenceAccessBuilder.kt index 099569586e4..3835b84207b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCallableReferenceAccessBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCallableReferenceAccessBuilder.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirCallableReferenceAccessBuilder : FirQualifiedAccessBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) override val annotations: MutableList = mutableListOf() override val typeArguments: MutableList = mutableListOf() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCatchBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCatchBuilder.kt index c158b689449..ff04df5fea9 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCatchBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCatchBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.expressions.FirBlock @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirCatchBuilder { - var source: FirSourceElement? = null + var source: KtSourceElement? = null lateinit var parameter: FirValueParameter lateinit var block: FirBlock diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCheckNotNullCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCheckNotNullCallBuilder.kt index 61530a68c96..58793a842b2 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCheckNotNullCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCheckNotNullCallBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirCheckNotNullCallBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) override val annotations: MutableList = mutableListOf() lateinit var argumentList: FirArgumentList diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCheckedSafeCallSubjectBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCheckedSafeCallSubjectBuilder.kt index aa1e14d4b94..95d55f94de7 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCheckedSafeCallSubjectBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCheckedSafeCallSubjectBuilder.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirExpressionRef -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirCheckedSafeCallSubjectBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) override val annotations: MutableList = mutableListOf() lateinit var originalReceiverRef: FirExpressionRef diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirClassReferenceExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirClassReferenceExpressionBuilder.kt index 68d65aeef0a..7229b4ea473 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirClassReferenceExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirClassReferenceExpressionBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirClassReferenceExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override val annotations: MutableList = mutableListOf() lateinit var classTypeRef: FirTypeRef diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirComparisonExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirComparisonExpressionBuilder.kt index 70d2c7b82ca..20e147b7e69 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirComparisonExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirComparisonExpressionBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirComparisonExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override val annotations: MutableList = mutableListOf() lateinit var operation: FirOperation lateinit var compareToCall: FirFunctionCall diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirComponentCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirComponentCallBuilder.kt index 5a81029da74..1ccbcd22427 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirComponentCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirComponentCallBuilder.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -36,7 +36,7 @@ import org.jetbrains.kotlin.name.Name @FirBuilderDsl class FirComponentCallBuilder : FirCallBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override val annotations: MutableList = mutableListOf() val typeArguments: MutableList = mutableListOf() var dispatchReceiver: FirExpression = FirNoReceiverExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirContinueExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirContinueExpressionBuilder.kt index 17ae956b128..678052612a2 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirContinueExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirContinueExpressionBuilder.kt @@ -6,8 +6,9 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.FirTarget import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl @@ -17,7 +18,6 @@ import org.jetbrains.kotlin.fir.expressions.FirLoop import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.builder.FirLoopJumpBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirContinueExpressionImpl -import org.jetbrains.kotlin.fir.fakeElement import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitNothingTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirContinueExpressionBuilder : FirLoopJumpBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override val annotations: MutableList = mutableListOf() override lateinit var target: FirTarget diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirDelegatedConstructorCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirDelegatedConstructorCallBuilder.kt index 0e2dc3ea61d..a70c5ab9a11 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirDelegatedConstructorCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirDelegatedConstructorCallBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirDelegatedConstructorCallBuilder : FirCallBuilder, FirAnnotationContainerBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override val annotations: MutableList = mutableListOf() override var argumentList: FirArgumentList = FirEmptyArgumentList lateinit var constructedTypeRef: FirTypeRef diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirDoWhileLoopBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirDoWhileLoopBuilder.kt index 1cfe0472742..5babcf9252d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirDoWhileLoopBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirDoWhileLoopBuilder.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirLabel -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirDoWhileLoopBuilder : FirLoopBuilder, FirAnnotationContainerBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override val annotations: MutableList = mutableListOf() override lateinit var block: FirBlock override lateinit var condition: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirElseIfTrueConditionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirElseIfTrueConditionBuilder.kt index 9d93347fb03..52eb216965e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirElseIfTrueConditionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirElseIfTrueConditionBuilder.kt @@ -6,15 +6,15 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.FirImplementationDetail -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.impl.FirElseIfTrueCondition -import org.jetbrains.kotlin.fir.fakeElement import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitBooleanTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirElseIfTrueConditionBuilder : FirAnnotationContainerBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override val annotations: MutableList = mutableListOf() @OptIn(FirImplementationDetail::class) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirElvisExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirElvisExpressionBuilder.kt index 4f2c9d09d33..2896d5c5d6c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirElvisExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirElvisExpressionBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirElvisExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override val annotations: MutableList = mutableListOf() var calleeReference: FirReference = FirStubReference lateinit var lhs: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEmptyExpressionBlockBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEmptyExpressionBlockBuilder.kt index c060d6af7fb..14fa0372145 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEmptyExpressionBlockBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEmptyExpressionBlockBuilder.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEqualityOperatorCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEqualityOperatorCallBuilder.kt index dee48c0a79a..ad3f254d6f0 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEqualityOperatorCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEqualityOperatorCallBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirEqualityOperatorCallBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override val annotations: MutableList = mutableListOf() lateinit var argumentList: FirArgumentList lateinit var operation: FirOperation diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorExpressionBuilder.kt index a554d02976d..2145aa0767b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorExpressionBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirErrorExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override val annotations: MutableList = mutableListOf() lateinit var diagnostic: ConeDiagnostic var expression: FirExpression? = null diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorLoopBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorLoopBuilder.kt index 28b7ac2fbac..62fa52979e4 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorLoopBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorLoopBuilder.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirLabel -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirErrorLoopBuilder : FirAnnotationContainerBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override val annotations: MutableList = mutableListOf() var label: FirLabel? = null lateinit var diagnostic: ConeDiagnostic diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorResolvedQualifierBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorResolvedQualifierBuilder.kt index 187f83fc878..a826276a96c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorResolvedQualifierBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorResolvedQualifierBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.name.FqName @FirBuilderDsl class FirErrorResolvedQualifierBuilder : FirAbstractResolvedQualifierBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override val annotations: MutableList = mutableListOf() override lateinit var packageFqName: FqName override var relativeClassFqName: FqName? = null diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirExpressionBuilder.kt index fa007416090..9ddc03aa5e3 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirExpressionBuilder.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.builder -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl interface FirExpressionBuilder { - abstract var source: FirSourceElement? + abstract var source: KtSourceElement? abstract var typeRef: FirTypeRef abstract val annotations: MutableList diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirExpressionStubBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirExpressionStubBuilder.kt index 4bf04638494..77db6ff5200 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirExpressionStubBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirExpressionStubBuilder.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirExpressionStubBuilder : FirAnnotationContainerBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) override val annotations: MutableList = mutableListOf() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirFunctionCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirFunctionCallBuilder.kt index 65e40dcf455..68f1a453a60 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirFunctionCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirFunctionCallBuilder.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -34,7 +34,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl open class FirFunctionCallBuilder : FirAbstractFunctionCallBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) override val annotations: MutableList = mutableListOf() override val typeArguments: MutableList = mutableListOf() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirGetClassCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirGetClassCallBuilder.kt index 724c8bc4234..7e3dcad26b8 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirGetClassCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirGetClassCallBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirGetClassCallBuilder : FirCallBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override val annotations: MutableList = mutableListOf() override lateinit var argumentList: FirArgumentList diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirImplicitInvokeCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirImplicitInvokeCallBuilder.kt index 8b0d454be06..68329edda35 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirImplicitInvokeCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirImplicitInvokeCallBuilder.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -34,7 +34,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl open class FirImplicitInvokeCallBuilder : FirAbstractFunctionCallBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override val annotations: MutableList = mutableListOf() override val typeArguments: MutableList = mutableListOf() override var explicitReceiver: FirExpression? = null diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLambdaArgumentExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLambdaArgumentExpressionBuilder.kt index c5b4a696b78..9e741e95813 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLambdaArgumentExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLambdaArgumentExpressionBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirLambdaArgumentExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override val annotations: MutableList = mutableListOf() lateinit var expression: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyBlockBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyBlockBuilder.kt index e6ca79b75b6..39a45deb943 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyBlockBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyBlockBuilder.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirLazyBlockBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null @OptIn(FirImplementationDetail::class) override fun build(): FirBlock { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyExpressionBuilder.kt index b7c6cc1c138..bb75fa4ba9e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyExpressionBuilder.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirLazyExpressionBuilder : FirAnnotationContainerBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null @OptIn(FirImplementationDetail::class) override fun build(): FirExpression { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLoopBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLoopBuilder.kt index b3a21b910aa..6405f12fafa 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLoopBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLoopBuilder.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions.builder +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirLabel -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl interface FirLoopBuilder { - abstract var source: FirSourceElement? + abstract var source: KtSourceElement? abstract val annotations: MutableList abstract var block: FirBlock abstract var condition: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLoopJumpBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLoopJumpBuilder.kt index 876b33bc260..c1ca6e03904 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLoopJumpBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLoopJumpBuilder.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.builder -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirTarget import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl interface FirLoopJumpBuilder { - abstract var source: FirSourceElement? + abstract var source: KtSourceElement? abstract val annotations: MutableList abstract var target: FirTarget fun build(): FirLoopJump diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirNamedArgumentExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirNamedArgumentExpressionBuilder.kt index fbf10a6f1cf..eff989c84f0 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirNamedArgumentExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirNamedArgumentExpressionBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.name.Name @FirBuilderDsl class FirNamedArgumentExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override val annotations: MutableList = mutableListOf() lateinit var expression: FirExpression var isSpread: Boolean by kotlin.properties.Delegates.notNull() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirPropertyAccessExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirPropertyAccessExpressionBuilder.kt index 37c815eafe8..d000dceed6d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirPropertyAccessExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirPropertyAccessExpressionBuilder.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirPropertyAccessExpressionBuilder : FirQualifiedAccessBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) override val annotations: MutableList = mutableListOf() lateinit var calleeReference: FirReference diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirQualifiedAccessBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirQualifiedAccessBuilder.kt index b1edc823552..a0f5de90506 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirQualifiedAccessBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirQualifiedAccessBuilder.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.builder -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -25,6 +25,6 @@ interface FirQualifiedAccessBuilder { abstract var explicitReceiver: FirExpression? abstract var dispatchReceiver: FirExpression abstract var extensionReceiver: FirExpression - abstract var source: FirSourceElement? + abstract var source: KtSourceElement? fun build(): FirQualifiedAccess } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirResolvedQualifierBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirResolvedQualifierBuilder.kt index 9e34c5c5ea7..7838c12489d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirResolvedQualifierBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirResolvedQualifierBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.FirRegularClass @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.name.FqName @FirBuilderDsl class FirResolvedQualifierBuilder : FirAbstractResolvedQualifierBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) override val annotations: MutableList = mutableListOf() override lateinit var packageFqName: FqName diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirResolvedReifiedParameterReferenceBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirResolvedReifiedParameterReferenceBuilder.kt index 13b56847d39..032631902ea 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirResolvedReifiedParameterReferenceBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirResolvedReifiedParameterReferenceBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirResolvedReifiedParameterReferenceBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) override val annotations: MutableList = mutableListOf() lateinit var symbol: FirTypeParameterSymbol diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirReturnExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirReturnExpressionBuilder.kt index 2ef43a1cddb..fc06febe345 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirReturnExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirReturnExpressionBuilder.kt @@ -6,8 +6,9 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.FirTarget import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl @@ -17,7 +18,6 @@ import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirReturnExpression import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirReturnExpressionImpl -import org.jetbrains.kotlin.fir.fakeElement import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitNothingTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirReturnExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override val annotations: MutableList = mutableListOf() lateinit var target: FirTarget lateinit var result: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSafeCallExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSafeCallExpressionBuilder.kt index a9e12e55888..3bfef5e6a06 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSafeCallExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSafeCallExpressionBuilder.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirExpressionRef -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirSafeCallExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) override val annotations: MutableList = mutableListOf() lateinit var receiver: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSpreadArgumentExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSpreadArgumentExpressionBuilder.kt index 832c7d38df2..ff22f57f7a4 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSpreadArgumentExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSpreadArgumentExpressionBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirSpreadArgumentExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override val annotations: MutableList = mutableListOf() lateinit var expression: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirStringConcatenationCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirStringConcatenationCallBuilder.kt index 77e48bc2524..8ef20d4234e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirStringConcatenationCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirStringConcatenationCallBuilder.kt @@ -6,8 +6,9 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -16,7 +17,6 @@ import org.jetbrains.kotlin.fir.expressions.FirStringConcatenationCall import org.jetbrains.kotlin.fir.expressions.builder.FirCallBuilder import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirStringConcatenationCallImpl -import org.jetbrains.kotlin.fir.fakeElement import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitStringTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirStringConcatenationCallBuilder : FirCallBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override val annotations: MutableList = mutableListOf() override lateinit var argumentList: FirArgumentList diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirThisReceiverExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirThisReceiverExpressionBuilder.kt index 344c8a48ece..ab392de59d9 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirThisReceiverExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirThisReceiverExpressionBuilder.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirThisReceiverExpressionBuilder : FirQualifiedAccessBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) override val annotations: MutableList = mutableListOf() override val typeArguments: MutableList = mutableListOf() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirThrowExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirThrowExpressionBuilder.kt index 60d7d331757..566cf575b61 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirThrowExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirThrowExpressionBuilder.kt @@ -6,8 +6,9 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -15,7 +16,6 @@ import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirThrowExpression import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirThrowExpressionImpl -import org.jetbrains.kotlin.fir.fakeElement import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitNothingTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirThrowExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override val annotations: MutableList = mutableListOf() lateinit var exception: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirTryExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirTryExpressionBuilder.kt index 5a72b66eb28..8565203ca26 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirTryExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirTryExpressionBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirTryExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) override val annotations: MutableList = mutableListOf() var calleeReference: FirReference = FirStubReference diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirTypeOperatorCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirTypeOperatorCallBuilder.kt index 066ee53ddb4..e9fce8059f1 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirTypeOperatorCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirTypeOperatorCallBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirTypeOperatorCallBuilder : FirCallBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override val annotations: MutableList = mutableListOf() override var argumentList: FirArgumentList = FirEmptyArgumentList lateinit var operation: FirOperation diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirUnitExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirUnitExpressionBuilder.kt index 91cbbce82dc..957109c2e04 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirUnitExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirUnitExpressionBuilder.kt @@ -6,15 +6,15 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.FirImplementationDetail -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.impl.FirUnitExpression -import org.jetbrains.kotlin.fir.fakeElement import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitUnitTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirUnitExpressionBuilder : FirAnnotationContainerBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override val annotations: MutableList = mutableListOf() @OptIn(FirImplementationDetail::class) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirVarargArgumentsExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirVarargArgumentsExpressionBuilder.kt index 4df6300b057..a0c1a6bc83c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirVarargArgumentsExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirVarargArgumentsExpressionBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirVarargArgumentsExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) override val annotations: MutableList = mutableListOf() val arguments: MutableList = mutableListOf() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirVariableAssignmentBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirVariableAssignmentBuilder.kt index 63d48570d9c..4ae941f5399 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirVariableAssignmentBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirVariableAssignmentBuilder.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -35,7 +35,7 @@ class FirVariableAssignmentBuilder : FirQualifiedAccessBuilder, FirAnnotationCon override var explicitReceiver: FirExpression? = null override var dispatchReceiver: FirExpression = FirNoReceiverExpression override var extensionReceiver: FirExpression = FirNoReceiverExpression - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null lateinit var rValue: FirExpression override fun build(): FirVariableAssignment { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenBranchBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenBranchBuilder.kt index b92b9f966a5..891681f74ca 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenBranchBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenBranchBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirWhenBranchBuilder { - var source: FirSourceElement? = null + var source: KtSourceElement? = null lateinit var condition: FirExpression lateinit var result: FirBlock diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenExpressionBuilder.kt index 35af759276f..af2e95472fb 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenExpressionBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.FirVariable @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirWhenExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) override val annotations: MutableList = mutableListOf() var calleeReference: FirReference = FirStubReference diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenSubjectExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenSubjectExpressionBuilder.kt index 5cc5a858ff3..ba89cb87086 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenSubjectExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenSubjectExpressionBuilder.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirExpressionRef -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirWhenSubjectExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override val annotations: MutableList = mutableListOf() lateinit var whenRef: FirExpressionRef diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhileLoopBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhileLoopBuilder.kt index 89fd7c696c4..bcbb27d0dc1 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhileLoopBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhileLoopBuilder.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirLabel -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirWhileLoopBuilder : FirLoopBuilder, FirAnnotationContainerBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override val annotations: MutableList = mutableListOf() override var label: FirLabel? = null override lateinit var condition: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWrappedDelegateExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWrappedDelegateExpressionBuilder.kt index 44c08cfad92..bcc6c3ae2f1 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWrappedDelegateExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWrappedDelegateExpressionBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirWrappedDelegateExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override val annotations: MutableList = mutableListOf() lateinit var expression: FirExpression lateinit var delegateProvider: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationCallImpl.kt index 00c256db147..9b1ae5807f6 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationCallImpl.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirAnnotationArgumentMapping import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirAnnotationCallImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val useSiteTarget: AnnotationUseSiteTarget?, override var annotationTypeRef: FirTypeRef, override var argumentList: FirArgumentList, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationImpl.kt index 031c64d292f..82d3666d02b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationImpl.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirAnnotationArgumentMapping import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirAnnotationImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val useSiteTarget: AnnotationUseSiteTarget?, override var annotationTypeRef: FirTypeRef, override var argumentMapping: FirAnnotationArgumentMapping, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirArrayOfCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirArrayOfCallImpl.kt index 1d13fe970c8..6bb5d9d33cb 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirArrayOfCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirArrayOfCallImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirArrayOfCall @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirArrayOfCallImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override var typeRef: FirTypeRef, override val annotations: MutableList, override var argumentList: FirArgumentList, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAssignmentOperatorStatementImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAssignmentOperatorStatementImpl.kt index d63af3692e7..861de20df87 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAssignmentOperatorStatementImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAssignmentOperatorStatementImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirAssignmentOperatorStatement import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirAssignmentOperatorStatementImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val annotations: MutableList, override val operation: FirOperation, override var leftArgument: FirExpression, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAugmentedArraySetCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAugmentedArraySetCallImpl.kt index 66c263a35d8..1cdf54514b3 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAugmentedArraySetCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAugmentedArraySetCallImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirAugmentedArraySetCall import org.jetbrains.kotlin.fir.expressions.FirBlock @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirAugmentedArraySetCallImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val annotations: MutableList, override var assignCall: FirFunctionCall, override var setGetBlock: FirBlock, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBinaryLogicExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBinaryLogicExpressionImpl.kt index 5f96bd94179..fc9592a1fc8 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBinaryLogicExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBinaryLogicExpressionImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBinaryLogicExpression import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirBinaryLogicExpressionImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val annotations: MutableList, override var leftOperand: FirExpression, override var rightOperand: FirExpression, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBlockImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBlockImpl.kt index ffcdf466620..1e6e01c23e1 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBlockImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBlockImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirStatement @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirBlockImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val annotations: MutableList, override val statements: MutableList, ) : FirBlock() { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBreakExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBreakExpressionImpl.kt index 4e5e73a3941..b6c937a7940 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBreakExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBreakExpressionImpl.kt @@ -5,13 +5,13 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.FirTarget import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBreakExpression import org.jetbrains.kotlin.fir.expressions.FirLoop -import org.jetbrains.kotlin.fir.fakeElement import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitNothingTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -22,11 +22,11 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirBreakExpressionImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val annotations: MutableList, override val target: FirTarget, ) : FirBreakExpression() { - override var typeRef: FirTypeRef = FirImplicitNothingTypeRef(source?.fakeElement(FirFakeSourceElementKind.ImplicitTypeRef)) + override var typeRef: FirTypeRef = FirImplicitNothingTypeRef(source?.fakeElement(KtFakeSourceElementKind.ImplicitTypeRef)) override fun acceptChildren(visitor: FirVisitor, data: D) { typeRef.accept(visitor, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCallableReferenceAccessImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCallableReferenceAccessImpl.kt index f84cf94d745..0888a97d32d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCallableReferenceAccessImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCallableReferenceAccessImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirCallableReferenceAccess import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail */ internal class FirCallableReferenceAccessImpl( - override var source: FirSourceElement?, + override var source: KtSourceElement?, override var typeRef: FirTypeRef, override val annotations: MutableList, override val typeArguments: MutableList, @@ -92,7 +92,7 @@ internal class FirCallableReferenceAccessImpl( } @FirImplementationDetail - override fun replaceSource(newSource: FirSourceElement?) { + override fun replaceSource(newSource: KtSourceElement?) { source = newSource } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCatchImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCatchImpl.kt index ecda072a80a..9128b32f2d0 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCatchImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCatchImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement 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.* */ internal class FirCatchImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override var parameter: FirValueParameter, override var block: FirBlock, ) : FirCatch() { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCheckNotNullCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCheckNotNullCallImpl.kt index f8b155902aa..e03b34795d6 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCheckNotNullCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCheckNotNullCallImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirCheckNotNullCall @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirCheckNotNullCallImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override var typeRef: FirTypeRef, override val annotations: MutableList, override var argumentList: FirArgumentList, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCheckedSafeCallSubjectImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCheckedSafeCallSubjectImpl.kt index e120d2c4b91..9efa35c378d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCheckedSafeCallSubjectImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCheckedSafeCallSubjectImpl.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirExpressionRef -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirCheckedSafeCallSubject import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirCheckedSafeCallSubjectImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override var typeRef: FirTypeRef, override val annotations: MutableList, override val originalReceiverRef: FirExpressionRef, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirClassReferenceExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirClassReferenceExpressionImpl.kt index 0747375b482..d0d6602d09c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirClassReferenceExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirClassReferenceExpressionImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirClassReferenceExpression import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirClassReferenceExpressionImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val annotations: MutableList, override var classTypeRef: FirTypeRef, ) : FirClassReferenceExpression() { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComparisonExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComparisonExpressionImpl.kt index 2d011bfb4fe..4d4885a6212 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComparisonExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComparisonExpressionImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirComparisonExpression import org.jetbrains.kotlin.fir.expressions.FirFunctionCall @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirComparisonExpressionImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val annotations: MutableList, override val operation: FirOperation, override var compareToCall: FirFunctionCall, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComponentCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComponentCallImpl.kt index 25c9df1542b..18d0dcffb58 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComponentCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComponentCallImpl.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirComponentCall @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.fir.visitors.* @OptIn(FirImplementationDetail::class) internal class FirComponentCallImpl( - override var source: FirSourceElement?, + override var source: KtSourceElement?, override val annotations: MutableList, override val typeArguments: MutableList, override var dispatchReceiver: FirExpression, @@ -103,7 +103,7 @@ internal class FirComponentCallImpl( } @FirImplementationDetail - override fun replaceSource(newSource: FirSourceElement?) { + override fun replaceSource(newSource: KtSourceElement?) { source = newSource } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirConstExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirConstExpressionImpl.kt index 3e3ecad9535..8fd021de4e5 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirConstExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirConstExpressionImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirConstExpression import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirConstExpressionImpl ( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val annotations: MutableList, override var kind: ConstantValueKind, override val value: T, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirContinueExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirContinueExpressionImpl.kt index 1c98531879f..15ebfa14e8d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirContinueExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirContinueExpressionImpl.kt @@ -5,13 +5,13 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.FirTarget import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirContinueExpression import org.jetbrains.kotlin.fir.expressions.FirLoop -import org.jetbrains.kotlin.fir.fakeElement import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitNothingTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -22,11 +22,11 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirContinueExpressionImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val annotations: MutableList, override val target: FirTarget, ) : FirContinueExpression() { - override var typeRef: FirTypeRef = FirImplicitNothingTypeRef(source?.fakeElement(FirFakeSourceElementKind.ImplicitTypeRef)) + override var typeRef: FirTypeRef = FirImplicitNothingTypeRef(source?.fakeElement(KtFakeSourceElementKind.ImplicitTypeRef)) override fun acceptChildren(visitor: FirVisitor, data: D) { typeRef.accept(visitor, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirDelegatedConstructorCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirDelegatedConstructorCallImpl.kt index 296c8e05fbf..9f5b2c8c39f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirDelegatedConstructorCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirDelegatedConstructorCallImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirDelegatedConstructorCallImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val annotations: MutableList, override var argumentList: FirArgumentList, override var constructedTypeRef: FirTypeRef, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirDoWhileLoopImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirDoWhileLoopImpl.kt index 616b26fb5be..de887f59aa5 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirDoWhileLoopImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirDoWhileLoopImpl.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirLabel -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirDoWhileLoop @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirDoWhileLoopImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val annotations: MutableList, override var block: FirBlock, override var condition: FirExpression, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirElseIfTrueCondition.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirElseIfTrueCondition.kt index 908cf257b54..76be655841c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirElseIfTrueCondition.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirElseIfTrueCondition.kt @@ -5,12 +5,12 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.FirImplementationDetail -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.fakeElement import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitBooleanTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -21,10 +21,10 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirElseIfTrueCondition @FirImplementationDetail constructor( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val annotations: MutableList, ) : FirExpression() { - override var typeRef: FirTypeRef = FirImplicitBooleanTypeRef(source?.fakeElement(FirFakeSourceElementKind.ImplicitTypeRef)) + override var typeRef: FirTypeRef = FirImplicitBooleanTypeRef(source?.fakeElement(KtFakeSourceElementKind.ImplicitTypeRef)) override fun acceptChildren(visitor: FirVisitor, data: D) { typeRef.accept(visitor, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirElvisExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirElvisExpressionImpl.kt index 6d3354eb4ad..61f2bbd162d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirElvisExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirElvisExpressionImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirElvisExpression import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirElvisExpressionImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val annotations: MutableList, override var calleeReference: FirReference, override var lhs: FirExpression, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEmptyExpressionBlock.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEmptyExpressionBlock.kt index 0b7f0bf53fb..075bc5b4ebd 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEmptyExpressionBlock.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEmptyExpressionBlock.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation 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() { - override val source: FirSourceElement? get() = null + override val source: KtSourceElement? get() = null override val annotations: List get() = emptyList() override val statements: List get() = emptyList() override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEqualityOperatorCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEqualityOperatorCallImpl.kt index 3e1f738eec4..22289922c45 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEqualityOperatorCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEqualityOperatorCallImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirEqualityOperatorCall @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirEqualityOperatorCallImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val annotations: MutableList, override var argumentList: FirArgumentList, override val operation: FirOperation, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorExpressionImpl.kt index e1ea6395da8..5315d8ad6ee 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorExpressionImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.diagnostics.ConeStubDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirErrorExpressionImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val annotations: MutableList, override val diagnostic: ConeDiagnostic, override var expression: FirExpression?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorLoopImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorLoopImpl.kt index 43bcc1c7313..d3595063fa0 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorLoopImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorLoopImpl.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirLabel -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.diagnostics.ConeStubDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirErrorLoopImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val annotations: MutableList, override var label: FirLabel?, override val diagnostic: ConeDiagnostic, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorResolvedQualifierImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorResolvedQualifierImpl.kt index 698ba3c3dfa..6a85549ecb6 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorResolvedQualifierImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorResolvedQualifierImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirErrorResolvedQualifier @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirErrorResolvedQualifierImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val annotations: MutableList, override val packageFqName: FqName, override val relativeClassFqName: FqName?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionStub.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionStub.kt index 7aaf53c9c5d..805cf8f136f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionStub.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionStub.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirExpressionStub @FirImplementationDetail constructor( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override var typeRef: FirTypeRef, override val annotations: MutableList, ) : FirExpression() { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirFunctionCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirFunctionCallImpl.kt index e3422fca5c1..fe57f89c57b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirFunctionCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirFunctionCallImpl.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ open class FirFunctionCallImpl @FirImplementationDetail constructor( - override var source: FirSourceElement?, + override var source: KtSourceElement?, override var typeRef: FirTypeRef, override val annotations: MutableList, override val typeArguments: MutableList, @@ -97,7 +97,7 @@ open class FirFunctionCallImpl @FirImplementationDetail constructor( } @FirImplementationDetail - override fun replaceSource(newSource: FirSourceElement?) { + override fun replaceSource(newSource: KtSourceElement?) { source = newSource } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirGetClassCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirGetClassCallImpl.kt index 1c4166f3091..5232db1ba2f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirGetClassCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirGetClassCallImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirGetClassCallImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val annotations: MutableList, override var argumentList: FirArgumentList, ) : FirGetClassCall() { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirImplicitInvokeCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirImplicitInvokeCallImpl.kt index 281844a3bae..a8b99a9c4dc 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirImplicitInvokeCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirImplicitInvokeCallImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail */ internal class FirImplicitInvokeCallImpl( - override var source: FirSourceElement?, + override var source: KtSourceElement?, override val annotations: MutableList, override val typeArguments: MutableList, override var explicitReceiver: FirExpression?, @@ -99,7 +99,7 @@ internal class FirImplicitInvokeCallImpl( } @FirImplementationDetail - override fun replaceSource(newSource: FirSourceElement?) { + override fun replaceSource(newSource: KtSourceElement?) { source = newSource } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLambdaArgumentExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLambdaArgumentExpressionImpl.kt index 92d71ccac45..fdde9531c0d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLambdaArgumentExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLambdaArgumentExpressionImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirLambdaArgumentExpression @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirLambdaArgumentExpressionImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val annotations: MutableList, override var expression: FirExpression, ) : FirLambdaArgumentExpression() { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyBlock.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyBlock.kt index d189334fd16..d41ba768a38 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyBlock.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyBlock.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirStatement @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirLazyBlock @FirImplementationDetail constructor( - override val source: FirSourceElement?, + override val source: KtSourceElement?, ) : FirBlock() { override val annotations: List get() = error("FirLazyBlock should be calculated before accessing") override val statements: List get() = error("FirLazyBlock should be calculated before accessing") diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyExpression.kt index 92a4b5e5eea..68c269652f6 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyExpression.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirLazyExpression @FirImplementationDetail constructor( - override val source: FirSourceElement?, + override val source: KtSourceElement?, ) : FirExpression() { override val typeRef: FirTypeRef get() = error("FirLazyExpression should be calculated before accessing") override val annotations: List get() = error("FirLazyExpression should be calculated before accessing") diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirNamedArgumentExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirNamedArgumentExpressionImpl.kt index 80fb149c3b1..d0f60705911 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirNamedArgumentExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirNamedArgumentExpressionImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirNamedArgumentExpression @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirNamedArgumentExpressionImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val annotations: MutableList, override var expression: FirExpression, override val isSpread: Boolean, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirPropertyAccessExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirPropertyAccessExpressionImpl.kt index cb7b401d2f7..320d8de4642 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirPropertyAccessExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirPropertyAccessExpressionImpl.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirPropertyAccessExpressionImpl @FirImplementationDetail constructor( - override var source: FirSourceElement?, + override var source: KtSourceElement?, override var typeRef: FirTypeRef, override val annotations: MutableList, override var calleeReference: FirReference, @@ -92,7 +92,7 @@ class FirPropertyAccessExpressionImpl @FirImplementationDetail constructor( } @FirImplementationDetail - override fun replaceSource(newSource: FirSourceElement?) { + override fun replaceSource(newSource: KtSourceElement?) { source = newSource } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedQualifierImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedQualifierImpl.kt index 77ce58beb90..a16dcc01bbf 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedQualifierImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedQualifierImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.declarations.FirRegularClass import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirResolvedQualifierImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override var typeRef: FirTypeRef, override val annotations: MutableList, override var packageFqName: FqName, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedReifiedParameterReferenceImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedReifiedParameterReferenceImpl.kt index ee602310cc0..dcc3d2e6231 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedReifiedParameterReferenceImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedReifiedParameterReferenceImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirResolvedReifiedParameterReference import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirResolvedReifiedParameterReferenceImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override var typeRef: FirTypeRef, override val annotations: MutableList, override val symbol: FirTypeParameterSymbol, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirReturnExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirReturnExpressionImpl.kt index bef02abf7cb..181df360652 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirReturnExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirReturnExpressionImpl.kt @@ -5,14 +5,14 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.FirTarget import org.jetbrains.kotlin.fir.declarations.FirFunction import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirReturnExpression -import org.jetbrains.kotlin.fir.fakeElement import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitNothingTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -23,12 +23,12 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirReturnExpressionImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val annotations: MutableList, override val target: FirTarget, override var result: FirExpression, ) : FirReturnExpression() { - override var typeRef: FirTypeRef = FirImplicitNothingTypeRef(source?.fakeElement(FirFakeSourceElementKind.ImplicitTypeRef)) + override var typeRef: FirTypeRef = FirImplicitNothingTypeRef(source?.fakeElement(KtFakeSourceElementKind.ImplicitTypeRef)) override fun acceptChildren(visitor: FirVisitor, data: D) { typeRef.accept(visitor, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSafeCallExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSafeCallExpressionImpl.kt index 3909e89de16..414189387ab 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSafeCallExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSafeCallExpressionImpl.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirExpressionRef -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirCheckedSafeCallSubject import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirSafeCallExpressionImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override var typeRef: FirTypeRef, override val annotations: MutableList, override var receiver: FirExpression, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSpreadArgumentExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSpreadArgumentExpressionImpl.kt index f44a5b13f01..d39932a1a35 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSpreadArgumentExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSpreadArgumentExpressionImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirSpreadArgumentExpression @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirSpreadArgumentExpressionImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val annotations: MutableList, override var expression: FirExpression, ) : FirSpreadArgumentExpression() { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirStringConcatenationCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirStringConcatenationCallImpl.kt index 182084733b3..498312f807a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirStringConcatenationCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirStringConcatenationCallImpl.kt @@ -5,12 +5,12 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirStringConcatenationCall -import org.jetbrains.kotlin.fir.fakeElement import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitStringTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -21,11 +21,11 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirStringConcatenationCallImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val annotations: MutableList, override var argumentList: FirArgumentList, ) : FirStringConcatenationCall() { - override var typeRef: FirTypeRef = FirImplicitStringTypeRef(source?.fakeElement(FirFakeSourceElementKind.ImplicitTypeRef)) + override var typeRef: FirTypeRef = FirImplicitStringTypeRef(source?.fakeElement(KtFakeSourceElementKind.ImplicitTypeRef)) override fun acceptChildren(visitor: FirVisitor, data: D) { annotations.forEach { it.accept(visitor, data) } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThisReceiverExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThisReceiverExpressionImpl.kt index f0cddc32b5a..d83d3cf86a6 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThisReceiverExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThisReceiverExpressionImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirThisReceiverExpression @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail */ internal class FirThisReceiverExpressionImpl( - override var source: FirSourceElement?, + override var source: KtSourceElement?, override var typeRef: FirTypeRef, override val annotations: MutableList, override val typeArguments: MutableList, @@ -94,7 +94,7 @@ internal class FirThisReceiverExpressionImpl( } @FirImplementationDetail - override fun replaceSource(newSource: FirSourceElement?) { + override fun replaceSource(newSource: KtSourceElement?) { source = newSource } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThrowExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThrowExpressionImpl.kt index 42a54ef81af..0efe40a5fb6 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThrowExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThrowExpressionImpl.kt @@ -5,12 +5,12 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirThrowExpression -import org.jetbrains.kotlin.fir.fakeElement import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitNothingTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -21,11 +21,11 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirThrowExpressionImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val annotations: MutableList, override var exception: FirExpression, ) : FirThrowExpression() { - override var typeRef: FirTypeRef = FirImplicitNothingTypeRef(source?.fakeElement(FirFakeSourceElementKind.ImplicitTypeRef)) + override var typeRef: FirTypeRef = FirImplicitNothingTypeRef(source?.fakeElement(KtFakeSourceElementKind.ImplicitTypeRef)) override fun acceptChildren(visitor: FirVisitor, data: D) { typeRef.accept(visitor, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirTryExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirTryExpressionImpl.kt index c76a86df289..343466d1312 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirTryExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirTryExpressionImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirCatch @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirTryExpressionImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override var typeRef: FirTypeRef, override val annotations: MutableList, override var calleeReference: FirReference, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirTypeOperatorCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirTypeOperatorCallImpl.kt index 3ab0f5a6707..61dccf1837f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirTypeOperatorCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirTypeOperatorCallImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirOperation @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirTypeOperatorCallImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val annotations: MutableList, override var argumentList: FirArgumentList, override val operation: FirOperation, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirUnitExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirUnitExpression.kt index 7626a40e01e..662f6d9c98b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirUnitExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirUnitExpression.kt @@ -5,12 +5,12 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.FirImplementationDetail -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.fakeElement import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitUnitTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -21,10 +21,10 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirUnitExpression @FirImplementationDetail constructor( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val annotations: MutableList, ) : FirExpression() { - override var typeRef: FirTypeRef = FirImplicitUnitTypeRef(source?.fakeElement(FirFakeSourceElementKind.ImplicitTypeRef)) + override var typeRef: FirTypeRef = FirImplicitUnitTypeRef(source?.fakeElement(KtFakeSourceElementKind.ImplicitTypeRef)) override fun acceptChildren(visitor: FirVisitor, data: D) { typeRef.accept(visitor, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirVarargArgumentsExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirVarargArgumentsExpressionImpl.kt index 4c98ece79e8..bce189d83f7 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirVarargArgumentsExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirVarargArgumentsExpressionImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirVarargArgumentsExpression @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirVarargArgumentsExpressionImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override var typeRef: FirTypeRef, override val annotations: MutableList, override val arguments: MutableList, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirVariableAssignmentImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirVariableAssignmentImpl.kt index 0ac9b327611..fbfda22f3b9 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirVariableAssignmentImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirVariableAssignmentImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirVariableAssignment @@ -28,7 +28,7 @@ internal class FirVariableAssignmentImpl( override var explicitReceiver: FirExpression?, override var dispatchReceiver: FirExpression, override var extensionReceiver: FirExpression, - override var source: FirSourceElement?, + override var source: KtSourceElement?, override var rValue: FirExpression, ) : FirVariableAssignment() { override var lValue: FirReference @@ -118,7 +118,7 @@ internal class FirVariableAssignmentImpl( } @FirImplementationDetail - override fun replaceSource(newSource: FirSourceElement?) { + override fun replaceSource(newSource: KtSourceElement?) { source = newSource } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenBranchImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenBranchImpl.kt index 5aa37fed9e8..123e0c2649d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenBranchImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenBranchImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement 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.* */ internal class FirWhenBranchImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override var condition: FirExpression, override var result: FirBlock, ) : FirWhenBranch() { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenExpressionImpl.kt index ac7898049ef..2281f13bd2e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenExpressionImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.declarations.FirVariable import org.jetbrains.kotlin.fir.expressions.ExhaustivenessStatus import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirWhenExpressionImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override var typeRef: FirTypeRef, override val annotations: MutableList, override var calleeReference: FirReference, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenSubjectExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenSubjectExpressionImpl.kt index ef16838a96c..8702ec6265c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenSubjectExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenSubjectExpressionImpl.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirExpressionRef -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirWhenExpression import org.jetbrains.kotlin.fir.expressions.FirWhenSubjectExpression @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirWhenSubjectExpressionImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val annotations: MutableList, override val whenRef: FirExpressionRef, ) : FirWhenSubjectExpression() { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhileLoopImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhileLoopImpl.kt index ac8a1f917b6..c75a6ad9107 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhileLoopImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhileLoopImpl.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirLabel -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirWhileLoopImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val annotations: MutableList, override var label: FirLabel?, override var condition: FirExpression, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWrappedDelegateExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWrappedDelegateExpressionImpl.kt index 43caadc8f21..bfdb92fdb55 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWrappedDelegateExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWrappedDelegateExpressionImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirWrappedDelegateExpression @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirWrappedDelegateExpressionImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val annotations: MutableList, override var expression: FirExpression, override var delegateProvider: FirExpression, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/impl/FirLabelImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/impl/FirLabelImpl.kt index f90bfc8d2a5..a8faf7a4f06 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/impl/FirLabelImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/impl/FirLabelImpl.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.impl +import org.jetbrains.kotlin.KtSourceElement 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.* */ internal class FirLabelImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val name: String, ) : FirLabel() { override fun acceptChildren(visitor: FirVisitor, data: D) {} diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/impl/FirPackageDirectiveImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/impl/FirPackageDirectiveImpl.kt index 9bdf09d37b1..71fa1d93960 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/impl/FirPackageDirectiveImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/impl/FirPackageDirectiveImpl.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirPackageDirective -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirPackageDirectiveImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val packageFqName: FqName, ) : FirPackageDirective() { override fun acceptChildren(visitor: FirVisitor, data: D) {} diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirBackingFieldReference.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirBackingFieldReference.kt index 3bf4ddfd6f9..4b94c865cf0 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirBackingFieldReference.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirBackingFieldReference.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.references +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirBackingFieldSymbol import org.jetbrains.kotlin.name.Name @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirBackingFieldReference : FirResolvedNamedReference() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val name: Name abstract override val candidateSymbol: FirBasedSymbol<*>? abstract override val resolvedSymbol: FirBackingFieldSymbol diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirControlFlowGraphReference.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirControlFlowGraphReference.kt index 703ae7b1aaf..2feb4ae9335 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirControlFlowGraphReference.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirControlFlowGraphReference.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.references +import org.jetbrains.kotlin.KtSourceElement 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.* */ abstract class FirControlFlowGraphReference : FirReference() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? override fun accept(visitor: FirVisitor, data: D): R = visitor.visitControlFlowGraphReference(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirDelegateFieldReference.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirDelegateFieldReference.kt index 75c806267f8..61b76c27db2 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirDelegateFieldReference.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirDelegateFieldReference.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.references +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirDelegateFieldSymbol import org.jetbrains.kotlin.name.Name @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirDelegateFieldReference : FirResolvedNamedReference() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val name: Name abstract override val candidateSymbol: FirBasedSymbol<*>? abstract override val resolvedSymbol: FirDelegateFieldSymbol diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirErrorNamedReference.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirErrorNamedReference.kt index a56f49e48d2..873d30d70df 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirErrorNamedReference.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirErrorNamedReference.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.references +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.diagnostics.FirDiagnosticHolder import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirErrorNamedReference : FirNamedReference(), FirDiagnosticHolder { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val name: Name abstract override val candidateSymbol: FirBasedSymbol<*>? abstract override val diagnostic: ConeDiagnostic diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirNamedReference.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirNamedReference.kt index caeec880f1c..550cec96cb9 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirNamedReference.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirNamedReference.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.references +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.fir.visitors.* @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirNamedReference : FirReference() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract val name: Name abstract val candidateSymbol: FirBasedSymbol<*>? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirReference.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirReference.kt index f4e032a1192..7388f7b5494 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirReference.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirReference.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.references +import org.jetbrains.kotlin.KtSourceElement 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 source: FirSourceElement? + abstract override val source: KtSourceElement? override fun accept(visitor: FirVisitor, data: D): R = visitor.visitReference(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirResolvedCallableReference.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirResolvedCallableReference.kt index c5c6d8e6f0a..38af2d4f835 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirResolvedCallableReference.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirResolvedCallableReference.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.references +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.resolve.calls.CallableReferenceMappedArguments import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.types.ConeKotlinType @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirResolvedCallableReference : FirResolvedNamedReference() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val name: Name abstract override val candidateSymbol: FirBasedSymbol<*>? abstract override val resolvedSymbol: FirBasedSymbol<*> diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirResolvedNamedReference.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirResolvedNamedReference.kt index ab27ccf3394..200655db12d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirResolvedNamedReference.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirResolvedNamedReference.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.references +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.fir.visitors.* @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirResolvedNamedReference : FirNamedReference() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val name: Name abstract override val candidateSymbol: FirBasedSymbol<*>? abstract val resolvedSymbol: FirBasedSymbol<*> diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirSuperReference.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirSuperReference.kt index 7998b9f62f9..fa918a34d3f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirSuperReference.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirSuperReference.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.references +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -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 FirSuperReference : FirReference() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract val labelName: String? abstract val superTypeRef: FirTypeRef diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirThisReference.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirThisReference.kt index d39a71f378f..c15ee40a3bf 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirThisReference.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirThisReference.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.references +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirThisReference : FirReference() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract val labelName: String? abstract val boundSymbol: FirBasedSymbol<*>? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirBackingFieldReferenceBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirBackingFieldReferenceBuilder.kt index e351bbb2f42..7d4fb4fe12e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirBackingFieldReferenceBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirBackingFieldReferenceBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.references.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.references.FirBackingFieldReference import org.jetbrains.kotlin.fir.references.impl.FirBackingFieldReferenceImpl @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.name.Name @FirBuilderDsl class FirBackingFieldReferenceBuilder { - var source: FirSourceElement? = null + var source: KtSourceElement? = null var candidateSymbol: FirBasedSymbol<*>? = null lateinit var resolvedSymbol: FirBackingFieldSymbol diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirDelegateFieldReferenceBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirDelegateFieldReferenceBuilder.kt index 771ad55dae9..12fd1e2240e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirDelegateFieldReferenceBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirDelegateFieldReferenceBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.references.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.references.FirDelegateFieldReference import org.jetbrains.kotlin.fir.references.impl.FirDelegateFieldReferenceImpl @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.name.Name @FirBuilderDsl class FirDelegateFieldReferenceBuilder { - var source: FirSourceElement? = null + var source: KtSourceElement? = null var candidateSymbol: FirBasedSymbol<*>? = null lateinit var resolvedSymbol: FirDelegateFieldSymbol diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirErrorNamedReferenceBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirErrorNamedReferenceBuilder.kt index 1498c769cd7..82527098f51 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirErrorNamedReferenceBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirErrorNamedReferenceBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.references.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.references.FirErrorNamedReference @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.name.Name @FirBuilderDsl class FirErrorNamedReferenceBuilder { - var source: FirSourceElement? = null + var source: KtSourceElement? = null var candidateSymbol: FirBasedSymbol<*>? = null lateinit var diagnostic: ConeDiagnostic diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirExplicitSuperReferenceBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirExplicitSuperReferenceBuilder.kt index 003a89dc56f..c865f94b984 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirExplicitSuperReferenceBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirExplicitSuperReferenceBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.references.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.references.FirSuperReference import org.jetbrains.kotlin.fir.references.impl.FirExplicitSuperReference @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirExplicitSuperReferenceBuilder { - var source: FirSourceElement? = null + var source: KtSourceElement? = null var labelName: String? = null lateinit var superTypeRef: FirTypeRef diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirExplicitThisReferenceBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirExplicitThisReferenceBuilder.kt index 976f206f02a..055d6e3a8f9 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirExplicitThisReferenceBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirExplicitThisReferenceBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.references.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.references.FirThisReference import org.jetbrains.kotlin.fir.references.impl.FirExplicitThisReference @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirExplicitThisReferenceBuilder { - var source: FirSourceElement? = null + var source: KtSourceElement? = null var labelName: String? = null fun build(): FirThisReference { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirImplicitThisReferenceBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirImplicitThisReferenceBuilder.kt index 10fa72ae12e..4009992c900 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirImplicitThisReferenceBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirImplicitThisReferenceBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.references.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.references.FirThisReference import org.jetbrains.kotlin.fir.references.impl.FirImplicitThisReference diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirPropertyFromParameterResolvedNamedReferenceBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirPropertyFromParameterResolvedNamedReferenceBuilder.kt index 27bf18b85ff..710b7c99c28 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirPropertyFromParameterResolvedNamedReferenceBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirPropertyFromParameterResolvedNamedReferenceBuilder.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.fir.references.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference import org.jetbrains.kotlin.fir.references.impl.FirPropertyFromParameterResolvedNamedReference @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.name.Name @FirBuilderDsl class FirPropertyFromParameterResolvedNamedReferenceBuilder { - var source: FirSourceElement? = null + var source: KtSourceElement? = null lateinit var name: Name lateinit var resolvedSymbol: FirBasedSymbol<*> diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirResolvedCallableReferenceBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirResolvedCallableReferenceBuilder.kt index e8383945b81..1fca9241e24 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirResolvedCallableReferenceBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirResolvedCallableReferenceBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.references.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.references.FirResolvedCallableReference import org.jetbrains.kotlin.fir.references.impl.FirResolvedCallableReferenceImpl @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.name.Name @FirBuilderDsl class FirResolvedCallableReferenceBuilder { - var source: FirSourceElement? = null + var source: KtSourceElement? = null lateinit var name: Name lateinit var resolvedSymbol: FirBasedSymbol<*> val inferredTypeArguments: MutableList = mutableListOf() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirResolvedNamedReferenceBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirResolvedNamedReferenceBuilder.kt index cb1d2879b84..cf402981213 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirResolvedNamedReferenceBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirResolvedNamedReferenceBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.references.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference import org.jetbrains.kotlin.fir.references.impl.FirResolvedNamedReferenceImpl @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.name.Name @FirBuilderDsl class FirResolvedNamedReferenceBuilder { - var source: FirSourceElement? = null + var source: KtSourceElement? = null lateinit var name: Name lateinit var resolvedSymbol: FirBasedSymbol<*> diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirSimpleNamedReferenceBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirSimpleNamedReferenceBuilder.kt index 88eb0b6f054..bab8d6543d0 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirSimpleNamedReferenceBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirSimpleNamedReferenceBuilder.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.fir.references.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.references.FirNamedReference import org.jetbrains.kotlin.fir.references.impl.FirSimpleNamedReference @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.name.Name @FirBuilderDsl class FirSimpleNamedReferenceBuilder { - var source: FirSourceElement? = null + var source: KtSourceElement? = null lateinit var name: Name var candidateSymbol: FirBasedSymbol<*>? = null diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirBackingFieldReferenceImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirBackingFieldReferenceImpl.kt index 9d6cd6ddd7b..8a65ef51e21 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirBackingFieldReferenceImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirBackingFieldReferenceImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.references.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.references.FirBackingFieldReference import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirBackingFieldSymbol @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirBackingFieldReferenceImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val candidateSymbol: FirBasedSymbol<*>?, override val resolvedSymbol: FirBackingFieldSymbol, ) : FirBackingFieldReference() { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirDelegateFieldReferenceImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirDelegateFieldReferenceImpl.kt index 0c020e8191d..dc03df13c0d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirDelegateFieldReferenceImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirDelegateFieldReferenceImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.references.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.references.FirDelegateFieldReference import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirDelegateFieldSymbol @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirDelegateFieldReferenceImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val candidateSymbol: FirBasedSymbol<*>?, override val resolvedSymbol: FirDelegateFieldSymbol, ) : FirDelegateFieldReference() { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirErrorNamedReferenceImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirErrorNamedReferenceImpl.kt index 1d5317afb2b..f2f227ac535 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirErrorNamedReferenceImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirErrorNamedReferenceImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.references.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.references.FirErrorNamedReference import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirErrorNamedReferenceImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val candidateSymbol: FirBasedSymbol<*>?, override val diagnostic: ConeDiagnostic, ) : FirErrorNamedReference() { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirExplicitSuperReference.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirExplicitSuperReference.kt index e82515492fa..4d590a02b1a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirExplicitSuperReference.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirExplicitSuperReference.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.references.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement 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.* */ internal class FirExplicitSuperReference( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val labelName: String?, override var superTypeRef: FirTypeRef, ) : FirSuperReference() { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirExplicitThisReference.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirExplicitThisReference.kt index bff08bb77bb..71a87e9562c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirExplicitThisReference.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirExplicitThisReference.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.references.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.references.FirThisReference import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirExplicitThisReference( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val labelName: String?, ) : FirThisReference() { override var boundSymbol: FirBasedSymbol<*>? = null diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirImplicitThisReference.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirImplicitThisReference.kt index 3f8522716c2..8b69a4c571d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirImplicitThisReference.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirImplicitThisReference.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.references.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.references.FirThisReference import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.visitors.* @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirImplicitThisReference( override val boundSymbol: FirBasedSymbol<*>?, ) : FirThisReference() { - override val source: FirSourceElement? get() = null + override val source: KtSourceElement? get() = null override val labelName: String? get() = null override fun acceptChildren(visitor: FirVisitor, data: D) {} diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirPropertyFromParameterResolvedNamedReference.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirPropertyFromParameterResolvedNamedReference.kt index 95e43476e88..967e2181bca 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirPropertyFromParameterResolvedNamedReference.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirPropertyFromParameterResolvedNamedReference.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.references.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.name.Name @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirPropertyFromParameterResolvedNamedReference @FirImplementationDetail constructor( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val name: Name, override val resolvedSymbol: FirBasedSymbol<*>, ) : FirResolvedNamedReference() { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirResolvedCallableReferenceImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirResolvedCallableReferenceImpl.kt index 73ae028e64d..912298cd879 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirResolvedCallableReferenceImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirResolvedCallableReferenceImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.references.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.references.FirResolvedCallableReference import org.jetbrains.kotlin.fir.resolve.calls.CallableReferenceMappedArguments import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirResolvedCallableReferenceImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val name: Name, override val resolvedSymbol: FirBasedSymbol<*>, override val inferredTypeArguments: MutableList, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirResolvedNamedReferenceImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirResolvedNamedReferenceImpl.kt index c5c54745f52..8504c50cde1 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirResolvedNamedReferenceImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirResolvedNamedReferenceImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.references.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.name.Name @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirResolvedNamedReferenceImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val name: Name, override val resolvedSymbol: FirBasedSymbol<*>, ) : FirResolvedNamedReference() { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirSimpleNamedReference.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirSimpleNamedReference.kt index 4aa9cb4adac..c359d174c2d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirSimpleNamedReference.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirSimpleNamedReference.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.references.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.references.FirNamedReference import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.name.Name @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ open class FirSimpleNamedReference @FirImplementationDetail constructor( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val name: Name, override val candidateSymbol: FirBasedSymbol<*>?, ) : FirNamedReference() { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirStubReference.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirStubReference.kt index 55035899e28..667b6c93250 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirStubReference.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirStubReference.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.references.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail -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.* */ object FirStubReference : FirReference() { - override val source: FirSourceElement? get() = null + override val source: KtSourceElement? get() = null override fun acceptChildren(visitor: FirVisitor, data: D) {} diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirDynamicTypeRef.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirDynamicTypeRef.kt index 7ba8519f7c6..a482d5089f2 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirDynamicTypeRef.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirDynamicTypeRef.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.types +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirDynamicTypeRef : FirTypeRefWithNullability() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val annotations: List abstract override val isMarkedNullable: Boolean diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirErrorTypeRef.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirErrorTypeRef.kt index 5323e66265e..f412e8b4e54 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirErrorTypeRef.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirErrorTypeRef.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.types +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.diagnostics.FirDiagnosticHolder import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirErrorTypeRef : FirResolvedTypeRef(), FirDiagnosticHolder { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val annotations: List abstract override val type: ConeKotlinType abstract override val delegatedTypeRef: FirTypeRef? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirFunctionTypeRef.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirFunctionTypeRef.kt index 8efec00013e..6233085883d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirFunctionTypeRef.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirFunctionTypeRef.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.types +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.visitors.* @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirFunctionTypeRef : FirTypeRefWithNullability() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val annotations: List abstract override val isMarkedNullable: Boolean abstract val receiverTypeRef: FirTypeRef? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirImplicitTypeRef.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirImplicitTypeRef.kt index e7fefd41364..3ef8adc1090 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirImplicitTypeRef.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirImplicitTypeRef.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.types +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirImplicitTypeRef : FirTypeRef() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val annotations: List override fun accept(visitor: FirVisitor, data: D): R = visitor.visitImplicitTypeRef(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirResolvedTypeRef.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirResolvedTypeRef.kt index 8987a848bdf..19bc51abadc 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirResolvedTypeRef.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirResolvedTypeRef.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.types +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirResolvedTypeRef : FirTypeRef() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val annotations: List abstract val type: ConeKotlinType abstract val delegatedTypeRef: FirTypeRef? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirStarProjection.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirStarProjection.kt index 14b2a0f45d1..ee4a74b4d12 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirStarProjection.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirStarProjection.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.types +import org.jetbrains.kotlin.KtSourceElement 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.* */ abstract class FirStarProjection : FirTypeProjection() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? override fun accept(visitor: FirVisitor, data: D): R = visitor.visitStarProjection(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeProjection.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeProjection.kt index 64275fe9ea5..9ecbf7eedcb 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeProjection.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeProjection.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.types +import org.jetbrains.kotlin.KtSourceElement 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 source: FirSourceElement? + abstract override val source: KtSourceElement? override fun accept(visitor: FirVisitor, data: D): R = visitor.visitTypeProjection(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeProjectionWithVariance.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeProjectionWithVariance.kt index f8e89619136..2851c385213 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeProjectionWithVariance.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeProjectionWithVariance.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.types +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.types.Variance import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirTypeProjectionWithVariance : FirTypeProjection() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract val typeRef: FirTypeRef abstract val variance: Variance diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeRef.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeRef.kt index c0ec03f0042..622e154072b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeRef.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeRef.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.fir.types +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirAnnotationContainer import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirPureAbstractElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.visitors.* @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ sealed class FirTypeRef : FirPureAbstractElement(), FirAnnotationContainer { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val annotations: List override fun accept(visitor: FirVisitor, data: D): R = visitor.visitTypeRef(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeRefWithNullability.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeRefWithNullability.kt index 50f7e5b9ab6..47e3f7ae756 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeRefWithNullability.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeRefWithNullability.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.types +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirTypeRefWithNullability : FirTypeRef() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val annotations: List abstract val isMarkedNullable: Boolean diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirUserTypeRef.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirUserTypeRef.kt index b82b00e0642..a1284fe5753 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirUserTypeRef.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirUserTypeRef.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.types +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ abstract class FirUserTypeRef : FirTypeRefWithNullability() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract override val annotations: List abstract override val isMarkedNullable: Boolean abstract val qualifier: List diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirDynamicTypeRefBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirDynamicTypeRefBuilder.kt index 4b972ed5aca..621b11ee578 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirDynamicTypeRefBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirDynamicTypeRefBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.types.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirDynamicTypeRefBuilder : FirAnnotationContainerBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override val annotations: MutableList = mutableListOf() var isMarkedNullable: Boolean by kotlin.properties.Delegates.notNull() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirErrorTypeRefBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirErrorTypeRefBuilder.kt index c1356577dcf..94a11541688 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirErrorTypeRefBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirErrorTypeRefBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.types.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirErrorTypeRefBuilder : FirAnnotationContainerBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null var delegatedTypeRef: FirTypeRef? = null lateinit var diagnostic: ConeDiagnostic diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirFunctionTypeRefBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirFunctionTypeRefBuilder.kt index 318a7b3c0f1..eb5c45e86bf 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirFunctionTypeRefBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirFunctionTypeRefBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.types.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.FirValueParameter @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirFunctionTypeRefBuilder : FirAnnotationContainerBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override val annotations: MutableList = mutableListOf() var isMarkedNullable: Boolean by kotlin.properties.Delegates.notNull() var receiverTypeRef: FirTypeRef? = null diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirImplicitTypeRefBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirImplicitTypeRefBuilder.kt index 3bb66fcdb90..05089daa130 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirImplicitTypeRefBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirImplicitTypeRefBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.types.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.FirImplicitTypeRef @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirImplicitTypeRefBuilder { - var source: FirSourceElement? = null + var source: KtSourceElement? = null fun build(): FirImplicitTypeRef { return FirImplicitTypeRefImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirResolvedTypeRefBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirResolvedTypeRefBuilder.kt index abe96851559..3b32a542911 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirResolvedTypeRefBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirResolvedTypeRefBuilder.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.fir.types.builder import kotlin.contracts.* +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirResolvedTypeRefBuilder : FirAnnotationContainerBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override val annotations: MutableList = mutableListOf() lateinit var type: ConeKotlinType var delegatedTypeRef: FirTypeRef? = null diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirStarProjectionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirStarProjectionBuilder.kt index 54ae68f6e59..3c49fd9a882 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirStarProjectionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirStarProjectionBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.types.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.types.FirStarProjection import org.jetbrains.kotlin.fir.types.impl.FirStarProjectionImpl @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirStarProjectionBuilder { - var source: FirSourceElement? = null + var source: KtSourceElement? = null fun build(): FirStarProjection { return FirStarProjectionImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirTypeProjectionWithVarianceBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirTypeProjectionWithVarianceBuilder.kt index c35f2d4da35..edd441fcc6d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirTypeProjectionWithVarianceBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirTypeProjectionWithVarianceBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.types.builder import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.types.FirTypeProjectionWithVariance import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.types.Variance @FirBuilderDsl class FirTypeProjectionWithVarianceBuilder { - var source: FirSourceElement? = null + var source: KtSourceElement? = null lateinit var typeRef: FirTypeRef lateinit var variance: Variance diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirDynamicTypeRefImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirDynamicTypeRefImpl.kt index d1e40d642ec..2dc0a8f8699 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirDynamicTypeRefImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirDynamicTypeRefImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.types.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.FirDynamicTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirDynamicTypeRefImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val annotations: MutableList, override val isMarkedNullable: Boolean, ) : FirDynamicTypeRef() { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirErrorTypeRefImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirErrorTypeRefImpl.kt index c814e42159c..a27ce6d9877 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirErrorTypeRefImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirErrorTypeRefImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.types.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.ConeClassErrorType @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirErrorTypeRefImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override var delegatedTypeRef: FirTypeRef?, override val diagnostic: ConeDiagnostic, ) : FirErrorTypeRef() { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirFunctionTypeRefImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirFunctionTypeRefImpl.kt index 8616196205e..d85ce345100 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirFunctionTypeRefImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirFunctionTypeRefImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.types.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.FirFunctionTypeRef @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirFunctionTypeRefImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val annotations: MutableList, override val isMarkedNullable: Boolean, override var receiverTypeRef: FirTypeRef?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirImplicitTypeRefImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirImplicitTypeRefImpl.kt index 5c5028a2a84..3d2f61b8b6e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirImplicitTypeRefImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirImplicitTypeRefImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.types.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.FirImplicitTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirImplicitTypeRefImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, ) : FirImplicitTypeRef() { override val annotations: List get() = emptyList() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirResolvedTypeRefImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirResolvedTypeRefImpl.kt index 3bb6781b915..a2276c4aa70 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirResolvedTypeRefImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirResolvedTypeRefImpl.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.types.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ class FirResolvedTypeRefImpl @FirImplementationDetail constructor( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val annotations: MutableList, override val type: ConeKotlinType, override var delegatedTypeRef: FirTypeRef?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirStarProjectionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirStarProjectionImpl.kt index c95cd6ae3ac..bd290092164 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirStarProjectionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirStarProjectionImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.types.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.types.FirStarProjection import org.jetbrains.kotlin.fir.visitors.* @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirStarProjectionImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, ) : FirStarProjection() { override fun acceptChildren(visitor: FirVisitor, data: D) {} diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirTypePlaceholderProjection.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirTypePlaceholderProjection.kt index 905f2272623..a3f9ebe3410 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirTypePlaceholderProjection.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirTypePlaceholderProjection.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.types.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.types.FirTypeProjection import org.jetbrains.kotlin.fir.visitors.* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ object FirTypePlaceholderProjection : FirTypeProjection() { - override val source: FirSourceElement? get() = null + override val source: KtSourceElement? get() = null override fun acceptChildren(visitor: FirVisitor, data: D) {} diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirTypeProjectionWithVarianceImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirTypeProjectionWithVarianceImpl.kt index 3e614834851..1f245bd6ac0 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirTypeProjectionWithVarianceImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirTypeProjectionWithVarianceImpl.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.types.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement 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.* */ internal class FirTypeProjectionWithVarianceImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override var typeRef: FirTypeRef, override val variance: Variance, ) : FirTypeProjectionWithVariance() { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/EnumClassUtils.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/EnumClassUtils.kt index 97fd2f3e5de..9afab201a6b 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/EnumClassUtils.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/EnumClassUtils.kt @@ -5,8 +5,10 @@ package org.jetbrains.kotlin.fir +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus import org.jetbrains.kotlin.fir.declarations.FirResolvePhase @@ -34,7 +36,7 @@ private val VALUE = Name.identifier("value") fun FirRegularClassBuilder.generateValuesFunction( moduleData: FirModuleData, packageFqName: FqName, classFqName: FqName, makeExpect: Boolean = false ) { - val sourceElement = source?.fakeElement(FirFakeSourceElementKind.EnumGeneratedDeclaration) + val sourceElement = source?.fakeElement(KtFakeSourceElementKind.EnumGeneratedDeclaration) declarations += buildSimpleFunction { source = sourceElement origin = FirDeclarationOrigin.Source @@ -67,7 +69,7 @@ fun FirRegularClassBuilder.generateValuesFunction( fun FirRegularClassBuilder.generateValueOfFunction( moduleData: FirModuleData, packageFqName: FqName, classFqName: FqName, makeExpect: Boolean = false ) { - val sourceElement = source?.fakeElement(FirFakeSourceElementKind.EnumGeneratedDeclaration) + val sourceElement = source?.fakeElement(KtFakeSourceElementKind.EnumGeneratedDeclaration) declarations += buildSimpleFunction { source = sourceElement origin = FirDeclarationOrigin.Source diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/Utils.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/Utils.kt index 510bfc6cf82..d339445c8fa 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/Utils.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/Utils.kt @@ -5,7 +5,12 @@ package org.jetbrains.kotlin.fir +import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtPsiSourceElement +import org.jetbrains.kotlin.KtRealPsiSourceElement import org.jetbrains.kotlin.analyzer.ModuleInfo +import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.declarations.FirFile import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -23,7 +28,7 @@ fun ModuleInfo.dependenciesWithoutSelf(): Sequence = dependencies(). fun FirBlock.returnExpressions(): List = listOfNotNull(statements.lastOrNull() as? FirExpression) // do we need a deep copy here ? -fun R.copyWithNewSourceKind(newKind: FirFakeSourceElementKind): R { +fun R.copyWithNewSourceKind(newKind: KtFakeSourceElementKind): R { if (source == null) return this if (source?.kind == newKind) return this val newSource = source?.fakeElement(newKind) @@ -60,3 +65,7 @@ fun R.copyWithNewSourceKind(newKind: FirFakeSourceElementKind): val FirFile.packageFqName: FqName get() = packageDirective.packageFqName + +val FirElement.psi: PsiElement? get() = (source as? KtPsiSourceElement)?.psi +val FirElement.realPsi: PsiElement? get() = (source as? KtRealPsiSourceElement)?.psi + diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/contracts/ContractUtils.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/contracts/ContractUtils.kt index d9dce0bf8a8..df7a168dd85 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/contracts/ContractUtils.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/contracts/ContractUtils.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.contracts -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.contracts.builder.buildEffectDeclaration import org.jetbrains.kotlin.fir.contracts.description.ConeEffectDeclaration @@ -15,7 +15,7 @@ val FirContractDescription.effects: List? val FirContractDescription.coneEffects: List? get() = effects?.map { it.effect } -fun ConeEffectDeclaration.toFirEffectDeclaration(source: FirSourceElement? = null): FirEffectDeclaration = +fun ConeEffectDeclaration.toFirEffectDeclaration(source: KtSourceElement? = null): FirEffectDeclaration = buildEffectDeclaration { if (source != null) { this.source = source 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 94f381db4e7..d404a2503e0 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,13 @@ package org.jetbrains.kotlin.fir.contracts.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement 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 source: FirSourceElement? get() = null + override val source: KtSourceElement? get() = null override fun acceptChildren(visitor: FirVisitor, data: D) {} 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 2d08c73912e..557ab3a332f 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,11 +5,11 @@ package org.jetbrains.kotlin.fir.declarations.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.EffectiveVisibility 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 @@ -19,7 +19,7 @@ open class FirDeclarationStatusImpl( override val visibility: Visibility, override val modality: Modality? ) : FirPureAbstractElement(), FirDeclarationStatus { - override val source: FirSourceElement? get() = null + override val source: KtSourceElement? get() = null protected var flags: Int = 0 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 fe4e4f167a7..f4b5f30e501 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,9 +5,12 @@ package org.jetbrains.kotlin.fir.declarations.impl +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.EffectiveVisibility import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.* import org.jetbrains.kotlin.fir.contracts.impl.FirEmptyContractDescription import org.jetbrains.kotlin.fir.declarations.* @@ -23,7 +26,7 @@ import org.jetbrains.kotlin.name.Name @OptIn(FirImplementationDetail::class) abstract class FirDefaultPropertyAccessor( - source: FirSourceElement?, + source: KtSourceElement?, moduleData: FirModuleData, origin: FirDeclarationOrigin, propertyTypeRef: FirTypeRef, @@ -67,7 +70,7 @@ abstract class FirDefaultPropertyAccessor( companion object { fun createGetterOrSetter( - source: FirSourceElement?, + source: KtSourceElement?, moduleData: FirModuleData, origin: FirDeclarationOrigin, propertyTypeRef: FirTypeRef, @@ -89,7 +92,7 @@ abstract class FirDefaultPropertyAccessor( } class FirDefaultPropertyGetter( - source: FirSourceElement?, + source: KtSourceElement?, moduleData: FirModuleData, origin: FirDeclarationOrigin, propertyTypeRef: FirTypeRef, @@ -113,7 +116,7 @@ class FirDefaultPropertyGetter( ) class FirDefaultPropertySetter( - source: FirSourceElement?, + source: KtSourceElement?, moduleData: FirModuleData, origin: FirDeclarationOrigin, propertyTypeRef: FirTypeRef, @@ -130,7 +133,7 @@ class FirDefaultPropertySetter( FirImplicitUnitTypeRef(source), valueParameters = mutableListOf( buildDefaultSetterValueParameter builder@{ - this@builder.source = source?.fakeElement(FirFakeSourceElementKind.DefaultAccessor) + this@builder.source = source?.fakeElement(KtFakeSourceElementKind.DefaultAccessor) this@builder.moduleData = moduleData this@builder.origin = origin this@builder.returnTypeRef = propertyTypeRef diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticProperty.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticProperty.kt index f0cf5577e8d..e6e7af33210 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticProperty.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticProperty.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations.synthetic +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -42,7 +42,7 @@ class FirSyntheticProperty( override val dispatchReceiverType: ConeKotlinType? get() = getter.dispatchReceiverType - override val source: FirSourceElement? + override val source: KtSourceElement? get() = null override val origin: FirDeclarationOrigin diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticPropertyAccessor.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticPropertyAccessor.kt index bebd2b0c8f0..6ab9e33e18e 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticPropertyAccessor.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticPropertyAccessor.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations.synthetic +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData -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.* @@ -26,7 +26,7 @@ class FirSyntheticPropertyAccessor( val delegate: FirSimpleFunction, override val isGetter: Boolean ) : FirPropertyAccessor() { - override val source: FirSourceElement? + override val source: KtSourceElement? get() = delegate.source override val moduleData: FirModuleData diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/utils/declarationAttributes.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/utils/declarationAttributes.kt index 4be9aa6680a..746604e0106 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/utils/declarationAttributes.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/utils/declarationAttributes.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.declarations.utils +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.SourceElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.impl.FirDefaultPropertyBackingField import org.jetbrains.kotlin.fir.declarations.impl.FirDefaultPropertyGetter @@ -30,7 +30,7 @@ var FirRegularClass.moduleName: String? by FirDeclarationDataRegistry.data(Modul /** * Constraint without corresponding type argument */ -data class DanglingTypeConstraint(val name: Name, val source: FirSourceElement) +data class DanglingTypeConstraint(val name: Name, val source: KtSourceElement) var T.danglingTypeConstraints: List? where T : FirDeclaration, T : FirTypeParameterRefsOwner diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/diagnostics/CommonDiagnostics.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/diagnostics/CommonDiagnostics.kt index b4223893555..b4d316470cc 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/diagnostics/CommonDiagnostics.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/diagnostics/CommonDiagnostics.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.diagnostics -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement -class ConeUnexpectedTypeArgumentsError(override val reason: String, val source: FirSourceElement? = null) : ConeDiagnostic +class ConeUnexpectedTypeArgumentsError(override val reason: String, val source: KtSourceElement? = null) : ConeDiagnostic class ConeIntermediateDiagnostic(override val reason: String) : ConeDiagnostic diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/diagnostics/ConeSimpleDiagnostic.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/diagnostics/ConeSimpleDiagnostic.kt index 00676a25e2d..08925a58772 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/diagnostics/ConeSimpleDiagnostic.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/diagnostics/ConeSimpleDiagnostic.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.diagnostics -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.types.ConeKotlinType class ConeSimpleDiagnostic(override val reason: String, val kind: DiagnosticKind = DiagnosticKind.Other) : ConeDiagnostic @@ -14,13 +14,13 @@ class ConeNotAnnotationContainer(val text: String) : ConeDiagnostic { override val reason: String get() = "Strange annotated expression: $text" } -abstract class ConeDiagnosticWithSource(val source: FirSourceElement) : ConeDiagnostic +abstract class ConeDiagnosticWithSource(val source: KtSourceElement) : ConeDiagnostic -class ConeUnderscoreIsReserved(source: FirSourceElement) : ConeDiagnosticWithSource(source) { +class ConeUnderscoreIsReserved(source: KtSourceElement) : ConeDiagnosticWithSource(source) { override val reason: String get() = "Names _, __, ___, ..., are reserved in Kotlin" } -class ConeUnderscoreUsageWithoutBackticks(source: FirSourceElement) : ConeDiagnosticWithSource(source) { +class ConeUnderscoreUsageWithoutBackticks(source: KtSourceElement) : ConeDiagnosticWithSource(source) { override val reason: String get() = "Names _, __, ___, ... can be used only in back-ticks (`_`, `__`, `___`, ...)" } diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirAbstractArgumentList.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirAbstractArgumentList.kt index 9cae4ba6789..d8082d8e52d 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirAbstractArgumentList.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirAbstractArgumentList.kt @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.visitors.FirTransformer import org.jetbrains.kotlin.fir.visitors.FirVisitor diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirArgumentUtil.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirArgumentUtil.kt index 4c952eb3990..deefcdf94b4 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirArgumentUtil.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirArgumentUtil.kt @@ -5,12 +5,12 @@ package org.jetbrains.kotlin.fir.expressions -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.expressions.builder.buildArgumentList import org.jetbrains.kotlin.fir.expressions.impl.FirArraySetArgumentList -import org.jetbrains.kotlin.fir.expressions.impl.FirResolvedArgumentListForErrorCall import org.jetbrains.kotlin.fir.expressions.impl.FirResolvedArgumentList +import org.jetbrains.kotlin.fir.expressions.impl.FirResolvedArgumentListForErrorCall import org.jetbrains.kotlin.fir.expressions.impl.FirResolvedArgumentListImpl fun buildUnaryArgumentList(argument: FirExpression): FirArgumentList = buildArgumentList { @@ -27,7 +27,7 @@ fun buildArraySetArgumentList(rValue: FirExpression, indexes: List, - source: FirSourceElement? = null + source: KtSourceElement? = null ): FirResolvedArgumentList = FirResolvedArgumentListImpl(source, mapping) @@ -45,6 +45,6 @@ object FirEmptyArgumentList : FirAbstractArgumentList() { override val arguments: List get() = emptyList() - override val source: FirSourceElement? + override val source: KtSourceElement? get() = null } 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 4a3a90d3a16..9346fc2b776 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 org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.expressions.builder.buildConstExpression @@ -31,7 +31,7 @@ inline val FirAnnotation.coneClassLikeType: ConeClassLikeType? inline val FirAnnotation.classId: ClassId? get() = coneClassLikeType?.lookupTag?.classId -fun buildConstOrErrorExpression(source: FirSourceElement?, kind: ConstantValueKind, value: T?, diagnostic: ConeDiagnostic): FirExpression = +fun buildConstOrErrorExpression(source: KtSourceElement?, kind: ConstantValueKind, value: T?, diagnostic: ConeDiagnostic): FirExpression = value?.let { buildConstExpression(source, kind, it) } ?: buildErrorExpression { @@ -72,14 +72,14 @@ fun FirReference.toResolvedCallableSymbol(): FirCallableSymbol<*>? { return (this as? FirResolvedNamedReference)?.resolvedSymbol as? FirCallableSymbol<*> } -fun buildErrorLoop(source: FirSourceElement?, diagnostic: ConeDiagnostic): FirErrorLoop { +fun buildErrorLoop(source: KtSourceElement?, diagnostic: ConeDiagnostic): FirErrorLoop { return buildErrorLoop { this.source = source this.diagnostic = diagnostic } } -fun buildErrorExpression(source: FirSourceElement?, diagnostic: ConeDiagnostic): FirErrorExpression { +fun buildErrorExpression(source: KtSourceElement?, diagnostic: ConeDiagnostic): FirErrorExpression { return buildErrorExpression { this.source = source this.diagnostic = diagnostic diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/builder/FirAnnotationArgumentMappingBuilder.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/builder/FirAnnotationArgumentMappingBuilder.kt index 239ed7e0847..2bfb551440f 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/builder/FirAnnotationArgumentMappingBuilder.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/builder/FirAnnotationArgumentMappingBuilder.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.builder -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotationArgumentMapping import org.jetbrains.kotlin.fir.expressions.FirArgumentList @@ -14,14 +14,13 @@ import org.jetbrains.kotlin.fir.expressions.impl.FirAnnotationArgumentMappingImp import org.jetbrains.kotlin.fir.expressions.impl.FirEmptyAnnotationArgumentMapping import org.jetbrains.kotlin.fir.expressions.impl.FirResolvedArgumentList import org.jetbrains.kotlin.name.Name -import kotlin.annotations.jvm.UnderMigration import kotlin.contracts.ExperimentalContracts import kotlin.contracts.InvocationKind import kotlin.contracts.contract @FirBuilderDsl class FirAnnotationArgumentMappingBuilder { - var source: FirSourceElement? = null + var source: KtSourceElement? = null val mapping: MutableMap = mutableMapOf() fun build(): FirAnnotationArgumentMapping { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/builder/FirAnonymousFunctionExpressionBuilder.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/builder/FirAnonymousFunctionExpressionBuilder.kt index eccd36d3fe5..70f3867b18c 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/builder/FirAnonymousFunctionExpressionBuilder.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/builder/FirAnonymousFunctionExpressionBuilder.kt @@ -5,22 +5,21 @@ package org.jetbrains.kotlin.fir.expressions.builder -import kotlin.contracts.* -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.FirAnonymousFunction import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirAnonymousFunctionExpression -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirAnonymousFunctionExpressionImpl import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImpl -import org.jetbrains.kotlin.fir.visitors.* +import kotlin.contracts.ExperimentalContracts +import kotlin.contracts.InvocationKind +import kotlin.contracts.contract @FirBuilderDsl class FirAnonymousFunctionExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null lateinit var anonymousFunction: FirAnonymousFunction override fun build(): FirAnonymousFunctionExpression { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/builder/FirAnonymousObjectExpressionBuilder.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/builder/FirAnonymousObjectExpressionBuilder.kt index 32c800fa759..56ecd3deead 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/builder/FirAnonymousObjectExpressionBuilder.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/builder/FirAnonymousObjectExpressionBuilder.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.builder -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.FirAnonymousObject @@ -19,7 +19,7 @@ import kotlin.contracts.contract @FirBuilderDsl class FirAnonymousObjectExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) lateinit var anonymousObject: FirAnonymousObject diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/builder/FirArgumentListBuilder.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/builder/FirArgumentListBuilder.kt index 5a2da1f36ef..446968a99e0 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/builder/FirArgumentListBuilder.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/builder/FirArgumentListBuilder.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.builder -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -16,7 +16,7 @@ import kotlin.contracts.contract @FirBuilderDsl class FirArgumentListBuilder { - var source: FirSourceElement? = null + var source: KtSourceElement? = null val arguments: MutableList = mutableListOf() fun build(): FirArgumentList { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/builder/FirConstExpressionBuilder.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/builder/FirConstExpressionBuilder.kt index 2d6d7b80b06..0728802442e 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/builder/FirConstExpressionBuilder.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/builder/FirConstExpressionBuilder.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.builder -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirConstExpression import org.jetbrains.kotlin.fir.expressions.impl.FirConstExpressionImpl @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.fir.types.impl.* import org.jetbrains.kotlin.types.ConstantValueKind fun buildConstExpression( - source: FirSourceElement?, + source: KtSourceElement?, kind: ConstantValueKind, value: T, annotations: MutableList = mutableListOf(), diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationArgumentMappingImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationArgumentMappingImpl.kt index a28a2565663..79dfe705474 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationArgumentMappingImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationArgumentMappingImpl.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotationArgumentMapping import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.unwrapArgument @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.Name class FirAnnotationArgumentMappingImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val mapping: Map ) : FirAnnotationArgumentMapping() { override fun acceptChildren(visitor: FirVisitor, data: D) {} @@ -26,7 +26,7 @@ class FirAnnotationArgumentMappingImpl( } object FirEmptyAnnotationArgumentMapping : FirAnnotationArgumentMapping() { - override val source: FirSourceElement? + override val source: KtSourceElement? get() = null override val mapping: Map get() = emptyMap() diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAnonymousFunctionExpressionImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAnonymousFunctionExpressionImpl.kt index 8da15f227d2..fd52a853276 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAnonymousFunctionExpressionImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAnonymousFunctionExpressionImpl.kt @@ -5,16 +5,16 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.declarations.FirAnonymousFunction import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirAnonymousFunctionExpression 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 internal class FirAnonymousFunctionExpressionImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override var anonymousFunction: FirAnonymousFunction ) : FirAnonymousFunctionExpression() { override val typeRef: FirTypeRef diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAnonymousObjectExpressionImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAnonymousObjectExpressionImpl.kt index aa4a7b982ee..32e60c82e4e 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAnonymousObjectExpressionImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAnonymousObjectExpressionImpl.kt @@ -5,12 +5,13 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.declarations.FirAnonymousObject import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirAnonymousObjectExpression 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 /* * This file was generated automatically @@ -18,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirAnonymousObjectExpressionImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override var typeRef: FirTypeRef, override var anonymousObject: FirAnonymousObject, ) : FirAnonymousObjectExpression() { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirArgumentListImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirArgumentListImpl.kt index 654dea80526..3d56a0df1e9 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirArgumentListImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirArgumentListImpl.kt @@ -5,9 +5,8 @@ package org.jetbrains.kotlin.fir.expressions.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirPureAbstractElement -import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.declarations.FirAnonymousFunction import org.jetbrains.kotlin.fir.expressions.FirAnonymousFunctionExpression import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -15,7 +14,7 @@ import org.jetbrains.kotlin.fir.visitors.FirTransformer import org.jetbrains.kotlin.fir.visitors.FirVisitor internal class FirArgumentListImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, override val arguments: MutableList, ) : FirArgumentList() { override fun acceptChildren(visitor: FirVisitor, data: D) { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirArraySetArgumentList.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirArraySetArgumentList.kt index dafcb84a3c3..0826570c907 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirArraySetArgumentList.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirArraySetArgumentList.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAbstractArgumentList import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -16,6 +16,6 @@ class FirArraySetArgumentList internal constructor( override val arguments: List get() = indexes + rValue - override val source: FirSourceElement? + override val source: KtSourceElement? get() = null } 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 a981bac5a26..b06dec9306e 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,9 +5,8 @@ package org.jetbrains.kotlin.fir.expressions.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail -import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirExpressionWithSmartcast @@ -32,7 +31,7 @@ internal class FirExpressionWithSmartcastImpl( assert(originalExpression.typeRef is FirResolvedTypeRef) } - override val source: FirSourceElement? get() = originalExpression.source + override val source: KtSourceElement? get() = originalExpression.source override val annotations: List get() = originalExpression.annotations override val typeArguments: List get() = originalExpression.typeArguments override val explicitReceiver: FirExpression? get() = originalExpression.explicitReceiver @@ -95,6 +94,6 @@ internal class FirExpressionWithSmartcastImpl( override fun replaceTypeRef(newTypeRef: FirTypeRef) {} @FirImplementationDetail - override fun replaceSource(newSource: FirSourceElement?) { + override fun replaceSource(newSource: KtSourceElement?) { } } diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionWithSmartcastToNullImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionWithSmartcastToNullImpl.kt index 642982d38fa..b2770c67296 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionWithSmartcastToNullImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionWithSmartcastToNullImpl.kt @@ -5,9 +5,8 @@ package org.jetbrains.kotlin.fir.expressions.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail -import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirExpressionWithSmartcastToNull @@ -33,7 +32,7 @@ class FirExpressionWithSmartcastToNullImpl( assert(originalExpression.typeRef is FirResolvedTypeRef) } - override val source: FirSourceElement? get() = originalExpression.source + override val source: KtSourceElement? get() = originalExpression.source override val annotations: List get() = originalExpression.annotations override val typeArguments: List get() = originalExpression.typeArguments override val explicitReceiver: FirExpression? get() = originalExpression.explicitReceiver @@ -96,6 +95,6 @@ class FirExpressionWithSmartcastToNullImpl( override fun replaceTypeRef(newTypeRef: FirTypeRef) {} @FirImplementationDetail - override fun replaceSource(newSource: FirSourceElement?) { + override fun replaceSource(newSource: KtSourceElement?) { } } 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 c24f631fd17..16195cd91fd 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,8 +5,7 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.fir.FirPureAbstractElement -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -15,7 +14,7 @@ import org.jetbrains.kotlin.fir.visitors.FirTransformer import org.jetbrains.kotlin.fir.visitors.FirVisitor object FirNoReceiverExpression : FirExpression() { - override val source: FirSourceElement? = null + override val source: KtSourceElement? = 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/FirResolvedArgumentList.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedArgumentList.kt index 0602dea95db..c359cc69faa 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedArgumentList.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedArgumentList.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.expressions.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.expressions.FirAbstractArgumentList import org.jetbrains.kotlin.fir.expressions.FirArgumentList @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.fir.visitors.transformSingle abstract class FirResolvedArgumentList : FirAbstractArgumentList() { - abstract override val source: FirSourceElement? + abstract override val source: KtSourceElement? abstract val mapping: LinkedHashMap override val arguments: List @@ -38,7 +38,7 @@ abstract class FirResolvedArgumentList : FirAbstractArgumentList() { internal class FirResolvedArgumentListImpl( - override val source: FirSourceElement?, + override val source: KtSourceElement?, mapping: LinkedHashMap ) : FirResolvedArgumentList() { @@ -52,7 +52,7 @@ internal class FirResolvedArgumentListImpl( } internal class FirResolvedArgumentListForErrorCall( - override var source: FirSourceElement?, + override var source: KtSourceElement?, private var _mapping: LinkedHashMap ) : FirResolvedArgumentList() { 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 6b5d3b0b6c9..cfdb9b03d4b 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,8 +5,9 @@ package org.jetbrains.kotlin.fir.expressions.impl -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirStatement @@ -16,13 +17,12 @@ import org.jetbrains.kotlin.fir.visitors.FirTransformer import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.fir.visitors.transformInplace import org.jetbrains.kotlin.fir.visitors.transformSingle -import org.jetbrains.kotlin.fir.fakeElement class FirSingleExpressionBlock( var statement: FirStatement ) : FirBlock() { - override val source: FirSourceElement? - get() = statement.source?.fakeElement(FirFakeSourceElementKind.SingleExpressionBlock) + override val source: KtSourceElement? + get() = statement.source?.fakeElement(KtFakeSourceElementKind.SingleExpressionBlock) 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/FirStubStatement.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirStubStatement.kt index da1fb5865f8..c7025719c43 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirStubStatement.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirStubStatement.kt @@ -5,16 +5,16 @@ package org.jetbrains.kotlin.fir.expressions.impl +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirPureAbstractElement -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.visitors.FirTransformer import org.jetbrains.kotlin.fir.visitors.FirVisitor object FirStubStatement : FirPureAbstractElement(), FirStatement { - override val source: FirSourceElement? + override val source: KtSourceElement? get() = null override val annotations: List diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirReferenceForUnresolvedAnnotations.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirReferenceForUnresolvedAnnotations.kt index c96807147f6..871ca68cbb8 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirReferenceForUnresolvedAnnotations.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirReferenceForUnresolvedAnnotations.kt @@ -5,13 +5,13 @@ package org.jetbrains.kotlin.fir.references.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.visitors.FirTransformer import org.jetbrains.kotlin.fir.visitors.FirVisitor object FirReferenceForUnresolvedAnnotations : FirReference() { - override val source: FirSourceElement? + override val source: KtSourceElement? get() = null override fun acceptChildren(visitor: FirVisitor, data: D) {} diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirReferencePlaceholderForResolvedAnnotations.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirReferencePlaceholderForResolvedAnnotations.kt index 1bf48b3b655..5a20f0cfe7e 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirReferencePlaceholderForResolvedAnnotations.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirReferencePlaceholderForResolvedAnnotations.kt @@ -5,13 +5,13 @@ package org.jetbrains.kotlin.fir.references.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.visitors.FirTransformer import org.jetbrains.kotlin.fir.visitors.FirVisitor object FirReferencePlaceholderForResolvedAnnotations : FirReference() { - override val source: FirSourceElement? + override val source: KtSourceElement? get() = null override fun acceptChildren(visitor: FirVisitor, data: D) {} diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/FirBasedSymbol.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/FirBasedSymbol.kt index b38fe26b88d..c17d8cf290b 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/FirBasedSymbol.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/FirBasedSymbol.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.symbols +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirAnnotatedDeclaration import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin @@ -27,7 +27,7 @@ abstract class FirBasedSymbol { val origin: FirDeclarationOrigin get() = fir.origin - val source: FirSourceElement? + val source: KtSourceElement? get() = fir.source val moduleData: FirModuleData diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirQualifierPart.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirQualifierPart.kt index b2e821836e9..32db320579f 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirQualifierPart.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirQualifierPart.kt @@ -5,16 +5,16 @@ package org.jetbrains.kotlin.fir.types -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.name.Name interface FirTypeArgumentList { - val source: FirSourceElement + val source: KtSourceElement val typeArguments: List } interface FirQualifierPart { - val source: FirSourceElement + val source: KtSourceElement val name: Name val typeArgumentList: FirTypeArgumentList } \ No newline at end of file diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/builder/FirUserTypeRefBuilder.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/builder/FirUserTypeRefBuilder.kt index 51a2c93a18a..a8274041aa1 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/builder/FirUserTypeRefBuilder.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/builder/FirUserTypeRefBuilder.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.types.builder -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.types.impl.FirUserTypeRefImpl @FirBuilderDsl open class FirUserTypeRefBuilder : FirAnnotationContainerBuilder { - override var source: FirSourceElement? = null + override var source: KtSourceElement? = null override val annotations: MutableList = mutableListOf() open var isMarkedNullable: Boolean by kotlin.properties.Delegates.notNull() val qualifier: MutableList = mutableListOf() 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 edade9ccc5f..f7b4c6fbba9 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,11 +5,11 @@ package org.jetbrains.kotlin.fir.types.impl +import org.jetbrains.kotlin.KtFakeSourceElementKind +import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirFakeSourceElementKind -import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.name.StandardClassIds import org.jetbrains.kotlin.fir.symbols.impl.ConeClassLikeLookupTagImpl import org.jetbrains.kotlin.fir.types.ConeClassLikeType import org.jetbrains.kotlin.fir.types.ConeTypeProjection @@ -17,11 +17,11 @@ import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.FirTransformer import org.jetbrains.kotlin.fir.visitors.FirVisitor -import org.jetbrains.kotlin.fir.fakeElement import org.jetbrains.kotlin.name.ClassId +import org.jetbrains.kotlin.name.StandardClassIds sealed class FirImplicitBuiltinTypeRef( - override val source: FirSourceElement?, + override val source: KtSourceElement?, val id: ClassId, typeArguments: Array = emptyArray(), isNullable: Boolean = false @@ -46,102 +46,102 @@ sealed class FirImplicitBuiltinTypeRef( } class FirImplicitUnitTypeRef( - source: FirSourceElement? + source: KtSourceElement? ) : FirImplicitBuiltinTypeRef(source, StandardClassIds.Unit) class FirImplicitAnyTypeRef( - source: FirSourceElement? + source: KtSourceElement? ) : FirImplicitBuiltinTypeRef(source, StandardClassIds.Any) class FirImplicitNullableAnyTypeRef( - source: FirSourceElement? + source: KtSourceElement? ) : FirImplicitBuiltinTypeRef(source, StandardClassIds.Any, isNullable = true) class FirImplicitEnumTypeRef( - source: FirSourceElement? + source: KtSourceElement? ) : FirImplicitBuiltinTypeRef(source, StandardClassIds.Enum) class FirImplicitAnnotationTypeRef( - source: FirSourceElement? + source: KtSourceElement? ) : FirImplicitBuiltinTypeRef(source, StandardClassIds.Annotation) class FirImplicitBooleanTypeRef( - source: FirSourceElement? + source: KtSourceElement? ) : FirImplicitBuiltinTypeRef(source, StandardClassIds.Boolean) class FirImplicitByteTypeRef( - source: FirSourceElement? + source: KtSourceElement? ) : FirImplicitBuiltinTypeRef(source, StandardClassIds.Byte) class FirImplicitShortTypeRef( - source: FirSourceElement? + source: KtSourceElement? ) : FirImplicitBuiltinTypeRef(source, StandardClassIds.Short) class FirImplicitIntTypeRef( - source: FirSourceElement? + source: KtSourceElement? ) : FirImplicitBuiltinTypeRef(source, StandardClassIds.Int) class FirImplicitLongTypeRef( - source: FirSourceElement? + source: KtSourceElement? ) : FirImplicitBuiltinTypeRef(source, StandardClassIds.Long) class FirImplicitDoubleTypeRef( - source: FirSourceElement? + source: KtSourceElement? ) : FirImplicitBuiltinTypeRef(source, StandardClassIds.Double) class FirImplicitFloatTypeRef( - source: FirSourceElement? + source: KtSourceElement? ) : FirImplicitBuiltinTypeRef(source, StandardClassIds.Float) class FirImplicitNothingTypeRef( - source: FirSourceElement? + source: KtSourceElement? ) : FirImplicitBuiltinTypeRef(source, StandardClassIds.Nothing) class FirImplicitNullableNothingTypeRef( - source: FirSourceElement? + source: KtSourceElement? ) : FirImplicitBuiltinTypeRef(source, StandardClassIds.Nothing, isNullable = true) class FirImplicitCharTypeRef( - source: FirSourceElement? + source: KtSourceElement? ) : FirImplicitBuiltinTypeRef(source, StandardClassIds.Char) class FirImplicitStringTypeRef( - source: FirSourceElement? + source: KtSourceElement? ) : FirImplicitBuiltinTypeRef(source, StandardClassIds.String) class FirImplicitThrowableTypeRef( - source: FirSourceElement? + source: KtSourceElement? ) : FirImplicitBuiltinTypeRef(source, StandardClassIds.Throwable) class FirImplicitKPropertyTypeRef( - source: FirSourceElement?, + source: KtSourceElement?, typeArgument: ConeTypeProjection ) : FirImplicitBuiltinTypeRef(source, StandardClassIds.KProperty, arrayOf(typeArgument)) class FirImplicitKProperty0TypeRef( - source: FirSourceElement?, + source: KtSourceElement?, propertyTypeArgument: ConeTypeProjection ) : FirImplicitBuiltinTypeRef(source, StandardClassIds.KProperty0, arrayOf(propertyTypeArgument)) class FirImplicitKMutableProperty0TypeRef( - source: FirSourceElement?, + source: KtSourceElement?, propertyTypeArgument: ConeTypeProjection ) : FirImplicitBuiltinTypeRef(source, StandardClassIds.KMutableProperty0, arrayOf(propertyTypeArgument)) class FirImplicitKProperty1TypeRef( - source: FirSourceElement?, + source: KtSourceElement?, receiverTypeArgument: ConeTypeProjection, propertyTypeArgument: ConeTypeProjection ) : FirImplicitBuiltinTypeRef(source, StandardClassIds.KProperty1, arrayOf(receiverTypeArgument, propertyTypeArgument)) class FirImplicitKMutableProperty1TypeRef( - source: FirSourceElement?, + source: KtSourceElement?, receiverTypeArgument: ConeTypeProjection, propertyTypeArgument: ConeTypeProjection ) : FirImplicitBuiltinTypeRef(source, StandardClassIds.KMutableProperty1, arrayOf(receiverTypeArgument, propertyTypeArgument)) class FirImplicitKProperty2TypeRef( - source: FirSourceElement?, + source: KtSourceElement?, dispatchReceiverTypeArgument: ConeTypeProjection, extensionReceiverTypeArgument: ConeTypeProjection, propertyTypeArgument: ConeTypeProjection @@ -151,7 +151,7 @@ class FirImplicitKProperty2TypeRef( ) class FirImplicitKMutableProperty2TypeRef( - source: FirSourceElement?, + source: KtSourceElement?, dispatchReceiverTypeArgument: ConeTypeProjection, extensionReceiverTypeArgument: ConeTypeProjection, propertyTypeArgument: ConeTypeProjection @@ -160,7 +160,7 @@ class FirImplicitKMutableProperty2TypeRef( arrayOf(dispatchReceiverTypeArgument, extensionReceiverTypeArgument, propertyTypeArgument) ) -fun FirImplicitBuiltinTypeRef.withFakeSource(kind: FirFakeSourceElementKind): FirImplicitBuiltinTypeRef { +fun FirImplicitBuiltinTypeRef.withFakeSource(kind: KtFakeSourceElementKind): FirImplicitBuiltinTypeRef { val source = source ?: return this if (source.kind == kind) return this val newSource = source.fakeElement(kind) diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirQualifierPartImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirQualifierPartImpl.kt index 33788b7e4f5..8cf7e6d1030 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirQualifierPartImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirQualifierPartImpl.kt @@ -5,18 +5,18 @@ package org.jetbrains.kotlin.fir.types.impl -import org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.types.FirQualifierPart import org.jetbrains.kotlin.fir.types.FirTypeArgumentList import org.jetbrains.kotlin.fir.types.FirTypeProjection import org.jetbrains.kotlin.name.Name -class FirTypeArgumentListImpl(override val source: FirSourceElement) : FirTypeArgumentList { +class FirTypeArgumentListImpl(override val source: KtSourceElement) : FirTypeArgumentList { override val typeArguments = mutableListOf() } class FirQualifierPartImpl( - override val source: FirSourceElement, + override val source: KtSourceElement, override val name: Name, override val typeArgumentList: FirTypeArgumentList ) : FirQualifierPart \ No newline at end of file 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 9dad5d0a4d3..75c8086e804 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 org.jetbrains.kotlin.fir.FirSourceElement +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.FirQualifierPart import org.jetbrains.kotlin.fir.types.FirTypeProjection @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.fir.visitors.transformInplace class FirUserTypeRefImpl( - override var source: FirSourceElement?, + override var source: KtSourceElement?, override val isMarkedNullable: Boolean, override val qualifier: MutableList, override val annotations: MutableList 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 14c152cf838..5bbc71fda13 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,6 +5,7 @@ package org.jetbrains.kotlin.fir.tree.generator +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.contracts.description.EventOccurrencesRange import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.Modality @@ -20,7 +21,7 @@ import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.types.SmartcastStability import org.jetbrains.kotlin.types.Variance -val sourceElementType = type("fir", "FirSourceElement") +val sourceElementType = type(KtSourceElement::class) val jumpTargetType = type("fir", "FirTarget") val constKindType = type("types", "ConstantValueKind") 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 9169d6e14cb..169841f86e8 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 @@ -122,9 +122,9 @@ abstract class AbstractFirTreeImplementationConfigurator { } fun defaultTypeRefWithSource(typeRefClass: String) { - default("typeRef", "$typeRefClass(source?.fakeElement(FirFakeSourceElementKind.ImplicitTypeRef))") - implementation.arbitraryImportables += ArbitraryImportable("org.jetbrains.kotlin.fir", "FirFakeSourceElementKind") - implementation.arbitraryImportables += ArbitraryImportable("org.jetbrains.kotlin.fir", "fakeElement") + default("typeRef", "$typeRefClass(source?.fakeElement(KtFakeSourceElementKind.ImplicitTypeRef))") + implementation.arbitraryImportables += ArbitraryImportable("org.jetbrains.kotlin", "KtFakeSourceElementKind") + implementation.arbitraryImportables += ArbitraryImportable("org.jetbrains.kotlin", "fakeElement") } fun defaultTrue(field: String, withGetter: Boolean = false) { diff --git a/compiler/frontend.common/src/org/jetbrains/kotlin/KtSourceElement.kt b/compiler/frontend.common/src/org/jetbrains/kotlin/KtSourceElement.kt index bdd27adf9e5..4de516b515d 100644 --- a/compiler/frontend.common/src/org/jetbrains/kotlin/KtSourceElement.kt +++ b/compiler/frontend.common/src/org/jetbrains/kotlin/KtSourceElement.kt @@ -15,59 +15,59 @@ import com.intellij.psi.PsiWhiteSpace import com.intellij.psi.tree.IElementType import com.intellij.util.diff.FlyweightCapableTreeStructure -sealed class FirSourceElementKind +sealed class KtSourceElementKind -object FirRealSourceElementKind : FirSourceElementKind() +object KtRealSourceElementKind : KtSourceElementKind() -sealed class FirFakeSourceElementKind : FirSourceElementKind() { +sealed class KtFakeSourceElementKind : KtSourceElementKind() { // for some fir expression implicit return typeRef is generated // some of them are: break, continue, return, throw, string concat, // destruction parameters, function literals, explicitly boolean expressions - object ImplicitTypeRef : FirFakeSourceElementKind() + object ImplicitTypeRef : KtFakeSourceElementKind() // for each class special class self type ref is created // and have a fake source referencing it - object ClassSelfTypeRef : FirFakeSourceElementKind() + object ClassSelfTypeRef : KtFakeSourceElementKind() // FirErrorTypeRef may be built using unresolved firExpression // and have a fake source referencing it - object ErrorTypeRef : FirFakeSourceElementKind() + object ErrorTypeRef : KtFakeSourceElementKind() // for properties without accessors default getter & setter are generated // they have a fake source which refers to property - object DefaultAccessor : FirFakeSourceElementKind() + object DefaultAccessor : KtFakeSourceElementKind() // for delegated properties, getter & setter calls to the delegate // they have a fake source which refers to the call that creates the delegate - object DelegatedPropertyAccessor : FirFakeSourceElementKind() + object DelegatedPropertyAccessor : KtFakeSourceElementKind() // for kt classes without implicit primary constructor one is generated // with a fake source which refers to containing class - object ImplicitConstructor : FirFakeSourceElementKind() + object ImplicitConstructor : KtFakeSourceElementKind() // for constructors which do not have delegated constructor call the fake one is generated // with a fake sources which refers to the original constructor - object DelegatingConstructorCall : FirFakeSourceElementKind() + object DelegatingConstructorCall : KtFakeSourceElementKind() // for enum entry with bodies the initializer in a form of anonymous object is generated // with a fake sources which refers to the enum entry - object EnumInitializer : FirFakeSourceElementKind() + object EnumInitializer : KtFakeSourceElementKind() // for lambdas with implicit return the return statement is generated which is labeled // with a fake sources which refers to the target expression - object GeneratedLambdaLabel : FirFakeSourceElementKind() + object GeneratedLambdaLabel : KtFakeSourceElementKind() // for lambdas & functions with expression bodies the return statement is added // with a fake sources which refers to the return target - object ImplicitReturn : FirFakeSourceElementKind() + object ImplicitReturn : KtFakeSourceElementKind() // return expression in procedures -> return Unit // with a fake sources which refers to the return statement - object ImplicitUnit : FirFakeSourceElementKind() + object ImplicitUnit : KtFakeSourceElementKind() // delegates are wrapped into FirWrappedDelegateExpression // with a fake sources which refers to delegated expression - object WrappedDelegate : FirFakeSourceElementKind() + object WrappedDelegate : KtFakeSourceElementKind() // `for (i in list) { println(i) }` is converted to // ``` @@ -79,122 +79,122 @@ sealed class FirFakeSourceElementKind : FirSourceElementKind() { // ``` // where the generated WHILE loop has source element of initial FOR loop, // other generated elements are marked as fake ones - object DesugaredForLoop : FirFakeSourceElementKind() + object DesugaredForLoop : KtFakeSourceElementKind() - object ImplicitInvokeCall : FirFakeSourceElementKind() + object ImplicitInvokeCall : KtFakeSourceElementKind() // Consider an atomic qualified access like `i`. In the FIR tree, both the FirQualifiedAccessExpression and its calleeReference uses // `i` as the source. Hence, this fake kind is set on the `calleeReference` to make sure no PSI element is shared by multiple FIR // elements. This also applies to `this` and `super` references. - object ReferenceInAtomicQualifiedAccess : FirFakeSourceElementKind() + object ReferenceInAtomicQualifiedAccess : KtFakeSourceElementKind() // for enum classes we have valueOf & values functions generated // with a fake sources which refers to this the enum class - object EnumGeneratedDeclaration : FirFakeSourceElementKind() + object EnumGeneratedDeclaration : KtFakeSourceElementKind() // when (x) { "abc" -> 42 } --> when(val $subj = x) { $subj == "abc" -> 42 } // where $subj == "42" has fake psi source which refers to "42" as inner expression // and $subj fake source refers to "42" as KtWhenCondition - object WhenCondition : FirFakeSourceElementKind() + object WhenCondition : KtFakeSourceElementKind() // for primary constructor parameter the corresponding class property is generated // with a fake sources which refers to this the corresponding parameter - object PropertyFromParameter : FirFakeSourceElementKind() + object PropertyFromParameter : KtFakeSourceElementKind() // if (true) 1 --> if(true) { 1 } // with a fake sources for the block which refers to the wrapped expression - object SingleExpressionBlock : FirFakeSourceElementKind() + object SingleExpressionBlock : KtFakeSourceElementKind() // x++ -> x = x.inc() // x = x++ -> x = { val = x; x = .inc(); } - object DesugaredIncrementOrDecrement : FirFakeSourceElementKind() + object DesugaredIncrementOrDecrement : KtFakeSourceElementKind() // x !in list --> !(x in list) where ! and !(x in list) will have a fake source - object DesugaredInvertedContains : FirFakeSourceElementKind() + object DesugaredInvertedContains : KtFakeSourceElementKind() // for data classes fir generates componentN() & copy() functions // for componentN() functions the source will refer to the corresponding param and will be marked as a fake one // for copy() functions the source will refer class to the param and will be marked as a fake one - object DataClassGeneratedMembers : FirFakeSourceElementKind() + object DataClassGeneratedMembers : KtFakeSourceElementKind() // (vararg x: Int) --> (x: Array) where array type ref has a fake source kind - object ArrayTypeFromVarargParameter : FirFakeSourceElementKind() + object ArrayTypeFromVarargParameter : KtFakeSourceElementKind() // val (a,b) = x --> val a = x.component1(); val b = x.component2() // where componentN calls will have the fake source elements refer to the corresponding KtDestructuringDeclarationEntry - object DesugaredComponentFunctionCall : FirFakeSourceElementKind() + object DesugaredComponentFunctionCall : KtFakeSourceElementKind() // when smart casts applied to the expression, its wrapped into FirExpressionWithSmartcast // which type reference will have a fake source refer to a original source element of it - object SmartCastedTypeRef : FirFakeSourceElementKind() + object SmartCastedTypeRef : KtFakeSourceElementKind() // for safe call expressions like a?.foo() the FirSafeCallExpression is generated // and it have a fake source - object DesugaredSafeCallExpression : FirFakeSourceElementKind() + object DesugaredSafeCallExpression : KtFakeSourceElementKind() // a += 2 --> a = a + 2 // where a + 2 will have a fake source - object DesugaredCompoundAssignment : FirFakeSourceElementKind() + object DesugaredCompoundAssignment : KtFakeSourceElementKind() // `a > b` will be wrapped in FirComparisonExpression // with real source which points to initial `a > b` expression // and inner FirFunctionCall will refer to a fake source - object GeneratedComparisonExpression : FirFakeSourceElementKind() + object GeneratedComparisonExpression : KtFakeSourceElementKind() // a ?: b --> when(val $subj = a) { .... } // where `val $subj = a` has a fake source - object WhenGeneratedSubject : FirFakeSourceElementKind() + object WhenGeneratedSubject : KtFakeSourceElementKind() // list[0] -> list.get(0) where name reference will have a fake source element - object ArrayAccessNameReference : FirFakeSourceElementKind() + object ArrayAccessNameReference : KtFakeSourceElementKind() // super.foo() --> super.foo() // where `Supertype` has a fake source - object SuperCallImplicitType : FirFakeSourceElementKind() + object SuperCallImplicitType : KtFakeSourceElementKind() // Consider `super.foo()`. The source PSI `Supertype` is referenced by both the qualified access expression // `super` and the calleeExpression `super`. To avoid having two FIR elements sharing the same source, this fake // source is assigned to the qualified access expression. - object SuperCallExplicitType : FirFakeSourceElementKind() + object SuperCallExplicitType : KtFakeSourceElementKind() // fun foo(vararg args: Int) {} // fun bar(1, 2, 3) --> [resolved] fun bar(VarargArgument(1, 2, 3)) - object VarargArgument : FirFakeSourceElementKind() + object VarargArgument : KtFakeSourceElementKind() // Part of desugared x?.y - object CheckedSafeCallSubject : FirFakeSourceElementKind() + object CheckedSafeCallSubject : KtFakeSourceElementKind() // { it + 1} --> { it -> it + 1 } // where `it` parameter declaration has fake source - object ItLambdaParameter : FirFakeSourceElementKind() + object ItLambdaParameter : KtFakeSourceElementKind() // for java annotations implicit constructor is generated // with a fake source which refers to containing class - object ImplicitJavaAnnotationConstructor : FirFakeSourceElementKind() + object ImplicitJavaAnnotationConstructor : KtFakeSourceElementKind() // for java annotations constructor implicit parameters are generated // with a fake source which refers to declared annotation methods - object ImplicitAnnotationAnnotationConstructorParameter : FirFakeSourceElementKind() + object ImplicitAnnotationAnnotationConstructorParameter : KtFakeSourceElementKind() // for the implicit field storing the delegated object for class delegation // with a fake source that refers to the KtExpression that creates the delegate - object ClassDelegationField : FirFakeSourceElementKind() + object ClassDelegationField : KtFakeSourceElementKind() // for annotation moved to another element due to annotation use-site target - object FromUseSiteTarget : FirFakeSourceElementKind() + object FromUseSiteTarget : KtFakeSourceElementKind() // for `@ParameterName` annotation call added to function types with names in the notation // with a fake source that refers to the value parameter in the function type notation // e.g., `(x: Int) -> Unit` becomes `Function1<@ParameterName("x") Int, Unit>` - object ParameterNameAnnotationCall : FirFakeSourceElementKind() + object ParameterNameAnnotationCall : KtFakeSourceElementKind() } -sealed class FirSourceElement { +sealed class KtSourceElement { abstract val elementType: IElementType abstract val startOffset: Int abstract val endOffset: Int - abstract val kind: FirSourceElementKind + abstract val kind: KtSourceElementKind abstract val lighterASTNode: LighterASTNode abstract val treeStructure: FlyweightCapableTreeStructure @@ -207,7 +207,7 @@ sealed class FirSourceElement { // NB: in certain situations, psi.node could be null // Potentially exceptions can be provoked by elementType / lighterASTNode -sealed class FirPsiSourceElement(val psi: PsiElement) : FirSourceElement() { +sealed class KtPsiSourceElement(val psi: PsiElement) : KtSourceElement() { override val elementType: IElementType get() = psi.node.elementType @@ -291,7 +291,7 @@ sealed class FirPsiSourceElement(val psi: PsiElement) : FirSourceElement() { if (this === other) return true if (javaClass != other?.javaClass) return false - other as FirPsiSourceElement + other as KtPsiSourceElement if (psi != other.psi) return false @@ -303,17 +303,17 @@ sealed class FirPsiSourceElement(val psi: PsiElement) : FirSourceElement() { } } -class FirRealPsiSourceElement(psi: PsiElement) : FirPsiSourceElement(psi) { - override val kind: FirSourceElementKind get() = FirRealSourceElementKind +class KtRealPsiSourceElement(psi: PsiElement) : KtPsiSourceElement(psi) { + override val kind: KtSourceElementKind get() = KtRealSourceElementKind } -class FirFakeSourceElement(psi: PsiElement, override val kind: FirFakeSourceElementKind) : FirPsiSourceElement(psi) { +class KtFakeSourceElement(psi: PsiElement, override val kind: KtFakeSourceElementKind) : KtPsiSourceElement(psi) { override fun equals(other: Any?): Boolean { if (this === other) return true if (javaClass != other?.javaClass) return false if (!super.equals(other)) return false - other as FirFakeSourceElement + other as KtFakeSourceElement if (kind != other.kind) return false @@ -327,49 +327,49 @@ class FirFakeSourceElement(psi: PsiElement, override val kind: FirFakeSourceElem } } -fun FirSourceElement.fakeElement(newKind: FirFakeSourceElementKind): FirSourceElement { +fun KtSourceElement.fakeElement(newKind: KtFakeSourceElementKind): KtSourceElement { if (kind == newKind) return this return when (this) { - is FirLightSourceElement -> FirLightSourceElement(lighterASTNode, startOffset, endOffset, treeStructure, newKind) - is FirPsiSourceElement -> FirFakeSourceElement(psi, newKind) + is KtLightSourceElement -> KtLightSourceElement(lighterASTNode, startOffset, endOffset, treeStructure, newKind) + is KtPsiSourceElement -> KtFakeSourceElement(psi, newKind) } } -fun FirSourceElement.realElement(): FirSourceElement = when (this) { - is FirRealPsiSourceElement -> this - is FirLightSourceElement -> FirLightSourceElement(lighterASTNode, startOffset, endOffset, treeStructure, FirRealSourceElementKind) - is FirPsiSourceElement -> FirRealPsiSourceElement(psi) +fun KtSourceElement.realElement(): KtSourceElement = when (this) { + is KtRealPsiSourceElement -> this + is KtLightSourceElement -> KtLightSourceElement(lighterASTNode, startOffset, endOffset, treeStructure, KtRealSourceElementKind) + is KtPsiSourceElement -> KtRealPsiSourceElement(psi) } -class FirLightSourceElement( +class KtLightSourceElement( override val lighterASTNode: LighterASTNode, override val startOffset: Int, override val endOffset: Int, override val treeStructure: FlyweightCapableTreeStructure, - override val kind: FirSourceElementKind = FirRealSourceElementKind, -) : FirSourceElement() { + override val kind: KtSourceElementKind = KtRealSourceElementKind, +) : KtSourceElement() { override val elementType: IElementType get() = lighterASTNode.tokenType /** - * We can create a [FirLightSourceElement] from a [FirPsiSourceElement] by using [FirPsiSourceElement.lighterASTNode]; - * [unwrapToFirPsiSourceElement] allows to get original [FirPsiSourceElement] in such case. + * We can create a [KtLightSourceElement] from a [KtPsiSourceElement] by using [KtPsiSourceElement.lighterASTNode]; + * [unwrapToKtPsiSourceElement] allows to get original [KtPsiSourceElement] in such case. * - * If it is `pure` [FirLightSourceElement], i.e, compiler created it in light tree mode, then return [unwrapToFirPsiSourceElement] `null`. + * If it is `pure` [KtLightSourceElement], i.e, compiler created it in light tree mode, then return [unwrapToKtPsiSourceElement] `null`. * Otherwise, return some not-null result. */ - fun unwrapToFirPsiSourceElement(): FirPsiSourceElement? { - if (treeStructure !is FirPsiSourceElement.WrappedTreeStructure) return null + fun unwrapToKtPsiSourceElement(): KtPsiSourceElement? { + if (treeStructure !is KtPsiSourceElement.WrappedTreeStructure) return null val node = treeStructure.unwrap(lighterASTNode) - return node.psi?.toFirPsiSourceElement(kind) + return node.psi?.toKtPsiSourceElement(kind) } override fun equals(other: Any?): Boolean { if (this === other) return true if (javaClass != other?.javaClass) return false - other as FirLightSourceElement + other as KtLightSourceElement if (lighterASTNode != other.lighterASTNode) return false if (startOffset != other.startOffset) return false @@ -390,25 +390,25 @@ class FirLightSourceElement( } } -val FirSourceElement?.psi: PsiElement? get() = (this as? FirPsiSourceElement)?.psi +val KtSourceElement?.psi: PsiElement? get() = (this as? KtPsiSourceElement)?.psi -val FirSourceElement?.text: CharSequence? +val KtSourceElement?.text: CharSequence? get() = when (this) { - is FirPsiSourceElement -> psi.text - is FirLightSourceElement -> treeStructure.toString(lighterASTNode) + is KtPsiSourceElement -> psi.text + is KtLightSourceElement -> treeStructure.toString(lighterASTNode) else -> null } @Suppress("NOTHING_TO_INLINE") -inline fun PsiElement.toFirPsiSourceElement(kind: FirSourceElementKind = FirRealSourceElementKind): FirPsiSourceElement = when (kind) { - is FirRealSourceElementKind -> FirRealPsiSourceElement(this) - is FirFakeSourceElementKind -> FirFakeSourceElement(this, kind) +inline fun PsiElement.toKtPsiSourceElement(kind: KtSourceElementKind = KtRealSourceElementKind): KtPsiSourceElement = when (kind) { + is KtRealSourceElementKind -> KtRealPsiSourceElement(this) + is KtFakeSourceElementKind -> KtFakeSourceElement(this, kind) } @Suppress("NOTHING_TO_INLINE") -inline fun LighterASTNode.toFirLightSourceElement( +inline fun LighterASTNode.toKtLightSourceElement( tree: FlyweightCapableTreeStructure, - kind: FirSourceElementKind = FirRealSourceElementKind, + kind: KtSourceElementKind = KtRealSourceElementKind, startOffset: Int = this.startOffset, endOffset: Int = this.endOffset -): FirLightSourceElement = FirLightSourceElement(this, startOffset, endOffset, tree, kind) +): KtLightSourceElement = KtLightSourceElement(this, startOffset, endOffset, tree, kind) diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/NoFirCompilationErrorsHandler.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/NoFirCompilationErrorsHandler.kt index 321b5dbf202..b5176fd4c7d 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/NoFirCompilationErrorsHandler.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/NoFirCompilationErrorsHandler.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.test.backend.handlers import org.jetbrains.kotlin.diagnostics.PsiDiagnosticUtils import org.jetbrains.kotlin.diagnostics.Severity import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDefaultErrorMessages -import org.jetbrains.kotlin.fir.psi +import org.jetbrains.kotlin.psi import org.jetbrains.kotlin.test.directives.CodegenTestDirectives import org.jetbrains.kotlin.test.directives.CodegenTestDirectives.IGNORE_FIR_DIAGNOSTICS import org.jetbrains.kotlin.test.directives.model.DirectivesContainer diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirDiagnosticsHandler.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirDiagnosticsHandler.kt index b11666379b9..70b70b81328 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirDiagnosticsHandler.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirDiagnosticsHandler.kt @@ -6,11 +6,11 @@ package org.jetbrains.kotlin.test.frontend.fir.handlers import com.intellij.psi.PsiElement -import org.jetbrains.kotlin.KtNodeTypes +import org.jetbrains.kotlin.* import org.jetbrains.kotlin.checkers.diagnostics.factories.DebugInfoDiagnosticFactory1 import org.jetbrains.kotlin.checkers.utils.TypeOfCall import org.jetbrains.kotlin.diagnostics.rendering.Renderers -import org.jetbrains.kotlin.fir.* +import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.analysis.diagnostics.* import org.jetbrains.kotlin.fir.declarations.FirFile import org.jetbrains.kotlin.fir.declarations.FirFunction @@ -19,8 +19,10 @@ import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirExpressionWithSmartcast import org.jetbrains.kotlin.fir.expressions.FirFunctionCall import org.jetbrains.kotlin.fir.expressions.FirSafeCallExpression +import org.jetbrains.kotlin.fir.psi import org.jetbrains.kotlin.fir.references.FirNamedReference import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference +import org.jetbrains.kotlin.fir.renderForDebugInfo import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.SymbolInternals import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol @@ -50,9 +52,9 @@ import org.jetbrains.kotlin.utils.addIfNotNull class FirDiagnosticsHandler(testServices: TestServices) : FirAnalysisHandler(testServices) { companion object { private val allowedKindsForDebugInfo = setOf( - FirRealSourceElementKind, - FirFakeSourceElementKind.DesugaredCompoundAssignment, - FirFakeSourceElementKind.ReferenceInAtomicQualifiedAccess, + KtRealSourceElementKind, + KtFakeSourceElementKind.DesugaredCompoundAssignment, + KtFakeSourceElementKind.ReferenceInAtomicQualifiedAccess, ) } @@ -130,7 +132,7 @@ class FirDiagnosticsHandler(testServices: TestServices) : FirAnalysisHandler(tes ) { val metaInfos = if (firFile.psi != null) { AnalyzingUtils.getSyntaxErrorRanges(firFile.psi!!).flatMap { - FirErrors.SYNTAX.on(FirRealPsiSourceElement(it), positioningStrategy = null) + FirErrors.SYNTAX.on(KtRealPsiSourceElement(it), positioningStrategy = null) .toMetaInfos(testFile, lightTreeEnabled, lightTreeComparingModeEnabled) } } else { @@ -223,14 +225,14 @@ class FirDiagnosticsHandler(testServices: TestServices) : FirAnalysisHandler(tes Renderers.renderCallInfo(fqName, getTypeOfCall(reference, resolvedSymbol)) } - private fun DebugInfoDiagnosticFactory1.getPositionedElement(sourceElement: FirSourceElement): FirSourceElement { + private fun DebugInfoDiagnosticFactory1.getPositionedElement(sourceElement: KtSourceElement): KtSourceElement { val elementType = sourceElement.elementType return if (this === DebugInfoDiagnosticFactory1.CALL && (elementType == KtNodeTypes.DOT_QUALIFIED_EXPRESSION || elementType == KtNodeTypes.SAFE_ACCESS_EXPRESSION) ) { - if (sourceElement is FirPsiSourceElement) { + if (sourceElement is KtPsiSourceElement) { val psi = (sourceElement.psi as KtQualifiedExpression).selectorExpression - psi?.let { FirRealPsiSourceElement(it) } ?: sourceElement + psi?.let { KtRealPsiSourceElement(it) } ?: sourceElement } else { val tree = sourceElement.treeStructure val selector = tree.selector(sourceElement.lighterASTNode) @@ -239,7 +241,7 @@ class FirDiagnosticsHandler(testServices: TestServices) : FirAnalysisHandler(tes } else { val startDelta = tree.getStartOffset(selector) - tree.getStartOffset(sourceElement.lighterASTNode) val endDelta = tree.getEndOffset(selector) - tree.getEndOffset(sourceElement.lighterASTNode) - FirLightSourceElement( + KtLightSourceElement( selector, sourceElement.startOffset + startDelta, sourceElement.endOffset + endDelta, tree ) } @@ -270,14 +272,14 @@ class FirDiagnosticsHandler(testServices: TestServices) : FirAnalysisHandler(tes val argumentText = argument() val factory = FirDiagnosticFactory1(name, severity, SourceElementPositioningStrategy.DEFAULT, PsiElement::class) return when (positionedElement) { - is FirPsiSourceElement -> FirPsiDiagnosticWithParameters1( + is KtPsiSourceElement -> FirPsiDiagnosticWithParameters1( positionedElement, argumentText, severity, factory, factory.defaultPositioningStrategy ) - is FirLightSourceElement -> FirLightDiagnosticWithParameters1( + is KtLightSourceElement -> FirLightDiagnosticWithParameters1( positionedElement, argumentText, severity, diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/lightTreeDiagnostics.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/lightTreeDiagnostics.kt index 90f2a23e4f7..077bdd22a58 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/lightTreeDiagnostics.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/lightTreeDiagnostics.kt @@ -9,12 +9,12 @@ import com.intellij.lang.LighterASTNode import com.intellij.openapi.util.Ref import com.intellij.psi.TokenType import com.intellij.util.diff.FlyweightCapableTreeStructure +import org.jetbrains.kotlin.KtLightSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirLightSourceElement import org.jetbrains.kotlin.fir.declarations.FirFile -import org.jetbrains.kotlin.fir.toFirLightSourceElement import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.lexer.KtTokens +import org.jetbrains.kotlin.toKtLightSourceElement private typealias Tree = FlyweightCapableTreeStructure @@ -72,12 +72,12 @@ private object FirTreesExtractVisitor : FirVisitor() { } } -internal fun collectLightTreeSyntaxErrors(file: FirFile): List { +internal fun collectLightTreeSyntaxErrors(file: FirFile): List { val state = VisitorState() file.accept(FirTreesExtractVisitor,state) return state.result.flatMap { (tree, offset) -> LightTreeErrorsCollector(tree).collectErrorNodes(tree.root).map { - it.toFirLightSourceElement(tree, startOffset = it.startOffset + offset, endOffset = it.endOffset + offset) + it.toKtLightSourceElement(tree, startOffset = it.startOffset + offset, endOffset = it.endOffset + offset) } } } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticTest.kt index 2dc81af0d57..ccf3c3c1322 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticTest.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir import com.intellij.psi.PsiElement -import org.jetbrains.kotlin.KtNodeTypes +import org.jetbrains.kotlin.* import org.jetbrains.kotlin.checkers.diagnostics.factories.DebugInfoDiagnosticFactory1 import org.jetbrains.kotlin.checkers.utils.TypeOfCall import org.jetbrains.kotlin.diagnostics.rendering.Renderers @@ -62,8 +62,8 @@ abstract class AbstractFirDiagnosticsTest : AbstractFirBaseDiagnosticsTest() { const val DUMP_CFG_DIRECTIVE = "DUMP_CFG" private val allowedKindsForDebugInfo = setOf( - FirRealSourceElementKind, - FirFakeSourceElementKind.DesugaredCompoundAssignment, + KtRealSourceElementKind, + KtFakeSourceElementKind.DesugaredCompoundAssignment, ) val TestFile.withDumpCfgDirective: Boolean @@ -200,7 +200,7 @@ abstract class AbstractFirDiagnosticsTest : AbstractFirBaseDiagnosticsTest() { val sourceElement = element.source ?: return null val sourceKind = sourceElement.kind if (sourceKind !in allowedKindsForDebugInfo) { - if (sourceKind != FirFakeSourceElementKind.ImplicitReturn || sourceElement.elementType != KtNodeTypes.RETURN) { + if (sourceKind != KtFakeSourceElementKind.ImplicitReturn || sourceElement.elementType != KtNodeTypes.RETURN) { return null } } @@ -212,14 +212,14 @@ abstract class AbstractFirDiagnosticsTest : AbstractFirBaseDiagnosticsTest() { val argumentText = argument() return when (sourceElement) { - is FirPsiSourceElement -> FirPsiDiagnosticWithParameters1( + is KtPsiSourceElement -> FirPsiDiagnosticWithParameters1( sourceElement, argumentText, severity, FirDiagnosticFactory1(name, severity, SourceElementPositioningStrategy.DEFAULT, PsiElement::class), SourceElementPositioningStrategy.DEFAULT ) - is FirLightSourceElement -> FirLightDiagnosticWithParameters1( + is KtLightSourceElement -> FirLightDiagnosticWithParameters1( sourceElement, argumentText, severity, 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 c4cf1d21b61..57e45116686 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 @@ -25,6 +25,7 @@ import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.CallableId import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.Name +import org.jetbrains.kotlin.psi import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.getChildOfType import org.jetbrains.kotlin.psi.psiUtil.getChildrenOfType 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 612906033a2..70ef1d2b729 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 @@ -8,8 +8,8 @@ package org.jetbrains.kotlin.compiler.visualizer import com.intellij.psi.PsiElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.expressions.FirCallableReferenceAccess -import org.jetbrains.kotlin.fir.psi import org.jetbrains.kotlin.fir.visitors.FirVisitorVoid +import org.jetbrains.kotlin.psi import org.jetbrains.kotlin.psi.KtCallableReferenceExpression class Psi2FirMapper(val map: MutableMap>) : FirVisitorVoid() { diff --git a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/checkers/PluginErrors.kt b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/checkers/PluginErrors.kt index 32fb3a31099..b2e6ea23c4a 100644 --- a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/checkers/PluginErrors.kt +++ b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/checkers/PluginErrors.kt @@ -6,9 +6,9 @@ package org.jetbrains.kotlin.fir.plugin.checkers import com.intellij.psi.PsiElement -import org.jetbrains.kotlin.fir.analysis.diagnostics.SourceElementPositioningStrategies -import org.jetbrains.kotlin.fir.analysis.diagnostics.error2 -import org.jetbrains.kotlin.fir.analysis.diagnostics.warning1 +import org.jetbrains.kotlin.diagnostics.SourceElementPositioningStrategies +import org.jetbrains.kotlin.diagnostics.error2 +import org.jetbrains.kotlin.diagnostics.warning1 object PluginErrors { val FUNCTION_WITH_DUMMY_NAME by warning1(SourceElementPositioningStrategies.DECLARATION_NAME) diff --git a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/checkers/SignedNumberCallChecker.kt b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/checkers/SignedNumberCallChecker.kt index 343e1a957d5..f888fade5d9 100644 --- a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/checkers/SignedNumberCallChecker.kt +++ b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/checkers/SignedNumberCallChecker.kt @@ -7,9 +7,9 @@ package org.jetbrains.kotlin.fir.plugin.checkers import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.expression.FirFunctionCallChecker -import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter -import org.jetbrains.kotlin.fir.analysis.diagnostics.InternalDiagnosticFactoryMethod -import org.jetbrains.kotlin.fir.analysis.diagnostics.reportOn +import org.jetbrains.kotlin.diagnostics.DiagnosticReporter +import org.jetbrains.kotlin.diagnostics.InternalDiagnosticFactoryMethod +import org.jetbrains.kotlin.diagnostics.reportOn import org.jetbrains.kotlin.fir.analysis.diagnostics.withSuppressedDiagnostics import org.jetbrains.kotlin.fir.expressions.FirFunctionCall import org.jetbrains.kotlin.fir.expressions.argumentMapping