From 39cd1c8504be05eafb3b4f115108c326036ce74d Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Fri, 11 Jun 2021 12:14:24 +0300 Subject: [PATCH] [FIR] Squash `AbstractFirBasedSymbol` with `FirBasedSymbol` --- .../diagnostics/FirDiagnosticsList.kt | 18 +++---- .../fir/analysis/diagnostics/FirErrors.kt | 54 +++++++++---------- .../analysis/cfa/FirCallsEffectAnalyzer.kt | 15 +++--- .../analysis/cfa/FirReturnsImpliesAnalyzer.kt | 6 +-- .../declaration/FirConflictsChecker.kt | 8 +-- .../FirDelegatedPropertyChecker.kt | 6 +-- .../FirInlineDeclarationChecker.kt | 16 +++--- .../declaration/FirSupertypesChecker.kt | 6 +-- .../checkers/expression/FirForLoopChecker.kt | 6 +-- .../diagnostics/FirDiagnosticRenderers.kt | 8 +-- .../jetbrains/kotlin/fir/dump/HtmlFirDump.kt | 3 +- .../kotlin/fir/backend/ConversionUtils.kt | 4 +- .../generators/FakeOverrideGenerator.kt | 6 +-- .../fir/java/FirJavaVisibilityChecker.kt | 4 +- .../kotlin/fir/FirVisibilityChecker.kt | 10 ++-- .../kotlin/fir/resolve/ResolveUtils.kt | 2 +- .../kotlin/fir/resolve/calls/Candidate.kt | 4 +- .../fir/resolve/calls/CandidateFactory.kt | 6 +-- .../calls/FirNamedReferenceWithCandidate.kt | 6 +-- .../kotlin/fir/resolve/calls/FirReceivers.kt | 6 +-- .../resolve/calls/tower/TowerLevelHandler.kt | 7 ++- .../fir/resolve/calls/tower/TowerLevels.kt | 18 +++---- .../fir/resolve/dfa/FirDataFlowAnalyzer.kt | 4 +- .../kotlin/fir/resolve/dfa/VariableStorage.kt | 18 +++---- .../dfa/cfg/ControlFlowGraphBuilder.kt | 4 +- .../jetbrains/kotlin/fir/resolve/dfa/model.kt | 4 +- .../jetbrains/kotlin/fir/resolve/dfa/util.kt | 6 +-- .../fir/resolve/diagnostics/FirDiagnostics.kt | 8 +-- .../resolve/providers/FirSymbolProvider.kt | 2 +- ...rCallCompletionResultsWriterTransformer.kt | 4 +- .../FirPhaseCheckingPhaseManager.kt | 6 +-- .../resolve/transformers/FirPhaseManager.kt | 4 +- .../FirWhenExhaustivenessTransformer.kt | 16 +++--- .../fir/resolve/transformers/PhaseUtils.kt | 6 +-- .../body/resolve/FirArrayOfCallTransformer.kt | 4 +- .../fir/scopes/FakeOverrideTypeCalculator.kt | 4 +- .../scopes/impl/AbstractFirOverrideScope.kt | 6 +-- .../jetbrains/kotlin/fir/types/TypeUtils.kt | 4 +- .../jetbrains/kotlin/fir/FirSymbolOwner.kt | 4 +- .../references/FirBackingFieldReference.kt | 4 +- .../references/FirDelegateFieldReference.kt | 4 +- .../fir/references/FirErrorNamedReference.kt | 4 +- .../fir/references/FirNamedReference.kt | 4 +- .../FirResolvedCallableReference.kt | 6 +-- .../references/FirResolvedNamedReference.kt | 6 +-- .../kotlin/fir/references/FirThisReference.kt | 6 +-- .../FirBackingFieldReferenceBuilder.kt | 4 +- .../FirDelegateFieldReferenceBuilder.kt | 4 +- .../builder/FirErrorNamedReferenceBuilder.kt | 4 +- .../FirExplicitThisReferenceBuilder.kt | 2 +- .../FirImplicitThisReferenceBuilder.kt | 4 +- ...mParameterResolvedNamedReferenceBuilder.kt | 4 +- .../FirResolvedCallableReferenceBuilder.kt | 4 +- .../FirResolvedNamedReferenceBuilder.kt | 4 +- .../builder/FirSimpleNamedReferenceBuilder.kt | 4 +- .../impl/FirBackingFieldReferenceImpl.kt | 4 +- .../impl/FirDelegateFieldReferenceImpl.kt | 4 +- .../impl/FirErrorNamedReferenceImpl.kt | 4 +- .../impl/FirExplicitThisReference.kt | 6 +-- .../impl/FirImplicitThisReference.kt | 6 +-- ...ertyFromParameterResolvedNamedReference.kt | 6 +-- .../impl/FirResolvedCallableReferenceImpl.kt | 6 +-- .../impl/FirResolvedNamedReferenceImpl.kt | 6 +-- .../impl/FirSimpleNamedReference.kt | 4 +- .../org/jetbrains/kotlin/fir/FirRenderer.kt | 6 +-- .../fir/symbols/AbstractFirBasedSymbol.kt | 21 -------- .../kotlin/fir/symbols/FirBasedSymbol.kt | 12 +++-- .../impl/FirAnonymousInitializerSymbol.kt | 6 +-- .../fir/symbols/impl/FirCallableSymbol.kt | 4 +- .../fir/symbols/impl/FirClassifierSymbol.kt | 4 +- .../fir/tree/generator/NodeConfigurator.kt | 8 +-- .../kotlin/fir/tree/generator/Types.kt | 2 +- .../fir/handlers/FirDiagnosticsHandler.kt | 6 +-- .../fir/handlers/FirScopeDumpHandler.kt | 6 +-- .../kotlin/fir/AbstractFirDiagnosticTest.kt | 6 +-- .../compiler/visualizer/FirVisualizer.kt | 8 +-- .../fir/low/level/api/IdeFirPhaseManager.kt | 4 +- .../file/structure/FileStructureElement.kt | 4 +- .../idea/fir/low/level/api/firTestUtils.kt | 6 +-- .../fir/generator/HLDiagnosticConverter.kt | 4 +- ...KtFirSymbolDeclarationOverridesProvider.kt | 4 +- .../diagnostics/KtFirDataClassConverters.kt | 52 +++++++++--------- .../api/fir/symbols/pointers/pointerUtils.kt | 4 +- .../references/FirReferenceResolveHelper.kt | 3 +- 84 files changed, 294 insertions(+), 313 deletions(-) delete mode 100644 compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/AbstractFirBasedSymbol.kt 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 32bd4afbd2e..26d33dafead 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 @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.PrivateForInline import org.jetbrains.kotlin.fir.checkers.generator.diagnostics.model.* import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +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.lexer.KtKeywordToken @@ -405,13 +405,13 @@ object DIAGNOSTICS_LIST : DiagnosticList("FirErrors") { parameter>("candidates") } val ITERATOR_AMBIGUITY by error(PositioningStrategy.REFERENCE_BY_QUALIFIED) { - parameter>>("candidates") + parameter>>("candidates") } val HAS_NEXT_FUNCTION_AMBIGUITY by error(PositioningStrategy.REFERENCE_BY_QUALIFIED) { - parameter>>("candidates") + parameter>>("candidates") } val NEXT_AMBIGUITY by error(PositioningStrategy.REFERENCE_BY_QUALIFIED) { - parameter>>("candidates") + parameter>>("candidates") } } @@ -893,10 +893,10 @@ object DIAGNOSTICS_LIST : DiagnosticList("FirErrors") { val HAS_NEXT_MISSING by error() val NEXT_MISSING by error() val HAS_NEXT_FUNCTION_NONE_APPLICABLE by error { - parameter>>("candidates") + parameter>>("candidates") } val NEXT_NONE_APPLICABLE by error { - parameter>>("candidates") + parameter>>("candidates") } val DELEGATE_SPECIAL_FUNCTION_MISSING by error { parameter("expectedFunctionSignature") @@ -905,11 +905,11 @@ object DIAGNOSTICS_LIST : DiagnosticList("FirErrors") { } val DELEGATE_SPECIAL_FUNCTION_AMBIGUITY by error { parameter("expectedFunctionSignature") - parameter>>("candidates") + parameter>>("candidates") } val DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE by error { parameter("expectedFunctionSignature") - parameter>>("candidates") + parameter>>("candidates") } val DELEGATE_SPECIAL_FUNCTION_RETURN_TYPE_MISMATCH by error { parameter("delegateFunction") @@ -1048,4 +1048,4 @@ private inline fun AbstractDiagnosticGroup.exposedVisib return warning

(positioningStrategy, exposedVisibilityDiagnosticInit) } -typealias Symbol = AbstractFirBasedSymbol<*> +typealias Symbol = FirBasedSymbol<*> 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 628048aee45..4bcf012fcfe 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 @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.fir.declarations.FirRegularClass import org.jetbrains.kotlin.fir.declarations.FirSimpleFunction import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol @@ -108,7 +108,7 @@ object FirErrors { val VAL_OR_VAR_ON_SECONDARY_CONSTRUCTOR_PARAMETER by warning1(SourceElementPositioningStrategies.VAL_OR_VAR_NODE) // Unresolved - val INVISIBLE_REFERENCE by error1>(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED) + val INVISIBLE_REFERENCE by error1>(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED) val UNRESOLVED_REFERENCE by error1(SourceElementPositioningStrategies.REFERENCED_NAME_BY_QUALIFIED) val UNRESOLVED_LABEL by error0() val DESERIALIZATION_ERROR by error0() @@ -257,8 +257,8 @@ object FirErrors { val VALUE_CLASS_CANNOT_BE_CLONEABLE by error0(SourceElementPositioningStrategies.INLINE_OR_VALUE_MODIFIER) // Applicability - val NONE_APPLICABLE by error1>>(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED) - val INAPPLICABLE_CANDIDATE by error1>(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED) + val NONE_APPLICABLE by error1>>(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED) + val INAPPLICABLE_CANDIDATE by error1>(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED) val TYPE_MISMATCH by error2() val THROWABLE_TYPE_MISMATCH by error1() val CONDITION_TYPE_MISMATCH by error1() @@ -278,11 +278,11 @@ object FirErrors { val NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER by error1() // Ambiguity - val OVERLOAD_RESOLUTION_AMBIGUITY by error1>>(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED) - val ASSIGN_OPERATOR_AMBIGUITY by error1>>() - val ITERATOR_AMBIGUITY by error1>>(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED) - val HAS_NEXT_FUNCTION_AMBIGUITY by error1>>(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED) - val NEXT_AMBIGUITY by error1>>(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED) + val OVERLOAD_RESOLUTION_AMBIGUITY by error1>>(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED) + val ASSIGN_OPERATOR_AMBIGUITY by error1>>() + val ITERATOR_AMBIGUITY by error1>>(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED) + val HAS_NEXT_FUNCTION_AMBIGUITY by error1>>(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED) + val NEXT_AMBIGUITY by error1>>(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED) // Types & type parameters val RECURSION_IN_IMPLICIT_TYPES by error0() @@ -360,8 +360,8 @@ object FirErrors { // Redeclarations val MANY_COMPANION_OBJECTS by error0(SourceElementPositioningStrategies.COMPANION_OBJECT) - val CONFLICTING_OVERLOADS by error1>>(SourceElementPositioningStrategies.DECLARATION_SIGNATURE_OR_DEFAULT) - val REDECLARATION by error1>>() + val CONFLICTING_OVERLOADS by error1>>(SourceElementPositioningStrategies.DECLARATION_SIGNATURE_OR_DEFAULT) + val REDECLARATION by error1>>() val METHOD_OF_ANY_IMPLEMENTED_IN_INTERFACE by error0() // Invalid local declarations @@ -435,7 +435,7 @@ object FirErrors { // Destructuring declaration val INITIALIZER_REQUIRED_FOR_DESTRUCTURING_DECLARATION by error0() val COMPONENT_FUNCTION_MISSING by error2() - val COMPONENT_FUNCTION_AMBIGUITY by error2>>() + val COMPONENT_FUNCTION_AMBIGUITY by error2>>() val COMPONENT_FUNCTION_ON_NULLABLE by error1() val COMPONENT_FUNCTION_RETURN_TYPE_MISMATCH by error3() @@ -449,8 +449,8 @@ object FirErrors { val VAL_REASSIGNMENT_VIA_BACKING_FIELD_ERROR by error1() val CAPTURED_VAL_INITIALIZATION by error1() val CAPTURED_MEMBER_VAL_INITIALIZATION by error1() - val WRONG_INVOCATION_KIND by warning3, EventOccurrencesRange, EventOccurrencesRange>() - val LEAKED_IN_PLACE_LAMBDA by error1>() + val WRONG_INVOCATION_KIND by warning3, EventOccurrencesRange, EventOccurrencesRange>() + val LEAKED_IN_PLACE_LAMBDA by error1>() val WRONG_IMPLIES_CONDITION by warning0() // Nullability @@ -491,11 +491,11 @@ object FirErrors { val ITERATOR_MISSING by error0() val HAS_NEXT_MISSING by error0() val NEXT_MISSING by error0() - val HAS_NEXT_FUNCTION_NONE_APPLICABLE by error1>>() - val NEXT_NONE_APPLICABLE by error1>>() + val HAS_NEXT_FUNCTION_NONE_APPLICABLE by error1>>() + val NEXT_NONE_APPLICABLE by error1>>() val DELEGATE_SPECIAL_FUNCTION_MISSING by error3() - val DELEGATE_SPECIAL_FUNCTION_AMBIGUITY by error2>>() - val DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE by error2>>() + val DELEGATE_SPECIAL_FUNCTION_AMBIGUITY by error2>>() + val DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE by error2>>() val DELEGATE_SPECIAL_FUNCTION_RETURN_TYPE_MISMATCH by error3() val UNDERSCORE_IS_RESERVED by error0(SourceElementPositioningStrategies.RESERVED_UNDERSCORE) val UNDERSCORE_USAGE_WITHOUT_BACKTICKS by error0(SourceElementPositioningStrategies.RESERVED_UNDERSCORE) @@ -531,15 +531,15 @@ object FirErrors { val RETURN_IN_FUNCTION_WITH_EXPRESSION_BODY by error0(SourceElementPositioningStrategies.RETURN_WITH_LABEL) // Inline - val USAGE_IS_NOT_INLINABLE by error1>(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED) - val NON_LOCAL_RETURN_NOT_ALLOWED by error1>(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED) - val RECURSION_IN_INLINE by error1>(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED) - val NON_PUBLIC_CALL_FROM_PUBLIC_INLINE by error2, AbstractFirBasedSymbol<*>>(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED) - val PROTECTED_CONSTRUCTOR_CALL_FROM_PUBLIC_INLINE by error2, AbstractFirBasedSymbol<*>>(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED) - val PROTECTED_CALL_FROM_PUBLIC_INLINE_ERROR by error2, AbstractFirBasedSymbol<*>>(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED) - val PROTECTED_CALL_FROM_PUBLIC_INLINE by warning2, AbstractFirBasedSymbol<*>>(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED) - val PRIVATE_CLASS_MEMBER_FROM_INLINE by error2, AbstractFirBasedSymbol<*>>(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED) - val SUPER_CALL_FROM_PUBLIC_INLINE by warning1>(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED) + val USAGE_IS_NOT_INLINABLE by error1>(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED) + val NON_LOCAL_RETURN_NOT_ALLOWED by error1>(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED) + val RECURSION_IN_INLINE by error1>(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED) + val NON_PUBLIC_CALL_FROM_PUBLIC_INLINE by error2, FirBasedSymbol<*>>(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED) + val PROTECTED_CONSTRUCTOR_CALL_FROM_PUBLIC_INLINE by error2, FirBasedSymbol<*>>(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED) + val PROTECTED_CALL_FROM_PUBLIC_INLINE_ERROR by error2, FirBasedSymbol<*>>(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED) + val PROTECTED_CALL_FROM_PUBLIC_INLINE by warning2, FirBasedSymbol<*>>(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED) + val PRIVATE_CLASS_MEMBER_FROM_INLINE by error2, FirBasedSymbol<*>>(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED) + val SUPER_CALL_FROM_PUBLIC_INLINE by warning1>(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED) // Imports val CANNOT_ALL_UNDER_IMPORT_FROM_SINGLETON by error1(SourceElementPositioningStrategies.IMPORT_LAST_NAME) 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 b0cede828f4..531f32ecb37 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 @@ -32,7 +32,6 @@ import org.jetbrains.kotlin.fir.references.FirThisReference import org.jetbrains.kotlin.fir.resolve.dfa.cfg.* import org.jetbrains.kotlin.fir.resolve.inference.isBuiltinFunctionalType import org.jetbrains.kotlin.fir.resolve.isInvoke -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol import org.jetbrains.kotlin.fir.types.ConeKotlinType @@ -50,7 +49,7 @@ object FirCallsEffectAnalyzer : FirControlFlowChecker() { if (function !is FirContractDescriptionOwner) return if (function.contractDescription.coneEffects?.any { it is ConeCallsEffectDeclaration } != true) return - val functionalTypeEffects = mutableMapOf, ConeCallsEffectDeclaration>() + val functionalTypeEffects = mutableMapOf, ConeCallsEffectDeclaration>() function.valueParameters.forEachIndexed { index, parameter -> if (parameter.returnTypeRef.isFunctionalTypeRef(session)) { @@ -66,7 +65,7 @@ object FirCallsEffectAnalyzer : FirControlFlowChecker() { if (functionalTypeEffects.isEmpty()) return - val leakedSymbols = mutableMapOf, MutableList>() + val leakedSymbols = mutableMapOf, MutableList>() graph.traverse( TraverseDirection.Forward, CapturedLambdaFinder(function), @@ -102,7 +101,7 @@ object FirCallsEffectAnalyzer : FirControlFlowChecker() { private fun investigate( info: LambdaInvocationInfo, - symbol: AbstractFirBasedSymbol<*>, + symbol: FirBasedSymbol<*>, requiredRange: EventOccurrencesRange, function: FirContractDescriptionOwner, reporter: DiagnosticReporter, @@ -124,8 +123,8 @@ object FirCallsEffectAnalyzer : FirControlFlowChecker() { } private class IllegalScopeContext( - private val functionalTypeSymbols: Set>, - private val leakedSymbols: MutableMap, MutableList>, + private val functionalTypeSymbols: Set>, + private val leakedSymbols: MutableMap, MutableList>, ) { private var scopeDepth: Int = 0 private var illegalScopeDepth: Int? = null @@ -237,7 +236,7 @@ object FirCallsEffectAnalyzer : FirControlFlowChecker() { } private class InvocationDataCollector( - val functionalTypeSymbols: Set> + val functionalTypeSymbols: Set> ) : ControlFlowGraphVisitor>>() { override fun visitNode( @@ -334,7 +333,7 @@ object FirCallsEffectAnalyzer : FirControlFlowChecker() { private fun FirExpression?.toQualifiedReference(): FirReference? = (this as? FirQualifiedAccess)?.calleeReference - private fun referenceToSymbol(reference: FirReference?): AbstractFirBasedSymbol<*>? = when (reference) { + private fun referenceToSymbol(reference: FirReference?): FirBasedSymbol<*>? = when (reference) { is FirResolvedNamedReference -> reference.resolvedSymbol is FirThisReference -> reference.boundSymbol else -> null diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/cfa/FirReturnsImpliesAnalyzer.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/cfa/FirReturnsImpliesAnalyzer.kt index d92b1fbe00b..36ed41ec604 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/cfa/FirReturnsImpliesAnalyzer.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/cfa/FirReturnsImpliesAnalyzer.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.fir.resolve.dfa.cfg.BlockExitNode import org.jetbrains.kotlin.fir.resolve.dfa.cfg.CFGNode import org.jetbrains.kotlin.fir.resolve.dfa.cfg.ControlFlowGraph import org.jetbrains.kotlin.fir.resolve.dfa.cfg.JumpNode -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirPropertyAccessorSymbol import org.jetbrains.kotlin.fir.typeContext import org.jetbrains.kotlin.fir.types.* @@ -216,7 +216,7 @@ object FirReturnsImpliesAnalyzer : FirControlFlowChecker() { private val CheckerContext.containingProperty: FirProperty? get() = (containingDeclarations.asReversed().firstOrNull { it is FirProperty } as? FirProperty) - private fun FirFunction<*>.getParameterType(symbol: AbstractFirBasedSymbol<*>, context: CheckerContext): ConeKotlinType? { + private fun FirFunction<*>.getParameterType(symbol: FirBasedSymbol<*>, context: CheckerContext): ConeKotlinType? { val typeRef = if (this.symbol == symbol) { if (symbol is FirPropertyAccessorSymbol) { context.containingProperty?.receiverTypeRef @@ -229,7 +229,7 @@ object FirReturnsImpliesAnalyzer : FirControlFlowChecker() { return typeRef?.coneType } - private fun FirFunction<*>.getParameterSymbol(index: Int, context: CheckerContext): AbstractFirBasedSymbol<*> { + private fun FirFunction<*>.getParameterSymbol(index: Int, context: CheckerContext): FirBasedSymbol<*> { return if (index == -1) { if (symbol !is FirPropertyAccessorSymbol) { symbol 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 aec27a34260..f08516c190f 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 @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.resolve.firProvider import org.jetbrains.kotlin.fir.scopes.PACKAGE_MEMBER import org.jetbrains.kotlin.fir.scopes.impl.FirPackageMemberScope -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol import org.jetbrains.kotlin.fir.visitors.FirVisitorVoid @@ -28,7 +28,7 @@ object FirConflictsChecker : FirBasicDeclarationChecker() { private class DeclarationInspector : FirDeclarationInspector() { - val declarationConflictingSymbols: HashMap>> = hashMapOf() + val declarationConflictingSymbols: HashMap>> = hashMapOf() override fun collectNonFunctionDeclaration(key: String, declaration: FirDeclaration): MutableList = super.collectNonFunctionDeclaration(key, declaration).also { @@ -41,7 +41,7 @@ object FirConflictsChecker : FirBasicDeclarationChecker() { } private fun collectLocalConflicts(declaration: FirDeclaration, conflicting: List) { - val localConflicts = SmartSet.create>() + val localConflicts = SmartSet.create>() for (otherDeclaration in conflicting) { if (otherDeclaration is FirSymbolOwner<*>) { if (otherDeclaration != declaration && declaration is FirSymbolOwner<*> && @@ -75,7 +75,7 @@ object FirConflictsChecker : FirBasicDeclarationChecker() { declaration: FirDeclaration, declarationPresentation: String, containingFile: FirFile, - conflictingSymbol: AbstractFirBasedSymbol<*>, + conflictingSymbol: FirBasedSymbol<*>, conflictingPresentation: String?, conflictingFile: FirFile?, session: FirSession 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 4038604ad39..e2e8a0040ba 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 @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.references.FirErrorNamedReference import org.jetbrains.kotlin.fir.resolve.diagnostics.ConeAmbiguityError import org.jetbrains.kotlin.fir.resolve.diagnostics.ConeInapplicableCandidateError import org.jetbrains.kotlin.fir.resolve.diagnostics.ConeUnresolvedNameError -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.typeContext import org.jetbrains.kotlin.fir.types.ConeKotlinErrorType import org.jetbrains.kotlin.fir.types.coneType @@ -65,7 +65,7 @@ object FirDelegatedPropertyChecker : FirPropertyChecker() { fun reportInapplicableDiagnostics( candidateApplicability: CandidateApplicability, - candidates: Collection> + candidates: Collection> ) { if (candidateApplicability == CandidateApplicability.INAPPLICABLE_WRONG_RECEIVER) { reporter.reportOn( @@ -141,4 +141,4 @@ object FirDelegatedPropertyChecker : FirPropertyChecker() { declaration.getter?.body?.acceptChildren(DelegatedPropertyAccessorVisitor(true)) declaration.setter?.body?.acceptChildren(DelegatedPropertyAccessorVisitor(false)) } -} \ No newline at end of file +} 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 53e1ff61a17..118c693915b 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 @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.resolve.inference.isBuiltinFunctionalType import org.jetbrains.kotlin.fir.resolve.inference.isFunctionalType import org.jetbrains.kotlin.fir.resolve.toSymbol import org.jetbrains.kotlin.fir.resolve.transformers.publishedApiEffectiveVisibility -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol import org.jetbrains.kotlin.fir.symbols.impl.FirVariableSymbol @@ -103,7 +103,7 @@ object FirInlineDeclarationChecker : FirMemberDeclarationChecker() { private fun checkReceiversOfQualifiedAccessExpression( qualifiedAccessExpression: FirQualifiedAccessExpression, - targetSymbol: AbstractFirBasedSymbol<*>?, + targetSymbol: FirBasedSymbol<*>?, context: CheckerContext ) { checkReceiver(qualifiedAccessExpression, qualifiedAccessExpression.dispatchReceiver, targetSymbol, context) @@ -112,7 +112,7 @@ object FirInlineDeclarationChecker : FirMemberDeclarationChecker() { private fun checkArgumentsOfCall( functionCall: FirFunctionCall, - targetSymbol: AbstractFirBasedSymbol<*>?, + targetSymbol: FirBasedSymbol<*>?, context: CheckerContext ) { val calledFunction = (targetSymbol as? FirNamedFunctionSymbol)?.fir ?: return @@ -140,7 +140,7 @@ object FirInlineDeclarationChecker : FirMemberDeclarationChecker() { private fun checkReceiver( qualifiedAccessExpression: FirQualifiedAccessExpression, receiverExpression: FirExpression, - targetSymbol: AbstractFirBasedSymbol<*>?, + targetSymbol: FirBasedSymbol<*>?, context: CheckerContext ) { val receiverSymbol = receiverExpression.toResolvedCallableSymbol() ?: return @@ -157,7 +157,7 @@ object FirInlineDeclarationChecker : FirMemberDeclarationChecker() { } } - private fun isInvokeOrInlineExtension(targetSymbol: AbstractFirBasedSymbol<*>?): Boolean { + private fun isInvokeOrInlineExtension(targetSymbol: FirBasedSymbol<*>?): Boolean { if (targetSymbol !is FirNamedFunctionSymbol) return false val function = targetSymbol.fir if (function.isInline) return true @@ -167,7 +167,7 @@ object FirInlineDeclarationChecker : FirMemberDeclarationChecker() { private fun checkQualifiedAccess( qualifiedAccess: FirQualifiedAccess, - targetSymbol: AbstractFirBasedSymbol<*>?, + targetSymbol: FirBasedSymbol<*>?, context: CheckerContext ) { val source = qualifiedAccess.source ?: return @@ -280,7 +280,7 @@ object FirInlineDeclarationChecker : FirMemberDeclarationChecker() { } } - private fun AbstractFirBasedSymbol<*>.isDefinedInInlineFunction(): Boolean { + private fun FirBasedSymbol<*>.isDefinedInInlineFunction(): Boolean { return when (val fir = this.fir) { is FirAnonymousFunction -> true is FirMemberDeclaration -> fir.isLocalMember @@ -291,7 +291,7 @@ object FirInlineDeclarationChecker : FirMemberDeclarationChecker() { } private fun checkRecursion( - targetSymbol: AbstractFirBasedSymbol<*>, + targetSymbol: FirBasedSymbol<*>, source: FirSourceElement, context: CheckerContext ) { diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirSupertypesChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirSupertypesChecker.kt index 7863fc30b65..c69cd465732 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirSupertypesChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirSupertypesChecker.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.withSuppressedDiagnostics import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.resolve.fullyExpandedType import org.jetbrains.kotlin.fir.resolve.toSymbol -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol import org.jetbrains.kotlin.fir.types.* import org.jetbrains.kotlin.name.StandardClassIds @@ -110,7 +110,7 @@ object FirSupertypesChecker : FirClassChecker() { } private fun checkClassCannotBeExtendedDirectly( - symbol: AbstractFirBasedSymbol<*>?, + symbol: FirBasedSymbol<*>?, reporter: DiagnosticReporter, superTypeRef: FirTypeRef, context: CheckerContext @@ -139,7 +139,7 @@ object FirSupertypesChecker : FirClassChecker() { } private fun checkExpandedTypeCannotBeInherited( - symbol: AbstractFirBasedSymbol<*>?, + symbol: FirBasedSymbol<*>?, fullyExpandedType: ConeKotlinType, reporter: DiagnosticReporter, superTypeRef: FirTypeRef, 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 49cfa83ccb9..28ae70a2152 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 @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.fir.resolve.calls.UnsafeCall import org.jetbrains.kotlin.fir.resolve.diagnostics.ConeAmbiguityError import org.jetbrains.kotlin.fir.resolve.diagnostics.ConeInapplicableCandidateError import org.jetbrains.kotlin.fir.resolve.diagnostics.ConeUnresolvedNameError -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol import org.jetbrains.kotlin.resolve.calls.tower.isSuccess @@ -93,9 +93,9 @@ object FirForLoopChecker : FirBlockChecker() { reporter: DiagnosticReporter, reportSource: FirSourceElement?, context: CheckerContext, - ambiguityFactory: FirDiagnosticFactory1>>, + ambiguityFactory: FirDiagnosticFactory1>>, missingFactory: FirDiagnosticFactory0, - noneApplicableFactory: FirDiagnosticFactory1>>? = null, + noneApplicableFactory: FirDiagnosticFactory1>>? = null, unsafeCallFactory: FirDiagnosticFactory0? = null, ): Boolean { when (val calleeReference = call.calleeReference) { diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticRenderers.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticRenderers.kt index 9eac0190297..7a56da36b95 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticRenderers.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticRenderers.kt @@ -12,7 +12,7 @@ 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.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.fir.types.render object FirDiagnosticRenderers { val NULLABLE_STRING = Renderer { it ?: "null" } - val SYMBOL = Renderer { symbol: AbstractFirBasedSymbol<*> -> + val SYMBOL = Renderer { symbol: FirBasedSymbol<*> -> when (symbol) { is FirClassLikeSymbol<*> -> symbol.classId.asString() is FirCallableSymbol<*> -> symbol.callableId.toString() @@ -32,7 +32,7 @@ object FirDiagnosticRenderers { } } - val SYMBOLS = Renderer { symbols: Collection> -> + val SYMBOLS = Renderer { symbols: Collection> -> symbols.joinToString(prefix = "[", postfix = "]", separator = ", ", limit = 3, truncated = "...") { symbol -> SYMBOL.render(symbol) } @@ -97,7 +97,7 @@ object FirDiagnosticRenderers { element.render(mode = FirRenderer.RenderMode.WithFqNamesExceptAnnotationAndBody) } - val AMBIGUOUS_CALLS = Renderer { candidates: Collection> -> + val AMBIGUOUS_CALLS = Renderer { candidates: Collection> -> candidates.joinToString(separator = "\n", prefix = "\n") { symbol -> SYMBOL.render(symbol) } diff --git a/compiler/fir/dump/src/org/jetbrains/kotlin/fir/dump/HtmlFirDump.kt b/compiler/fir/dump/src/org/jetbrains/kotlin/fir/dump/HtmlFirDump.kt index fb01e930457..717a4101f94 100644 --- a/compiler/fir/dump/src/org/jetbrains/kotlin/fir/dump/HtmlFirDump.kt +++ b/compiler/fir/dump/src/org/jetbrains/kotlin/fir/dump/HtmlFirDump.kt @@ -28,7 +28,6 @@ import org.jetbrains.kotlin.fir.resolve.diagnostics.ConeInapplicableCandidateErr import org.jetbrains.kotlin.fir.resolve.directExpansionType import org.jetbrains.kotlin.fir.resolve.fullyExpandedType import org.jetbrains.kotlin.fir.resolve.toSymbol -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol @@ -1631,7 +1630,7 @@ class HtmlFirDump internal constructor(private var linkResolver: FirLinkResolver } } - private fun FlowContent.symbolAnchor(symbol: AbstractFirBasedSymbol<*>, body: FlowContent.() -> Unit) { + private fun FlowContent.symbolAnchor(symbol: FirBasedSymbol<*>, body: FlowContent.() -> Unit) { span(classes = "declaration") { id = linkResolver.symbolSignature(symbol) body() diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt index 61b7e19eb52..5993da8d4c8 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.fir.resolve.calls.originalConstructorIfTypeAlias import org.jetbrains.kotlin.fir.resolve.providers.FirProvider import org.jetbrains.kotlin.fir.scopes.* import org.jetbrains.kotlin.fir.scopes.impl.delegatedWrapperData -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.AccessorSymbol import org.jetbrains.kotlin.fir.symbols.impl.* import org.jetbrains.kotlin.fir.types.* @@ -140,7 +140,7 @@ fun FirClassifierSymbol<*>.toSymbol( } } -private fun AbstractFirBasedSymbol<*>.toSymbolForCall( +private fun FirBasedSymbol<*>.toSymbolForCall( session: FirSession, classifierStorage: Fir2IrClassifierStorage, declarationStorage: Fir2IrDeclarationStorage, diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/FakeOverrideGenerator.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/FakeOverrideGenerator.kt index adfc1a64924..d9742b60a0f 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/FakeOverrideGenerator.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/FakeOverrideGenerator.kt @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.fir.resolve.toSymbol import org.jetbrains.kotlin.fir.scopes.* import org.jetbrains.kotlin.fir.scopes.impl.FirFakeOverrideGenerator import org.jetbrains.kotlin.fir.scopes.impl.delegatedWrapperData -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.ConeClassLikeLookupTag import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol @@ -98,7 +98,7 @@ class FakeOverrideGenerator( name: Name, firClass: FirClass<*>, result: MutableList, - realDeclarationSymbols: Set> + realDeclarationSymbols: Set> ) { val isLocal = firClass !is FirRegularClass || firClass.isLocal useSiteMemberScope.processFunctionsByName(name) { functionSymbol -> @@ -181,7 +181,7 @@ class FakeOverrideGenerator( baseSymbols: MutableMap>, result: MutableList, containsErrorTypes: (I) -> Boolean, - realDeclarationSymbols: Set>, + realDeclarationSymbols: Set>, computeDirectOverridden: FirTypeScope.(S) -> List, scope: FirTypeScope, ) { diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaVisibilityChecker.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaVisibilityChecker.kt index 30e9a392e2b..a2943697f1c 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaVisibilityChecker.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaVisibilityChecker.kt @@ -14,13 +14,13 @@ import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirFile import org.jetbrains.kotlin.fir.getOwnerId import org.jetbrains.kotlin.fir.resolve.calls.ReceiverValue -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol @NoMutableState object FirJavaVisibilityChecker : FirVisibilityChecker() { override fun platformVisibilityCheck( declarationVisibility: Visibility, - symbol: AbstractFirBasedSymbol<*>, + symbol: FirBasedSymbol<*>, useSiteFile: FirFile, containingDeclarations: List, dispatchReceiver: ReceiverValue?, diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirVisibilityChecker.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirVisibilityChecker.kt index 20a0d4a3a4b..eecd6b8b20a 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirVisibilityChecker.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirVisibilityChecker.kt @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.fir.resolve.firProvider import org.jetbrains.kotlin.fir.resolve.fullyExpandedType import org.jetbrains.kotlin.fir.resolve.lookupSuperTypes import org.jetbrains.kotlin.fir.resolve.symbolProvider -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol @@ -32,7 +32,7 @@ abstract class FirVisibilityChecker : FirSessionComponent { object Default : FirVisibilityChecker() { override fun platformVisibilityCheck( declarationVisibility: Visibility, - symbol: AbstractFirBasedSymbol<*>, + symbol: FirBasedSymbol<*>, useSiteFile: FirFile, containingDeclarations: List, dispatchReceiver: ReceiverValue?, @@ -122,7 +122,7 @@ abstract class FirVisibilityChecker : FirSessionComponent { protected abstract fun platformVisibilityCheck( declarationVisibility: Visibility, - symbol: AbstractFirBasedSymbol<*>, + symbol: FirBasedSymbol<*>, useSiteFile: FirFile, containingDeclarations: List, dispatchReceiver: ReceiverValue?, @@ -210,7 +210,7 @@ abstract class FirVisibilityChecker : FirSessionComponent { return false } - protected fun AbstractFirBasedSymbol<*>.packageFqName(): FqName { + protected fun FirBasedSymbol<*>.packageFqName(): FqName { return when (this) { is FirClassLikeSymbol<*> -> classId.packageFqName is FirCallableSymbol<*> -> callableId.packageName @@ -222,7 +222,7 @@ abstract class FirVisibilityChecker : FirSessionComponent { val FirSession.moduleVisibilityChecker: FirModuleVisibilityChecker? by FirSession.nullableSessionComponentAccessor() val FirSession.visibilityChecker: FirVisibilityChecker by FirSession.sessionComponentAccessor() -fun AbstractFirBasedSymbol<*>.getOwnerId(): ClassId? { +fun FirBasedSymbol<*>.getOwnerId(): ClassId? { return when (this) { is FirClassLikeSymbol<*> -> { val ownerId = classId.outerClassId 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 5a2115ab121..f2930efa28c 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 @@ -220,7 +220,7 @@ fun BodyResolveComponents.typeFromCallee(access: T): FirReso } } -private fun BodyResolveComponents.typeFromSymbol(symbol: AbstractFirBasedSymbol<*>, makeNullable: Boolean): FirResolvedTypeRef { +private fun BodyResolveComponents.typeFromSymbol(symbol: FirBasedSymbol<*>, makeNullable: Boolean): FirResolvedTypeRef { return when (symbol) { is FirCallableSymbol<*> -> { val returnTypeRef = returnTypeCalculator.tryCalculateReturnType(symbol.fir) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Candidate.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Candidate.kt index bf418f9f6fb..f1725de1062 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Candidate.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Candidate.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.resolve.inference.InferenceComponents import org.jetbrains.kotlin.fir.resolve.inference.PostponedResolvedAtom import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutor import org.jetbrains.kotlin.fir.scopes.FirScope -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.ConeTypeVariable import org.jetbrains.kotlin.fir.types.FirTypeProjection @@ -77,7 +77,7 @@ data class CallInfo( } class Candidate( - val symbol: AbstractFirBasedSymbol<*>, + val symbol: FirBasedSymbol<*>, val dispatchReceiverValue: ReceiverValue?, val extensionReceiverValue: ReceiverValue?, val explicitReceiverKind: ExplicitReceiverKind, diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CandidateFactory.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CandidateFactory.kt index 697d61aaaea..55acba6bf77 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CandidateFactory.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CandidateFactory.kt @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.expressions.* import org.jetbrains.kotlin.fir.moduleData import org.jetbrains.kotlin.fir.returnExpressions import org.jetbrains.kotlin.fir.scopes.FirScope -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirErrorFunctionSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirErrorPropertySymbol import org.jetbrains.kotlin.fir.types.classId @@ -44,7 +44,7 @@ class CandidateFactory private constructor( fun createCandidate( callInfo: CallInfo, - symbol: AbstractFirBasedSymbol<*>, + symbol: FirBasedSymbol<*>, explicitReceiverKind: ExplicitReceiverKind, scope: FirScope?, dispatchReceiverValue: ReceiverValue? = null, @@ -75,7 +75,7 @@ class CandidateFactory private constructor( } fun createErrorCandidate(callInfo: CallInfo, diagnostic: ConeDiagnostic): Candidate { - val symbol: AbstractFirBasedSymbol<*> = when (callInfo.callKind) { + val symbol: FirBasedSymbol<*> = when (callInfo.callKind) { is CallKind.VariableAccess -> createErrorPropertySymbol(diagnostic) is CallKind.Function, is CallKind.DelegatingConstructorCall, 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 14ee41fa03d..56d8515a410 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 @@ -9,7 +9,7 @@ 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.impl.FirSimpleNamedReference -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.name.Name @OptIn(FirImplementationDetail::class) @@ -18,7 +18,7 @@ open class FirNamedReferenceWithCandidate( name: Name, val candidate: Candidate ) : FirSimpleNamedReference(source, name, candidate.symbol) { - override val candidateSymbol: AbstractFirBasedSymbol<*> + override val candidateSymbol: FirBasedSymbol<*> get() = candidate.symbol open val isError: Boolean get() = false @@ -31,4 +31,4 @@ class FirErrorReferenceWithCandidate( val diagnostic: ConeDiagnostic ) : FirNamedReferenceWithCandidate(source, name, candidate) { override val isError: Boolean get() = true -} \ No newline at end of file +} diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/FirReceivers.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/FirReceivers.kt index ac21f72d6ec..a1b666ff181 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/FirReceivers.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/FirReceivers.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.resolve.smartcastScope import org.jetbrains.kotlin.fir.resolvedTypeFromPrototype import org.jetbrains.kotlin.fir.scopes.FakeOverrideTypeCalculator import org.jetbrains.kotlin.fir.scopes.FirTypeScope -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol import org.jetbrains.kotlin.fir.types.ConeKotlinErrorType @@ -65,7 +65,7 @@ class ExpressionReceiverValue( ?: type.scope(useSiteSession, scopeSession, FakeOverrideTypeCalculator.DoNothing) } -sealed class ImplicitReceiverValue>( +sealed class ImplicitReceiverValue>( val boundSymbol: S, type: ConeKotlinType, protected val useSiteSession: FirSession, @@ -105,7 +105,7 @@ sealed class ImplicitReceiverValue>( } } -private fun receiverExpression(symbol: AbstractFirBasedSymbol<*>, type: ConeKotlinType): FirThisReceiverExpression = +private fun receiverExpression(symbol: FirBasedSymbol<*>, type: ConeKotlinType): FirThisReceiverExpression = buildThisReceiverExpression { // NB: we can't use `symbol.fir.source` as the source of `this` receiver. For instance, if this is an implicit receiver for a class, // the entire class itself will be set as a source. If combined with an implicit type operation, a certain assertion, like null diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/TowerLevelHandler.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/TowerLevelHandler.kt index a4fc646ab61..67fbe722a04 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/TowerLevelHandler.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/TowerLevelHandler.kt @@ -7,8 +7,7 @@ package org.jetbrains.kotlin.fir.resolve.calls.tower import org.jetbrains.kotlin.fir.resolve.calls.* import org.jetbrains.kotlin.fir.scopes.FirScope -import org.jetbrains.kotlin.fir.scopes.ProcessorAction -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind @@ -71,9 +70,9 @@ private class TowerScopeLevelProcessor( val resultCollector: CandidateCollector, val candidateFactory: CandidateFactory, val group: TowerGroup -) : TowerScopeLevel.TowerScopeLevelProcessor> { +) : TowerScopeLevel.TowerScopeLevelProcessor> { override fun consumeCandidate( - symbol: AbstractFirBasedSymbol<*>, + symbol: FirBasedSymbol<*>, dispatchReceiverValue: ReceiverValue?, extensionReceiverValue: ReceiverValue?, scope: FirScope, diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/TowerLevels.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/TowerLevels.kt index 07f1ca0b704..8eca3d56bb9 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/TowerLevels.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/TowerLevels.kt @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.scopes.FirScope import org.jetbrains.kotlin.fir.scopes.impl.FirDefaultStarImportingScope import org.jetbrains.kotlin.fir.scopes.impl.importedFromObjectData import org.jetbrains.kotlin.fir.scopes.processClassifiersByName -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.* import org.jetbrains.kotlin.fir.types.* import org.jetbrains.kotlin.types.AbstractTypeChecker @@ -34,19 +34,19 @@ enum class ProcessResult { abstract class TowerScopeLevel { - sealed class Token> { + sealed class Token> { object Properties : Token>() object Functions : Token>() - object Objects : Token>() + object Objects : Token>() } abstract fun processFunctionsByName(info: CallInfo, processor: TowerScopeLevelProcessor>): ProcessResult abstract fun processPropertiesByName(info: CallInfo, processor: TowerScopeLevelProcessor>): ProcessResult - abstract fun processObjectsByName(info: CallInfo, processor: TowerScopeLevelProcessor>): ProcessResult + abstract fun processObjectsByName(info: CallInfo, processor: TowerScopeLevelProcessor>): ProcessResult - interface TowerScopeLevelProcessor> { + interface TowerScopeLevelProcessor> { fun consumeCandidate( symbol: T, dispatchReceiverValue: ReceiverValue?, @@ -79,7 +79,7 @@ class MemberScopeTowerLevel( private val implicitExtensionInvokeMode: Boolean = false, private val scopeSession: ScopeSession ) : SessionBasedTowerLevel(session) { - private fun > processMembers( + private fun > processMembers( output: TowerScopeLevelProcessor, processScopeMembers: FirScope.(processor: (T) -> Unit) -> Unit ): ProcessResult { @@ -169,7 +169,7 @@ class MemberScopeTowerLevel( override fun processObjectsByName( info: CallInfo, - processor: TowerScopeLevelProcessor> + processor: TowerScopeLevelProcessor> ): ProcessResult { return ProcessResult.FOUND } @@ -273,7 +273,7 @@ class ScopeTowerLevel( return false } - private fun > consumeCallableCandidate( + private fun > consumeCallableCandidate( candidate: FirCallableSymbol<*>, processor: TowerScopeLevelProcessor ) { @@ -326,7 +326,7 @@ class ScopeTowerLevel( override fun processObjectsByName( info: CallInfo, - processor: TowerScopeLevelProcessor> + processor: TowerScopeLevelProcessor> ): ProcessResult { var empty = true session.lookupTracker?.recordCallLookup(info, scope.scopeOwnerLookupNames) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/FirDataFlowAnalyzer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/FirDataFlowAnalyzer.kt index 3f60bf995b8..d03915d0e88 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/FirDataFlowAnalyzer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/FirDataFlowAnalyzer.kt @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutorByMap import org.jetbrains.kotlin.fir.resolve.toSymbol import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.FirAbstractBodyResolveTransformer import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.resultType -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirVariableSymbol import org.jetbrains.kotlin.fir.types.* @@ -175,7 +175,7 @@ abstract class FirDataFlowAnalyzer( * DataFlowAnalyzer holds variables only for declarations that have some smartcast (or can have) * If there is no useful information there is no data flow variable also */ - val symbol: AbstractFirBasedSymbol<*> = qualifiedAccessExpression.symbol ?: return null + val symbol: FirBasedSymbol<*> = qualifiedAccessExpression.symbol ?: return null val flow = graphBuilder.lastNode.flow var variable = variableStorage.getRealVariableWithoutUnwrappingAlias(symbol, qualifiedAccessExpression, flow) ?: return null val stability = variable.stability diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/VariableStorage.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/VariableStorage.kt index 5e7114cbd53..86a82cbbf43 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/VariableStorage.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/VariableStorage.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.expressions.impl.FirNoReceiverExpression import org.jetbrains.kotlin.fir.references.FirThisReference import org.jetbrains.kotlin.fir.resolve.fullyExpandedType import org.jetbrains.kotlin.fir.resolve.toSymbol -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.* import org.jetbrains.kotlin.fir.types.ConeClassLikeType import org.jetbrains.kotlin.fir.types.coneTypeSafe @@ -38,7 +38,7 @@ class VariableStorage(private val session: FirSession) { fun getOrCreateRealVariableWithoutUnwrappingAlias( flow: Flow, - symbol: AbstractFirBasedSymbol<*>, + symbol: FirBasedSymbol<*>, fir: FirElement, stability: PropertyStability ): RealVariable { @@ -49,7 +49,7 @@ class VariableStorage(private val session: FirSession) { private fun getOrCreateRealVariable( flow: Flow, - symbol: AbstractFirBasedSymbol<*>, + symbol: FirBasedSymbol<*>, fir: FirElement, stability: PropertyStability ): RealVariable { @@ -67,7 +67,7 @@ class VariableStorage(private val session: FirSession) { private fun getIdentifierBySymbol( flow: Flow, - symbol: AbstractFirBasedSymbol<*>, + symbol: FirBasedSymbol<*>, fir: FirElement, ): Identifier { val expression = fir as? FirQualifiedAccess @@ -109,7 +109,7 @@ class VariableStorage(private val session: FirSession) { } @JvmName("getOrCreateRealVariableOrNull") - fun getOrCreateRealVariable(flow: Flow, symbol: AbstractFirBasedSymbol<*>?, fir: FirElement): RealVariable? = + fun getOrCreateRealVariable(flow: Flow, symbol: FirBasedSymbol<*>?, fir: FirElement): RealVariable? = symbol.getStability(fir)?.let { getOrCreateRealVariable(flow, symbol!!, fir, it) } fun createSyntheticVariable(fir: FirElement): SyntheticVariable = @@ -126,14 +126,14 @@ class VariableStorage(private val session: FirSession) { } } - fun getRealVariableWithoutUnwrappingAlias(symbol: AbstractFirBasedSymbol<*>?, fir: FirElement, flow: Flow): RealVariable? { + fun getRealVariableWithoutUnwrappingAlias(symbol: FirBasedSymbol<*>?, fir: FirElement, flow: Flow): RealVariable? { val realFir = fir.unwrapElement() return symbol.takeIf { it.getStability(realFir) != null }?.let { _realVariables[getIdentifierBySymbol(flow, it, realFir.unwrapElement())] } } - fun getRealVariable(symbol: AbstractFirBasedSymbol<*>?, fir: FirElement, flow: Flow): RealVariable? { + fun getRealVariable(symbol: FirBasedSymbol<*>?, fir: FirElement, flow: Flow): RealVariable? { return getRealVariableWithoutUnwrappingAlias(symbol, fir, flow)?.let { flow.unwrapVariable(it) } } @@ -152,7 +152,7 @@ class VariableStorage(private val session: FirSession) { } } - fun removeRealVariable(symbol: AbstractFirBasedSymbol<*>) { + fun removeRealVariable(symbol: FirBasedSymbol<*>) { _realVariables.remove(Identifier(symbol, null, null)) } @@ -162,7 +162,7 @@ class VariableStorage(private val session: FirSession) { } @OptIn(ExperimentalContracts::class) - fun AbstractFirBasedSymbol<*>?.getStability(originalFir: FirElement): PropertyStability? { + fun FirBasedSymbol<*>?.getStability(originalFir: FirElement): PropertyStability? { contract { returnsNotNull() implies (this@getStability != null) } diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphBuilder.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphBuilder.kt index 53ece718587..3e3f269eab9 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphBuilder.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphBuilder.kt @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.render import org.jetbrains.kotlin.fir.resolve.dfa.* import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.resultType -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol import org.jetbrains.kotlin.fir.types.isNothing import org.jetbrains.kotlin.fir.visitors.FirDefaultVisitor @@ -67,7 +67,7 @@ class ControlFlowGraphBuilder { private val exitTargetsForReturn: SymbolBasedNodeStorage, FunctionExitNode> = SymbolBasedNodeStorage() private val exitTargetsForTry: Stack> = stackOf() private val exitsOfAnonymousFunctions: MutableMap, FunctionExitNode> = mutableMapOf() - private val enterToLocalClassesMembers: MutableMap, CFGNode<*>?> = mutableMapOf() + private val enterToLocalClassesMembers: MutableMap, CFGNode<*>?> = mutableMapOf() private val postponedLambdas: MutableSet> = mutableSetOf() private val entersToPostponedAnonymousFunctions: MutableMap, PostponedLambdaEnterNode> = mutableMapOf() diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/model.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/model.kt index d808cc66015..5b0435fc1bb 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/model.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/model.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.resolve.dfa import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.expressions.FirResolvedQualifier -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol import org.jetbrains.kotlin.fir.types.ConeClassErrorType import org.jetbrains.kotlin.fir.types.ConeKotlinType @@ -18,7 +18,7 @@ import kotlin.contracts.contract // --------------------------------------- Variables --------------------------------------- data class Identifier( - val symbol: AbstractFirBasedSymbol<*>, + val symbol: FirBasedSymbol<*>, val dispatchReceiver: DataFlowVariable?, val extensionReceiver: DataFlowVariable? ) { diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/util.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/util.kt index e203d07b79f..7fb7da16dde 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/util.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/util.kt @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.fir.expressions.* import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference import org.jetbrains.kotlin.fir.references.FirThisReference import org.jetbrains.kotlin.fir.resolve.calls.FirNamedReferenceWithCandidate -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirAccessorSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol @@ -92,7 +92,7 @@ internal val FirExpression.coneType: ConeKotlinType get() = typeRef.coneType @DfaInternals -internal val FirElement.symbol: AbstractFirBasedSymbol<*>? +internal val FirElement.symbol: FirBasedSymbol<*>? get() = when (this) { is FirResolvable -> symbol is FirSymbolOwner<*> -> symbol @@ -105,7 +105,7 @@ internal val FirElement.symbol: AbstractFirBasedSymbol<*>? } @DfaInternals -internal val FirResolvable.symbol: AbstractFirBasedSymbol<*>? +internal val FirResolvable.symbol: FirBasedSymbol<*>? get() = when (val reference = calleeReference) { is FirThisReference -> reference.boundSymbol is FirResolvedNamedReference -> reference.resolvedSymbol diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/diagnostics/FirDiagnostics.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/diagnostics/FirDiagnostics.kt index 2542b84593c..4e042667a06 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/diagnostics/FirDiagnostics.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/diagnostics/FirDiagnostics.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.fir.declarations.FirCallableDeclaration import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.render import org.jetbrains.kotlin.fir.resolve.calls.Candidate -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol @@ -45,7 +45,7 @@ class ConeUnresolvedNameError(val name: Name) : ConeUnresolvedError() { } class ConeHiddenCandidateError( - val candidateSymbol: AbstractFirBasedSymbol<*> + val candidateSymbol: FirBasedSymbol<*> ) : ConeDiagnostic() { override val reason: String get() = "HIDDEN: ${describeSymbol(candidateSymbol)} is invisible" } @@ -75,7 +75,7 @@ class ConeAmbiguityError(val name: Name, val applicability: CandidateApplicabili override val reason: String get() = "Ambiguity: $name, ${candidates.map { describeSymbol(it.symbol) }}" } -class ConeOperatorAmbiguityError(val candidates: Collection>) : ConeDiagnostic() { +class ConeOperatorAmbiguityError(val candidates: Collection>) : ConeDiagnostic() { override val reason: String get() = "Operator overload ambiguity. Compatible candidates: ${candidates.map { describeSymbol(it) }}" } @@ -137,7 +137,7 @@ class ConeUnsupportedDynamicType() : ConeDiagnostic() { override val reason: String get() = "Dynamic types are not supported in this context" } -private fun describeSymbol(symbol: AbstractFirBasedSymbol<*>): String { +private fun describeSymbol(symbol: FirBasedSymbol<*>): String { return when (symbol) { is FirClassLikeSymbol<*> -> symbol.classId.asString() is FirCallableSymbol<*> -> symbol.callableId.toString() diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/FirSymbolProvider.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/FirSymbolProvider.kt index 50573b67923..17330e0369e 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/FirSymbolProvider.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/FirSymbolProvider.kt @@ -75,7 +75,7 @@ fun FirSymbolProvider.getClassDeclaredPropertySymbols(classId: ClassId, name: Na return classMemberScope?.getProperties(name).orEmpty() } -inline fun > FirSymbolProvider.getSymbolByTypeRef(typeRef: FirTypeRef): T? { +inline fun > FirSymbolProvider.getSymbolByTypeRef(typeRef: FirTypeRef): T? { val lookupTag = typeRef.coneTypeSafe()?.lookupTag ?: return null return getSymbolByLookupTag(lookupTag) as? T } 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 d88a7b27055..952484c15cf 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 @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.remapArguments import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.resultType import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.writeResultType import org.jetbrains.kotlin.fir.scopes.impl.FirIntegerOperatorCall -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirConstructorSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol import org.jetbrains.kotlin.fir.types.* @@ -225,7 +225,7 @@ class FirCallCompletionResultsWriterTransformer( return result } - private val AbstractFirBasedSymbol<*>.isArrayConstructorWithLambda: Boolean + private val FirBasedSymbol<*>.isArrayConstructorWithLambda: Boolean get() { val constructor = (this as? FirConstructorSymbol)?.fir ?: return false if (constructor.valueParameters.size != 2) return false diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirPhaseCheckingPhaseManager.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirPhaseCheckingPhaseManager.kt index 5ef558c86f6..011cd538b5d 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirPhaseCheckingPhaseManager.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirPhaseCheckingPhaseManager.kt @@ -9,10 +9,10 @@ import org.jetbrains.kotlin.fir.FirRenderer import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.render -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol object FirPhaseCheckingPhaseManager : FirPhaseManager() { - override fun ensureResolved(symbol: AbstractFirBasedSymbol<*>, requiredPhase: FirResolvePhase) { + override fun ensureResolved(symbol: FirBasedSymbol<*>, requiredPhase: FirResolvePhase) { val fir = symbol.fir as FirDeclaration val availablePhase = fir.resolvePhase require(availablePhase >= requiredPhase) { @@ -21,4 +21,4 @@ object FirPhaseCheckingPhaseManager : FirPhaseManager() { } private val renderMode = FirRenderer.RenderMode.WithResolvePhases.copy(renderDeclarationOrigin = true) -} \ No newline at end of file +} diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirPhaseManager.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirPhaseManager.kt index 0ae76e99ebe..8765d3f49dc 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirPhaseManager.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirPhaseManager.kt @@ -8,11 +8,11 @@ package org.jetbrains.kotlin.fir.resolve.transformers import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSessionComponent import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol abstract class FirPhaseManager : FirSessionComponent { abstract fun ensureResolved( - symbol: AbstractFirBasedSymbol<*>, + symbol: FirBasedSymbol<*>, requiredPhase: FirResolvePhase = FirResolvePhase.DECLARATIONS ) } diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirWhenExhaustivenessTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirWhenExhaustivenessTransformer.kt index 03dc0c96491..eccb6489378 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirWhenExhaustivenessTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirWhenExhaustivenessTransformer.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.expressions.impl.FirElseIfTrueCondition import org.jetbrains.kotlin.fir.resolve.BodyResolveComponents import org.jetbrains.kotlin.fir.resolve.fullyExpandedType import org.jetbrains.kotlin.fir.resolve.symbolProvider -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirVariableSymbol @@ -306,7 +306,7 @@ private object WhenOnSealedClassExhaustivenessChecker : WhenExhaustivenessChecke destination: MutableCollection ) { val allSubclasses = subjectType.toSymbol(session)?.collectAllSubclasses(session) ?: return - val checkedSubclasses = mutableSetOf>() + val checkedSubclasses = mutableSetOf>() whenExpression.accept(ConditionChecker, Flags(allSubclasses, checkedSubclasses, session)) (allSubclasses - checkedSubclasses).mapNotNullTo(destination) { when (it) { @@ -318,8 +318,8 @@ private object WhenOnSealedClassExhaustivenessChecker : WhenExhaustivenessChecke } private class Flags( - val allSubclasses: Set>, - val checkedSubclasses: MutableSet>, + val allSubclasses: Set>, + val checkedSubclasses: MutableSet>, val session: FirSession ) @@ -357,7 +357,7 @@ private object WhenOnSealedClassExhaustivenessChecker : WhenExhaustivenessChecke processBranch(symbol, isNegated, data) } - private fun processBranch(symbolToCheck: AbstractFirBasedSymbol<*>, isNegated: Boolean, flags: Flags) { + private fun processBranch(symbolToCheck: FirBasedSymbol<*>, isNegated: Boolean, flags: Flags) { val subclassesOfType = symbolToCheck.collectAllSubclasses(flags.session) if (subclassesOfType.none { it in flags.allSubclasses }) { return @@ -368,11 +368,11 @@ private object WhenOnSealedClassExhaustivenessChecker : WhenExhaustivenessChecke } - private fun AbstractFirBasedSymbol<*>.collectAllSubclasses(session: FirSession): Set> { - return mutableSetOf>().apply { collectAllSubclassesTo(this, session) } + private fun FirBasedSymbol<*>.collectAllSubclasses(session: FirSession): Set> { + return mutableSetOf>().apply { collectAllSubclassesTo(this, session) } } - private fun AbstractFirBasedSymbol<*>.collectAllSubclassesTo(destination: MutableSet>, session: FirSession) { + private fun FirBasedSymbol<*>.collectAllSubclassesTo(destination: MutableSet>, session: FirSession) { if (this !is FirRegularClassSymbol) { destination.add(this) return diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/PhaseUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/PhaseUtils.kt index c064458dcab..5e44b1e810d 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/PhaseUtils.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/PhaseUtils.kt @@ -11,13 +11,13 @@ import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.resolve.fullyExpandedType import org.jetbrains.kotlin.fir.resolve.toSymbol -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.types.ConeClassLikeType import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.coneTypeSafe -fun AbstractFirBasedSymbol<*>.ensureResolved( +fun FirBasedSymbol<*>.ensureResolved( requiredPhase: FirResolvePhase, // TODO: Currently, the parameter is unused but it's needed to guarantee that all call-sites are able to supply use-site session // TODO: Decide which one session should be used and probably get rid of the parameter if use-site session is not needed @@ -35,7 +35,7 @@ fun FirSymbolOwner<*>.ensureResolved( symbol.ensureResolved(requiredPhase, useSiteSession) } -fun AbstractFirBasedSymbol<*>.ensureResolvedForCalls( +fun FirBasedSymbol<*>.ensureResolvedForCalls( useSiteSession: FirSession, ) { val fir = fir as FirDeclaration diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirArrayOfCallTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirArrayOfCallTransformer.kt index 18d9b8885c8..776be642af7 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirArrayOfCallTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirArrayOfCallTransformer.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.fir.expressions.builder.buildArgumentList import org.jetbrains.kotlin.fir.expressions.builder.buildArrayOfCall import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference import org.jetbrains.kotlin.fir.resolve.calls.FirNamedReferenceWithCandidate -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.types.isArrayType /** @@ -68,7 +68,7 @@ internal class FirArrayOfCallTransformer { } private fun FirFunctionCall.getOriginalFunction(): FirCallableDeclaration<*>? { - val symbol: AbstractFirBasedSymbol<*>? = when (val reference = calleeReference) { + val symbol: FirBasedSymbol<*>? = when (val reference = calleeReference) { is FirResolvedNamedReference -> reference.resolvedSymbol is FirNamedReferenceWithCandidate -> reference.candidateSymbol else -> null diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/FakeOverrideTypeCalculator.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/FakeOverrideTypeCalculator.kt index b5ef04e63e9..4e5e9bff7e1 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/FakeOverrideTypeCalculator.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/FakeOverrideTypeCalculator.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.fir.declarations.FirDeclarationDataRegistry import org.jetbrains.kotlin.fir.declarations.FirTypedDeclaration import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutor import org.jetbrains.kotlin.fir.resolvedTypeFromPrototype -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -49,5 +49,5 @@ var FirDeclarationAttributes.fakeOverrideSubstitution: FakeOverrideSubstitution? data class FakeOverrideSubstitution( val substitutor: ConeSubstitutor, - val baseSymbol: AbstractFirBasedSymbol<*> + val baseSymbol: FirBasedSymbol<*> ) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/AbstractFirOverrideScope.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/AbstractFirOverrideScope.kt index a1dcd85471f..dbe0426b586 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/AbstractFirOverrideScope.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/AbstractFirOverrideScope.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.scopes.FirOverrideChecker import org.jetbrains.kotlin.fir.scopes.FirTypeScope -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol abstract class AbstractFirOverrideScope( @@ -49,9 +49,9 @@ abstract class AbstractFirOverrideScope( protected open fun FirCallableSymbol<*>.getOverridden(overrideCandidates: Set>): FirCallableSymbol<*>? { if (overrideByBase.containsKey(this)) return overrideByBase[this] - val baseDeclaration = (this as AbstractFirBasedSymbol<*>).fir as FirCallableMemberDeclaration<*> + val baseDeclaration = (this as FirBasedSymbol<*>).fir as FirCallableMemberDeclaration<*> val override = overrideCandidates.firstOrNull { - val overrideCandidate = (it as AbstractFirBasedSymbol<*>).fir as FirCallableMemberDeclaration<*> + val overrideCandidate = (it as FirBasedSymbol<*>).fir as FirCallableMemberDeclaration<*> baseDeclaration.modality != Modality.FINAL && similarFunctionsOrBothProperties(overrideCandidate, baseDeclaration) } // TODO: two or more overrides for one fun? overrideByBase[this] = override diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/types/TypeUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/types/TypeUtils.kt index adcbdd8926e..37e269ab2b0 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/types/TypeUtils.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/types/TypeUtils.kt @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.fir.diagnostics.ConeSimpleDiagnostic 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.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.ConeTypeParameterLookupTag import org.jetbrains.kotlin.fir.symbols.impl.ConeClassLookupTagWithFixedSymbol import org.jetbrains.kotlin.fir.types.builder.buildErrorTypeRef @@ -188,7 +188,7 @@ fun ConeKotlinType.isUnsafeVarianceType(session: FirSession): Boolean { return type.attributes.unsafeVarianceType != null } -fun ConeKotlinType.toSymbol(session: FirSession): AbstractFirBasedSymbol<*>? { +fun ConeKotlinType.toSymbol(session: FirSession): FirBasedSymbol<*>? { return (this as? ConeLookupTagBasedType)?.lookupTag?.toSymbol(session) } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirSymbolOwner.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirSymbolOwner.kt index f24c64ff944..032b2b46ffa 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirSymbolOwner.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirSymbolOwner.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir import org.jetbrains.kotlin.fir.declarations.FirDeclaration -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.visitors.* /* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* interface FirSymbolOwner : FirElement where E : FirSymbolOwner, E : FirDeclaration { override val source: FirSourceElement? - val symbol: AbstractFirBasedSymbol + val symbol: FirBasedSymbol override fun accept(visitor: FirVisitor, data: D): R = visitor.visitSymbolOwner(this, data) 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 f054cf65b30..3bf4ddfd6f9 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 @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.references import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirBackingFieldSymbol import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.fir.visitors.* @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirBackingFieldReference : FirResolvedNamedReference() { abstract override val source: FirSourceElement? abstract override val name: Name - abstract override val candidateSymbol: AbstractFirBasedSymbol<*>? + abstract override val candidateSymbol: FirBasedSymbol<*>? abstract override val resolvedSymbol: FirBackingFieldSymbol override fun accept(visitor: FirVisitor, data: D): R = visitor.visitBackingFieldReference(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 f6824ea678d..1af684cc0c2 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 @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.references import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirDelegateFieldSymbol import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.fir.visitors.* @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirDelegateFieldReference : FirResolvedNamedReference() { abstract override val source: FirSourceElement? abstract override val name: Name - abstract override val candidateSymbol: AbstractFirBasedSymbol<*>? + abstract override val candidateSymbol: FirBasedSymbol<*>? abstract override val resolvedSymbol: FirDelegateFieldSymbol<*> override fun accept(visitor: FirVisitor, data: D): R = visitor.visitDelegateFieldReference(this, data) 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 8d96d54bb33..a56f49e48d2 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 @@ -9,7 +9,7 @@ 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.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.fir.visitors.* @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirErrorNamedReference : FirNamedReference(), FirDiagnosticHolder { abstract override val source: FirSourceElement? abstract override val name: Name - abstract override val candidateSymbol: AbstractFirBasedSymbol<*>? + abstract override val candidateSymbol: FirBasedSymbol<*>? abstract override val diagnostic: ConeDiagnostic override fun accept(visitor: FirVisitor, data: D): R = visitor.visitErrorNamedReference(this, data) 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 6759bfea742..caeec880f1c 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 @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.references import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.fir.visitors.* @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirNamedReference : FirReference() { abstract override val source: FirSourceElement? abstract val name: Name - abstract val candidateSymbol: AbstractFirBasedSymbol<*>? + abstract val candidateSymbol: FirBasedSymbol<*>? override fun accept(visitor: FirVisitor, data: D): R = visitor.visitNamedReference(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 ebe9d48f12c..c5c6d8e6f0a 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 @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.references 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.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.fir.visitors.* @@ -21,8 +21,8 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirResolvedCallableReference : FirResolvedNamedReference() { abstract override val source: FirSourceElement? abstract override val name: Name - abstract override val candidateSymbol: AbstractFirBasedSymbol<*>? - abstract override val resolvedSymbol: AbstractFirBasedSymbol<*> + abstract override val candidateSymbol: FirBasedSymbol<*>? + abstract override val resolvedSymbol: FirBasedSymbol<*> abstract val inferredTypeArguments: List abstract val mappedArguments: CallableReferenceMappedArguments 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 702232b5bc2..ab27ccf3394 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 @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.references import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.fir.visitors.* @@ -19,8 +19,8 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirResolvedNamedReference : FirNamedReference() { abstract override val source: FirSourceElement? abstract override val name: Name - abstract override val candidateSymbol: AbstractFirBasedSymbol<*>? - abstract val resolvedSymbol: AbstractFirBasedSymbol<*> + abstract override val candidateSymbol: FirBasedSymbol<*>? + abstract val resolvedSymbol: FirBasedSymbol<*> override fun accept(visitor: FirVisitor, data: D): R = visitor.visitResolvedNamedReference(this, data) 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 8ab66887e2c..d39a71f378f 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 @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.references import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.visitors.* /* @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirThisReference : FirReference() { abstract override val source: FirSourceElement? abstract val labelName: String? - abstract val boundSymbol: AbstractFirBasedSymbol<*>? + abstract val boundSymbol: FirBasedSymbol<*>? override fun accept(visitor: FirVisitor, data: D): R = visitor.visitThisReference(this, data) @@ -26,5 +26,5 @@ abstract class FirThisReference : FirReference() { override fun transform(transformer: FirTransformer, data: D): E = transformer.transformThisReference(this, data) as E - abstract fun replaceBoundSymbol(newBoundSymbol: AbstractFirBasedSymbol<*>?) + abstract fun replaceBoundSymbol(newBoundSymbol: 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 30791977320..e351bbb2f42 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 @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.references.FirBackingFieldReference import org.jetbrains.kotlin.fir.references.impl.FirBackingFieldReferenceImpl -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirBackingFieldSymbol import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.Name @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.name.Name @FirBuilderDsl class FirBackingFieldReferenceBuilder { var source: FirSourceElement? = null - var candidateSymbol: AbstractFirBasedSymbol<*>? = null + var candidateSymbol: FirBasedSymbol<*>? = null lateinit var resolvedSymbol: FirBackingFieldSymbol fun build(): FirBackingFieldReference { 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 d6b45e64bda..c6336aa7657 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 @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.references.FirDelegateFieldReference import org.jetbrains.kotlin.fir.references.impl.FirDelegateFieldReferenceImpl -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirDelegateFieldSymbol import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.Name @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.name.Name @FirBuilderDsl class FirDelegateFieldReferenceBuilder { var source: FirSourceElement? = null - var candidateSymbol: AbstractFirBasedSymbol<*>? = null + var candidateSymbol: FirBasedSymbol<*>? = null lateinit var resolvedSymbol: FirDelegateFieldSymbol<*> fun build(): FirDelegateFieldReference { 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 87dae2541e1..1498c769cd7 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 @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.references.FirErrorNamedReference import org.jetbrains.kotlin.fir.references.impl.FirErrorNamedReferenceImpl -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.Name @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.name.Name @FirBuilderDsl class FirErrorNamedReferenceBuilder { var source: FirSourceElement? = null - var candidateSymbol: AbstractFirBasedSymbol<*>? = null + var candidateSymbol: FirBasedSymbol<*>? = null lateinit var diagnostic: ConeDiagnostic fun build(): FirErrorNamedReference { 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 f9ad8e11b98..976f206f02a 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 @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.references.FirThisReference import org.jetbrains.kotlin.fir.references.impl.FirExplicitThisReference -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.visitors.* /* 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 17a869a4eea..10fa72ae12e 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 @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.references.FirThisReference import org.jetbrains.kotlin.fir.references.impl.FirImplicitThisReference -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.visitors.* /* @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirImplicitThisReferenceBuilder { - var boundSymbol: AbstractFirBasedSymbol<*>? = null + var boundSymbol: FirBasedSymbol<*>? = null fun build(): FirThisReference { return 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 60411d6d8bf..27bf18b85ff 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 @@ -11,7 +11,7 @@ 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 -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.Name @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.name.Name class FirPropertyFromParameterResolvedNamedReferenceBuilder { var source: FirSourceElement? = null lateinit var name: Name - lateinit var resolvedSymbol: AbstractFirBasedSymbol<*> + lateinit var resolvedSymbol: FirBasedSymbol<*> @OptIn(FirImplementationDetail::class) fun build(): FirResolvedNamedReference { 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 35c28b7c25c..e8383945b81 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 @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.references.FirResolvedCallableReference import org.jetbrains.kotlin.fir.references.impl.FirResolvedCallableReferenceImpl import org.jetbrains.kotlin.fir.resolve.calls.CallableReferenceMappedArguments -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.Name @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.name.Name class FirResolvedCallableReferenceBuilder { var source: FirSourceElement? = null lateinit var name: Name - lateinit var resolvedSymbol: AbstractFirBasedSymbol<*> + lateinit var resolvedSymbol: FirBasedSymbol<*> val inferredTypeArguments: MutableList = mutableListOf() lateinit var mappedArguments: CallableReferenceMappedArguments 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 196f5133ed8..cb1d2879b84 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 @@ -10,7 +10,7 @@ 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.FirResolvedNamedReferenceImpl -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.Name @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.name.Name class FirResolvedNamedReferenceBuilder { var source: FirSourceElement? = null lateinit var name: Name - lateinit var resolvedSymbol: AbstractFirBasedSymbol<*> + lateinit var resolvedSymbol: FirBasedSymbol<*> fun build(): FirResolvedNamedReference { return FirResolvedNamedReferenceImpl( 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 31eecbd7881..88eb0b6f054 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 @@ -11,7 +11,7 @@ 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 -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.Name @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.name.Name class FirSimpleNamedReferenceBuilder { var source: FirSourceElement? = null lateinit var name: Name - var candidateSymbol: AbstractFirBasedSymbol<*>? = null + var candidateSymbol: FirBasedSymbol<*>? = null @OptIn(FirImplementationDetail::class) fun build(): FirNamedReference { 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 5649491a1fb..9d6cd6ddd7b 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 @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.references.impl import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.references.FirBackingFieldReference -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirBackingFieldSymbol import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.fir.visitors.* @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirBackingFieldReferenceImpl( override val source: FirSourceElement?, - override val candidateSymbol: AbstractFirBasedSymbol<*>?, + override val candidateSymbol: FirBasedSymbol<*>?, override val resolvedSymbol: FirBackingFieldSymbol, ) : FirBackingFieldReference() { override val name: Name get() = Name.identifier("\$field") 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 831cfb5b849..82456f27365 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 @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.references.impl import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.references.FirDelegateFieldReference -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirDelegateFieldSymbol import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.fir.visitors.* @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirDelegateFieldReferenceImpl( override val source: FirSourceElement?, - override val candidateSymbol: AbstractFirBasedSymbol<*>?, + override val candidateSymbol: FirBasedSymbol<*>?, override val resolvedSymbol: FirDelegateFieldSymbol<*>, ) : FirDelegateFieldReference() { override val name: Name get() = Name.identifier("\$delegate") 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 9d513fb9f7c..1d5317afb2b 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 @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.references.impl import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.references.FirErrorNamedReference -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.fir.visitors.* @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirErrorNamedReferenceImpl( override val source: FirSourceElement?, - override val candidateSymbol: AbstractFirBasedSymbol<*>?, + override val candidateSymbol: FirBasedSymbol<*>?, override val diagnostic: ConeDiagnostic, ) : FirErrorNamedReference() { override val name: Name = Name.special("<${diagnostic.reason}>") 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 12245b265dd..bff08bb77bb 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 @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.references.impl import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.references.FirThisReference -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.visitors.* /* @@ -19,7 +19,7 @@ internal class FirExplicitThisReference( override val source: FirSourceElement?, override val labelName: String?, ) : FirThisReference() { - override var boundSymbol: AbstractFirBasedSymbol<*>? = null + override var boundSymbol: FirBasedSymbol<*>? = null override fun acceptChildren(visitor: FirVisitor, data: D) {} @@ -27,7 +27,7 @@ internal class FirExplicitThisReference( return this } - override fun replaceBoundSymbol(newBoundSymbol: AbstractFirBasedSymbol<*>?) { + override fun replaceBoundSymbol(newBoundSymbol: FirBasedSymbol<*>?) { boundSymbol = newBoundSymbol } } 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 94abbb83e27..3f8522716c2 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 @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.references.impl import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.references.FirThisReference -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.visitors.* /* @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* */ internal class FirImplicitThisReference( - override val boundSymbol: AbstractFirBasedSymbol<*>?, + override val boundSymbol: FirBasedSymbol<*>?, ) : FirThisReference() { override val source: FirSourceElement? get() = null override val labelName: String? get() = null @@ -27,5 +27,5 @@ internal class FirImplicitThisReference( return this } - override fun replaceBoundSymbol(newBoundSymbol: AbstractFirBasedSymbol<*>?) {} + override fun replaceBoundSymbol(newBoundSymbol: FirBasedSymbol<*>?) {} } 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 63a2ef2e7ae..95e43476e88 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 @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.references.impl 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.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.fir.visitors.* @@ -20,9 +20,9 @@ import org.jetbrains.kotlin.fir.visitors.* class FirPropertyFromParameterResolvedNamedReference @FirImplementationDetail constructor( override val source: FirSourceElement?, override val name: Name, - override val resolvedSymbol: AbstractFirBasedSymbol<*>, + override val resolvedSymbol: FirBasedSymbol<*>, ) : FirResolvedNamedReference() { - override val candidateSymbol: AbstractFirBasedSymbol<*>? get() = null + override val candidateSymbol: FirBasedSymbol<*>? get() = null override fun acceptChildren(visitor: FirVisitor, data: D) {} 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 bd5b475725f..73ae028e64d 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 @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.references.impl import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.references.FirResolvedCallableReference import org.jetbrains.kotlin.fir.resolve.calls.CallableReferenceMappedArguments -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.fir.visitors.* @@ -21,11 +21,11 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirResolvedCallableReferenceImpl( override val source: FirSourceElement?, override val name: Name, - override val resolvedSymbol: AbstractFirBasedSymbol<*>, + override val resolvedSymbol: FirBasedSymbol<*>, override val inferredTypeArguments: MutableList, override val mappedArguments: CallableReferenceMappedArguments, ) : FirResolvedCallableReference() { - override val candidateSymbol: AbstractFirBasedSymbol<*>? get() = null + override val candidateSymbol: FirBasedSymbol<*>? get() = null override fun acceptChildren(visitor: FirVisitor, data: D) {} 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 35b2be66979..c5c54745f52 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 @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.references.impl import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.fir.visitors.* @@ -19,9 +19,9 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirResolvedNamedReferenceImpl( override val source: FirSourceElement?, override val name: Name, - override val resolvedSymbol: AbstractFirBasedSymbol<*>, + override val resolvedSymbol: FirBasedSymbol<*>, ) : FirResolvedNamedReference() { - override val candidateSymbol: AbstractFirBasedSymbol<*>? get() = null + override val candidateSymbol: FirBasedSymbol<*>? get() = null override fun acceptChildren(visitor: FirVisitor, data: D) {} 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 ece8cb1607f..4aa9cb4adac 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 @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.references.impl 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.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.fir.visitors.* @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* open class FirSimpleNamedReference @FirImplementationDetail constructor( override val source: FirSourceElement?, override val name: Name, - override val candidateSymbol: AbstractFirBasedSymbol<*>?, + override val candidateSymbol: FirBasedSymbol<*>?, ) : FirNamedReference() { override fun acceptChildren(visitor: FirVisitor, data: D) {} diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt index 99ebe1b4056..cc096392b29 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.expressions.* import org.jetbrains.kotlin.fir.expressions.impl.* import org.jetbrains.kotlin.fir.references.* -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.ConeClassLikeLookupTag import org.jetbrains.kotlin.name.StandardClassIds import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol @@ -1051,7 +1051,7 @@ class FirRenderer(builder: StringBuilder, private val mode: RenderMode = RenderM print("*") } - private fun AbstractFirBasedSymbol<*>.render(): String { + private fun FirBasedSymbol<*>.render(): String { return when (this) { is FirCallableSymbol<*> -> callableId.toString() is FirClassLikeSymbol<*> -> classId.toString() @@ -1117,7 +1117,7 @@ class FirRenderer(builder: StringBuilder, private val mode: RenderMode = RenderM print("|") } - private fun AbstractFirBasedSymbol<*>.unwrapIntersectionOverrides(): AbstractFirBasedSymbol<*> { + private fun FirBasedSymbol<*>.unwrapIntersectionOverrides(): FirBasedSymbol<*> { (this as? FirCallableSymbol<*>)?.baseForIntersectionOverride?.let { return it.unwrapIntersectionOverrides() } return this } diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/AbstractFirBasedSymbol.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/AbstractFirBasedSymbol.kt deleted file mode 100644 index f550a61fb87..00000000000 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/AbstractFirBasedSymbol.kt +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.fir.symbols - -import org.jetbrains.kotlin.fir.FirSymbolOwner -import org.jetbrains.kotlin.fir.declarations.FirDeclaration - -abstract class AbstractFirBasedSymbol : FirBasedSymbol where E : FirSymbolOwner, E : FirDeclaration { - private var _fir: E? = null - - override val fir: E - get() = _fir - ?: error("Fir is not initialized for $this") - - override fun bind(e: E) { - _fir = e - } -} \ No newline at end of file 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 cf72810d43f..1104f5a9f14 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 @@ -8,8 +8,14 @@ package org.jetbrains.kotlin.fir.symbols import org.jetbrains.kotlin.fir.FirSymbolOwner import org.jetbrains.kotlin.fir.declarations.FirDeclaration -interface FirBasedSymbol where E : FirSymbolOwner, E : FirDeclaration { - val fir: E +abstract class FirBasedSymbol where E : FirSymbolOwner, E : FirDeclaration { + private var _fir: E? = null - fun bind(e: E) + val fir: E + get() = _fir + ?: error("Fir is not initialized for $this") + + fun bind(e: E) { + _fir = e + } } diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirAnonymousInitializerSymbol.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirAnonymousInitializerSymbol.kt index 57881274eb4..57dd59b73fd 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirAnonymousInitializerSymbol.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirAnonymousInitializerSymbol.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.fir.symbols.impl import org.jetbrains.kotlin.fir.declarations.FirAnonymousInitializer -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol -class FirAnonymousInitializerSymbol : AbstractFirBasedSymbol() { +class FirAnonymousInitializerSymbol : FirBasedSymbol() { override fun toString(): String = "${this::class.simpleName} " -} \ No newline at end of file +} diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirCallableSymbol.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirCallableSymbol.kt index b1c4d3661aa..644aab01735 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirCallableSymbol.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirCallableSymbol.kt @@ -9,10 +9,10 @@ import org.jetbrains.kotlin.fir.declarations.FirCallableDeclaration import org.jetbrains.kotlin.fir.declarations.FirFunction import org.jetbrains.kotlin.fir.declarations.FirMemberDeclaration import org.jetbrains.kotlin.fir.declarations.FirProperty -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.name.CallableId -abstract class FirCallableSymbol> : AbstractFirBasedSymbol() { +abstract class FirCallableSymbol> : FirBasedSymbol() { abstract val callableId: CallableId override fun toString(): String = "${this::class.simpleName} $callableId" diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirClassifierSymbol.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirClassifierSymbol.kt index 26f2c31d40d..9427447369d 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirClassifierSymbol.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirClassifierSymbol.kt @@ -7,10 +7,10 @@ package org.jetbrains.kotlin.fir.symbols.impl import org.jetbrains.kotlin.fir.FirSymbolOwner import org.jetbrains.kotlin.fir.declarations.FirDeclaration -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.ConeClassifierLookupTag -sealed class FirClassifierSymbol : AbstractFirBasedSymbol() +sealed class FirClassifierSymbol : FirBasedSymbol() where E : FirSymbolOwner, E : FirDeclaration { abstract fun toLookupTag(): ConeClassifierLookupTag } diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt index 2d8261caa31..25d029ad26d 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt @@ -48,7 +48,7 @@ object NodeConfigurator : AbstractFieldConfigurator(FirTreeBuild symbolOwner.configure { withArg("E", symbolOwner, declaration) - +symbolWithPackage("fir.symbols", "AbstractFirBasedSymbol", "E") + +symbolWithPackage("fir.symbols", "FirBasedSymbol", "E") } typeParameterRef.configure { @@ -560,11 +560,11 @@ object NodeConfigurator : AbstractFieldConfigurator(FirTreeBuild namedReference.configure { +name - +field("candidateSymbol", abstractFirBasedSymbolType, "*", nullable = true) + +field("candidateSymbol", firBasedSymbolType, "*", nullable = true) } resolvedNamedReference.configure { - +field("resolvedSymbol", abstractFirBasedSymbolType, "*") + +field("resolvedSymbol", firBasedSymbolType, "*") } resolvedCallableReference.configure { @@ -587,7 +587,7 @@ object NodeConfigurator : AbstractFieldConfigurator(FirTreeBuild thisReference.configure { +stringField("labelName", nullable = true) - +field("boundSymbol", abstractFirBasedSymbolType, "*", nullable = true, withReplace = true) + +field("boundSymbol", firBasedSymbolType, "*", nullable = true, withReplace = true) } typeRef.configure { diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/Types.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/Types.kt index 51ae3c6889f..b152876faab 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 @@ -63,7 +63,7 @@ val implicitUnitTypeRefType = generatedType("types.impl", "FirImplicitUnitTypeRe val resolvePhaseType = type("fir.declarations", "FirResolvePhase") val stubReferenceType = generatedType("references.impl", "FirStubReference") -val abstractFirBasedSymbolType = type("fir.symbols", "AbstractFirBasedSymbol") +val firBasedSymbolType = type("fir.symbols", "FirBasedSymbol") val backingFieldSymbolType = type("fir.symbols.impl", "FirBackingFieldSymbol") val delegateFieldSymbolType = type("fir.symbols.impl", "FirDelegateFieldSymbol") val classSymbolType = type("fir.symbols.impl", "FirClassSymbol") 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 85d08acbe99..1f436aa79e8 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 @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.expressions.FirFunctionCall import org.jetbrains.kotlin.fir.expressions.FirSafeCallExpression import org.jetbrains.kotlin.fir.references.FirNamedReference import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol @@ -280,7 +280,7 @@ class FirDiagnosticsHandler(testServices: TestServices) : FirAnalysisHandler(tes private fun getTypeOfCall( reference: FirNamedReference, - resolvedSymbol: AbstractFirBasedSymbol<*>? + resolvedSymbol: FirBasedSymbol<*>? ): String { if (resolvedSymbol == null) return TypeOfCall.UNRESOLVED.nameToRender @@ -307,7 +307,7 @@ class FirDiagnosticsHandler(testServices: TestServices) : FirAnalysisHandler(tes } } - private fun AbstractFirBasedSymbol<*>.fqNameUnsafe(): FqNameUnsafe? = when (this) { + private fun FirBasedSymbol<*>.fqNameUnsafe(): FqNameUnsafe? = when (this) { is FirClassLikeSymbol<*> -> classId.asSingleFqName().toUnsafe() is FirCallableSymbol<*> -> callableId.asFqNameForDebugInfo().toUnsafe() else -> null diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirScopeDumpHandler.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirScopeDumpHandler.kt index 42ba1f48364..ad8c4e0ed6e 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirScopeDumpHandler.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirScopeDumpHandler.kt @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.fir.render import org.jetbrains.kotlin.fir.resolve.ScopeSession import org.jetbrains.kotlin.fir.resolve.symbolProvider import org.jetbrains.kotlin.fir.scopes.* -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol import org.jetbrains.kotlin.fir.types.render @@ -66,10 +66,10 @@ class FirScopeDumpHandler(testServices: TestServices) : FirAnalysisHandler(testS } private class SymbolCounter { - private val map = mutableMapOf, Int>() + private val map = mutableMapOf, Int>() private var counter = 0 - fun getIndex(symbol: AbstractFirBasedSymbol<*>): Int { + fun getIndex(symbol: FirBasedSymbol<*>): Int { return map.computeIfAbsent(symbol) { counter++ } } } 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 0aa1718b2cf..2cef6c29313 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticTest.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference import org.jetbrains.kotlin.fir.resolve.ScopeSession import org.jetbrains.kotlin.fir.resolve.dfa.cfg.FirControlFlowGraphRenderVisitor import org.jetbrains.kotlin.fir.resolve.transformers.createAllCompilerResolveProcessors -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol @@ -228,7 +228,7 @@ abstract class AbstractFirDiagnosticsTest : AbstractFirBaseDiagnosticsTest() { } } - private fun AbstractFirBasedSymbol<*>.fqNameUnsafe(): FqNameUnsafe? = when (this) { + private fun FirBasedSymbol<*>.fqNameUnsafe(): FqNameUnsafe? = when (this) { is FirClassLikeSymbol<*> -> classId.asSingleFqName().toUnsafe() is FirCallableSymbol<*> -> callableId.asFqNameForDebugInfo().toUnsafe() else -> null @@ -236,7 +236,7 @@ abstract class AbstractFirDiagnosticsTest : AbstractFirBaseDiagnosticsTest() { private fun getTypeOfCall( reference: FirNamedReference, - resolvedSymbol: AbstractFirBasedSymbol<*>? + resolvedSymbol: FirBasedSymbol<*>? ): String { if (resolvedSymbol == null) return TypeOfCall.UNRESOLVED.nameToRender 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 e592ae5c039..3ad75a74fa1 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 @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.references.* import org.jetbrains.kotlin.fir.resolve.* import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.firUnsafe import org.jetbrains.kotlin.fir.scopes.impl.delegatedWrapperData -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.* import org.jetbrains.kotlin.fir.types.* import org.jetbrains.kotlin.fir.visitors.FirVisitor @@ -465,7 +465,7 @@ class FirVisualizer(private val firFile: FirFile) : BaseRenderer() { return current } - private fun renderImplicitReceiver(symbol: AbstractFirBasedSymbol<*>, psi: PsiElement?) { + private fun renderImplicitReceiver(symbol: FirBasedSymbol<*>, psi: PsiElement?) { val receiverType = (symbol.fir as? FirCallableMemberDeclaration<*>)?.dispatchReceiverType ?: return val implicitReceiverIndex = implicitReceivers.indexOf(receiverType) if (implicitReceiverIndex != -1) addAnnotation("this@$implicitReceiverIndex", psi) @@ -837,7 +837,7 @@ class FirVisualizer(private val firFile: FirFile) : BaseRenderer() { data.append("(vararg $valueParameter): $name${typeParameters.trim()}") // TODO change "T" to concrete type is array is primitive } - private fun AbstractFirBasedSymbol<*>.isLocalDeclaration(): Boolean { + private fun FirBasedSymbol<*>.isLocalDeclaration(): Boolean { return when (val fir = this.fir) { is FirConstructor -> fir.returnTypeRef.coneType.isLocal() is FirCallableDeclaration<*> -> { @@ -853,7 +853,7 @@ class FirVisualizer(private val firFile: FirFile) : BaseRenderer() { } // id == packageName + className - private fun getSymbolId(symbol: AbstractFirBasedSymbol<*>?): String { + private fun getSymbolId(symbol: FirBasedSymbol<*>?): String { return when (symbol) { is FirCallableSymbol<*> -> { if (symbol.isLocalDeclaration()) { diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/IdeFirPhaseManager.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/IdeFirPhaseManager.kt index ea0c6607e79..140cd82b642 100644 --- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/IdeFirPhaseManager.kt +++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/IdeFirPhaseManager.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.resolve.ScopeSession import org.jetbrains.kotlin.fir.resolve.transformers.FirPhaseManager -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.idea.fir.low.level.api.file.builder.ModuleFileCache import org.jetbrains.kotlin.idea.fir.low.level.api.lazy.resolve.FirLazyDeclarationResolver import org.jetbrains.kotlin.idea.fir.low.level.api.sessions.FirSessionInvalidator @@ -22,7 +22,7 @@ internal class IdeFirPhaseManager( private val sessionInvalidator: FirSessionInvalidator, ) : FirPhaseManager() { override fun ensureResolved( - symbol: AbstractFirBasedSymbol<*>, + symbol: FirBasedSymbol<*>, requiredPhase: FirResolvePhase ) { val fir = symbol.fir as FirDeclaration diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/file/structure/FileStructureElement.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/file/structure/FileStructureElement.kt index ce98dc88e90..c437e704c2a 100644 --- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/file/structure/FileStructureElement.kt +++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/file/structure/FileStructureElement.kt @@ -10,7 +10,7 @@ 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.AbstractFirBasedSymbol +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.idea.fir.low.level.api.api.FirModuleResolveState @@ -71,7 +71,7 @@ internal class KtToFirMapping(firElement: FirElement, recorder: FirElementsRecor } } -internal sealed class ReanalyzableStructureElement>( +internal sealed class ReanalyzableStructureElement>( firFile: FirFile, val firSymbol: S, lockProvider: LockProvider, diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/firTestUtils.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/firTestUtils.kt index 0af63e31e12..9496c6c9bb2 100644 --- a/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/firTestUtils.kt +++ b/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/firTestUtils.kt @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.fir.FirSymbolOwner import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirFile import org.jetbrains.kotlin.fir.render -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirAnonymousInitializerSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol @@ -30,7 +30,7 @@ internal fun FirElement.renderWithClassName(renderMode: FirRenderer.RenderMode = "${this::class.simpleName} `${render(renderMode)}`" -internal fun AbstractFirBasedSymbol<*>.name(): String = when (this) { +internal fun FirBasedSymbol<*>.name(): String = when (this) { is FirCallableSymbol<*> -> callableId.callableName.asString() is FirClassLikeSymbol<*> -> classId.shortClassName.asString() is FirAnonymousInitializerSymbol -> "" @@ -50,4 +50,4 @@ internal inline fun resolveWithClearCaches( ): R { val resolveState = createResolveStateForNoCaching(context.getModuleInfo(), context.project, configureSession) return action(resolveState) -} \ No newline at end of file +} diff --git a/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/HLDiagnosticConverter.kt b/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/HLDiagnosticConverter.kt index 628487f2bcd..a685cff740c 100644 --- a/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/HLDiagnosticConverter.kt +++ b/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/HLDiagnosticConverter.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.checkers.generator.diagnostics.model.DiagnosticP import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccess -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +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 @@ -136,7 +136,7 @@ private object FirToKtConversionCreator { ) private val typeMapping: Map, HLFunctionCallConversion> = mapOf( - AbstractFirBasedSymbol::class to HLFunctionCallConversion( + FirBasedSymbol::class to HLFunctionCallConversion( "firSymbolBuilder.buildSymbol({0}.fir as FirDeclaration)", KtSymbol::class.createType(), importsToAdd = listOf("org.jetbrains.kotlin.fir.declarations.FirDeclaration") diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirSymbolDeclarationOverridesProvider.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirSymbolDeclarationOverridesProvider.kt index 4d7aabf8fbb..71e7a0c7c77 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirSymbolDeclarationOverridesProvider.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirSymbolDeclarationOverridesProvider.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.fir.FirSymbolOwner import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.resolve.ScopeSession import org.jetbrains.kotlin.fir.scopes.* -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirIntersectionOverrideFunctionSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirIntersectionOverridePropertySymbol @@ -139,7 +139,7 @@ internal class KtFirSymbolDeclarationOverridesProvider( } } - private fun AbstractFirBasedSymbol<*>.getIntersectionOverriddenSymbols(): Collection> { + private fun FirBasedSymbol<*>.getIntersectionOverriddenSymbols(): Collection> { require(this is FirCallableSymbol<*>) { "Required FirCallableSymbol but ${this::class} found" } diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDataClassConverters.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDataClassConverters.kt index b7fa474d039..1e8b744fbf2 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDataClassConverters.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDataClassConverters.kt @@ -1079,8 +1079,8 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert } add(FirErrors.NONE_APPLICABLE) { firDiagnostic -> NoneApplicableImpl( - firDiagnostic.a.map { abstractFirBasedSymbol -> - firSymbolBuilder.buildSymbol(abstractFirBasedSymbol.fir as FirDeclaration) + firDiagnostic.a.map { firBasedSymbol -> + firSymbolBuilder.buildSymbol(firBasedSymbol.fir as FirDeclaration) }, firDiagnostic as FirPsiDiagnostic, token, @@ -1214,8 +1214,8 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert } add(FirErrors.OVERLOAD_RESOLUTION_AMBIGUITY) { firDiagnostic -> OverloadResolutionAmbiguityImpl( - firDiagnostic.a.map { abstractFirBasedSymbol -> - firSymbolBuilder.buildSymbol(abstractFirBasedSymbol.fir as FirDeclaration) + firDiagnostic.a.map { firBasedSymbol -> + firSymbolBuilder.buildSymbol(firBasedSymbol.fir as FirDeclaration) }, firDiagnostic as FirPsiDiagnostic, token, @@ -1223,8 +1223,8 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert } add(FirErrors.ASSIGN_OPERATOR_AMBIGUITY) { firDiagnostic -> AssignOperatorAmbiguityImpl( - firDiagnostic.a.map { abstractFirBasedSymbol -> - firSymbolBuilder.buildSymbol(abstractFirBasedSymbol.fir as FirDeclaration) + firDiagnostic.a.map { firBasedSymbol -> + firSymbolBuilder.buildSymbol(firBasedSymbol.fir as FirDeclaration) }, firDiagnostic as FirPsiDiagnostic, token, @@ -1232,8 +1232,8 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert } add(FirErrors.ITERATOR_AMBIGUITY) { firDiagnostic -> IteratorAmbiguityImpl( - firDiagnostic.a.map { abstractFirBasedSymbol -> - firSymbolBuilder.buildSymbol(abstractFirBasedSymbol.fir as FirDeclaration) + firDiagnostic.a.map { firBasedSymbol -> + firSymbolBuilder.buildSymbol(firBasedSymbol.fir as FirDeclaration) }, firDiagnostic as FirPsiDiagnostic, token, @@ -1241,8 +1241,8 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert } add(FirErrors.HAS_NEXT_FUNCTION_AMBIGUITY) { firDiagnostic -> HasNextFunctionAmbiguityImpl( - firDiagnostic.a.map { abstractFirBasedSymbol -> - firSymbolBuilder.buildSymbol(abstractFirBasedSymbol.fir as FirDeclaration) + firDiagnostic.a.map { firBasedSymbol -> + firSymbolBuilder.buildSymbol(firBasedSymbol.fir as FirDeclaration) }, firDiagnostic as FirPsiDiagnostic, token, @@ -1250,8 +1250,8 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert } add(FirErrors.NEXT_AMBIGUITY) { firDiagnostic -> NextAmbiguityImpl( - firDiagnostic.a.map { abstractFirBasedSymbol -> - firSymbolBuilder.buildSymbol(abstractFirBasedSymbol.fir as FirDeclaration) + firDiagnostic.a.map { firBasedSymbol -> + firSymbolBuilder.buildSymbol(firBasedSymbol.fir as FirDeclaration) }, firDiagnostic as FirPsiDiagnostic, token, @@ -1745,8 +1745,8 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert } add(FirErrors.CONFLICTING_OVERLOADS) { firDiagnostic -> ConflictingOverloadsImpl( - firDiagnostic.a.map { abstractFirBasedSymbol -> - firSymbolBuilder.buildSymbol(abstractFirBasedSymbol.fir as FirDeclaration) + firDiagnostic.a.map { firBasedSymbol -> + firSymbolBuilder.buildSymbol(firBasedSymbol.fir as FirDeclaration) }, firDiagnostic as FirPsiDiagnostic, token, @@ -1754,8 +1754,8 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert } add(FirErrors.REDECLARATION) { firDiagnostic -> RedeclarationImpl( - firDiagnostic.a.map { abstractFirBasedSymbol -> - firSymbolBuilder.buildSymbol(abstractFirBasedSymbol.fir as FirDeclaration) + firDiagnostic.a.map { firBasedSymbol -> + firSymbolBuilder.buildSymbol(firBasedSymbol.fir as FirDeclaration) }, firDiagnostic as FirPsiDiagnostic, token, @@ -2150,8 +2150,8 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert add(FirErrors.COMPONENT_FUNCTION_AMBIGUITY) { firDiagnostic -> ComponentFunctionAmbiguityImpl( firDiagnostic.a, - firDiagnostic.b.map { abstractFirBasedSymbol -> - firSymbolBuilder.buildSymbol(abstractFirBasedSymbol.fir as FirDeclaration) + firDiagnostic.b.map { firBasedSymbol -> + firSymbolBuilder.buildSymbol(firBasedSymbol.fir as FirDeclaration) }, firDiagnostic as FirPsiDiagnostic, token, @@ -2442,8 +2442,8 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert } add(FirErrors.HAS_NEXT_FUNCTION_NONE_APPLICABLE) { firDiagnostic -> HasNextFunctionNoneApplicableImpl( - firDiagnostic.a.map { abstractFirBasedSymbol -> - firSymbolBuilder.buildSymbol(abstractFirBasedSymbol.fir as FirDeclaration) + firDiagnostic.a.map { firBasedSymbol -> + firSymbolBuilder.buildSymbol(firBasedSymbol.fir as FirDeclaration) }, firDiagnostic as FirPsiDiagnostic, token, @@ -2451,8 +2451,8 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert } add(FirErrors.NEXT_NONE_APPLICABLE) { firDiagnostic -> NextNoneApplicableImpl( - firDiagnostic.a.map { abstractFirBasedSymbol -> - firSymbolBuilder.buildSymbol(abstractFirBasedSymbol.fir as FirDeclaration) + firDiagnostic.a.map { firBasedSymbol -> + firSymbolBuilder.buildSymbol(firBasedSymbol.fir as FirDeclaration) }, firDiagnostic as FirPsiDiagnostic, token, @@ -2470,8 +2470,8 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert add(FirErrors.DELEGATE_SPECIAL_FUNCTION_AMBIGUITY) { firDiagnostic -> DelegateSpecialFunctionAmbiguityImpl( firDiagnostic.a, - firDiagnostic.b.map { abstractFirBasedSymbol -> - firSymbolBuilder.buildSymbol(abstractFirBasedSymbol.fir as FirDeclaration) + firDiagnostic.b.map { firBasedSymbol -> + firSymbolBuilder.buildSymbol(firBasedSymbol.fir as FirDeclaration) }, firDiagnostic as FirPsiDiagnostic, token, @@ -2480,8 +2480,8 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert add(FirErrors.DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE) { firDiagnostic -> DelegateSpecialFunctionNoneApplicableImpl( firDiagnostic.a, - firDiagnostic.b.map { abstractFirBasedSymbol -> - firSymbolBuilder.buildSymbol(abstractFirBasedSymbol.fir as FirDeclaration) + firDiagnostic.b.map { firBasedSymbol -> + firSymbolBuilder.buildSymbol(firBasedSymbol.fir as FirDeclaration) }, firDiagnostic as FirPsiDiagnostic, token, diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/pointers/pointerUtils.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/pointers/pointerUtils.kt index 66575e07373..07b985b62a5 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/pointers/pointerUtils.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/pointers/pointerUtils.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.renderWithType import org.jetbrains.kotlin.fir.scopes.FirScope -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol +import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol import org.jetbrains.kotlin.idea.fir.low.level.api.ideSessionComponents import org.jetbrains.kotlin.ir.util.IdSignature @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.ir.util.IdSignature internal inline fun FirScope.findDeclarationWithSignature( signature: IdSignature, firSession: FirSession, - processor: FirScope.((AbstractFirBasedSymbol<*>) -> Unit) -> Unit + processor: FirScope.((FirBasedSymbol<*>) -> Unit) -> Unit ): D? { val signatureComposer = firSession.ideSessionComponents.signatureComposer var foundSymbol: D? = null diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/references/FirReferenceResolveHelper.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/references/FirReferenceResolveHelper.kt index a593da68de6..17eb4a7ae43 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/references/FirReferenceResolveHelper.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/references/FirReferenceResolveHelper.kt @@ -25,7 +25,6 @@ import org.jetbrains.kotlin.fir.resolve.toSymbol import org.jetbrains.kotlin.fir.resolve.transformers.FirImportResolveTransformer import org.jetbrains.kotlin.fir.scopes.impl.FirExplicitSimpleImportingScope import org.jetbrains.kotlin.fir.scopes.processClassifiersByName -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.ConeClassLikeLookupTagImpl import org.jetbrains.kotlin.fir.types.* @@ -52,7 +51,7 @@ internal object FirReferenceResolveHelper { fun FirResolvedTypeRef.toTargetSymbol(session: FirSession, symbolBuilder: KtSymbolByFirBuilder): KtSymbol? { val type = getDeclaredType() as? ConeLookupTagBasedType - val resolvedSymbol = type?.lookupTag?.toSymbol(session) as? AbstractFirBasedSymbol<*> + val resolvedSymbol = type?.lookupTag?.toSymbol(session) as? FirBasedSymbol<*> val symbol = resolvedSymbol ?: run { val diagnostic = (this as? FirErrorTypeRef)?.diagnostic