From 7b7bcb8ffa5633b0c4f89cbd86847b07d0bfcf5c Mon Sep 17 00:00:00 2001 From: Sergej Jaskiewicz Date: Mon, 16 Oct 2023 14:57:22 +0200 Subject: [PATCH] [FIR/IR generator] Introduce ImportCollector This class enables printing the import list in generated files in a smarter way. Also, refactor `Importable` interface hierarchy, namely, don't inherit `TypeRef` from `Importable`, since we have types like `TypeRef.Star` which are not really importable. Replace the `Importable#typeWithArguments` property with the `TypeRef#render` method to utilize `ImportCollector` while rendering types. --- build.gradle.kts | 3 + .../kotlin/fir/FirAnnotationContainer.kt | 3 +- .../org/jetbrains/kotlin/fir/FirElement.kt | 4 +- .../kotlin/fir/FirElementWithResolveState.kt | 5 +- .../kotlin/fir/FirFileAnnotationsContainer.kt | 7 +- .../kotlin/fir/FirFunctionTypeParameter.kt | 3 +- .../gen/org/jetbrains/kotlin/fir/FirLabel.kt | 3 +- .../kotlin/fir/FirPackageDirective.kt | 3 +- .../jetbrains/kotlin/fir/FirTargetElement.kt | 3 +- .../builder/FirAnnotationContainerBuilder.kt | 2 - .../FirFileAnnotationsContainerBuilder.kt | 9 +- .../FirFunctionTypeParameterBuilder.kt | 4 +- .../kotlin/fir/builder/FirLabelBuilder.kt | 4 +- .../fir/builder/FirPackageDirectiveBuilder.kt | 4 +- .../fir/contracts/FirContractDescription.kt | 3 +- .../FirContractElementDeclaration.kt | 3 +- .../fir/contracts/FirEffectDeclaration.kt | 3 +- .../FirLegacyRawContractDescription.kt | 3 +- .../contracts/FirRawContractDescription.kt | 3 +- .../FirResolvedContractDescription.kt | 3 +- .../FirContractElementDeclarationBuilder.kt | 3 +- .../builder/FirEffectDeclarationBuilder.kt | 3 +- .../FirLegacyRawContractDescriptionBuilder.kt | 3 +- .../FirRawContractDescriptionBuilder.kt | 3 +- .../FirResolvedContractDescriptionBuilder.kt | 3 +- .../impl/FirContractElementDeclarationImpl.kt | 3 +- .../impl/FirEffectDeclarationImpl.kt | 3 +- .../FirLegacyRawContractDescriptionImpl.kt | 3 +- .../impl/FirRawContractDescriptionImpl.kt | 4 +- .../FirResolvedContractDescriptionImpl.kt | 4 +- .../fir/declarations/FirAnonymousFunction.kt | 4 +- .../declarations/FirAnonymousInitializer.kt | 4 +- .../fir/declarations/FirAnonymousObject.kt | 4 +- .../fir/declarations/FirBackingField.kt | 4 +- .../declarations/FirCallableDeclaration.kt | 4 +- .../kotlin/fir/declarations/FirClass.kt | 4 +- .../declarations/FirClassLikeDeclaration.kt | 4 +- .../fir/declarations/FirCodeFragment.kt | 4 +- .../FirConstructedClassTypeParameterRef.kt | 3 +- .../kotlin/fir/declarations/FirConstructor.kt | 4 +- .../fir/declarations/FirContextReceiver.kt | 3 +- .../FirContractDescriptionOwner.kt | 3 +- .../declarations/FirControlFlowGraphOwner.kt | 3 +- .../declarations/FirDanglingModifierList.kt | 4 +- .../kotlin/fir/declarations/FirDeclaration.kt | 4 +- .../fir/declarations/FirDeclarationStatus.kt | 3 +- .../kotlin/fir/declarations/FirEnumEntry.kt | 4 +- .../fir/declarations/FirErrorFunction.kt | 4 +- .../kotlin/fir/declarations/FirErrorImport.kt | 3 +- .../FirErrorPrimaryConstructor.kt | 4 +- .../fir/declarations/FirErrorProperty.kt | 4 +- .../kotlin/fir/declarations/FirField.kt | 4 +- .../kotlin/fir/declarations/FirFile.kt | 4 +- .../kotlin/fir/declarations/FirFunction.kt | 4 +- .../kotlin/fir/declarations/FirImport.kt | 3 +- .../fir/declarations/FirMemberDeclaration.kt | 4 +- .../FirOuterClassTypeParameterRef.kt | 3 +- .../kotlin/fir/declarations/FirProperty.kt | 4 +- .../fir/declarations/FirPropertyAccessor.kt | 4 +- .../fir/declarations/FirReceiverParameter.kt | 3 +- .../fir/declarations/FirRegularClass.kt | 4 +- .../FirResolvedDeclarationStatus.kt | 3 +- .../fir/declarations/FirResolvedImport.kt | 3 +- .../kotlin/fir/declarations/FirScript.kt | 4 +- .../fir/declarations/FirSimpleFunction.kt | 4 +- .../kotlin/fir/declarations/FirTypeAlias.kt | 4 +- .../fir/declarations/FirTypeParameter.kt | 4 +- .../fir/declarations/FirTypeParameterRef.kt | 3 +- .../declarations/FirTypeParameterRefsOwner.kt | 3 +- .../declarations/FirTypeParametersOwner.kt | 3 +- .../fir/declarations/FirValueParameter.kt | 4 +- .../kotlin/fir/declarations/FirVariable.kt | 4 +- .../builder/FirAbstractConstructorBuilder.kt | 13 +- .../builder/FirAnonymousFunctionBuilder.kt | 21 +-- .../builder/FirAnonymousInitializerBuilder.kt | 9 +- .../builder/FirAnonymousObjectBuilder.kt | 19 +-- .../builder/FirBackingFieldBuilder.kt | 18 +- .../declarations/builder/FirClassBuilder.kt | 11 +- .../builder/FirCodeFragmentBuilder.kt | 12 +- ...ConstructedClassTypeParameterRefBuilder.kt | 3 +- .../builder/FirConstructorBuilder.kt | 20 +-- .../builder/FirContextReceiverBuilder.kt | 3 +- .../builder/FirDanglingModifierListBuilder.kt | 6 +- .../builder/FirDeclarationBuilder.kt | 1 - .../FirDefaultSetterValueParameterBuilder.kt | 22 +-- .../builder/FirEnumEntryBuilder.kt | 19 +-- .../builder/FirErrorFunctionBuilder.kt | 23 +-- .../builder/FirErrorImportBuilder.kt | 5 +- .../FirErrorPrimaryConstructorBuilder.kt | 19 +-- .../builder/FirErrorPropertyBuilder.kt | 23 +-- .../declarations/builder/FirFieldBuilder.kt | 22 +-- .../declarations/builder/FirFileBuilder.kt | 15 +- .../builder/FirFunctionBuilder.kt | 11 +- .../declarations/builder/FirImportBuilder.kt | 3 +- .../FirOuterClassTypeParameterRefBuilder.kt | 3 +- .../builder/FirPrimaryConstructorBuilder.kt | 19 +-- .../builder/FirPropertyAccessorBuilder.kt | 22 +-- .../builder/FirPropertyBuilder.kt | 25 +-- .../builder/FirReceiverParameterBuilder.kt | 3 +- .../builder/FirRegularClassBuilder.kt | 21 +-- .../builder/FirResolvedImportBuilder.kt | 6 +- .../declarations/builder/FirScriptBuilder.kt | 14 +- .../builder/FirSimpleFunctionBuilder.kt | 22 +-- .../builder/FirTypeAliasBuilder.kt | 18 +- .../builder/FirTypeParameterBuilder.kt | 12 +- .../FirTypeParameterRefsOwnerBuilder.kt | 1 - .../builder/FirTypeParametersOwnerBuilder.kt | 1 - .../builder/FirValueParameterBuilder.kt | 22 +-- .../builder/FirVariableBuilder.kt | 13 +- .../impl/FirAnonymousFunctionImpl.kt | 23 +-- .../impl/FirAnonymousInitializerImpl.kt | 13 +- .../impl/FirAnonymousObjectImpl.kt | 20 +-- .../declarations/impl/FirBackingFieldImpl.kt | 22 +-- .../declarations/impl/FirCodeFragmentImpl.kt | 16 +- ...FirConstructedClassTypeParameterRefImpl.kt | 3 +- .../declarations/impl/FirConstructorImpl.kt | 22 +-- .../impl/FirContextReceiverImpl.kt | 3 +- .../impl/FirDanglingModifierListImpl.kt | 16 +- .../impl/FirDefaultSetterValueParameter.kt | 24 +-- .../fir/declarations/impl/FirEnumEntryImpl.kt | 23 +-- .../declarations/impl/FirErrorFunctionImpl.kt | 23 +-- .../declarations/impl/FirErrorImportImpl.kt | 3 +- .../impl/FirErrorPrimaryConstructorImpl.kt | 22 +-- .../declarations/impl/FirErrorPropertyImpl.kt | 24 +-- .../fir/declarations/impl/FirFieldImpl.kt | 23 +-- .../fir/declarations/impl/FirFileImpl.kt | 16 +- .../fir/declarations/impl/FirImportImpl.kt | 3 +- .../impl/FirOuterClassTypeParameterRefImpl.kt | 3 +- .../impl/FirPrimaryConstructor.kt | 22 +-- .../impl/FirPropertyAccessorImpl.kt | 22 +-- .../fir/declarations/impl/FirPropertyImpl.kt | 24 +-- .../impl/FirReceiverParameterImpl.kt | 8 +- .../declarations/impl/FirRegularClassImpl.kt | 21 +-- .../impl/FirResolvedImportImpl.kt | 3 +- .../fir/declarations/impl/FirScriptImpl.kt | 18 +- .../impl/FirSimpleFunctionImpl.kt | 22 +-- .../fir/declarations/impl/FirTypeAliasImpl.kt | 19 +-- .../declarations/impl/FirTypeParameterImpl.kt | 16 +- .../impl/FirValueParameterImpl.kt | 24 +-- .../fir/diagnostics/FirDiagnosticHolder.kt | 3 +- .../kotlin/fir/expressions/FirAnnotation.kt | 4 +- .../FirAnnotationArgumentMapping.kt | 3 +- .../fir/expressions/FirAnnotationCall.kt | 4 +- .../FirAnonymousFunctionExpression.kt | 4 +- .../FirAnonymousObjectExpression.kt | 4 +- .../kotlin/fir/expressions/FirArgumentList.kt | 3 +- .../kotlin/fir/expressions/FirArrayLiteral.kt | 4 +- .../FirAssignmentOperatorStatement.kt | 3 +- .../expressions/FirAugmentedArraySetCall.kt | 3 +- .../expressions/FirBinaryLogicExpression.kt | 4 +- .../kotlin/fir/expressions/FirBlock.kt | 4 +- .../fir/expressions/FirBreakExpression.kt | 4 +- .../kotlin/fir/expressions/FirCall.kt | 3 +- .../expressions/FirCallableReferenceAccess.kt | 6 +- .../kotlin/fir/expressions/FirCatch.kt | 3 +- .../fir/expressions/FirCheckNotNullCall.kt | 4 +- .../expressions/FirCheckedSafeCallSubject.kt | 4 +- .../FirClassReferenceExpression.kt | 4 +- .../expressions/FirComparisonExpression.kt | 4 +- .../fir/expressions/FirComponentCall.kt | 6 +- .../fir/expressions/FirConstExpression.kt | 4 +- .../FirContextReceiverArgumentListOwner.kt | 3 +- .../fir/expressions/FirContinueExpression.kt | 4 +- .../FirDelegatedConstructorCall.kt | 3 +- ...garedAssignmentValueReferenceExpression.kt | 4 +- .../kotlin/fir/expressions/FirDoWhileLoop.kt | 3 +- .../fir/expressions/FirElvisExpression.kt | 4 +- ...irEnumEntryDeserializedAccessExpression.kt | 4 +- .../expressions/FirEqualityOperatorCall.kt | 4 +- .../fir/expressions/FirErrorAnnotationCall.kt | 4 +- .../fir/expressions/FirErrorExpression.kt | 4 +- .../kotlin/fir/expressions/FirErrorLoop.kt | 3 +- .../expressions/FirErrorResolvedQualifier.kt | 4 +- .../kotlin/fir/expressions/FirExpression.kt | 4 +- .../kotlin/fir/expressions/FirFunctionCall.kt | 6 +- .../kotlin/fir/expressions/FirGetClassCall.kt | 4 +- .../fir/expressions/FirImplicitInvokeCall.kt | 6 +- .../FirInaccessibleReceiverExpression.kt | 4 +- .../FirIncrementDecrementExpression.kt | 4 +- .../FirIntegerLiteralOperatorCall.kt | 6 +- .../kotlin/fir/expressions/FirJump.kt | 4 +- .../FirLambdaArgumentExpression.kt | 4 +- .../kotlin/fir/expressions/FirLazyBlock.kt | 4 +- .../fir/expressions/FirLazyExpression.kt | 4 +- .../kotlin/fir/expressions/FirLoop.kt | 3 +- .../kotlin/fir/expressions/FirLoopJump.kt | 4 +- .../FirMultiDelegatedConstructorCall.kt | 3 +- .../expressions/FirNamedArgumentExpression.kt | 4 +- .../FirPropertyAccessExpression.kt | 6 +- .../FirQualifiedAccessExpression.kt | 6 +- .../FirQualifiedErrorAccessExpression.kt | 4 +- .../kotlin/fir/expressions/FirResolvable.kt | 3 +- .../fir/expressions/FirResolvedQualifier.kt | 4 +- .../FirResolvedReifiedParameterReference.kt | 4 +- .../fir/expressions/FirReturnExpression.kt | 4 +- .../fir/expressions/FirSafeCallExpression.kt | 4 +- .../fir/expressions/FirSmartCastExpression.kt | 4 +- .../FirSpreadArgumentExpression.kt | 4 +- .../kotlin/fir/expressions/FirStatement.kt | 3 +- .../expressions/FirStringConcatenationCall.kt | 4 +- .../expressions/FirThisReceiverExpression.kt | 6 +- .../fir/expressions/FirThrowExpression.kt | 4 +- .../fir/expressions/FirTryExpression.kt | 4 +- .../fir/expressions/FirTypeOperatorCall.kt | 4 +- .../FirVarargArgumentsExpression.kt | 4 +- .../fir/expressions/FirVariableAssignment.kt | 3 +- .../kotlin/fir/expressions/FirWhenBranch.kt | 3 +- .../fir/expressions/FirWhenExpression.kt | 4 +- .../expressions/FirWhenSubjectExpression.kt | 4 +- .../kotlin/fir/expressions/FirWhileLoop.kt | 3 +- .../FirWrappedArgumentExpression.kt | 4 +- .../FirWrappedDelegateExpression.kt | 4 +- .../fir/expressions/FirWrappedExpression.kt | 4 +- .../builder/FirAbstractFunctionCallBuilder.kt | 9 +- .../FirAbstractResolvedQualifierBuilder.kt | 1 - .../builder/FirAnnotationBuilder.kt | 6 +- .../builder/FirAnnotationCallBuilder.kt | 14 +- .../builder/FirArrayLiteralBuilder.kt | 6 +- .../FirAssignmentOperatorStatementBuilder.kt | 3 +- .../FirAugmentedArraySetCallBuilder.kt | 9 +- .../FirBinaryLogicExpressionBuilder.kt | 5 +- .../expressions/builder/FirBlockBuilder.kt | 5 +- .../builder/FirBreakExpressionBuilder.kt | 9 +- .../fir/expressions/builder/FirCallBuilder.kt | 1 - .../FirCallableReferenceAccessBuilder.kt | 8 +- .../expressions/builder/FirCatchBuilder.kt | 3 +- .../builder/FirCheckNotNullCallBuilder.kt | 5 +- .../FirCheckedSafeCallSubjectBuilder.kt | 5 +- .../FirClassReferenceExpressionBuilder.kt | 5 +- .../builder/FirComparisonExpressionBuilder.kt | 7 +- .../builder/FirComponentCallBuilder.kt | 18 +- .../builder/FirContinueExpressionBuilder.kt | 9 +- .../FirDelegatedConstructorCallBuilder.kt | 12 +- ...signmentValueReferenceExpressionBuilder.kt | 5 +- .../builder/FirDoWhileLoopBuilder.kt | 4 +- .../builder/FirElseIfTrueConditionBuilder.kt | 8 +- .../builder/FirElvisExpressionBuilder.kt | 5 +- .../builder/FirEmptyExpressionBlockBuilder.kt | 11 -- ...ntryDeserializedAccessExpressionBuilder.kt | 7 +- .../builder/FirEqualityOperatorCallBuilder.kt | 7 +- .../builder/FirErrorAnnotationCallBuilder.kt | 14 +- .../builder/FirErrorExpressionBuilder.kt | 7 +- .../builder/FirErrorLoopBuilder.kt | 7 +- .../FirErrorResolvedQualifierBuilder.kt | 6 +- .../builder/FirExpressionBuilder.kt | 1 - .../builder/FirExpressionStubBuilder.kt | 4 +- .../builder/FirFunctionCallBuilder.kt | 14 +- .../builder/FirGetClassCallBuilder.kt | 7 +- .../builder/FirImplicitInvokeCallBuilder.kt | 15 +- ...irInaccessibleReceiverExpressionBuilder.kt | 6 +- .../FirIncrementDecrementExpressionBuilder.kt | 5 +- .../FirIntegerLiteralOperatorCallBuilder.kt | 15 +- .../FirLambdaArgumentExpressionBuilder.kt | 5 +- .../builder/FirLazyBlockBuilder.kt | 11 -- .../FirLazyDelegatedConstructorCallBuilder.kt | 6 +- .../builder/FirLazyExpressionBuilder.kt | 6 +- .../fir/expressions/builder/FirLoopBuilder.kt | 1 - .../expressions/builder/FirLoopJumpBuilder.kt | 1 - ...FirMultiDelegatedConstructorCallBuilder.kt | 8 +- .../FirNamedArgumentExpressionBuilder.kt | 5 +- .../FirPropertyAccessExpressionBuilder.kt | 6 +- .../FirQualifiedAccessExpressionBuilder.kt | 1 - ...irQualifiedErrorAccessExpressionBuilder.kt | 7 +- .../builder/FirResolvedQualifierBuilder.kt | 7 +- ...esolvedReifiedParameterReferenceBuilder.kt | 5 +- .../builder/FirReturnExpressionBuilder.kt | 8 +- .../builder/FirSafeCallExpressionBuilder.kt | 11 +- .../builder/FirSmartCastExpressionBuilder.kt | 7 +- .../FirSpreadArgumentExpressionBuilder.kt | 5 +- .../FirStringConcatenationCallBuilder.kt | 9 +- .../FirThisReceiverExpressionBuilder.kt | 7 +- .../builder/FirThrowExpressionBuilder.kt | 8 +- .../builder/FirTryExpressionBuilder.kt | 5 +- .../builder/FirTypeOperatorCallBuilder.kt | 12 +- .../builder/FirUnitExpressionBuilder.kt | 8 +- .../FirVarargArgumentsExpressionBuilder.kt | 5 +- .../builder/FirVariableAssignmentBuilder.kt | 3 +- .../builder/FirWhenBranchBuilder.kt | 3 +- .../builder/FirWhenExpressionBuilder.kt | 11 +- .../FirWhenSubjectExpressionBuilder.kt | 7 +- .../builder/FirWhileLoopBuilder.kt | 4 +- .../FirWrappedDelegateExpressionBuilder.kt | 5 +- .../expressions/impl/FirAnnotationCallImpl.kt | 15 +- .../fir/expressions/impl/FirAnnotationImpl.kt | 10 +- .../expressions/impl/FirArrayLiteralImpl.kt | 10 +- .../FirAssignmentOperatorStatementImpl.kt | 8 +- .../impl/FirAugmentedArraySetCallImpl.kt | 12 +- .../impl/FirBinaryLogicExpressionImpl.kt | 10 +- .../fir/expressions/impl/FirBlockImpl.kt | 10 +- .../impl/FirBreakExpressionImpl.kt | 10 +- .../impl/FirCallableReferenceAccessImpl.kt | 12 +- .../fir/expressions/impl/FirCatchImpl.kt | 3 +- .../impl/FirCheckNotNullCallImpl.kt | 10 +- .../impl/FirCheckedSafeCallSubjectImpl.kt | 10 +- .../impl/FirClassReferenceExpressionImpl.kt | 12 +- .../impl/FirComparisonExpressionImpl.kt | 16 +- .../expressions/impl/FirComponentCallImpl.kt | 15 +- .../impl/FirConstExpressionImpl.kt | 12 +- .../impl/FirContinueExpressionImpl.kt | 10 +- .../impl/FirDelegatedConstructorCallImpl.kt | 8 +- ...dAssignmentValueReferenceExpressionImpl.kt | 10 +- .../expressions/impl/FirDoWhileLoopImpl.kt | 8 +- .../impl/FirElseIfTrueCondition.kt | 10 +- .../impl/FirElvisExpressionImpl.kt | 10 +- .../impl/FirEmptyExpressionBlock.kt | 8 +- ...umEntryDeserializedAccessExpressionImpl.kt | 10 +- .../impl/FirEqualityOperatorCallImpl.kt | 16 +- .../impl/FirErrorAnnotationCallImpl.kt | 15 +- .../impl/FirErrorExpressionImpl.kt | 10 +- .../fir/expressions/impl/FirErrorLoopImpl.kt | 9 +- .../impl/FirErrorResolvedQualifierImpl.kt | 10 +- .../fir/expressions/impl/FirExpressionStub.kt | 10 +- .../expressions/impl/FirFunctionCallImpl.kt | 15 +- .../expressions/impl/FirGetClassCallImpl.kt | 12 +- .../impl/FirImplicitInvokeCallImpl.kt | 17 +- .../FirInaccessibleReceiverExpressionImpl.kt | 10 +- .../FirIncrementDecrementExpressionImpl.kt | 12 +- .../impl/FirIntegerLiteralOperatorCallImpl.kt | 17 +- .../impl/FirLambdaArgumentExpressionImpl.kt | 10 +- .../fir/expressions/impl/FirLazyBlockImpl.kt | 7 +- .../impl/FirLazyDelegatedConstructorCall.kt | 5 +- .../expressions/impl/FirLazyExpressionImpl.kt | 7 +- .../FirMultiDelegatedConstructorCallImpl.kt | 12 +- .../impl/FirNamedArgumentExpressionImpl.kt | 12 +- .../impl/FirPropertyAccessExpressionImpl.kt | 10 +- .../FirQualifiedErrorAccessExpressionImpl.kt | 18 +- .../impl/FirResolvedQualifierImpl.kt | 10 +- ...irResolvedReifiedParameterReferenceImpl.kt | 12 +- .../impl/FirReturnExpressionImpl.kt | 10 +- .../impl/FirSafeCallExpressionImpl.kt | 13 +- .../impl/FirSmartCastExpressionImpl.kt | 10 +- .../impl/FirSpreadArgumentExpressionImpl.kt | 10 +- .../impl/FirStringConcatenationCallImpl.kt | 10 +- .../impl/FirThisReceiverExpressionImpl.kt | 12 +- .../impl/FirThrowExpressionImpl.kt | 10 +- .../expressions/impl/FirTryExpressionImpl.kt | 14 +- .../impl/FirTypeOperatorCallImpl.kt | 14 +- .../fir/expressions/impl/FirUnitExpression.kt | 10 +- .../impl/FirVarargArgumentsExpressionImpl.kt | 10 +- .../impl/FirVariableAssignmentImpl.kt | 8 +- .../fir/expressions/impl/FirWhenBranchImpl.kt | 3 +- .../expressions/impl/FirWhenExpressionImpl.kt | 17 +- .../impl/FirWhenSubjectExpressionImpl.kt | 10 +- .../fir/expressions/impl/FirWhileLoopImpl.kt | 8 +- .../impl/FirWrappedDelegateExpressionImpl.kt | 10 +- .../impl/FirFileAnnotationsContainerImpl.kt | 11 +- .../fir/impl/FirFunctionTypeParameterImpl.kt | 3 +- .../jetbrains/kotlin/fir/impl/FirLabelImpl.kt | 3 +- .../fir/impl/FirPackageDirectiveImpl.kt | 3 +- .../references/FirBackingFieldReference.kt | 3 +- .../FirControlFlowGraphReference.kt | 3 +- .../references/FirDelegateFieldReference.kt | 3 +- .../fir/references/FirErrorNamedReference.kt | 3 +- ...irFromMissingDependenciesNamedReference.kt | 3 +- .../fir/references/FirNamedReference.kt | 3 +- .../FirNamedReferenceWithCandidateBase.kt | 3 +- .../kotlin/fir/references/FirReference.kt | 3 +- .../FirResolvedCallableReference.kt | 3 +- .../references/FirResolvedErrorReference.kt | 3 +- .../references/FirResolvedNamedReference.kt | 3 +- .../fir/references/FirSuperReference.kt | 3 +- .../kotlin/fir/references/FirThisReference.kt | 3 +- .../FirBackingFieldReferenceBuilder.kt | 4 +- .../FirDelegateFieldReferenceBuilder.kt | 4 +- .../builder/FirErrorNamedReferenceBuilder.kt | 4 +- .../FirExplicitSuperReferenceBuilder.kt | 3 +- .../FirExplicitThisReferenceBuilder.kt | 4 +- ...issingDependenciesNamedReferenceBuilder.kt | 3 +- .../FirImplicitThisReferenceBuilder.kt | 4 +- ...mParameterResolvedNamedReferenceBuilder.kt | 3 +- .../FirResolvedCallableReferenceBuilder.kt | 3 +- .../FirResolvedErrorReferenceBuilder.kt | 3 +- .../FirResolvedNamedReferenceBuilder.kt | 3 +- .../builder/FirSimpleNamedReferenceBuilder.kt | 3 +- .../impl/FirBackingFieldReferenceImpl.kt | 3 +- .../impl/FirDelegateFieldReferenceImpl.kt | 3 +- .../impl/FirErrorNamedReferenceImpl.kt | 3 +- .../impl/FirExplicitSuperReference.kt | 3 +- .../impl/FirExplicitThisReference.kt | 3 +- ...omMissingDependenciesNamedReferenceImpl.kt | 3 +- .../impl/FirImplicitThisReference.kt | 3 +- ...ertyFromParameterResolvedNamedReference.kt | 3 +- .../impl/FirResolvedCallableReferenceImpl.kt | 3 +- .../impl/FirResolvedErrorReferenceImpl.kt | 3 +- .../impl/FirResolvedNamedReferenceImpl.kt | 3 +- .../impl/FirSimpleNamedReference.kt | 3 +- .../fir/references/impl/FirStubReference.kt | 4 +- .../kotlin/fir/types/FirDynamicTypeRef.kt | 3 +- .../kotlin/fir/types/FirErrorTypeRef.kt | 3 +- .../kotlin/fir/types/FirFunctionTypeRef.kt | 3 +- .../kotlin/fir/types/FirImplicitTypeRef.kt | 3 +- .../fir/types/FirIntersectionTypeRef.kt | 3 +- .../fir/types/FirPlaceholderProjection.kt | 3 +- .../kotlin/fir/types/FirResolvedTypeRef.kt | 3 +- .../kotlin/fir/types/FirStarProjection.kt | 3 +- .../kotlin/fir/types/FirTypeProjection.kt | 3 +- .../types/FirTypeProjectionWithVariance.kt | 3 +- .../jetbrains/kotlin/fir/types/FirTypeRef.kt | 3 +- .../fir/types/FirTypeRefWithNullability.kt | 3 +- .../kotlin/fir/types/FirUserTypeRef.kt | 3 +- .../types/builder/FirDynamicTypeRefBuilder.kt | 3 +- .../builder/FirFunctionTypeRefBuilder.kt | 3 +- .../builder/FirIntersectionTypeRefBuilder.kt | 3 +- .../FirPlaceholderProjectionBuilder.kt | 3 +- .../builder/FirResolvedTypeRefBuilder.kt | 3 +- .../types/builder/FirStarProjectionBuilder.kt | 3 +- .../FirTypeProjectionWithVarianceBuilder.kt | 3 +- .../fir/types/impl/FirDynamicTypeRefImpl.kt | 8 +- .../fir/types/impl/FirFunctionTypeRefImpl.kt | 8 +- .../types/impl/FirIntersectionTypeRefImpl.kt | 8 +- .../impl/FirPlaceholderProjectionImpl.kt | 3 +- .../fir/types/impl/FirResolvedTypeRefImpl.kt | 8 +- .../fir/types/impl/FirStarProjectionImpl.kt | 3 +- .../impl/FirTypeProjectionWithVarianceImpl.kt | 3 +- .../kotlin/fir/visitors/FirDefaultVisitor.kt | 155 +---------------- .../fir/visitors/FirDefaultVisitorVoid.kt | 155 +---------------- .../kotlin/fir/visitors/FirTransformer.kt | 161 +----------------- .../kotlin/fir/visitors/FirVisitor.kt | 161 +----------------- .../kotlin/fir/visitors/FirVisitorVoid.kt | 161 +----------------- .../fir/tree/generator/BuilderConfigurator.kt | 2 +- .../generator/ImplementationConfigurator.kt | 10 +- .../fir/tree/generator/NodeConfigurator.kt | 6 +- .../kotlin/fir/tree/generator/Types.kt | 11 ++ .../context/AbstractBuilderConfigurator.kt | 6 +- .../kotlin/fir/tree/generator/importables.kt | 5 +- .../fir/tree/generator/model/Builder.kt | 30 ++-- .../fir/tree/generator/model/Element.kt | 6 +- .../fir/tree/generator/model/ElementUtils.kt | 4 +- .../kotlin/fir/tree/generator/model/Field.kt | 3 +- .../tree/generator/model/Implementation.kt | 21 ++- .../fir/tree/generator/printer/builder.kt | 94 +++++----- .../fir/tree/generator/printer/element.kt | 42 +++-- .../fir/tree/generator/printer/field.kt | 14 +- .../tree/generator/printer/implementation.kt | 78 ++++++--- .../fir/tree/generator/printer/transformer.kt | 26 ++- .../fir/tree/generator/printer/utils.kt | 125 ++------------ .../fir/tree/generator/printer/visitor.kt | 64 ++++++- .../generator/util/HierachyGraphGenerator.kt | 4 +- .../kotlin/ir/generator/config/ConfigModel.kt | 19 +-- .../kotlin/ir/generator/model/Model.kt | 5 +- .../ir/generator/model/Transformations.kt | 10 +- .../kotlin/ir/generator/print/Types.kt | 4 +- .../kotlin/generators/tree/AbstractElement.kt | 14 +- .../kotlin/generators/tree/AbstractField.kt | 2 +- .../generators/tree/ArbitrarilyImportable.kt | 5 +- .../tree/ImplementationKindOwner.kt | 2 +- .../kotlin/generators/tree/ImportCollector.kt | 82 +++++++++ .../kotlin/generators/tree/Importable.kt | 10 +- .../kotlin/generators/tree/TypeRef.kt | 136 +++++++++------ .../kotlin/generators/tree/printer/common.kt | 7 +- .../generators/tree/printer/printUtils.kt | 13 +- 451 files changed, 1592 insertions(+), 3017 deletions(-) create mode 100644 generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/ImportCollector.kt diff --git a/build.gradle.kts b/build.gradle.kts index 611ecf4f6b4..05e4414e2a7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -481,6 +481,9 @@ val projectsWithEnabledContextReceivers by extra { ":compiler:fir:raw-fir:raw-fir.common", ":compiler:fir:raw-fir:psi2fir", ":compiler:fir:raw-fir:light-tree2fir", + ":compiler:fir:tree:tree-generator", + ":compiler:ir.tree:tree-generator", + ":generators:tree-generator-common", ":kotlin-lombok-compiler-plugin.k1", ":kotlinx-serialization-compiler-plugin.k2", ":plugins:parcelize:parcelize-compiler:parcelize.k2", diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirAnnotationContainer.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirAnnotationContainer.kt index 2b498fb2db0..770040e23a7 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirAnnotationContainer.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirAnnotationContainer.kt @@ -10,7 +10,8 @@ package org.jetbrains.kotlin.fir import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.annotationContainer] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirElement.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirElement.kt index 9054dc66f0e..793bb1b9bb4 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirElement.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirElement.kt @@ -9,7 +9,9 @@ package org.jetbrains.kotlin.fir import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.FirVisitorVoid /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.context.AbstractFirTreeBuilder.Companion.baseFirElement] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirElementWithResolveState.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirElementWithResolveState.kt index 229dd443ad1..06aa5ebbd2b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirElementWithResolveState.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirElementWithResolveState.kt @@ -9,11 +9,10 @@ package org.jetbrains.kotlin.fir import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.asResolveState -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.elementWithResolveState] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirFileAnnotationsContainer.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirFileAnnotationsContainer.kt index 0cccf6087a1..63622fea0b5 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirFileAnnotationsContainer.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirFileAnnotationsContainer.kt @@ -9,13 +9,10 @@ package org.jetbrains.kotlin.fir import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.asResolveState import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.symbols.impl.FirFileSymbol -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.fileAnnotationsContainer] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirFunctionTypeParameter.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirFunctionTypeParameter.kt index 8f234fb0855..8d54705619d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirFunctionTypeParameter.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirFunctionTypeParameter.kt @@ -10,8 +10,9 @@ package org.jetbrains.kotlin.fir import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.fir.visitors.* /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.functionTypeParameter] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirLabel.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirLabel.kt index 11f8b497af8..b38488900f2 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirLabel.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirLabel.kt @@ -9,7 +9,8 @@ package org.jetbrains.kotlin.fir import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.label] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirPackageDirective.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirPackageDirective.kt index 6842bc24298..cfba5f7d8ff 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirPackageDirective.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirPackageDirective.kt @@ -9,8 +9,9 @@ package org.jetbrains.kotlin.fir import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.FqName -import org.jetbrains.kotlin.fir.visitors.* /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.packageDirective] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirTargetElement.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirTargetElement.kt index c86dac4ccd5..cf582479fd3 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirTargetElement.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirTargetElement.kt @@ -9,7 +9,8 @@ package org.jetbrains.kotlin.fir import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.targetElement] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/builder/FirAnnotationContainerBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/builder/FirAnnotationContainerBuilder.kt index c7b8b2cebd2..29d3d8aed0a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/builder/FirAnnotationContainerBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/builder/FirAnnotationContainerBuilder.kt @@ -12,9 +12,7 @@ package org.jetbrains.kotlin.fir.builder import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirAnnotationContainer -import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl interface FirAnnotationContainerBuilder { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/builder/FirFileAnnotationsContainerBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/builder/FirFileAnnotationsContainerBuilder.kt index 3bb0d8c819c..368eba38f67 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/builder/FirFileAnnotationsContainerBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/builder/FirFileAnnotationsContainerBuilder.kt @@ -14,17 +14,10 @@ import kotlin.contracts.* import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirFileAnnotationsContainer import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder -import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess -import org.jetbrains.kotlin.fir.declarations.asResolveState import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.impl.FirFileAnnotationsContainerImpl import org.jetbrains.kotlin.fir.symbols.impl.FirFileSymbol -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirFileAnnotationsContainerBuilder : FirAnnotationContainerBuilder { @@ -49,7 +42,7 @@ class FirFileAnnotationsContainerBuilder : FirAnnotationContainerBuilder { @OptIn(ExperimentalContracts::class) inline fun buildFileAnnotationsContainer(init: FirFileAnnotationsContainerBuilder.() -> Unit): FirFileAnnotationsContainer { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirFileAnnotationsContainerBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/builder/FirFunctionTypeParameterBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/builder/FirFunctionTypeParameterBuilder.kt index 8507fdbaf91..f81ac7ce31d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/builder/FirFunctionTypeParameterBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/builder/FirFunctionTypeParameterBuilder.kt @@ -13,10 +13,8 @@ package org.jetbrains.kotlin.fir.builder import kotlin.contracts.* import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirFunctionTypeParameter -import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.impl.FirFunctionTypeParameterImpl import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.Name @FirBuilderDsl @@ -38,7 +36,7 @@ class FirFunctionTypeParameterBuilder { @OptIn(ExperimentalContracts::class) inline fun buildFunctionTypeParameter(init: FirFunctionTypeParameterBuilder.() -> Unit): FirFunctionTypeParameter { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirFunctionTypeParameterBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/builder/FirLabelBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/builder/FirLabelBuilder.kt index 7528076ec58..49041bfdd71 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/builder/FirLabelBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/builder/FirLabelBuilder.kt @@ -13,9 +13,7 @@ package org.jetbrains.kotlin.fir.builder import kotlin.contracts.* import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirLabel -import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.impl.FirLabelImpl -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirLabelBuilder { @@ -34,7 +32,7 @@ class FirLabelBuilder { @OptIn(ExperimentalContracts::class) inline fun buildLabel(init: FirLabelBuilder.() -> Unit): FirLabel { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirLabelBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/builder/FirPackageDirectiveBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/builder/FirPackageDirectiveBuilder.kt index b0a0ff8f84a..db1fe02f88b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/builder/FirPackageDirectiveBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/builder/FirPackageDirectiveBuilder.kt @@ -13,9 +13,7 @@ package org.jetbrains.kotlin.fir.builder import kotlin.contracts.* import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirPackageDirective -import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.impl.FirPackageDirectiveImpl -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.FqName @FirBuilderDsl @@ -35,7 +33,7 @@ class FirPackageDirectiveBuilder { @OptIn(ExperimentalContracts::class) inline fun buildPackageDirective(init: FirPackageDirectiveBuilder.() -> Unit): FirPackageDirective { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirPackageDirectiveBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirContractDescription.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirContractDescription.kt index 80e1c6b7089..afe90acb76b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirContractDescription.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirContractDescription.kt @@ -11,7 +11,8 @@ package org.jetbrains.kotlin.fir.contracts import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirPureAbstractElement -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.contractDescription] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirContractElementDeclaration.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirContractElementDeclaration.kt index 05a79a24bdc..95dbd21586d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirContractElementDeclaration.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirContractElementDeclaration.kt @@ -12,7 +12,8 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirPureAbstractElement import org.jetbrains.kotlin.fir.contracts.description.ConeContractDescriptionElement -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.contractElementDeclaration] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirEffectDeclaration.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirEffectDeclaration.kt index b362c0c78b2..a78c8972fff 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirEffectDeclaration.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirEffectDeclaration.kt @@ -11,7 +11,8 @@ package org.jetbrains.kotlin.fir.contracts import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.contracts.description.ConeEffectDeclaration -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.effectDeclaration] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirLegacyRawContractDescription.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirLegacyRawContractDescription.kt index 55326d47574..9a65e4fbf9d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirLegacyRawContractDescription.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirLegacyRawContractDescription.kt @@ -11,7 +11,8 @@ package org.jetbrains.kotlin.fir.contracts import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.expressions.FirFunctionCall -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.legacyRawContractDescription] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirRawContractDescription.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirRawContractDescription.kt index 43e0245b362..4cfc9d20474 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirRawContractDescription.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirRawContractDescription.kt @@ -11,7 +11,8 @@ package org.jetbrains.kotlin.fir.contracts import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.rawContractDescription] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirResolvedContractDescription.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirResolvedContractDescription.kt index bd61906b96f..d26d442f94b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirResolvedContractDescription.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/FirResolvedContractDescription.kt @@ -10,7 +10,8 @@ package org.jetbrains.kotlin.fir.contracts import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.resolvedContractDescription] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/builder/FirContractElementDeclarationBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/builder/FirContractElementDeclarationBuilder.kt index 19b55d63257..ca8f4bac1d7 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/builder/FirContractElementDeclarationBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/builder/FirContractElementDeclarationBuilder.kt @@ -16,7 +16,6 @@ import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.contracts.FirContractElementDeclaration import org.jetbrains.kotlin.fir.contracts.description.ConeContractDescriptionElement import org.jetbrains.kotlin.fir.contracts.impl.FirContractElementDeclarationImpl -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirContractElementDeclarationBuilder { @@ -35,7 +34,7 @@ class FirContractElementDeclarationBuilder { @OptIn(ExperimentalContracts::class) inline fun buildContractElementDeclaration(init: FirContractElementDeclarationBuilder.() -> Unit): FirContractElementDeclaration { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirContractElementDeclarationBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/builder/FirEffectDeclarationBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/builder/FirEffectDeclarationBuilder.kt index b7c21591dc0..7736fa0401c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/builder/FirEffectDeclarationBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/builder/FirEffectDeclarationBuilder.kt @@ -16,7 +16,6 @@ import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.contracts.FirEffectDeclaration import org.jetbrains.kotlin.fir.contracts.description.ConeEffectDeclaration import org.jetbrains.kotlin.fir.contracts.impl.FirEffectDeclarationImpl -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirEffectDeclarationBuilder { @@ -35,7 +34,7 @@ class FirEffectDeclarationBuilder { @OptIn(ExperimentalContracts::class) inline fun buildEffectDeclaration(init: FirEffectDeclarationBuilder.() -> Unit): FirEffectDeclaration { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirEffectDeclarationBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/builder/FirLegacyRawContractDescriptionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/builder/FirLegacyRawContractDescriptionBuilder.kt index 611b9d6b969..a67fbb17532 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/builder/FirLegacyRawContractDescriptionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/builder/FirLegacyRawContractDescriptionBuilder.kt @@ -16,7 +16,6 @@ import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.contracts.FirLegacyRawContractDescription import org.jetbrains.kotlin.fir.contracts.impl.FirLegacyRawContractDescriptionImpl import org.jetbrains.kotlin.fir.expressions.FirFunctionCall -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirLegacyRawContractDescriptionBuilder { @@ -35,7 +34,7 @@ class FirLegacyRawContractDescriptionBuilder { @OptIn(ExperimentalContracts::class) inline fun buildLegacyRawContractDescription(init: FirLegacyRawContractDescriptionBuilder.() -> Unit): FirLegacyRawContractDescription { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirLegacyRawContractDescriptionBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/builder/FirRawContractDescriptionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/builder/FirRawContractDescriptionBuilder.kt index 9a28c56b522..0fbd8c2d38d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/builder/FirRawContractDescriptionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/builder/FirRawContractDescriptionBuilder.kt @@ -16,7 +16,6 @@ import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.contracts.FirRawContractDescription import org.jetbrains.kotlin.fir.contracts.impl.FirRawContractDescriptionImpl import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirRawContractDescriptionBuilder { @@ -35,7 +34,7 @@ class FirRawContractDescriptionBuilder { @OptIn(ExperimentalContracts::class) inline fun buildRawContractDescription(init: FirRawContractDescriptionBuilder.() -> Unit = {}): FirRawContractDescription { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirRawContractDescriptionBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/builder/FirResolvedContractDescriptionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/builder/FirResolvedContractDescriptionBuilder.kt index 1447a9bf850..9768124b25f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/builder/FirResolvedContractDescriptionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/builder/FirResolvedContractDescriptionBuilder.kt @@ -17,7 +17,6 @@ import org.jetbrains.kotlin.fir.contracts.FirContractElementDeclaration import org.jetbrains.kotlin.fir.contracts.FirEffectDeclaration import org.jetbrains.kotlin.fir.contracts.FirResolvedContractDescription import org.jetbrains.kotlin.fir.contracts.impl.FirResolvedContractDescriptionImpl -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirResolvedContractDescriptionBuilder { @@ -38,7 +37,7 @@ class FirResolvedContractDescriptionBuilder { @OptIn(ExperimentalContracts::class) inline fun buildResolvedContractDescription(init: FirResolvedContractDescriptionBuilder.() -> Unit = {}): FirResolvedContractDescription { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirResolvedContractDescriptionBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/impl/FirContractElementDeclarationImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/impl/FirContractElementDeclarationImpl.kt index 01042d564f4..6b413ae2789 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/impl/FirContractElementDeclarationImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/impl/FirContractElementDeclarationImpl.kt @@ -13,7 +13,8 @@ package org.jetbrains.kotlin.fir.contracts.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.contracts.FirContractElementDeclaration import org.jetbrains.kotlin.fir.contracts.description.ConeContractDescriptionElement -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor internal class FirContractElementDeclarationImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/impl/FirEffectDeclarationImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/impl/FirEffectDeclarationImpl.kt index 38fc948b73b..47b0d85566d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/impl/FirEffectDeclarationImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/impl/FirEffectDeclarationImpl.kt @@ -13,7 +13,8 @@ package org.jetbrains.kotlin.fir.contracts.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.contracts.FirEffectDeclaration import org.jetbrains.kotlin.fir.contracts.description.ConeEffectDeclaration -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor internal class FirEffectDeclarationImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/impl/FirLegacyRawContractDescriptionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/impl/FirLegacyRawContractDescriptionImpl.kt index 88d8d5c0bc0..9e0966cb57a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/impl/FirLegacyRawContractDescriptionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/impl/FirLegacyRawContractDescriptionImpl.kt @@ -13,7 +13,8 @@ package org.jetbrains.kotlin.fir.contracts.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.contracts.FirLegacyRawContractDescription import org.jetbrains.kotlin.fir.expressions.FirFunctionCall -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor internal class FirLegacyRawContractDescriptionImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/impl/FirRawContractDescriptionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/impl/FirRawContractDescriptionImpl.kt index fdfa69f6e8a..6a3849907be 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/impl/FirRawContractDescriptionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/impl/FirRawContractDescriptionImpl.kt @@ -13,7 +13,9 @@ package org.jetbrains.kotlin.fir.contracts.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.contracts.FirRawContractDescription import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace internal class FirRawContractDescriptionImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/impl/FirResolvedContractDescriptionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/impl/FirResolvedContractDescriptionImpl.kt index a280b9741f0..edde6cbdf08 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/impl/FirResolvedContractDescriptionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/contracts/impl/FirResolvedContractDescriptionImpl.kt @@ -14,7 +14,9 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.contracts.FirContractElementDeclaration import org.jetbrains.kotlin.fir.contracts.FirEffectDeclaration import org.jetbrains.kotlin.fir.contracts.FirResolvedContractDescription -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace internal class FirResolvedContractDescriptionImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousFunction.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousFunction.kt index 74c1da521b6..5fc84413380 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousFunction.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousFunction.kt @@ -20,9 +20,9 @@ import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirAnonymousFunctionSymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.anonymousFunction] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousInitializer.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousInitializer.kt index 0623a1e3abb..c987205d143 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousInitializer.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousInitializer.kt @@ -16,8 +16,8 @@ import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirAnonymousInitializerSymbol import org.jetbrains.kotlin.fir.types.ConeClassLikeType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.anonymousInitializer] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousObject.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousObject.kt index 8cba68d41c3..25571ea94fd 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousObject.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousObject.kt @@ -17,8 +17,8 @@ import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.scopes.FirScopeProvider import org.jetbrains.kotlin.fir.symbols.impl.FirAnonymousObjectSymbol import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.anonymousObject] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirBackingField.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirBackingField.kt index af581a007e2..ec9e5bdc543 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirBackingField.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirBackingField.kt @@ -18,10 +18,10 @@ import org.jetbrains.kotlin.fir.symbols.impl.FirBackingFieldSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.backingField] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirCallableDeclaration.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirCallableDeclaration.kt index 585b4e55417..6496e6a51e8 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirCallableDeclaration.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirCallableDeclaration.kt @@ -15,9 +15,9 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.callableDeclaration] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirClass.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirClass.kt index 95e19848b43..733c55c01e0 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirClass.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirClass.kt @@ -18,8 +18,8 @@ import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.scopes.FirScopeProvider import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.klass] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirClassLikeDeclaration.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirClassLikeDeclaration.kt index 738f9c7d4c8..b7d27e01614 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirClassLikeDeclaration.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirClassLikeDeclaration.kt @@ -14,8 +14,8 @@ import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.classLikeDeclaration] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirCodeFragment.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirCodeFragment.kt index 598b5fd70c9..88cd0c371de 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirCodeFragment.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirCodeFragment.kt @@ -14,8 +14,8 @@ import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.symbols.impl.FirCodeFragmentSymbol -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.codeFragment] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirConstructedClassTypeParameterRef.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirConstructedClassTypeParameterRef.kt index f46f62f161f..ffee62d67bd 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirConstructedClassTypeParameterRef.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirConstructedClassTypeParameterRef.kt @@ -12,7 +12,8 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirPureAbstractElement import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.constructedClassTypeParameterRef] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirConstructor.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirConstructor.kt index 03c1b9b4469..50e6e77e88a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirConstructor.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirConstructor.kt @@ -19,9 +19,9 @@ import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirConstructorSymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.constructor] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirContextReceiver.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirContextReceiver.kt index 60e688b62f4..5d7d31d84f3 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirContextReceiver.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirContextReceiver.kt @@ -12,8 +12,9 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirPureAbstractElement import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.fir.visitors.* /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.contextReceiver] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirContractDescriptionOwner.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirContractDescriptionOwner.kt index e42037a1fa5..8ef7aa75042 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirContractDescriptionOwner.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirContractDescriptionOwner.kt @@ -11,7 +11,8 @@ package org.jetbrains.kotlin.fir.declarations import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.contracts.FirContractDescription -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.contractDescriptionOwner] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirControlFlowGraphOwner.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirControlFlowGraphOwner.kt index d72bb73292d..8a4bd11fefe 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirControlFlowGraphOwner.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirControlFlowGraphOwner.kt @@ -11,7 +11,8 @@ package org.jetbrains.kotlin.fir.declarations import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.controlFlowGraphOwner] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirDanglingModifierList.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirDanglingModifierList.kt index bebb5a7ac8c..0f9403cba99 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirDanglingModifierList.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirDanglingModifierList.kt @@ -15,8 +15,8 @@ import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.diagnostics.FirDiagnosticHolder import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.symbols.impl.FirDanglingModifierSymbol -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.danglingModifierList] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirDeclaration.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirDeclaration.kt index 89e88a960ea..f64cc10247d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirDeclaration.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirDeclaration.kt @@ -15,8 +15,8 @@ import org.jetbrains.kotlin.fir.FirElementWithResolveState import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.declaration] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirDeclarationStatus.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirDeclarationStatus.kt index 73c2dacafd9..b089dcf4042 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirDeclarationStatus.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirDeclarationStatus.kt @@ -12,7 +12,8 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.declarationStatus] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirEnumEntry.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirEnumEntry.kt index 7de8d41da2a..8a08a506210 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirEnumEntry.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirEnumEntry.kt @@ -16,10 +16,10 @@ import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.symbols.impl.FirEnumEntrySymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.enumEntry] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorFunction.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorFunction.kt index 0ab33316759..6e512e76eac 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorFunction.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorFunction.kt @@ -19,9 +19,9 @@ import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirErrorFunctionSymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.errorFunction] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorImport.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorImport.kt index 141af090b61..975c43f2480 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorImport.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorImport.kt @@ -12,9 +12,10 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.diagnostics.FirDiagnosticHolder +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.fir.visitors.* /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.errorImport] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorPrimaryConstructor.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorPrimaryConstructor.kt index def4f0d1a3d..904447e675d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorPrimaryConstructor.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorPrimaryConstructor.kt @@ -21,9 +21,9 @@ import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirConstructorSymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.errorPrimaryConstructor] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorProperty.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorProperty.kt index cae4856c0f8..7f062708ff5 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorProperty.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorProperty.kt @@ -18,10 +18,10 @@ import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.symbols.impl.FirErrorPropertySymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.errorProperty] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirField.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirField.kt index c17c49a2a33..e8b16a47317 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirField.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirField.kt @@ -17,10 +17,10 @@ import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirFieldSymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.field] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFile.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFile.kt index 997a40692b9..cd0d8c09bf1 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFile.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFile.kt @@ -18,8 +18,8 @@ import org.jetbrains.kotlin.fir.FirPackageDirective import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirFileSymbol -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.file] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFunction.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFunction.kt index 210a301b5e7..0bb483cffe8 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFunction.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFunction.kt @@ -19,9 +19,9 @@ import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.function] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirImport.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirImport.kt index 611738c66a8..5068c8ba2d9 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirImport.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirImport.kt @@ -11,9 +11,10 @@ package org.jetbrains.kotlin.fir.declarations import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.fir.visitors.* /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.import] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirMemberDeclaration.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirMemberDeclaration.kt index 0b0edb2d492..f1eb0a7643c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirMemberDeclaration.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirMemberDeclaration.kt @@ -13,8 +13,8 @@ import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.memberDeclaration] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirOuterClassTypeParameterRef.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirOuterClassTypeParameterRef.kt index e3909a87f02..9790b7b0fdd 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirOuterClassTypeParameterRef.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirOuterClassTypeParameterRef.kt @@ -12,7 +12,8 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirPureAbstractElement import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.outerClassTypeParameterRef] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirProperty.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirProperty.kt index c9bdcbe1177..37282f6cd9f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirProperty.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirProperty.kt @@ -18,10 +18,10 @@ import org.jetbrains.kotlin.fir.symbols.impl.FirDelegateFieldSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.property] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirPropertyAccessor.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirPropertyAccessor.kt index 119c7798a02..7a822df46b5 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirPropertyAccessor.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirPropertyAccessor.kt @@ -19,9 +19,9 @@ import org.jetbrains.kotlin.fir.symbols.impl.FirPropertyAccessorSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.propertyAccessor] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirReceiverParameter.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirReceiverParameter.kt index 4112fce23d3..d7f109be706 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirReceiverParameter.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirReceiverParameter.kt @@ -14,7 +14,8 @@ import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirPureAbstractElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.receiverParameter] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirRegularClass.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirRegularClass.kt index 27b72c52021..1b9d2ebc855 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirRegularClass.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirRegularClass.kt @@ -17,9 +17,9 @@ import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.scopes.FirScopeProvider import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.regularClass] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirResolvedDeclarationStatus.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirResolvedDeclarationStatus.kt index adcd4c139d2..0fbef7b02aa 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirResolvedDeclarationStatus.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirResolvedDeclarationStatus.kt @@ -13,7 +13,8 @@ import org.jetbrains.kotlin.descriptors.EffectiveVisibility import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.resolvedDeclarationStatus] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirResolvedImport.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirResolvedImport.kt index 4cbceccff97..4c0c10981a2 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirResolvedImport.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirResolvedImport.kt @@ -10,10 +10,11 @@ package org.jetbrains.kotlin.fir.declarations import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.fir.visitors.* /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.resolvedImport] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirScript.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirScript.kt index 80d60bd1776..2cdb9ec5cb6 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirScript.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirScript.kt @@ -14,9 +14,9 @@ import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.symbols.impl.FirScriptSymbol +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.script] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirSimpleFunction.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirSimpleFunction.kt index ea7cf88ff97..bc9bc10f23a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirSimpleFunction.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirSimpleFunction.kt @@ -18,10 +18,10 @@ import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.simpleFunction] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeAlias.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeAlias.kt index 9a5c0b98d38..b19d299917a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeAlias.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeAlias.kt @@ -14,9 +14,9 @@ import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.symbols.impl.FirTypeAliasSymbol import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.typeAlias] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParameter.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParameter.kt index 98e1d999de1..0b8fb59ca00 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParameter.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParameter.kt @@ -15,10 +15,10 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.types.Variance -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.typeParameter] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParameterRef.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParameterRef.kt index bbee93e3064..7a782e847f1 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParameterRef.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParameterRef.kt @@ -11,7 +11,8 @@ package org.jetbrains.kotlin.fir.declarations import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.typeParameterRef] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParameterRefsOwner.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParameterRefsOwner.kt index abf20cbfd55..70ba767f889 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParameterRefsOwner.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParameterRefsOwner.kt @@ -10,7 +10,8 @@ package org.jetbrains.kotlin.fir.declarations import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.typeParameterRefsOwner] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParametersOwner.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParametersOwner.kt index 5e7de180fdb..b0f7d54d1be 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParametersOwner.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParametersOwner.kt @@ -10,7 +10,8 @@ package org.jetbrains.kotlin.fir.declarations import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.typeParametersOwner] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirValueParameter.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirValueParameter.kt index 13bb9d13b02..cad38f42f6f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirValueParameter.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirValueParameter.kt @@ -18,10 +18,10 @@ import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirValueParameterSymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.valueParameter] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirVariable.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirVariable.kt index a32c6e3d70b..65457958ef1 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirVariable.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirVariable.kt @@ -17,10 +17,10 @@ import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.symbols.impl.FirVariableSymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.variable] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAbstractConstructorBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAbstractConstructorBuilder.kt index 1625a5e30ca..0bb836d900a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAbstractConstructorBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAbstractConstructorBuilder.kt @@ -14,17 +14,7 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.contracts.FirContractDescription -import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider -import org.jetbrains.kotlin.fir.declarations.FirConstructor -import org.jetbrains.kotlin.fir.declarations.FirContextReceiver -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirReceiverParameter -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef -import org.jetbrains.kotlin.fir.declarations.FirValueParameter -import org.jetbrains.kotlin.fir.declarations.builder.FirFunctionBuilder +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall @@ -32,7 +22,6 @@ import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirConstructorSymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource @FirBuilderDsl diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousFunctionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousFunctionBuilder.kt index 08406686dca..c7615d8ea2b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousFunctionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousFunctionBuilder.kt @@ -20,25 +20,9 @@ import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.contracts.FirContractDescription import org.jetbrains.kotlin.fir.contracts.impl.FirEmptyContractDescription -import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider -import org.jetbrains.kotlin.fir.declarations.FirAnonymousFunction -import org.jetbrains.kotlin.fir.declarations.FirContextReceiver -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirReceiverParameter -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.FirTypeParameter -import org.jetbrains.kotlin.fir.declarations.FirValueParameter -import org.jetbrains.kotlin.fir.declarations.InlineStatus -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess -import org.jetbrains.kotlin.fir.declarations.UnresolvedDeprecationProvider -import org.jetbrains.kotlin.fir.declarations.asResolveState -import org.jetbrains.kotlin.fir.declarations.builder.FirFunctionBuilder +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.impl.FirAnonymousFunctionImpl import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedDeclarationStatusImpl -import org.jetbrains.kotlin.fir.declarations.resolvePhase import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference @@ -46,7 +30,6 @@ import org.jetbrains.kotlin.fir.symbols.impl.FirAnonymousFunctionSymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource @FirBuilderDsl @@ -112,7 +95,7 @@ class FirAnonymousFunctionBuilder : FirFunctionBuilder, FirAnnotationContainerBu @OptIn(ExperimentalContracts::class) inline fun buildAnonymousFunction(init: FirAnonymousFunctionBuilder.() -> Unit): FirAnonymousFunction { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirAnonymousFunctionBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousInitializerBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousInitializerBuilder.kt index 805328227aa..d097a78e386 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousInitializerBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousInitializerBuilder.kt @@ -15,22 +15,15 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.declarations.FirAnonymousInitializer import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess -import org.jetbrains.kotlin.fir.declarations.asResolveState -import org.jetbrains.kotlin.fir.declarations.builder.FirDeclarationBuilder import org.jetbrains.kotlin.fir.declarations.impl.FirAnonymousInitializerImpl import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock -import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirAnonymousInitializerSymbol import org.jetbrains.kotlin.fir.types.ConeClassLikeType -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirAnonymousInitializerBuilder : FirDeclarationBuilder, FirAnnotationContainerBuilder { @@ -64,7 +57,7 @@ class FirAnonymousInitializerBuilder : FirDeclarationBuilder, FirAnnotationConta @OptIn(ExperimentalContracts::class) inline fun buildAnonymousInitializer(init: FirAnonymousInitializerBuilder.() -> Unit): FirAnonymousInitializer { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirAnonymousInitializerBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousObjectBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousObjectBuilder.kt index 32ce32843e9..a17f73910b1 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousObjectBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousObjectBuilder.kt @@ -17,27 +17,12 @@ import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider -import org.jetbrains.kotlin.fir.declarations.FirAnonymousObject -import org.jetbrains.kotlin.fir.declarations.FirDeclaration -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess -import org.jetbrains.kotlin.fir.declarations.UnresolvedDeprecationProvider -import org.jetbrains.kotlin.fir.declarations.asResolveState -import org.jetbrains.kotlin.fir.declarations.builder.FirClassBuilder -import org.jetbrains.kotlin.fir.declarations.builder.FirDeclarationBuilder +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.impl.FirAnonymousObjectImpl import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.scopes.FirScopeProvider import org.jetbrains.kotlin.fir.symbols.impl.FirAnonymousObjectSymbol import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirAnonymousObjectBuilder : FirDeclarationBuilder, FirClassBuilder, FirAnnotationContainerBuilder { @@ -80,7 +65,7 @@ class FirAnonymousObjectBuilder : FirDeclarationBuilder, FirClassBuilder, FirAnn @OptIn(ExperimentalContracts::class) inline fun buildAnonymousObject(init: FirAnonymousObjectBuilder.() -> Unit): FirAnonymousObject { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirAnonymousObjectBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirBackingFieldBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirBackingFieldBuilder.kt index 7230ad55c18..543860d72ce 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirBackingFieldBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirBackingFieldBuilder.kt @@ -17,20 +17,7 @@ import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider -import org.jetbrains.kotlin.fir.declarations.FirBackingField -import org.jetbrains.kotlin.fir.declarations.FirContextReceiver -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor -import org.jetbrains.kotlin.fir.declarations.FirReceiverParameter -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.FirTypeParameter -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess -import org.jetbrains.kotlin.fir.declarations.UnresolvedDeprecationProvider -import org.jetbrains.kotlin.fir.declarations.asResolveState +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.impl.FirBackingFieldImpl import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -38,7 +25,6 @@ import org.jetbrains.kotlin.fir.symbols.impl.FirBackingFieldSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource @@ -104,7 +90,7 @@ class FirBackingFieldBuilder : FirAnnotationContainerBuilder { @OptIn(ExperimentalContracts::class) inline fun buildBackingField(init: FirBackingFieldBuilder.() -> Unit): FirBackingField { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirBackingFieldBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirClassBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirClassBuilder.kt index ca0965a9d7e..174647edf89 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirClassBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirClassBuilder.kt @@ -15,19 +15,10 @@ import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider -import org.jetbrains.kotlin.fir.declarations.FirClass -import org.jetbrains.kotlin.fir.declarations.FirDeclaration -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef -import org.jetbrains.kotlin.fir.declarations.builder.FirDeclarationBuilder +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.scopes.FirScopeProvider import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl interface FirClassBuilder : FirDeclarationBuilder, FirAnnotationContainerBuilder { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirCodeFragmentBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirCodeFragmentBuilder.kt index b34db671b4a..eeff0ac4549 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirCodeFragmentBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirCodeFragmentBuilder.kt @@ -16,19 +16,11 @@ import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.declarations.FirCodeFragment -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess -import org.jetbrains.kotlin.fir.declarations.asResolveState +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.impl.FirCodeFragmentImpl -import org.jetbrains.kotlin.fir.declarations.resolvePhase import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.symbols.impl.FirCodeFragmentSymbol -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirCodeFragmentBuilder : FirAnnotationContainerBuilder { @@ -59,7 +51,7 @@ class FirCodeFragmentBuilder : FirAnnotationContainerBuilder { @OptIn(ExperimentalContracts::class) inline fun buildCodeFragment(init: FirCodeFragmentBuilder.() -> Unit): FirCodeFragment { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirCodeFragmentBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirConstructedClassTypeParameterRefBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirConstructedClassTypeParameterRefBuilder.kt index bd1f2aac2c0..cbad60c20b5 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirConstructedClassTypeParameterRefBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirConstructedClassTypeParameterRefBuilder.kt @@ -16,7 +16,6 @@ import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.FirConstructedClassTypeParameterRef import org.jetbrains.kotlin.fir.declarations.impl.FirConstructedClassTypeParameterRefImpl import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirConstructedClassTypeParameterRefBuilder { @@ -35,7 +34,7 @@ class FirConstructedClassTypeParameterRefBuilder { @OptIn(ExperimentalContracts::class) inline fun buildConstructedClassTypeParameterRef(init: FirConstructedClassTypeParameterRefBuilder.() -> Unit): FirConstructedClassTypeParameterRef { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirConstructedClassTypeParameterRefBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirConstructorBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirConstructorBuilder.kt index bd7f204953f..5856ef2acf9 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirConstructorBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirConstructorBuilder.kt @@ -18,23 +18,8 @@ import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.contracts.FirContractDescription import org.jetbrains.kotlin.fir.contracts.impl.FirEmptyContractDescription -import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider -import org.jetbrains.kotlin.fir.declarations.FirConstructor -import org.jetbrains.kotlin.fir.declarations.FirContextReceiver -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirReceiverParameter -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef -import org.jetbrains.kotlin.fir.declarations.FirValueParameter -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess -import org.jetbrains.kotlin.fir.declarations.UnresolvedDeprecationProvider -import org.jetbrains.kotlin.fir.declarations.asResolveState -import org.jetbrains.kotlin.fir.declarations.builder.FirAbstractConstructorBuilder +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.impl.FirConstructorImpl -import org.jetbrains.kotlin.fir.declarations.resolvePhase import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall @@ -42,7 +27,6 @@ import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirConstructorSymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource @FirBuilderDsl @@ -103,7 +87,7 @@ open class FirConstructorBuilder : FirAbstractConstructorBuilder, FirAnnotationC @OptIn(ExperimentalContracts::class) inline fun buildConstructor(init: FirConstructorBuilder.() -> Unit): FirConstructor { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirConstructorBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirContextReceiverBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirContextReceiverBuilder.kt index 20e1c5ee2c5..d257a205c83 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirContextReceiverBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirContextReceiverBuilder.kt @@ -16,7 +16,6 @@ import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.FirContextReceiver import org.jetbrains.kotlin.fir.declarations.impl.FirContextReceiverImpl import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.Name @FirBuilderDsl @@ -40,7 +39,7 @@ class FirContextReceiverBuilder { @OptIn(ExperimentalContracts::class) inline fun buildContextReceiver(init: FirContextReceiverBuilder.() -> Unit): FirContextReceiver { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirContextReceiverBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDanglingModifierListBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDanglingModifierListBuilder.kt index 5af54c34523..cf59131f455 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDanglingModifierListBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDanglingModifierListBuilder.kt @@ -20,14 +20,10 @@ import org.jetbrains.kotlin.fir.declarations.FirDanglingModifierList import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess -import org.jetbrains.kotlin.fir.declarations.asResolveState import org.jetbrains.kotlin.fir.declarations.impl.FirDanglingModifierListImpl import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.symbols.impl.FirDanglingModifierSymbol -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirDanglingModifierListBuilder : FirAnnotationContainerBuilder { @@ -58,7 +54,7 @@ class FirDanglingModifierListBuilder : FirAnnotationContainerBuilder { @OptIn(ExperimentalContracts::class) inline fun buildDanglingModifierList(init: FirDanglingModifierListBuilder.() -> Unit): FirDanglingModifierList { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirDanglingModifierListBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDeclarationBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDeclarationBuilder.kt index 7b5e49175e4..be1045568a0 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDeclarationBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDeclarationBuilder.kt @@ -18,7 +18,6 @@ import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl interface FirDeclarationBuilder { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDefaultSetterValueParameterBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDefaultSetterValueParameterBuilder.kt index 57638d3a9d4..eeaec3d91c3 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDefaultSetterValueParameterBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDefaultSetterValueParameterBuilder.kt @@ -16,32 +16,14 @@ import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider -import org.jetbrains.kotlin.fir.declarations.FirBackingField -import org.jetbrains.kotlin.fir.declarations.FirContextReceiver -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor -import org.jetbrains.kotlin.fir.declarations.FirReceiverParameter -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef -import org.jetbrains.kotlin.fir.declarations.FirValueParameter -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess -import org.jetbrains.kotlin.fir.declarations.UnresolvedDeprecationProvider -import org.jetbrains.kotlin.fir.declarations.asResolveState +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.impl.FirDefaultSetterValueParameter -import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedDeclarationStatusImpl import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirValueParameterSymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource @FirBuilderDsl @@ -107,7 +89,7 @@ class FirDefaultSetterValueParameterBuilder : FirAnnotationContainerBuilder { @OptIn(ExperimentalContracts::class) inline fun buildDefaultSetterValueParameter(init: FirDefaultSetterValueParameterBuilder.() -> Unit): FirValueParameter { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirDefaultSetterValueParameterBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirEnumEntryBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirEnumEntryBuilder.kt index 006efca662a..752db349d0a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirEnumEntryBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirEnumEntryBuilder.kt @@ -16,28 +16,13 @@ import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider -import org.jetbrains.kotlin.fir.declarations.FirBackingField -import org.jetbrains.kotlin.fir.declarations.FirContextReceiver -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirEnumEntry -import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor -import org.jetbrains.kotlin.fir.declarations.FirReceiverParameter -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess -import org.jetbrains.kotlin.fir.declarations.UnresolvedDeprecationProvider -import org.jetbrains.kotlin.fir.declarations.asResolveState +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.impl.FirEnumEntryImpl import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.symbols.impl.FirEnumEntrySymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource @@ -88,7 +73,7 @@ class FirEnumEntryBuilder : FirAnnotationContainerBuilder { @OptIn(ExperimentalContracts::class) inline fun buildEnumEntry(init: FirEnumEntryBuilder.() -> Unit): FirEnumEntry { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirEnumEntryBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorFunctionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorFunctionBuilder.kt index c8c0878ce51..eb335e1a7ed 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorFunctionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorFunctionBuilder.kt @@ -16,31 +16,12 @@ import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider -import org.jetbrains.kotlin.fir.declarations.FirContextReceiver -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirErrorFunction -import org.jetbrains.kotlin.fir.declarations.FirReceiverParameter -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef -import org.jetbrains.kotlin.fir.declarations.FirValueParameter -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess -import org.jetbrains.kotlin.fir.declarations.UnresolvedDeprecationProvider -import org.jetbrains.kotlin.fir.declarations.asResolveState +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.impl.FirErrorFunctionImpl -import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedDeclarationStatusImpl import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.expressions.FirBlock -import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirErrorFunctionSymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirErrorTypeRefImpl -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource @FirBuilderDsl @@ -82,7 +63,7 @@ class FirErrorFunctionBuilder : FirAnnotationContainerBuilder { @OptIn(ExperimentalContracts::class) inline fun buildErrorFunction(init: FirErrorFunctionBuilder.() -> Unit): FirErrorFunction { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirErrorFunctionBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorImportBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorImportBuilder.kt index 6b2960b938b..c6d2e1e16b0 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorImportBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorImportBuilder.kt @@ -17,9 +17,6 @@ import org.jetbrains.kotlin.fir.declarations.FirErrorImport import org.jetbrains.kotlin.fir.declarations.FirImport import org.jetbrains.kotlin.fir.declarations.impl.FirErrorImportImpl import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.name.FqName -import org.jetbrains.kotlin.name.Name @FirBuilderDsl class FirErrorImportBuilder { @@ -40,7 +37,7 @@ class FirErrorImportBuilder { @OptIn(ExperimentalContracts::class) inline fun buildErrorImport(init: FirErrorImportBuilder.() -> Unit): FirErrorImport { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirErrorImportBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorPrimaryConstructorBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorPrimaryConstructorBuilder.kt index dedb58fb526..fb6115ee99b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorPrimaryConstructorBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorPrimaryConstructorBuilder.kt @@ -19,21 +19,7 @@ import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.contracts.FirContractDescription import org.jetbrains.kotlin.fir.contracts.impl.FirEmptyContractDescription -import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider -import org.jetbrains.kotlin.fir.declarations.FirContextReceiver -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirErrorPrimaryConstructor -import org.jetbrains.kotlin.fir.declarations.FirReceiverParameter -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef -import org.jetbrains.kotlin.fir.declarations.FirValueParameter -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess -import org.jetbrains.kotlin.fir.declarations.UnresolvedDeprecationProvider -import org.jetbrains.kotlin.fir.declarations.asResolveState -import org.jetbrains.kotlin.fir.declarations.builder.FirAbstractConstructorBuilder +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.impl.FirErrorPrimaryConstructorImpl import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation @@ -43,7 +29,6 @@ import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirConstructorSymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource @FirBuilderDsl @@ -107,7 +92,7 @@ class FirErrorPrimaryConstructorBuilder : FirAbstractConstructorBuilder, FirAnno @OptIn(ExperimentalContracts::class) inline fun buildErrorPrimaryConstructor(init: FirErrorPrimaryConstructorBuilder.() -> Unit): FirErrorPrimaryConstructor { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirErrorPrimaryConstructorBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorPropertyBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorPropertyBuilder.kt index 8158ddffb0e..d5084cf2872 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorPropertyBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorPropertyBuilder.kt @@ -16,31 +16,12 @@ import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider -import org.jetbrains.kotlin.fir.declarations.FirBackingField -import org.jetbrains.kotlin.fir.declarations.FirContextReceiver -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirErrorProperty -import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor -import org.jetbrains.kotlin.fir.declarations.FirReceiverParameter -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess -import org.jetbrains.kotlin.fir.declarations.UnresolvedDeprecationProvider -import org.jetbrains.kotlin.fir.declarations.asResolveState +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.impl.FirErrorPropertyImpl -import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedDeclarationStatusImpl import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.symbols.impl.FirErrorPropertySymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirErrorTypeRefImpl -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource @@ -85,7 +66,7 @@ class FirErrorPropertyBuilder : FirAnnotationContainerBuilder { @OptIn(ExperimentalContracts::class) inline fun buildErrorProperty(init: FirErrorPropertyBuilder.() -> Unit): FirErrorProperty { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirErrorPropertyBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFieldBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFieldBuilder.kt index d18bed79753..796417e3065 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFieldBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFieldBuilder.kt @@ -17,31 +17,13 @@ import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider -import org.jetbrains.kotlin.fir.declarations.FirBackingField -import org.jetbrains.kotlin.fir.declarations.FirContextReceiver -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirField -import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor -import org.jetbrains.kotlin.fir.declarations.FirReceiverParameter -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess -import org.jetbrains.kotlin.fir.declarations.UnresolvedDeprecationProvider -import org.jetbrains.kotlin.fir.declarations.asResolveState -import org.jetbrains.kotlin.fir.declarations.builder.FirVariableBuilder +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.impl.FirFieldImpl -import org.jetbrains.kotlin.fir.declarations.resolvePhase import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirFieldSymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource @@ -123,7 +105,7 @@ open class FirFieldBuilder : FirVariableBuilder, FirAnnotationContainerBuilder { @OptIn(ExperimentalContracts::class) inline fun buildField(init: FirFieldBuilder.() -> Unit): FirField { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirFieldBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFileBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFileBuilder.kt index 3c9872958df..d9ca1eb954b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFileBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFileBuilder.kt @@ -19,21 +19,10 @@ import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.FirPackageDirective import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.declarations.FirDeclaration -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirFile -import org.jetbrains.kotlin.fir.declarations.FirImport -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess -import org.jetbrains.kotlin.fir.declarations.asResolveState +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.impl.FirFileImpl import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirFileSymbol -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirFileBuilder : FirAnnotationContainerBuilder { @@ -77,7 +66,7 @@ class FirFileBuilder : FirAnnotationContainerBuilder { @OptIn(ExperimentalContracts::class) inline fun buildFile(init: FirFileBuilder.() -> Unit): FirFile { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirFileBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFunctionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFunctionBuilder.kt index 81ddf7159e4..0afceba8e55 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFunctionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFunctionBuilder.kt @@ -14,20 +14,11 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider -import org.jetbrains.kotlin.fir.declarations.FirContextReceiver -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirFunction -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirValueParameter -import org.jetbrains.kotlin.fir.declarations.builder.FirDeclarationBuilder +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource @FirBuilderDsl diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirImportBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirImportBuilder.kt index 5ced0c0a7e4..b1614fc77aa 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirImportBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirImportBuilder.kt @@ -15,7 +15,6 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.FirImport import org.jetbrains.kotlin.fir.declarations.impl.FirImportImpl -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name @@ -42,7 +41,7 @@ class FirImportBuilder { @OptIn(ExperimentalContracts::class) inline fun buildImport(init: FirImportBuilder.() -> Unit): FirImport { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirImportBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirOuterClassTypeParameterRefBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirOuterClassTypeParameterRefBuilder.kt index fff970511bd..8a0428d0c59 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirOuterClassTypeParameterRefBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirOuterClassTypeParameterRefBuilder.kt @@ -17,7 +17,6 @@ import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.FirOuterClassTypeParameterRef import org.jetbrains.kotlin.fir.declarations.impl.FirOuterClassTypeParameterRefImpl import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirOuterClassTypeParameterRefBuilder { @@ -37,7 +36,7 @@ class FirOuterClassTypeParameterRefBuilder { @OptIn(ExperimentalContracts::class) inline fun buildOuterClassTypeParameterRef(init: FirOuterClassTypeParameterRefBuilder.() -> Unit): FirOuterClassTypeParameterRef { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirOuterClassTypeParameterRefBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPrimaryConstructorBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPrimaryConstructorBuilder.kt index 9cb900f9043..f3cb8db78c6 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPrimaryConstructorBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPrimaryConstructorBuilder.kt @@ -19,21 +19,7 @@ import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.contracts.FirContractDescription import org.jetbrains.kotlin.fir.contracts.impl.FirEmptyContractDescription -import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider -import org.jetbrains.kotlin.fir.declarations.FirConstructor -import org.jetbrains.kotlin.fir.declarations.FirContextReceiver -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirReceiverParameter -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef -import org.jetbrains.kotlin.fir.declarations.FirValueParameter -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess -import org.jetbrains.kotlin.fir.declarations.UnresolvedDeprecationProvider -import org.jetbrains.kotlin.fir.declarations.asResolveState -import org.jetbrains.kotlin.fir.declarations.builder.FirAbstractConstructorBuilder +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.impl.FirPrimaryConstructor import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock @@ -42,7 +28,6 @@ import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirConstructorSymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource @FirBuilderDsl @@ -104,7 +89,7 @@ class FirPrimaryConstructorBuilder : FirAbstractConstructorBuilder, FirAnnotatio @OptIn(ExperimentalContracts::class) inline fun buildPrimaryConstructor(init: FirPrimaryConstructorBuilder.() -> Unit): FirConstructor { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirPrimaryConstructorBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyAccessorBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyAccessorBuilder.kt index 458f1cf2790..a6306e42aaf 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyAccessorBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyAccessorBuilder.kt @@ -12,7 +12,6 @@ package org.jetbrains.kotlin.fir.declarations.builder import kotlin.contracts.* import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder @@ -20,31 +19,14 @@ import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.contracts.FirContractDescription import org.jetbrains.kotlin.fir.contracts.impl.FirEmptyContractDescription -import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider -import org.jetbrains.kotlin.fir.declarations.FirContextReceiver -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor -import org.jetbrains.kotlin.fir.declarations.FirReceiverParameter -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.FirTypeParameter -import org.jetbrains.kotlin.fir.declarations.FirValueParameter -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess -import org.jetbrains.kotlin.fir.declarations.UnresolvedDeprecationProvider -import org.jetbrains.kotlin.fir.declarations.asResolveState -import org.jetbrains.kotlin.fir.declarations.builder.FirFunctionBuilder +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.impl.FirPropertyAccessorImpl -import org.jetbrains.kotlin.fir.declarations.resolvePhase import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock -import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirPropertyAccessorSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource @FirBuilderDsl @@ -99,7 +81,7 @@ class FirPropertyAccessorBuilder : FirFunctionBuilder, FirAnnotationContainerBui @OptIn(ExperimentalContracts::class) inline fun buildPropertyAccessor(init: FirPropertyAccessorBuilder.() -> Unit): FirPropertyAccessor { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirPropertyAccessorBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyBuilder.kt index 57ee09a87ea..d82e0c5d7ba 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyBuilder.kt @@ -16,35 +16,14 @@ import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider -import org.jetbrains.kotlin.fir.declarations.FirBackingField -import org.jetbrains.kotlin.fir.declarations.FirContextReceiver -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirProperty -import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor -import org.jetbrains.kotlin.fir.declarations.FirPropertyBodyResolveState -import org.jetbrains.kotlin.fir.declarations.FirReceiverParameter -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.FirTypeParameter -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess -import org.jetbrains.kotlin.fir.declarations.UnresolvedDeprecationProvider -import org.jetbrains.kotlin.fir.declarations.asResolveState -import org.jetbrains.kotlin.fir.declarations.builder.FirTypeParametersOwnerBuilder -import org.jetbrains.kotlin.fir.declarations.builder.FirVariableBuilder +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.impl.FirPropertyImpl -import org.jetbrains.kotlin.fir.declarations.resolvePhase import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference -import org.jetbrains.kotlin.fir.symbols.impl.FirBackingFieldSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirDelegateFieldSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource @@ -111,7 +90,7 @@ class FirPropertyBuilder : FirVariableBuilder, FirTypeParametersOwnerBuilder, Fi @OptIn(ExperimentalContracts::class) inline fun buildProperty(init: FirPropertyBuilder.() -> Unit): FirProperty { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirPropertyBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirReceiverParameterBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirReceiverParameterBuilder.kt index 8c63a668e49..2073900355b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirReceiverParameterBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirReceiverParameterBuilder.kt @@ -19,7 +19,6 @@ import org.jetbrains.kotlin.fir.declarations.FirReceiverParameter import org.jetbrains.kotlin.fir.declarations.impl.FirReceiverParameterImpl import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirReceiverParameterBuilder : FirAnnotationContainerBuilder { @@ -40,7 +39,7 @@ class FirReceiverParameterBuilder : FirAnnotationContainerBuilder { @OptIn(ExperimentalContracts::class) inline fun buildReceiverParameter(init: FirReceiverParameterBuilder.() -> Unit): FirReceiverParameter { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirReceiverParameterBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirRegularClassBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirRegularClassBuilder.kt index e7e6b54fff3..5833dc3c50e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirRegularClassBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirRegularClassBuilder.kt @@ -17,29 +17,12 @@ import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider -import org.jetbrains.kotlin.fir.declarations.FirContextReceiver -import org.jetbrains.kotlin.fir.declarations.FirDeclaration -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirRegularClass -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess -import org.jetbrains.kotlin.fir.declarations.UnresolvedDeprecationProvider -import org.jetbrains.kotlin.fir.declarations.asResolveState -import org.jetbrains.kotlin.fir.declarations.builder.FirClassBuilder -import org.jetbrains.kotlin.fir.declarations.builder.FirTypeParameterRefsOwnerBuilder +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.impl.FirRegularClassImpl -import org.jetbrains.kotlin.fir.declarations.resolvePhase import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.scopes.FirScopeProvider import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.Name @FirBuilderDsl @@ -89,7 +72,7 @@ open class FirRegularClassBuilder : FirClassBuilder, FirTypeParameterRefsOwnerBu @OptIn(ExperimentalContracts::class) inline fun buildRegularClass(init: FirRegularClassBuilder.() -> Unit): FirRegularClass { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirRegularClassBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirResolvedImportBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirResolvedImportBuilder.kt index c296b594e2f..fcef6ef4fd2 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirResolvedImportBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirResolvedImportBuilder.kt @@ -11,15 +11,11 @@ package org.jetbrains.kotlin.fir.declarations.builder import kotlin.contracts.* -import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.FirImport import org.jetbrains.kotlin.fir.declarations.FirResolvedImport import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedImportImpl -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName -import org.jetbrains.kotlin.name.Name @FirBuilderDsl class FirResolvedImportBuilder { @@ -40,7 +36,7 @@ class FirResolvedImportBuilder { @OptIn(ExperimentalContracts::class) inline fun buildResolvedImport(init: FirResolvedImportBuilder.() -> Unit): FirResolvedImport { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirResolvedImportBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirScriptBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirScriptBuilder.kt index 555b588f627..60825399524 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirScriptBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirScriptBuilder.kt @@ -16,21 +16,11 @@ import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.declarations.FirContextReceiver -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.FirScript -import org.jetbrains.kotlin.fir.declarations.FirVariable -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess -import org.jetbrains.kotlin.fir.declarations.asResolveState +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.impl.FirScriptImpl -import org.jetbrains.kotlin.fir.declarations.resolvePhase import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.symbols.impl.FirScriptSymbol -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.Name @FirBuilderDsl @@ -70,7 +60,7 @@ class FirScriptBuilder : FirAnnotationContainerBuilder { @OptIn(ExperimentalContracts::class) inline fun buildScript(init: FirScriptBuilder.() -> Unit): FirScript { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirScriptBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirSimpleFunctionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirSimpleFunctionBuilder.kt index 42ac5967f07..533a80d6a0a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirSimpleFunctionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirSimpleFunctionBuilder.kt @@ -18,31 +18,13 @@ import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.contracts.FirContractDescription import org.jetbrains.kotlin.fir.contracts.impl.FirEmptyContractDescription -import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider -import org.jetbrains.kotlin.fir.declarations.FirContextReceiver -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirReceiverParameter -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.FirSimpleFunction -import org.jetbrains.kotlin.fir.declarations.FirTypeParameter -import org.jetbrains.kotlin.fir.declarations.FirValueParameter -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess -import org.jetbrains.kotlin.fir.declarations.UnresolvedDeprecationProvider -import org.jetbrains.kotlin.fir.declarations.asResolveState -import org.jetbrains.kotlin.fir.declarations.builder.FirFunctionBuilder -import org.jetbrains.kotlin.fir.declarations.builder.FirTypeParametersOwnerBuilder +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.impl.FirSimpleFunctionImpl -import org.jetbrains.kotlin.fir.declarations.resolvePhase import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock -import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource @@ -97,7 +79,7 @@ open class FirSimpleFunctionBuilder : FirFunctionBuilder, FirTypeParametersOwner @OptIn(ExperimentalContracts::class) inline fun buildSimpleFunction(init: FirSimpleFunctionBuilder.() -> Unit): FirSimpleFunction { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirSimpleFunctionBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeAliasBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeAliasBuilder.kt index 5afdc90368d..3e809c19b71 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeAliasBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeAliasBuilder.kt @@ -16,25 +16,11 @@ import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.FirTypeAlias -import org.jetbrains.kotlin.fir.declarations.FirTypeParameter -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess -import org.jetbrains.kotlin.fir.declarations.UnresolvedDeprecationProvider -import org.jetbrains.kotlin.fir.declarations.asResolveState -import org.jetbrains.kotlin.fir.declarations.builder.FirDeclarationBuilder -import org.jetbrains.kotlin.fir.declarations.builder.FirTypeParametersOwnerBuilder +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.impl.FirTypeAliasImpl -import org.jetbrains.kotlin.fir.declarations.resolvePhase import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.symbols.impl.FirTypeAliasSymbol import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.Name @FirBuilderDsl @@ -74,7 +60,7 @@ class FirTypeAliasBuilder : FirDeclarationBuilder, FirTypeParametersOwnerBuilder @OptIn(ExperimentalContracts::class) inline fun buildTypeAlias(init: FirTypeAliasBuilder.() -> Unit): FirTypeAlias { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirTypeAliasBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeParameterBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeParameterBuilder.kt index 14a41b4d05c..16b15df8a74 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeParameterBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeParameterBuilder.kt @@ -16,20 +16,12 @@ import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.FirTypeParameter -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess -import org.jetbrains.kotlin.fir.declarations.asResolveState +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.impl.FirTypeParameterImpl -import org.jetbrains.kotlin.fir.declarations.resolvePhase import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.types.Variance @@ -70,7 +62,7 @@ class FirTypeParameterBuilder : FirAnnotationContainerBuilder { @OptIn(ExperimentalContracts::class) inline fun buildTypeParameter(init: FirTypeParameterBuilder.() -> Unit): FirTypeParameter { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirTypeParameterBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeParameterRefsOwnerBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeParameterRefsOwnerBuilder.kt index b63308efc87..7e10b526e41 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeParameterRefsOwnerBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeParameterRefsOwnerBuilder.kt @@ -14,7 +14,6 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRefsOwner -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl interface FirTypeParameterRefsOwnerBuilder { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeParametersOwnerBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeParametersOwnerBuilder.kt index 8ec039a724b..68585375f27 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeParametersOwnerBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeParametersOwnerBuilder.kt @@ -14,7 +14,6 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.FirTypeParameter import org.jetbrains.kotlin.fir.declarations.FirTypeParametersOwner -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl interface FirTypeParametersOwnerBuilder { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirValueParameterBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirValueParameterBuilder.kt index f60ed035d46..9d319d533f9 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirValueParameterBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirValueParameterBuilder.kt @@ -16,32 +16,14 @@ import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider -import org.jetbrains.kotlin.fir.declarations.FirBackingField -import org.jetbrains.kotlin.fir.declarations.FirContextReceiver -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor -import org.jetbrains.kotlin.fir.declarations.FirReceiverParameter -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef -import org.jetbrains.kotlin.fir.declarations.FirValueParameter -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess -import org.jetbrains.kotlin.fir.declarations.UnresolvedDeprecationProvider -import org.jetbrains.kotlin.fir.declarations.asResolveState -import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedDeclarationStatusImpl +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.impl.FirValueParameterImpl -import org.jetbrains.kotlin.fir.declarations.resolvePhase import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirValueParameterSymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource @@ -96,7 +78,7 @@ open class FirValueParameterBuilder : FirAnnotationContainerBuilder { @OptIn(ExperimentalContracts::class) inline fun buildValueParameter(init: FirValueParameterBuilder.() -> Unit): FirValueParameter { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirValueParameterBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirVariableBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirVariableBuilder.kt index 66dbcb9e51c..56bce8853ee 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirVariableBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirVariableBuilder.kt @@ -13,22 +13,11 @@ package org.jetbrains.kotlin.fir.declarations.builder import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider -import org.jetbrains.kotlin.fir.declarations.FirBackingField -import org.jetbrains.kotlin.fir.declarations.FirContextReceiver -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor -import org.jetbrains.kotlin.fir.declarations.FirReceiverParameter -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirVariable -import org.jetbrains.kotlin.fir.declarations.builder.FirDeclarationBuilder +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousFunctionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousFunctionImpl.kt index c8e0752dec8..9cadbe006c7 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousFunctionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousFunctionImpl.kt @@ -14,31 +14,20 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.contracts.description.EventOccurrencesRange import org.jetbrains.kotlin.fir.FirLabel import org.jetbrains.kotlin.fir.FirModuleData +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.contracts.FirContractDescription -import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider -import org.jetbrains.kotlin.fir.declarations.FirAnonymousFunction -import org.jetbrains.kotlin.fir.declarations.FirContextReceiver -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirReceiverParameter -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.FirTypeParameter -import org.jetbrains.kotlin.fir.declarations.FirValueParameter -import org.jetbrains.kotlin.fir.declarations.InlineStatus -import org.jetbrains.kotlin.fir.declarations.asResolveState +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirAnonymousFunctionSymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess @OptIn(ResolveStateAccess::class) internal class FirAnonymousFunctionImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousInitializerImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousInitializerImpl.kt index 1106de8e992..63c3c5f114b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousInitializerImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousInitializerImpl.kt @@ -12,21 +12,14 @@ package org.jetbrains.kotlin.fir.declarations.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.declarations.FirAnonymousInitializer -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.asResolveState +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirAnonymousInitializerSymbol import org.jetbrains.kotlin.fir.types.ConeClassLikeType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor @OptIn(ResolveStateAccess::class) internal class FirAnonymousInitializerImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousObjectImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousObjectImpl.kt index 257a0239f24..866dda7cfba 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousObjectImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousObjectImpl.kt @@ -13,25 +13,17 @@ package org.jetbrains.kotlin.fir.declarations.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider -import org.jetbrains.kotlin.fir.declarations.FirAnonymousObject -import org.jetbrains.kotlin.fir.declarations.FirDeclaration -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef -import org.jetbrains.kotlin.fir.declarations.asResolveState +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.scopes.FirScopeProvider import org.jetbrains.kotlin.fir.symbols.impl.FirAnonymousObjectSymbol import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace @OptIn(ResolveStateAccess::class) internal class FirAnonymousObjectImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirBackingFieldImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirBackingFieldImpl.kt index 6365c8fed94..2e302d070be 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirBackingFieldImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirBackingFieldImpl.kt @@ -13,30 +13,20 @@ package org.jetbrains.kotlin.fir.declarations.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider -import org.jetbrains.kotlin.fir.declarations.FirBackingField -import org.jetbrains.kotlin.fir.declarations.FirContextReceiver -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor -import org.jetbrains.kotlin.fir.declarations.FirReceiverParameter -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.FirTypeParameter -import org.jetbrains.kotlin.fir.declarations.asResolveState +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.symbols.impl.FirBackingFieldSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess @OptIn(ResolveStateAccess::class) open class FirBackingFieldImpl @FirImplementationDetail constructor( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirCodeFragmentImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirCodeFragmentImpl.kt index 52aabc2a8d8..2e0d5521dce 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirCodeFragmentImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirCodeFragmentImpl.kt @@ -12,19 +12,15 @@ package org.jetbrains.kotlin.fir.declarations.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.declarations.FirCodeFragment -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.asResolveState +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.symbols.impl.FirCodeFragmentSymbol -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace @OptIn(ResolveStateAccess::class) internal class FirCodeFragmentImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirConstructedClassTypeParameterRefImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirConstructedClassTypeParameterRefImpl.kt index ad288fb1a5c..f425a458c27 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirConstructedClassTypeParameterRefImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirConstructedClassTypeParameterRefImpl.kt @@ -13,7 +13,8 @@ package org.jetbrains.kotlin.fir.declarations.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.declarations.FirConstructedClassTypeParameterRef import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor internal class FirConstructedClassTypeParameterRefImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirConstructorImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirConstructorImpl.kt index 72a4bdab22f..600239ce8b7 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirConstructorImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirConstructorImpl.kt @@ -12,19 +12,10 @@ package org.jetbrains.kotlin.fir.declarations.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.contracts.FirContractDescription -import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider -import org.jetbrains.kotlin.fir.declarations.FirConstructor -import org.jetbrains.kotlin.fir.declarations.FirContextReceiver -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirReceiverParameter -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef -import org.jetbrains.kotlin.fir.declarations.FirValueParameter -import org.jetbrains.kotlin.fir.declarations.asResolveState +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall @@ -32,11 +23,10 @@ import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirConstructorSymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess @OptIn(ResolveStateAccess::class) internal class FirConstructorImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirContextReceiverImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirContextReceiverImpl.kt index 1c17a51178e..44b68ff7f6e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirContextReceiverImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirContextReceiverImpl.kt @@ -13,8 +13,9 @@ package org.jetbrains.kotlin.fir.declarations.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.declarations.FirContextReceiver import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.fir.visitors.* internal class FirContextReceiverImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirDanglingModifierListImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirDanglingModifierListImpl.kt index 69f01b99995..0c8a08d0c08 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirDanglingModifierListImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirDanglingModifierListImpl.kt @@ -12,19 +12,15 @@ package org.jetbrains.kotlin.fir.declarations.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.declarations.FirDanglingModifierList -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.asResolveState +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.symbols.impl.FirDanglingModifierSymbol -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace @OptIn(ResolveStateAccess::class) internal class FirDanglingModifierListImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultSetterValueParameter.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultSetterValueParameter.kt index a4b90ae6793..916a5d11854 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultSetterValueParameter.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultSetterValueParameter.kt @@ -12,20 +12,9 @@ package org.jetbrains.kotlin.fir.declarations.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider -import org.jetbrains.kotlin.fir.declarations.FirBackingField -import org.jetbrains.kotlin.fir.declarations.FirContextReceiver -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor -import org.jetbrains.kotlin.fir.declarations.FirReceiverParameter -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef -import org.jetbrains.kotlin.fir.declarations.FirValueParameter -import org.jetbrains.kotlin.fir.declarations.asResolveState -import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedDeclarationStatusImpl +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference @@ -33,12 +22,11 @@ import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirValueParameterSymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess @OptIn(ResolveStateAccess::class) internal class FirDefaultSetterValueParameter( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirEnumEntryImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirEnumEntryImpl.kt index a9ea803426f..a125dfffabb 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirEnumEntryImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirEnumEntryImpl.kt @@ -12,30 +12,19 @@ package org.jetbrains.kotlin.fir.declarations.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider -import org.jetbrains.kotlin.fir.declarations.FirBackingField -import org.jetbrains.kotlin.fir.declarations.FirContextReceiver -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirEnumEntry -import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor -import org.jetbrains.kotlin.fir.declarations.FirReceiverParameter -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef -import org.jetbrains.kotlin.fir.declarations.asResolveState +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.symbols.impl.FirEnumEntrySymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess @OptIn(ResolveStateAccess::class) internal class FirEnumEntryImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorFunctionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorFunctionImpl.kt index 9c70779acb8..38276c35e56 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorFunctionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorFunctionImpl.kt @@ -12,19 +12,9 @@ package org.jetbrains.kotlin.fir.declarations.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider -import org.jetbrains.kotlin.fir.declarations.FirContextReceiver -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirErrorFunction -import org.jetbrains.kotlin.fir.declarations.FirReceiverParameter -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef -import org.jetbrains.kotlin.fir.declarations.FirValueParameter -import org.jetbrains.kotlin.fir.declarations.asResolveState -import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedDeclarationStatusImpl +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock @@ -33,11 +23,10 @@ import org.jetbrains.kotlin.fir.symbols.impl.FirErrorFunctionSymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirErrorTypeRefImpl +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess @OptIn(ResolveStateAccess::class) internal class FirErrorFunctionImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorImportImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorImportImpl.kt index 9950cec944f..0e92dfbf027 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorImportImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorImportImpl.kt @@ -14,9 +14,10 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.declarations.FirErrorImport import org.jetbrains.kotlin.fir.declarations.FirImport import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.fir.visitors.* internal class FirErrorImportImpl( override val aliasSource: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorPrimaryConstructorImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorPrimaryConstructorImpl.kt index 2fc4b057027..134def77e2f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorPrimaryConstructorImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorPrimaryConstructorImpl.kt @@ -13,19 +13,10 @@ package org.jetbrains.kotlin.fir.declarations.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirModuleData +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.contracts.FirContractDescription -import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider -import org.jetbrains.kotlin.fir.declarations.FirContextReceiver -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirErrorPrimaryConstructor -import org.jetbrains.kotlin.fir.declarations.FirReceiverParameter -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef -import org.jetbrains.kotlin.fir.declarations.FirValueParameter -import org.jetbrains.kotlin.fir.declarations.asResolveState +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock @@ -34,11 +25,10 @@ import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirConstructorSymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess @OptIn(ResolveStateAccess::class) class FirErrorPrimaryConstructorImpl @FirImplementationDetail constructor( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorPropertyImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorPropertyImpl.kt index 1a356a4ee9c..4d6e1874cd0 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorPropertyImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorPropertyImpl.kt @@ -12,20 +12,9 @@ package org.jetbrains.kotlin.fir.declarations.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider -import org.jetbrains.kotlin.fir.declarations.FirBackingField -import org.jetbrains.kotlin.fir.declarations.FirContextReceiver -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirErrorProperty -import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor -import org.jetbrains.kotlin.fir.declarations.FirReceiverParameter -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef -import org.jetbrains.kotlin.fir.declarations.asResolveState -import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedDeclarationStatusImpl +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -33,12 +22,11 @@ import org.jetbrains.kotlin.fir.symbols.impl.FirErrorPropertySymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirErrorTypeRefImpl +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess @OptIn(ResolveStateAccess::class) internal class FirErrorPropertyImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFieldImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFieldImpl.kt index 68b0682de1d..4ccaf1da261 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFieldImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFieldImpl.kt @@ -13,31 +13,20 @@ package org.jetbrains.kotlin.fir.declarations.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider -import org.jetbrains.kotlin.fir.declarations.FirBackingField -import org.jetbrains.kotlin.fir.declarations.FirContextReceiver -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirField -import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor -import org.jetbrains.kotlin.fir.declarations.FirReceiverParameter -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef -import org.jetbrains.kotlin.fir.declarations.asResolveState +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirFieldSymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess @OptIn(ResolveStateAccess::class) class FirFieldImpl @FirImplementationDetail constructor( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFileImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFileImpl.kt index ad5f5c1824c..2475ea618db 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFileImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFileImpl.kt @@ -16,21 +16,13 @@ import org.jetbrains.kotlin.KtSourceFileLinesMapping import org.jetbrains.kotlin.fir.FirFileAnnotationsContainer import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.FirPackageDirective -import org.jetbrains.kotlin.fir.declarations.FirDeclaration -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirFile -import org.jetbrains.kotlin.fir.declarations.FirImport -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.asResolveState +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirFileSymbol -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace @OptIn(ResolveStateAccess::class) internal class FirFileImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirImportImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirImportImpl.kt index 31f2ceefc93..54939282278 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirImportImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirImportImpl.kt @@ -12,9 +12,10 @@ package org.jetbrains.kotlin.fir.declarations.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.declarations.FirImport +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.fir.visitors.* internal class FirImportImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirOuterClassTypeParameterRefImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirOuterClassTypeParameterRefImpl.kt index 10092113669..f0e020924e1 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirOuterClassTypeParameterRefImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirOuterClassTypeParameterRefImpl.kt @@ -14,7 +14,8 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.declarations.FirOuterClassTypeParameterRef import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor class FirOuterClassTypeParameterRefImpl @FirImplementationDetail constructor( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPrimaryConstructor.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPrimaryConstructor.kt index cb7e6e2b590..d4fe918ab03 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPrimaryConstructor.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPrimaryConstructor.kt @@ -13,19 +13,10 @@ package org.jetbrains.kotlin.fir.declarations.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirModuleData +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.contracts.FirContractDescription -import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider -import org.jetbrains.kotlin.fir.declarations.FirConstructor -import org.jetbrains.kotlin.fir.declarations.FirContextReceiver -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirReceiverParameter -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef -import org.jetbrains.kotlin.fir.declarations.FirValueParameter -import org.jetbrains.kotlin.fir.declarations.asResolveState +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall @@ -33,11 +24,10 @@ import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirConstructorSymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess @OptIn(ResolveStateAccess::class) class FirPrimaryConstructor @FirImplementationDetail constructor( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyAccessorImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyAccessorImpl.kt index dc42aca33d6..cb10c8bc206 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyAccessorImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyAccessorImpl.kt @@ -14,19 +14,10 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirModuleData +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.contracts.FirContractDescription -import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider -import org.jetbrains.kotlin.fir.declarations.FirContextReceiver -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor -import org.jetbrains.kotlin.fir.declarations.FirReceiverParameter -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.FirTypeParameter -import org.jetbrains.kotlin.fir.declarations.FirValueParameter -import org.jetbrains.kotlin.fir.declarations.asResolveState +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference @@ -34,11 +25,10 @@ import org.jetbrains.kotlin.fir.symbols.impl.FirPropertyAccessorSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess @OptIn(ResolveStateAccess::class) open class FirPropertyAccessorImpl @FirImplementationDetail constructor( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyImpl.kt index 2be3bd78490..111e4c0298d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyImpl.kt @@ -12,20 +12,9 @@ package org.jetbrains.kotlin.fir.declarations.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider -import org.jetbrains.kotlin.fir.declarations.FirBackingField -import org.jetbrains.kotlin.fir.declarations.FirContextReceiver -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirProperty -import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor -import org.jetbrains.kotlin.fir.declarations.FirPropertyBodyResolveState -import org.jetbrains.kotlin.fir.declarations.FirReceiverParameter -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.FirTypeParameter -import org.jetbrains.kotlin.fir.declarations.asResolveState +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference @@ -34,12 +23,11 @@ import org.jetbrains.kotlin.fir.symbols.impl.FirDelegateFieldSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess @OptIn(ResolveStateAccess::class) internal class FirPropertyImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirReceiverParameterImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirReceiverParameterImpl.kt index c9f6ebfdb07..11ef71698cf 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirReceiverParameterImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirReceiverParameterImpl.kt @@ -11,12 +11,14 @@ package org.jetbrains.kotlin.fir.declarations.impl import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.declarations.FirReceiverParameter import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace internal class FirReceiverParameterImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirRegularClassImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirRegularClassImpl.kt index 53cea5d5371..a5834a3bdfc 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirRegularClassImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirRegularClassImpl.kt @@ -13,27 +13,18 @@ package org.jetbrains.kotlin.fir.declarations.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider -import org.jetbrains.kotlin.fir.declarations.FirContextReceiver -import org.jetbrains.kotlin.fir.declarations.FirDeclaration -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirRegularClass -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef -import org.jetbrains.kotlin.fir.declarations.asResolveState +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.scopes.FirScopeProvider import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess @OptIn(ResolveStateAccess::class) internal class FirRegularClassImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirResolvedImportImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirResolvedImportImpl.kt index 99f0d895e78..24ce534a76c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirResolvedImportImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirResolvedImportImpl.kt @@ -13,10 +13,11 @@ package org.jetbrains.kotlin.fir.declarations.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.declarations.FirImport import org.jetbrains.kotlin.fir.declarations.FirResolvedImport +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.fir.visitors.* internal class FirResolvedImportImpl( override var delegate: FirImport, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirScriptImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirScriptImpl.kt index 5dc5ca808ef..03b1ddb1f41 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirScriptImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirScriptImpl.kt @@ -12,22 +12,16 @@ package org.jetbrains.kotlin.fir.declarations.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.declarations.FirContextReceiver -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.FirScript -import org.jetbrains.kotlin.fir.declarations.FirVariable -import org.jetbrains.kotlin.fir.declarations.asResolveState +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.symbols.impl.FirScriptSymbol +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess @OptIn(ResolveStateAccess::class) internal class FirScriptImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirSimpleFunctionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirSimpleFunctionImpl.kt index df85853a957..f87444a3949 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirSimpleFunctionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirSimpleFunctionImpl.kt @@ -12,31 +12,21 @@ package org.jetbrains.kotlin.fir.declarations.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.contracts.FirContractDescription -import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider -import org.jetbrains.kotlin.fir.declarations.FirContextReceiver -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirReceiverParameter -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.FirSimpleFunction -import org.jetbrains.kotlin.fir.declarations.FirTypeParameter -import org.jetbrains.kotlin.fir.declarations.FirValueParameter -import org.jetbrains.kotlin.fir.declarations.asResolveState +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess @OptIn(ResolveStateAccess::class) internal class FirSimpleFunctionImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirTypeAliasImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirTypeAliasImpl.kt index 376ee6f8519..a15cf0808d3 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirTypeAliasImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirTypeAliasImpl.kt @@ -12,23 +12,16 @@ package org.jetbrains.kotlin.fir.declarations.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.FirTypeAlias -import org.jetbrains.kotlin.fir.declarations.FirTypeParameter -import org.jetbrains.kotlin.fir.declarations.asResolveState +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.symbols.impl.FirTypeAliasSymbol import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess @OptIn(ResolveStateAccess::class) internal class FirTypeAliasImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirTypeParameterImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirTypeParameterImpl.kt index ba283ea0b56..1c8d9a9096d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirTypeParameterImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirTypeParameterImpl.kt @@ -12,22 +12,18 @@ package org.jetbrains.kotlin.fir.declarations.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.FirTypeParameter -import org.jetbrains.kotlin.fir.declarations.asResolveState +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.types.Variance -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess @OptIn(ResolveStateAccess::class) internal class FirTypeParameterImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirValueParameterImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirValueParameterImpl.kt index b19e9cb5b9d..1ac354362e1 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirValueParameterImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirValueParameterImpl.kt @@ -12,20 +12,9 @@ package org.jetbrains.kotlin.fir.declarations.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider -import org.jetbrains.kotlin.fir.declarations.FirBackingField -import org.jetbrains.kotlin.fir.declarations.FirContextReceiver -import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor -import org.jetbrains.kotlin.fir.declarations.FirReceiverParameter -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState -import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef -import org.jetbrains.kotlin.fir.declarations.FirValueParameter -import org.jetbrains.kotlin.fir.declarations.asResolveState -import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedDeclarationStatusImpl +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference @@ -33,12 +22,11 @@ import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirValueParameterSymbol import org.jetbrains.kotlin.fir.types.ConeSimpleKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess @OptIn(ResolveStateAccess::class) internal class FirValueParameterImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/diagnostics/FirDiagnosticHolder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/diagnostics/FirDiagnosticHolder.kt index c1ef8da5d5d..4f045a151b0 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/diagnostics/FirDiagnosticHolder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/diagnostics/FirDiagnosticHolder.kt @@ -10,7 +10,8 @@ package org.jetbrains.kotlin.fir.diagnostics import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.diagnosticHolder] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotation.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotation.kt index ef7baa18e27..857486267b0 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotation.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotation.kt @@ -14,8 +14,8 @@ import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.annotation] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotationArgumentMapping.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotationArgumentMapping.kt index ef16d8a2bb9..63d055afd99 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotationArgumentMapping.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotationArgumentMapping.kt @@ -11,8 +11,9 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirPureAbstractElement +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.fir.visitors.* /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.annotationArgumentMapping] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotationCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotationCall.kt index 8e12f6fabb9..da189e9d03e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotationCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotationCall.kt @@ -15,8 +15,8 @@ import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.annotationCall] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnonymousFunctionExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnonymousFunctionExpression.kt index 52d1c13cbca..380ab823d05 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnonymousFunctionExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnonymousFunctionExpression.kt @@ -12,8 +12,8 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.declarations.FirAnonymousFunction import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.anonymousFunctionExpression] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnonymousObjectExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnonymousObjectExpression.kt index 433efdfa93a..d20472bfeda 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnonymousObjectExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnonymousObjectExpression.kt @@ -12,8 +12,8 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.declarations.FirAnonymousObject import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.anonymousObjectExpression] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirArgumentList.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirArgumentList.kt index 9d5dab56ce3..6c85e69493c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirArgumentList.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirArgumentList.kt @@ -11,7 +11,8 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirPureAbstractElement -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.argumentList] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirArrayLiteral.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirArrayLiteral.kt index eeb90910ac6..d3fd86826d8 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirArrayLiteral.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirArrayLiteral.kt @@ -11,8 +11,8 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.arrayLiteral] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAssignmentOperatorStatement.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAssignmentOperatorStatement.kt index b018986977e..caa4b036eb8 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAssignmentOperatorStatement.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAssignmentOperatorStatement.kt @@ -11,7 +11,8 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirPureAbstractElement -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.assignmentOperatorStatement] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAugmentedArraySetCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAugmentedArraySetCall.kt index 9c4e68f0418..5c19dda7458 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAugmentedArraySetCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAugmentedArraySetCall.kt @@ -12,7 +12,8 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirPureAbstractElement import org.jetbrains.kotlin.fir.references.FirReference -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.augmentedArraySetCall] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBinaryLogicExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBinaryLogicExpression.kt index 606f6a430fc..4a2f5c4148a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBinaryLogicExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBinaryLogicExpression.kt @@ -12,8 +12,8 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.contracts.description.LogicOperationKind import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.binaryLogicExpression] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBlock.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBlock.kt index 16423809dae..b56ececdd72 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBlock.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBlock.kt @@ -11,8 +11,8 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.block] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBreakExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBreakExpression.kt index f3cbaebb999..c453e9a2c36 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBreakExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBreakExpression.kt @@ -12,8 +12,8 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirTarget import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.breakExpression] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCall.kt index 711cf186e63..847f39c255f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCall.kt @@ -10,7 +10,8 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.call] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCallableReferenceAccess.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCallableReferenceAccess.kt index 889cb6a623d..3e6a3a290ac 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCallableReferenceAccess.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCallableReferenceAccess.kt @@ -10,14 +10,14 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement +import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.references.FirNamedReference import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.FirImplementationDetail +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.callableReferenceAccess] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCatch.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCatch.kt index 02e1c4a702a..f50912d0dbb 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCatch.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCatch.kt @@ -12,7 +12,8 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirPureAbstractElement import org.jetbrains.kotlin.fir.declarations.FirProperty -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.catchClause] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCheckNotNullCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCheckNotNullCall.kt index 42ef3a77b43..70d5228daba 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCheckNotNullCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCheckNotNullCall.kt @@ -12,8 +12,8 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.checkNotNullCall] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCheckedSafeCallSubject.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCheckedSafeCallSubject.kt index 1c21f532421..15c1382651f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCheckedSafeCallSubject.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCheckedSafeCallSubject.kt @@ -12,8 +12,8 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirExpressionRef import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.checkedSafeCallSubject] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirClassReferenceExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirClassReferenceExpression.kt index c48bc677a2d..bee07a4500b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirClassReferenceExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirClassReferenceExpression.kt @@ -12,8 +12,8 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.classReferenceExpression] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComparisonExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComparisonExpression.kt index 3a32ac5fbc0..5ee490c93dd 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComparisonExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComparisonExpression.kt @@ -11,8 +11,8 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.comparisonExpression] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComponentCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComponentCall.kt index fa671506e78..cae46000444 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComponentCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComponentCall.kt @@ -10,14 +10,14 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement +import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.references.FirNamedReference import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.FirImplementationDetail +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.componentCall] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirConstExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirConstExpression.kt index d78679ff86a..8e6dd4f5860 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirConstExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirConstExpression.kt @@ -11,9 +11,9 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.types.ConstantValueKind -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.constExpression] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirContextReceiverArgumentListOwner.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirContextReceiverArgumentListOwner.kt index c098a099bb1..5ef508556c3 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirContextReceiverArgumentListOwner.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirContextReceiverArgumentListOwner.kt @@ -10,7 +10,8 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.contextReceiverArgumentListOwner] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirContinueExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirContinueExpression.kt index e3e125424ba..5be00012f65 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirContinueExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirContinueExpression.kt @@ -12,8 +12,8 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirTarget import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.continueExpression] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirDelegatedConstructorCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirDelegatedConstructorCall.kt index 2189638a118..7708041cb58 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirDelegatedConstructorCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirDelegatedConstructorCall.kt @@ -13,7 +13,8 @@ import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirPureAbstractElement import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.delegatedConstructorCall] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirDesugaredAssignmentValueReferenceExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirDesugaredAssignmentValueReferenceExpression.kt index 01fffaa3a64..b5a6bc7572d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirDesugaredAssignmentValueReferenceExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirDesugaredAssignmentValueReferenceExpression.kt @@ -12,8 +12,8 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirExpressionRef import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.desugaredAssignmentValueReferenceExpression] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirDoWhileLoop.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirDoWhileLoop.kt index 96368fc9aa3..282c5c02429 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirDoWhileLoop.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirDoWhileLoop.kt @@ -11,7 +11,8 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirLabel -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.doWhileLoop] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirElvisExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirElvisExpression.kt index 6c667315d75..87fd3dd7804 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirElvisExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirElvisExpression.kt @@ -12,8 +12,8 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.elvisExpression] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirEnumEntryDeserializedAccessExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirEnumEntryDeserializedAccessExpression.kt index 2484d6ff690..77f665d2569 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirEnumEntryDeserializedAccessExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirEnumEntryDeserializedAccessExpression.kt @@ -11,10 +11,10 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.enumEntryDeserializedAccessExpression] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirEqualityOperatorCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirEqualityOperatorCall.kt index 639643e305a..9a5111e8f7c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirEqualityOperatorCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirEqualityOperatorCall.kt @@ -11,8 +11,8 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.equalityOperatorCall] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorAnnotationCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorAnnotationCall.kt index 84c0d25a07e..8aa13a55b4d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorAnnotationCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorAnnotationCall.kt @@ -17,8 +17,8 @@ import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.errorAnnotationCall] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorExpression.kt index a302cc2ab1b..87ece51fa6b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorExpression.kt @@ -13,8 +13,8 @@ import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.diagnostics.FirDiagnosticHolder import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.errorExpression] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorLoop.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorLoop.kt index 62e2c55d8ad..675b4f383a6 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorLoop.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorLoop.kt @@ -13,7 +13,8 @@ import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirLabel import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.diagnostics.FirDiagnosticHolder -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.errorLoop] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorResolvedQualifier.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorResolvedQualifier.kt index 81067f3bb3c..79c9a0c5adf 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorResolvedQualifier.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorResolvedQualifier.kt @@ -15,10 +15,10 @@ import org.jetbrains.kotlin.fir.diagnostics.FirDiagnosticHolder import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.errorResolvedQualifier] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirExpression.kt index fa1837faca3..1cbf178f9a4 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirExpression.kt @@ -12,8 +12,8 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirPureAbstractElement import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.expression] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirFunctionCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirFunctionCall.kt index cb74e519299..6c1a1cc48d3 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirFunctionCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirFunctionCall.kt @@ -10,14 +10,14 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement +import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.references.FirNamedReference import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.FirImplementationDetail +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.functionCall] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirGetClassCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirGetClassCall.kt index 1001b19bb9c..c2ad75b3f17 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirGetClassCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirGetClassCall.kt @@ -11,8 +11,8 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.getClassCall] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirImplicitInvokeCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirImplicitInvokeCall.kt index 7dcd5341ab0..1f8fa1fcba7 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirImplicitInvokeCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirImplicitInvokeCall.kt @@ -10,14 +10,14 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement +import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.references.FirNamedReference import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.FirImplementationDetail +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.implicitInvokeCall] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirInaccessibleReceiverExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirInaccessibleReceiverExpression.kt index 716009e0301..4bdc620d48d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirInaccessibleReceiverExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirInaccessibleReceiverExpression.kt @@ -13,8 +13,8 @@ import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.references.FirThisReference import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.inaccessibleReceiverExpression] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirIncrementDecrementExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirIncrementDecrementExpression.kt index d58330cca32..98bf1e2cbdd 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirIncrementDecrementExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirIncrementDecrementExpression.kt @@ -11,9 +11,9 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.incrementDecrementExpression] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirIntegerLiteralOperatorCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirIntegerLiteralOperatorCall.kt index 4eacbdc31e2..261a5bae02d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirIntegerLiteralOperatorCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirIntegerLiteralOperatorCall.kt @@ -10,14 +10,14 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement +import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.references.FirNamedReference import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.FirImplementationDetail +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.integerLiteralOperatorCall] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirJump.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirJump.kt index 2474126102f..293aa80aec1 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirJump.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirJump.kt @@ -13,8 +13,8 @@ import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirTarget import org.jetbrains.kotlin.fir.FirTargetElement import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.jump] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLambdaArgumentExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLambdaArgumentExpression.kt index ed6ae999da8..6ef2d579ca5 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLambdaArgumentExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLambdaArgumentExpression.kt @@ -11,8 +11,8 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.lambdaArgumentExpression] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLazyBlock.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLazyBlock.kt index 1c481df5317..ff462eade24 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLazyBlock.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLazyBlock.kt @@ -11,8 +11,8 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.lazyBlock] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLazyExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLazyExpression.kt index 9e3c5e1da51..fcb4e7ac824 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLazyExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLazyExpression.kt @@ -11,8 +11,8 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.lazyExpression] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLoop.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLoop.kt index 147b27343df..4aed9976c1b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLoop.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLoop.kt @@ -13,7 +13,8 @@ import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirLabel import org.jetbrains.kotlin.fir.FirPureAbstractElement import org.jetbrains.kotlin.fir.FirTargetElement -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.loop] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLoopJump.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLoopJump.kt index c7826712c77..1f90f847d72 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLoopJump.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLoopJump.kt @@ -12,8 +12,8 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirTarget import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.loopJump] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirMultiDelegatedConstructorCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirMultiDelegatedConstructorCall.kt index b9fe79a444b..4d888089c52 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirMultiDelegatedConstructorCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirMultiDelegatedConstructorCall.kt @@ -12,7 +12,8 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.multiDelegatedConstructorCall] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirNamedArgumentExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirNamedArgumentExpression.kt index e189eed9117..3ce784bf200 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirNamedArgumentExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirNamedArgumentExpression.kt @@ -11,9 +11,9 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.namedArgumentExpression] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirPropertyAccessExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirPropertyAccessExpression.kt index b81bd2bd421..925a87f2084 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirPropertyAccessExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirPropertyAccessExpression.kt @@ -10,13 +10,13 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement +import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.FirImplementationDetail +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.propertyAccessExpression] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccessExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccessExpression.kt index 8da64fb4556..8c10a5f4c01 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccessExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccessExpression.kt @@ -10,13 +10,13 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement +import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.FirImplementationDetail +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.qualifiedAccessExpression] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedErrorAccessExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedErrorAccessExpression.kt index a6b34516019..2d8bb96483c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedErrorAccessExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedErrorAccessExpression.kt @@ -13,8 +13,8 @@ import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.diagnostics.FirDiagnosticHolder import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.qualifiedErrorAccessExpression] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvable.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvable.kt index 3d767099eda..b31c4828f77 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvable.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvable.kt @@ -11,7 +11,8 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.references.FirReference -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.resolvable] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvedQualifier.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvedQualifier.kt index 4b1d61e5832..7ac9ac57c5f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvedQualifier.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvedQualifier.kt @@ -14,10 +14,10 @@ import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.resolvedQualifier] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvedReifiedParameterReference.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvedReifiedParameterReference.kt index db026968cd6..2ad76941ae2 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvedReifiedParameterReference.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvedReifiedParameterReference.kt @@ -12,8 +12,8 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.resolvedReifiedParameterReference] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirReturnExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirReturnExpression.kt index 975e9b1241e..2f627f73f18 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirReturnExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirReturnExpression.kt @@ -13,8 +13,8 @@ import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirTarget import org.jetbrains.kotlin.fir.declarations.FirFunction import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.returnExpression] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSafeCallExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSafeCallExpression.kt index 5502368d334..58d77c966e5 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSafeCallExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSafeCallExpression.kt @@ -12,8 +12,8 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirExpressionRef import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.safeCallExpression] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSmartCastExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSmartCastExpression.kt index 8df7da3c904..3fb0f91b5a9 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSmartCastExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSmartCastExpression.kt @@ -12,9 +12,9 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.types.SmartcastStability -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.smartCastExpression] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSpreadArgumentExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSpreadArgumentExpression.kt index 5d2dce9b3de..825f162f785 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSpreadArgumentExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSpreadArgumentExpression.kt @@ -11,8 +11,8 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.spreadArgumentExpression] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirStatement.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirStatement.kt index 8e0b1cb6ebb..ff7124bbc89 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirStatement.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirStatement.kt @@ -11,7 +11,8 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirAnnotationContainer import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.statement] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirStringConcatenationCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirStringConcatenationCall.kt index 8030598e6ca..6bdbf7c8e1e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirStringConcatenationCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirStringConcatenationCall.kt @@ -11,8 +11,8 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.stringConcatenationCall] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThisReceiverExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThisReceiverExpression.kt index 7461f8513c7..f1c4828d1e3 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThisReceiverExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThisReceiverExpression.kt @@ -10,14 +10,14 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement +import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.references.FirThisReference import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.FirImplementationDetail +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.thisReceiverExpression] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThrowExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThrowExpression.kt index 885fe71466a..c9d7e53ab9f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThrowExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThrowExpression.kt @@ -11,8 +11,8 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.throwExpression] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirTryExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirTryExpression.kt index 850db3ed7a7..6cf8f2b4612 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirTryExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirTryExpression.kt @@ -12,8 +12,8 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.tryExpression] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirTypeOperatorCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirTypeOperatorCall.kt index 1c23438e123..8946cf9e985 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirTypeOperatorCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirTypeOperatorCall.kt @@ -12,8 +12,8 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.typeOperatorCall] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirVarargArgumentsExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirVarargArgumentsExpression.kt index 88dbbec002f..605728176b0 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirVarargArgumentsExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirVarargArgumentsExpression.kt @@ -12,8 +12,8 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.varargArgumentsExpression] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirVariableAssignment.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirVariableAssignment.kt index e8516f943f0..3996e5d8b30 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirVariableAssignment.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirVariableAssignment.kt @@ -11,7 +11,8 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirPureAbstractElement -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.variableAssignment] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenBranch.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenBranch.kt index 780de02a011..30c7e428a8b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenBranch.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenBranch.kt @@ -11,7 +11,8 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirPureAbstractElement -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.whenBranch] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenExpression.kt index b672de6f7b1..77dfa88ee9b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenExpression.kt @@ -13,8 +13,8 @@ import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.declarations.FirVariable import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.whenExpression] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenSubjectExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenSubjectExpression.kt index b2ea7d04525..4fede5cba80 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenSubjectExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenSubjectExpression.kt @@ -12,8 +12,8 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirExpressionRef import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.whenSubjectExpression] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhileLoop.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhileLoop.kt index e70f2f30086..6bc65059494 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhileLoop.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhileLoop.kt @@ -11,7 +11,8 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirLabel -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.whileLoop] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedArgumentExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedArgumentExpression.kt index ee938164037..6617086b25d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedArgumentExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedArgumentExpression.kt @@ -11,8 +11,8 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.wrappedArgumentExpression] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedDelegateExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedDelegateExpression.kt index fa575632d27..6dbe45ea342 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedDelegateExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedDelegateExpression.kt @@ -11,8 +11,8 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.wrappedDelegateExpression] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedExpression.kt index 0edddf900e5..5aca45a4343 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedExpression.kt @@ -11,8 +11,8 @@ package org.jetbrains.kotlin.fir.expressions import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.wrappedExpression] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAbstractFunctionCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAbstractFunctionCallBuilder.kt index d0b6f3b4cb9..0bf270e4a96 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAbstractFunctionCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAbstractFunctionCallBuilder.kt @@ -13,17 +13,10 @@ package org.jetbrains.kotlin.fir.expressions.builder import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic -import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.expressions.FirArgumentList -import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.expressions.FirFunctionCall -import org.jetbrains.kotlin.fir.expressions.FirFunctionCallOrigin -import org.jetbrains.kotlin.fir.expressions.builder.FirCallBuilder -import org.jetbrains.kotlin.fir.expressions.builder.FirQualifiedAccessExpressionBuilder +import org.jetbrains.kotlin.fir.expressions.* import org.jetbrains.kotlin.fir.references.FirNamedReference import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl interface FirAbstractFunctionCallBuilder : FirQualifiedAccessExpressionBuilder, FirCallBuilder { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAbstractResolvedQualifierBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAbstractResolvedQualifierBuilder.kt index e416866c90c..3559145e64b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAbstractResolvedQualifierBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAbstractResolvedQualifierBuilder.kt @@ -18,7 +18,6 @@ import org.jetbrains.kotlin.fir.expressions.FirResolvedQualifier import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAnnotationBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAnnotationBuilder.kt index 1dc9f4c82fb..616c1ee2e89 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAnnotationBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAnnotationBuilder.kt @@ -18,14 +18,10 @@ import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirAnnotationArgumentMapping -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirAnnotationImpl import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.coneTypeOrNull -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirAnnotationBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { @@ -60,7 +56,7 @@ class FirAnnotationBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder @OptIn(ExperimentalContracts::class) inline fun buildAnnotation(init: FirAnnotationBuilder.() -> Unit): FirAnnotation { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirAnnotationBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAnnotationCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAnnotationCallBuilder.kt index 5a0be2d25bc..3222567bccd 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAnnotationCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAnnotationCallBuilder.kt @@ -16,24 +16,14 @@ import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.expressions.FirAnnotationArgumentMapping -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall -import org.jetbrains.kotlin.fir.expressions.FirAnnotationResolvePhase -import org.jetbrains.kotlin.fir.expressions.FirArgumentList -import org.jetbrains.kotlin.fir.expressions.FirEmptyArgumentList -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirCallBuilder -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder +import org.jetbrains.kotlin.fir.expressions.* import org.jetbrains.kotlin.fir.expressions.impl.FirAnnotationCallImpl import org.jetbrains.kotlin.fir.expressions.impl.FirEmptyAnnotationArgumentMapping import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.coneTypeOrNull import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirAnnotationCallBuilder : FirCallBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { @@ -74,7 +64,7 @@ class FirAnnotationCallBuilder : FirCallBuilder, FirAnnotationContainerBuilder, @OptIn(ExperimentalContracts::class) inline fun buildAnnotationCall(init: FirAnnotationCallBuilder.() -> Unit): FirAnnotationCall { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirAnnotationCallBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirArrayLiteralBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirArrayLiteralBuilder.kt index 120c1329dcf..55129cd84c9 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirArrayLiteralBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirArrayLiteralBuilder.kt @@ -18,12 +18,8 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirArrayLiteral -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirCallBuilder -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirArrayLiteralImpl import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirArrayLiteralBuilder : FirCallBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { @@ -46,7 +42,7 @@ class FirArrayLiteralBuilder : FirCallBuilder, FirAnnotationContainerBuilder, Fi @OptIn(ExperimentalContracts::class) inline fun buildArrayLiteral(init: FirArrayLiteralBuilder.() -> Unit): FirArrayLiteral { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirArrayLiteralBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAssignmentOperatorStatementBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAssignmentOperatorStatementBuilder.kt index be12d7c8292..21d78000e80 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAssignmentOperatorStatementBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAssignmentOperatorStatementBuilder.kt @@ -20,7 +20,6 @@ import org.jetbrains.kotlin.fir.expressions.FirAssignmentOperatorStatement import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirOperation import org.jetbrains.kotlin.fir.expressions.impl.FirAssignmentOperatorStatementImpl -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirAssignmentOperatorStatementBuilder : FirAnnotationContainerBuilder { @@ -45,7 +44,7 @@ class FirAssignmentOperatorStatementBuilder : FirAnnotationContainerBuilder { @OptIn(ExperimentalContracts::class) inline fun buildAssignmentOperatorStatement(init: FirAssignmentOperatorStatementBuilder.() -> Unit): FirAssignmentOperatorStatement { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirAssignmentOperatorStatementBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAugmentedArraySetCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAugmentedArraySetCallBuilder.kt index dc1bf0777cb..33e2a41f939 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAugmentedArraySetCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAugmentedArraySetCallBuilder.kt @@ -15,15 +15,10 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.expressions.FirAugmentedArraySetCall -import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.expressions.FirFunctionCall -import org.jetbrains.kotlin.fir.expressions.FirOperation +import org.jetbrains.kotlin.fir.expressions.* import org.jetbrains.kotlin.fir.expressions.impl.FirAugmentedArraySetCallImpl import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.references.impl.FirStubReference -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirAugmentedArraySetCallBuilder : FirAnnotationContainerBuilder { @@ -52,7 +47,7 @@ class FirAugmentedArraySetCallBuilder : FirAnnotationContainerBuilder { @OptIn(ExperimentalContracts::class) inline fun buildAugmentedArraySetCall(init: FirAugmentedArraySetCallBuilder.() -> Unit): FirAugmentedArraySetCall { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirAugmentedArraySetCallBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBinaryLogicExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBinaryLogicExpressionBuilder.kt index 3776beddf2f..ed4dbae6d98 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBinaryLogicExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBinaryLogicExpressionBuilder.kt @@ -19,11 +19,8 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBinaryLogicExpression import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirBinaryLogicExpressionImpl import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirBinaryLogicExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { @@ -50,7 +47,7 @@ class FirBinaryLogicExpressionBuilder : FirAnnotationContainerBuilder, FirExpres @OptIn(ExperimentalContracts::class) inline fun buildBinaryLogicExpression(init: FirBinaryLogicExpressionBuilder.() -> Unit): FirBinaryLogicExpression { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirBinaryLogicExpressionBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBlockBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBlockBuilder.kt index 71db8c33c57..eb107134ee8 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBlockBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBlockBuilder.kt @@ -18,11 +18,8 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirStatement -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirBlockImpl import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirBlockBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { @@ -45,7 +42,7 @@ class FirBlockBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { @OptIn(ExperimentalContracts::class) inline fun buildBlock(init: FirBlockBuilder.() -> Unit = {}): FirBlock { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirBlockBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBreakExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBreakExpressionBuilder.kt index 7a03df6db60..6b4672c090a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBreakExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBreakExpressionBuilder.kt @@ -19,15 +19,8 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBreakExpression import org.jetbrains.kotlin.fir.expressions.FirLoop -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder -import org.jetbrains.kotlin.fir.expressions.builder.FirLoopJumpBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirBreakExpressionImpl import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.types.constructClassLikeType -import org.jetbrains.kotlin.fir.types.impl.FirImplicitNothingTypeRef -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.name.StandardClassIds @FirBuilderDsl class FirBreakExpressionBuilder : FirLoopJumpBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { @@ -55,7 +48,7 @@ class FirBreakExpressionBuilder : FirLoopJumpBuilder, FirAnnotationContainerBuil @OptIn(ExperimentalContracts::class) inline fun buildBreakExpression(init: FirBreakExpressionBuilder.() -> Unit): FirBreakExpression { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirBreakExpressionBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCallBuilder.kt index a929c3f6a50..19e4ee68cdb 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCallBuilder.kt @@ -15,7 +15,6 @@ import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirCall -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl interface FirCallBuilder { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCallableReferenceAccessBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCallableReferenceAccessBuilder.kt index 81f61bfc23f..90260ce67f4 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCallableReferenceAccessBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCallableReferenceAccessBuilder.kt @@ -12,7 +12,6 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -20,15 +19,10 @@ import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirCallableReferenceAccess import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder -import org.jetbrains.kotlin.fir.expressions.builder.FirQualifiedAccessExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirCallableReferenceAccessImpl import org.jetbrains.kotlin.fir.references.FirNamedReference -import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirCallableReferenceAccessBuilder : FirQualifiedAccessExpressionBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { @@ -65,7 +59,7 @@ class FirCallableReferenceAccessBuilder : FirQualifiedAccessExpressionBuilder, F @OptIn(ExperimentalContracts::class) inline fun buildCallableReferenceAccess(init: FirCallableReferenceAccessBuilder.() -> Unit): FirCallableReferenceAccess { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirCallableReferenceAccessBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCatchBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCatchBuilder.kt index 8b47c506ca6..abcb51bf953 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCatchBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCatchBuilder.kt @@ -17,7 +17,6 @@ import org.jetbrains.kotlin.fir.declarations.FirProperty import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirCatch import org.jetbrains.kotlin.fir.expressions.impl.FirCatchImpl -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirCatchBuilder { @@ -38,7 +37,7 @@ class FirCatchBuilder { @OptIn(ExperimentalContracts::class) inline fun buildCatch(init: FirCatchBuilder.() -> Unit): FirCatch { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirCatchBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCheckNotNullCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCheckNotNullCallBuilder.kt index f23a8df3a52..3d4bc6d9ce5 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCheckNotNullCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCheckNotNullCallBuilder.kt @@ -18,13 +18,10 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirCheckNotNullCall -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirCheckNotNullCallImpl import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.references.impl.FirStubReference import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirCheckNotNullCallBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { @@ -49,7 +46,7 @@ class FirCheckNotNullCallBuilder : FirAnnotationContainerBuilder, FirExpressionB @OptIn(ExperimentalContracts::class) inline fun buildCheckNotNullCall(init: FirCheckNotNullCallBuilder.() -> Unit): FirCheckNotNullCall { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirCheckNotNullCallBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCheckedSafeCallSubjectBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCheckedSafeCallSubjectBuilder.kt index b0e0bba5304..5634d91ddb3 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCheckedSafeCallSubjectBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCheckedSafeCallSubjectBuilder.kt @@ -19,11 +19,8 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirCheckedSafeCallSubject import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirCheckedSafeCallSubjectImpl import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirCheckedSafeCallSubjectBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { @@ -46,7 +43,7 @@ class FirCheckedSafeCallSubjectBuilder : FirAnnotationContainerBuilder, FirExpre @OptIn(ExperimentalContracts::class) inline fun buildCheckedSafeCallSubject(init: FirCheckedSafeCallSubjectBuilder.() -> Unit): FirCheckedSafeCallSubject { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirCheckedSafeCallSubjectBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirClassReferenceExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirClassReferenceExpressionBuilder.kt index 87550b00765..52dd94dd6da 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirClassReferenceExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirClassReferenceExpressionBuilder.kt @@ -17,12 +17,9 @@ import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirClassReferenceExpression -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirClassReferenceExpressionImpl import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirClassReferenceExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { @@ -45,7 +42,7 @@ class FirClassReferenceExpressionBuilder : FirAnnotationContainerBuilder, FirExp @OptIn(ExperimentalContracts::class) inline fun buildClassReferenceExpression(init: FirClassReferenceExpressionBuilder.() -> Unit): FirClassReferenceExpression { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirClassReferenceExpressionBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirComparisonExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirComparisonExpressionBuilder.kt index e17bbecd41a..21f9aa3a4f8 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirComparisonExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirComparisonExpressionBuilder.kt @@ -19,13 +19,8 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirComparisonExpression import org.jetbrains.kotlin.fir.expressions.FirFunctionCall import org.jetbrains.kotlin.fir.expressions.FirOperation -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirComparisonExpressionImpl import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.types.constructClassLikeType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.name.StandardClassIds @FirBuilderDsl class FirComparisonExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { @@ -55,7 +50,7 @@ class FirComparisonExpressionBuilder : FirAnnotationContainerBuilder, FirExpress @OptIn(ExperimentalContracts::class) inline fun buildComparisonExpression(init: FirComparisonExpressionBuilder.() -> Unit): FirComparisonExpression { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirComparisonExpressionBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirComponentCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirComponentCallBuilder.kt index 434bc354058..53eb1eead82 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirComponentCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirComponentCallBuilder.kt @@ -12,28 +12,14 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic -import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.expressions.FirArgumentList -import org.jetbrains.kotlin.fir.expressions.FirComponentCall -import org.jetbrains.kotlin.fir.expressions.FirEmptyArgumentList -import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.expressions.FirFunctionCallOrigin -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirCallBuilder -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder +import org.jetbrains.kotlin.fir.expressions.* import org.jetbrains.kotlin.fir.expressions.impl.FirComponentCallImpl -import org.jetbrains.kotlin.fir.references.FirNamedReference -import org.jetbrains.kotlin.fir.references.FirReference -import org.jetbrains.kotlin.fir.references.impl.FirSimpleNamedReference import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.name.Name @FirBuilderDsl class FirComponentCallBuilder : FirCallBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { @@ -70,7 +56,7 @@ class FirComponentCallBuilder : FirCallBuilder, FirAnnotationContainerBuilder, F @OptIn(ExperimentalContracts::class) inline fun buildComponentCall(init: FirComponentCallBuilder.() -> Unit): FirComponentCall { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirComponentCallBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirContinueExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirContinueExpressionBuilder.kt index a1cffbd07f4..b5d8d9b41ba 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirContinueExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirContinueExpressionBuilder.kt @@ -19,15 +19,8 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirContinueExpression import org.jetbrains.kotlin.fir.expressions.FirLoop -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder -import org.jetbrains.kotlin.fir.expressions.builder.FirLoopJumpBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirContinueExpressionImpl import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.types.constructClassLikeType -import org.jetbrains.kotlin.fir.types.impl.FirImplicitNothingTypeRef -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.name.StandardClassIds @FirBuilderDsl class FirContinueExpressionBuilder : FirLoopJumpBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { @@ -55,7 +48,7 @@ class FirContinueExpressionBuilder : FirLoopJumpBuilder, FirAnnotationContainerB @OptIn(ExperimentalContracts::class) inline fun buildContinueExpression(init: FirContinueExpressionBuilder.() -> Unit): FirContinueExpression { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirContinueExpressionBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirDelegatedConstructorCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirDelegatedConstructorCallBuilder.kt index 75e0f6aae6d..6c81e6dcdd6 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirDelegatedConstructorCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirDelegatedConstructorCallBuilder.kt @@ -15,18 +15,10 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.expressions.FirArgumentList -import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall -import org.jetbrains.kotlin.fir.expressions.FirEmptyArgumentList -import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.expressions.builder.FirCallBuilder +import org.jetbrains.kotlin.fir.expressions.* import org.jetbrains.kotlin.fir.expressions.impl.FirDelegatedConstructorCallImpl import org.jetbrains.kotlin.fir.references.FirReference -import org.jetbrains.kotlin.fir.references.impl.FirExplicitSuperReference -import org.jetbrains.kotlin.fir.references.impl.FirExplicitThisReference import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirDelegatedConstructorCallBuilder : FirCallBuilder, FirAnnotationContainerBuilder { @@ -57,7 +49,7 @@ class FirDelegatedConstructorCallBuilder : FirCallBuilder, FirAnnotationContaine @OptIn(ExperimentalContracts::class) inline fun buildDelegatedConstructorCall(init: FirDelegatedConstructorCallBuilder.() -> Unit): FirDelegatedConstructorCall { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirDelegatedConstructorCallBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirDesugaredAssignmentValueReferenceExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirDesugaredAssignmentValueReferenceExpressionBuilder.kt index 1404c85a755..c4b88a13e0e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirDesugaredAssignmentValueReferenceExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirDesugaredAssignmentValueReferenceExpressionBuilder.kt @@ -19,11 +19,8 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirDesugaredAssignmentValueReferenceExpression import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirDesugaredAssignmentValueReferenceExpressionImpl import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirDesugaredAssignmentValueReferenceExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { @@ -46,7 +43,7 @@ class FirDesugaredAssignmentValueReferenceExpressionBuilder : FirAnnotationConta @OptIn(ExperimentalContracts::class) inline fun buildDesugaredAssignmentValueReferenceExpression(init: FirDesugaredAssignmentValueReferenceExpressionBuilder.() -> Unit): FirDesugaredAssignmentValueReferenceExpression { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirDesugaredAssignmentValueReferenceExpressionBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirDoWhileLoopBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirDoWhileLoopBuilder.kt index f84e32c9987..907286f3cec 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirDoWhileLoopBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirDoWhileLoopBuilder.kt @@ -20,9 +20,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirDoWhileLoop import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.expressions.builder.FirLoopBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirDoWhileLoopImpl -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirDoWhileLoopBuilder : FirLoopBuilder, FirAnnotationContainerBuilder { @@ -47,7 +45,7 @@ class FirDoWhileLoopBuilder : FirLoopBuilder, FirAnnotationContainerBuilder { @OptIn(ExperimentalContracts::class) inline fun buildDoWhileLoop(init: FirDoWhileLoopBuilder.() -> Unit): FirDoWhileLoop { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirDoWhileLoopBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirElseIfTrueConditionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirElseIfTrueConditionBuilder.kt index 744dc17734b..0d9131d9da9 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirElseIfTrueConditionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirElseIfTrueConditionBuilder.kt @@ -18,13 +18,7 @@ import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess import org.jetbrains.kotlin.fir.expressions.impl.FirElseIfTrueCondition -import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.types.constructClassLikeType -import org.jetbrains.kotlin.fir.types.impl.FirImplicitBooleanTypeRef -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.name.StandardClassIds @FirBuilderDsl class FirElseIfTrueConditionBuilder : FirAnnotationContainerBuilder { @@ -44,7 +38,7 @@ class FirElseIfTrueConditionBuilder : FirAnnotationContainerBuilder { @OptIn(ExperimentalContracts::class) inline fun buildElseIfTrueCondition(init: FirElseIfTrueConditionBuilder.() -> Unit = {}): FirExpression { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirElseIfTrueConditionBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirElvisExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirElvisExpressionBuilder.kt index a331c445bd6..359aeb8a884 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirElvisExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirElvisExpressionBuilder.kt @@ -18,13 +18,10 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirElvisExpression import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirElvisExpressionImpl import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.references.impl.FirStubReference import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirElvisExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { @@ -51,7 +48,7 @@ class FirElvisExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBu @OptIn(ExperimentalContracts::class) inline fun buildElvisExpression(init: FirElvisExpressionBuilder.() -> Unit): FirElvisExpression { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirElvisExpressionBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEmptyExpressionBlockBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEmptyExpressionBlockBuilder.kt index 2f60a579c65..f5e9cffbd6c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEmptyExpressionBlockBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEmptyExpressionBlockBuilder.kt @@ -10,20 +10,9 @@ package org.jetbrains.kotlin.fir.expressions.builder -import kotlin.contracts.* -import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail -import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder -import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock -import org.jetbrains.kotlin.fir.expressions.FirStatement -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirEmptyExpressionBlock -import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* @OptIn(FirImplementationDetail::class) fun buildEmptyExpressionBlock(): FirBlock { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEnumEntryDeserializedAccessExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEnumEntryDeserializedAccessExpressionBuilder.kt index 2b9a75b615a..09dced2dde6 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEnumEntryDeserializedAccessExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEnumEntryDeserializedAccessExpressionBuilder.kt @@ -17,13 +17,8 @@ import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirEnumEntryDeserializedAccessExpression -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirEnumEntryDeserializedAccessExpressionImpl import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.types.constructClassType -import org.jetbrains.kotlin.fir.types.toLookupTag -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.Name @@ -59,7 +54,7 @@ class FirEnumEntryDeserializedAccessExpressionBuilder : FirAnnotationContainerBu @OptIn(ExperimentalContracts::class) inline fun buildEnumEntryDeserializedAccessExpression(init: FirEnumEntryDeserializedAccessExpressionBuilder.() -> Unit): FirEnumEntryDeserializedAccessExpression { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirEnumEntryDeserializedAccessExpressionBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEqualityOperatorCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEqualityOperatorCallBuilder.kt index 0199f327c42..0dee65fd985 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEqualityOperatorCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEqualityOperatorCallBuilder.kt @@ -19,13 +19,8 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirEqualityOperatorCall import org.jetbrains.kotlin.fir.expressions.FirOperation -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirEqualityOperatorCallImpl import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.types.constructClassLikeType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.name.StandardClassIds @FirBuilderDsl class FirEqualityOperatorCallBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { @@ -55,7 +50,7 @@ class FirEqualityOperatorCallBuilder : FirAnnotationContainerBuilder, FirExpress @OptIn(ExperimentalContracts::class) inline fun buildEqualityOperatorCall(init: FirEqualityOperatorCallBuilder.() -> Unit): FirEqualityOperatorCall { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirEqualityOperatorCallBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorAnnotationCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorAnnotationCallBuilder.kt index 4e791e0bea0..90604710b24 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorAnnotationCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorAnnotationCallBuilder.kt @@ -17,24 +17,14 @@ import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic -import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.expressions.FirAnnotationArgumentMapping -import org.jetbrains.kotlin.fir.expressions.FirAnnotationResolvePhase -import org.jetbrains.kotlin.fir.expressions.FirArgumentList -import org.jetbrains.kotlin.fir.expressions.FirEmptyArgumentList -import org.jetbrains.kotlin.fir.expressions.FirErrorAnnotationCall -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirCallBuilder -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder +import org.jetbrains.kotlin.fir.expressions.* import org.jetbrains.kotlin.fir.expressions.impl.FirEmptyAnnotationArgumentMapping import org.jetbrains.kotlin.fir.expressions.impl.FirErrorAnnotationCallImpl import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.types.coneTypeOrNull import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImplWithoutSource -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirErrorAnnotationCallBuilder : FirCallBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { @@ -75,7 +65,7 @@ class FirErrorAnnotationCallBuilder : FirCallBuilder, FirAnnotationContainerBuil @OptIn(ExperimentalContracts::class) inline fun buildErrorAnnotationCall(init: FirErrorAnnotationCallBuilder.() -> Unit): FirErrorAnnotationCall { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirErrorAnnotationCallBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorExpressionBuilder.kt index 896bc819ce5..dc222f6c7dc 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorExpressionBuilder.kt @@ -17,16 +17,11 @@ import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic -import org.jetbrains.kotlin.fir.diagnostics.ConeStubDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirErrorExpression import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirErrorExpressionImpl -import org.jetbrains.kotlin.fir.types.ConeErrorType import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirErrorExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { @@ -58,7 +53,7 @@ class FirErrorExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBu @OptIn(ExperimentalContracts::class) inline fun buildErrorExpression(init: FirErrorExpressionBuilder.() -> Unit): FirErrorExpression { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirErrorExpressionBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorLoopBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorLoopBuilder.kt index ce7ce56de03..9bcf3e97709 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorLoopBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorLoopBuilder.kt @@ -17,14 +17,9 @@ import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic -import org.jetbrains.kotlin.fir.diagnostics.ConeStubDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirErrorLoop -import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.expressions.impl.FirEmptyExpressionBlock import org.jetbrains.kotlin.fir.expressions.impl.FirErrorLoopImpl -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirErrorLoopBuilder : FirAnnotationContainerBuilder { @@ -47,7 +42,7 @@ class FirErrorLoopBuilder : FirAnnotationContainerBuilder { @OptIn(ExperimentalContracts::class) inline fun buildErrorLoop(init: FirErrorLoopBuilder.() -> Unit): FirErrorLoop { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirErrorLoopBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorResolvedQualifierBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorResolvedQualifierBuilder.kt index 349a599b5fd..aeea3df885b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorResolvedQualifierBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorResolvedQualifierBuilder.kt @@ -18,14 +18,10 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirErrorResolvedQualifier -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirAbstractResolvedQualifierBuilder -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirErrorResolvedQualifierImpl import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName @@ -80,7 +76,7 @@ class FirErrorResolvedQualifierBuilder : FirAbstractResolvedQualifierBuilder, Fi @OptIn(ExperimentalContracts::class) inline fun buildErrorResolvedQualifier(init: FirErrorResolvedQualifierBuilder.() -> Unit): FirErrorResolvedQualifier { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirErrorResolvedQualifierBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirExpressionBuilder.kt index 101c57296bd..9be1e565a4c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirExpressionBuilder.kt @@ -15,7 +15,6 @@ import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl interface FirExpressionBuilder { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirExpressionStubBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirExpressionStubBuilder.kt index f5d43201478..8c9fca8cf89 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirExpressionStubBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirExpressionStubBuilder.kt @@ -18,10 +18,8 @@ import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess import org.jetbrains.kotlin.fir.expressions.impl.FirExpressionStub import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirExpressionStubBuilder : FirAnnotationContainerBuilder { @@ -43,7 +41,7 @@ class FirExpressionStubBuilder : FirAnnotationContainerBuilder { @OptIn(ExperimentalContracts::class) inline fun buildExpressionStub(init: FirExpressionStubBuilder.() -> Unit = {}): FirExpression { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirExpressionStubBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirFunctionCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirFunctionCallBuilder.kt index e628f6c8f58..fa38fcc3fb8 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirFunctionCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirFunctionCallBuilder.kt @@ -17,21 +17,11 @@ import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic -import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.expressions.FirArgumentList -import org.jetbrains.kotlin.fir.expressions.FirEmptyArgumentList -import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.expressions.FirFunctionCall -import org.jetbrains.kotlin.fir.expressions.FirFunctionCallOrigin -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirAbstractFunctionCallBuilder -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder +import org.jetbrains.kotlin.fir.expressions.* import org.jetbrains.kotlin.fir.expressions.impl.FirFunctionCallImpl import org.jetbrains.kotlin.fir.references.FirNamedReference -import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl open class FirFunctionCallBuilder : FirAbstractFunctionCallBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { @@ -71,7 +61,7 @@ open class FirFunctionCallBuilder : FirAbstractFunctionCallBuilder, FirAnnotatio @OptIn(ExperimentalContracts::class) inline fun buildFunctionCall(init: FirFunctionCallBuilder.() -> Unit): FirFunctionCall { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirFunctionCallBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirGetClassCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirGetClassCallBuilder.kt index 7eced381c16..ab95cba1f58 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirGetClassCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirGetClassCallBuilder.kt @@ -17,14 +17,9 @@ import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList -import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirGetClassCall -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirCallBuilder -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirGetClassCallImpl import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirGetClassCallBuilder : FirCallBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { @@ -47,7 +42,7 @@ class FirGetClassCallBuilder : FirCallBuilder, FirAnnotationContainerBuilder, Fi @OptIn(ExperimentalContracts::class) inline fun buildGetClassCall(init: FirGetClassCallBuilder.() -> Unit): FirGetClassCall { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirGetClassCallBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirImplicitInvokeCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirImplicitInvokeCallBuilder.kt index d6ef45236d2..5ba2da00c19 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirImplicitInvokeCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirImplicitInvokeCallBuilder.kt @@ -12,26 +12,15 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic -import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.expressions.FirArgumentList -import org.jetbrains.kotlin.fir.expressions.FirEmptyArgumentList -import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.expressions.FirFunctionCallOrigin -import org.jetbrains.kotlin.fir.expressions.FirImplicitInvokeCall -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirAbstractFunctionCallBuilder -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder +import org.jetbrains.kotlin.fir.expressions.* import org.jetbrains.kotlin.fir.expressions.impl.FirImplicitInvokeCallImpl import org.jetbrains.kotlin.fir.references.FirNamedReference -import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl open class FirImplicitInvokeCallBuilder : FirAbstractFunctionCallBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { @@ -75,7 +64,7 @@ open class FirImplicitInvokeCallBuilder : FirAbstractFunctionCallBuilder, FirAnn @OptIn(ExperimentalContracts::class) inline fun buildImplicitInvokeCall(init: FirImplicitInvokeCallBuilder.() -> Unit): FirImplicitInvokeCall { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirImplicitInvokeCallBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirInaccessibleReceiverExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirInaccessibleReceiverExpressionBuilder.kt index 68f1db76aa5..67161aae1ac 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirInaccessibleReceiverExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirInaccessibleReceiverExpressionBuilder.kt @@ -17,13 +17,9 @@ import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirInaccessibleReceiverExpression -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirInaccessibleReceiverExpressionImpl -import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.references.FirThisReference import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirInaccessibleReceiverExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { @@ -46,7 +42,7 @@ class FirInaccessibleReceiverExpressionBuilder : FirAnnotationContainerBuilder, @OptIn(ExperimentalContracts::class) inline fun buildInaccessibleReceiverExpression(init: FirInaccessibleReceiverExpressionBuilder.() -> Unit): FirInaccessibleReceiverExpression { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirInaccessibleReceiverExpressionBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirIncrementDecrementExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirIncrementDecrementExpressionBuilder.kt index ec3e8a4ddbc..4e27ba63678 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirIncrementDecrementExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirIncrementDecrementExpressionBuilder.kt @@ -18,11 +18,8 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirIncrementDecrementExpression -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirIncrementDecrementExpressionImpl import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.Name @FirBuilderDsl @@ -52,7 +49,7 @@ class FirIncrementDecrementExpressionBuilder : FirAnnotationContainerBuilder, Fi @OptIn(ExperimentalContracts::class) inline fun buildIncrementDecrementExpression(init: FirIncrementDecrementExpressionBuilder.() -> Unit): FirIncrementDecrementExpression { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirIncrementDecrementExpressionBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirIntegerLiteralOperatorCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirIntegerLiteralOperatorCallBuilder.kt index b2cbb0caf03..0fb05731775 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirIntegerLiteralOperatorCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirIntegerLiteralOperatorCallBuilder.kt @@ -12,26 +12,15 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic -import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.expressions.FirArgumentList -import org.jetbrains.kotlin.fir.expressions.FirEmptyArgumentList -import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.expressions.FirFunctionCallOrigin -import org.jetbrains.kotlin.fir.expressions.FirIntegerLiteralOperatorCall -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirAbstractFunctionCallBuilder -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder +import org.jetbrains.kotlin.fir.expressions.* import org.jetbrains.kotlin.fir.expressions.impl.FirIntegerLiteralOperatorCallImpl import org.jetbrains.kotlin.fir.references.FirNamedReference -import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl open class FirIntegerLiteralOperatorCallBuilder : FirAbstractFunctionCallBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { @@ -70,7 +59,7 @@ open class FirIntegerLiteralOperatorCallBuilder : FirAbstractFunctionCallBuilder @OptIn(ExperimentalContracts::class) inline fun buildIntegerLiteralOperatorCall(init: FirIntegerLiteralOperatorCallBuilder.() -> Unit): FirIntegerLiteralOperatorCall { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirIntegerLiteralOperatorCallBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLambdaArgumentExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLambdaArgumentExpressionBuilder.kt index 960fd6c7f1c..40a6596f9c1 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLambdaArgumentExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLambdaArgumentExpressionBuilder.kt @@ -18,11 +18,8 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirLambdaArgumentExpression -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirLambdaArgumentExpressionImpl import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirLambdaArgumentExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { @@ -50,7 +47,7 @@ class FirLambdaArgumentExpressionBuilder : FirAnnotationContainerBuilder, FirExp @OptIn(ExperimentalContracts::class) inline fun buildLambdaArgumentExpression(init: FirLambdaArgumentExpressionBuilder.() -> Unit): FirLambdaArgumentExpression { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirLambdaArgumentExpressionBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyBlockBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyBlockBuilder.kt index caaaef9310e..9f4c12ec28e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyBlockBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyBlockBuilder.kt @@ -10,19 +10,8 @@ package org.jetbrains.kotlin.fir.expressions.builder -import kotlin.contracts.* -import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder -import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirLazyBlock -import org.jetbrains.kotlin.fir.expressions.FirStatement -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirLazyBlockImpl -import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* fun buildLazyBlock(): FirLazyBlock { return FirLazyBlockImpl() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyDelegatedConstructorCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyDelegatedConstructorCallBuilder.kt index d65a5e5fabf..30768b1590d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyDelegatedConstructorCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyDelegatedConstructorCallBuilder.kt @@ -15,15 +15,11 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall -import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.impl.FirLazyDelegatedConstructorCall import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirLazyDelegatedConstructorCallBuilder : FirAnnotationContainerBuilder { @@ -54,7 +50,7 @@ class FirLazyDelegatedConstructorCallBuilder : FirAnnotationContainerBuilder { @OptIn(ExperimentalContracts::class) inline fun buildLazyDelegatedConstructorCall(init: FirLazyDelegatedConstructorCallBuilder.() -> Unit): FirDelegatedConstructorCall { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirLazyDelegatedConstructorCallBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyExpressionBuilder.kt index 3b8d43c8abe..77463486191 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyExpressionBuilder.kt @@ -14,14 +14,10 @@ import kotlin.contracts.* import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirLazyExpression -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirLazyExpressionImpl import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirLazyExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { @@ -48,7 +44,7 @@ class FirLazyExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBui @OptIn(ExperimentalContracts::class) inline fun buildLazyExpression(init: FirLazyExpressionBuilder.() -> Unit = {}): FirLazyExpression { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirLazyExpressionBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLoopBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLoopBuilder.kt index 2d14a04000a..bb0b8b4ba60 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLoopBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLoopBuilder.kt @@ -17,7 +17,6 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirLoop -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl interface FirLoopBuilder { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLoopJumpBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLoopJumpBuilder.kt index b9cf91fea7e..8d48d470f24 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLoopJumpBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLoopJumpBuilder.kt @@ -17,7 +17,6 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirLoop import org.jetbrains.kotlin.fir.expressions.FirLoopJump import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl interface FirLoopJumpBuilder { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirMultiDelegatedConstructorCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirMultiDelegatedConstructorCallBuilder.kt index cc69de66c10..624d4871ba4 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirMultiDelegatedConstructorCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirMultiDelegatedConstructorCallBuilder.kt @@ -15,16 +15,10 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall -import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirMultiDelegatedConstructorCall import org.jetbrains.kotlin.fir.expressions.impl.FirMultiDelegatedConstructorCallImpl -import org.jetbrains.kotlin.fir.references.FirReference -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirMultiDelegatedConstructorCallBuilder : FirAnnotationContainerBuilder { @@ -51,7 +45,7 @@ class FirMultiDelegatedConstructorCallBuilder : FirAnnotationContainerBuilder { @OptIn(ExperimentalContracts::class) inline fun buildMultiDelegatedConstructorCall(init: FirMultiDelegatedConstructorCallBuilder.() -> Unit = {}): FirMultiDelegatedConstructorCall { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirMultiDelegatedConstructorCallBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirNamedArgumentExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirNamedArgumentExpressionBuilder.kt index b905a6b5710..067e9154c93 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirNamedArgumentExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirNamedArgumentExpressionBuilder.kt @@ -18,11 +18,8 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirNamedArgumentExpression -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirNamedArgumentExpressionImpl import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.Name @FirBuilderDsl @@ -55,7 +52,7 @@ class FirNamedArgumentExpressionBuilder : FirAnnotationContainerBuilder, FirExpr @OptIn(ExperimentalContracts::class) inline fun buildNamedArgumentExpression(init: FirNamedArgumentExpressionBuilder.() -> Unit): FirNamedArgumentExpression { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirNamedArgumentExpressionBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirPropertyAccessExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirPropertyAccessExpressionBuilder.kt index d48f34d35e9..41ce0c55ac0 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirPropertyAccessExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirPropertyAccessExpressionBuilder.kt @@ -20,14 +20,10 @@ import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirPropertyAccessExpression -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder -import org.jetbrains.kotlin.fir.expressions.builder.FirQualifiedAccessExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirPropertyAccessExpressionImpl import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirPropertyAccessExpressionBuilder : FirQualifiedAccessExpressionBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { @@ -63,7 +59,7 @@ class FirPropertyAccessExpressionBuilder : FirQualifiedAccessExpressionBuilder, @OptIn(ExperimentalContracts::class) inline fun buildPropertyAccessExpression(init: FirPropertyAccessExpressionBuilder.() -> Unit): FirPropertyAccessExpression { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirPropertyAccessExpressionBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirQualifiedAccessExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirQualifiedAccessExpressionBuilder.kt index 60a575f784b..55661d9ad73 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirQualifiedAccessExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirQualifiedAccessExpressionBuilder.kt @@ -18,7 +18,6 @@ import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccessExpression import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl interface FirQualifiedAccessExpressionBuilder { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirQualifiedErrorAccessExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirQualifiedErrorAccessExpressionBuilder.kt index 3f98afc75a0..24c82d47d1e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirQualifiedErrorAccessExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirQualifiedErrorAccessExpressionBuilder.kt @@ -16,17 +16,12 @@ import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic -import org.jetbrains.kotlin.fir.diagnostics.ConeStubDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirErrorExpression import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirQualifiedErrorAccessExpression -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirQualifiedErrorAccessExpressionImpl -import org.jetbrains.kotlin.fir.types.ConeErrorType import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirQualifiedErrorAccessExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { @@ -58,7 +53,7 @@ class FirQualifiedErrorAccessExpressionBuilder : FirAnnotationContainerBuilder, @OptIn(ExperimentalContracts::class) inline fun buildQualifiedErrorAccessExpression(init: FirQualifiedErrorAccessExpressionBuilder.() -> Unit): FirQualifiedErrorAccessExpression { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirQualifiedErrorAccessExpressionBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirResolvedQualifierBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirResolvedQualifierBuilder.kt index 041e7c5d062..23919d2b4a1 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirResolvedQualifierBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirResolvedQualifierBuilder.kt @@ -15,18 +15,13 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.declarations.FirRegularClass import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirResolvedQualifier -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirAbstractResolvedQualifierBuilder -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirResolvedQualifierImpl import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName @@ -79,7 +74,7 @@ class FirResolvedQualifierBuilder : FirAbstractResolvedQualifierBuilder, FirAnno @OptIn(ExperimentalContracts::class) inline fun buildResolvedQualifier(init: FirResolvedQualifierBuilder.() -> Unit): FirResolvedQualifier { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirResolvedQualifierBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirResolvedReifiedParameterReferenceBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirResolvedReifiedParameterReferenceBuilder.kt index 238eaba0498..cec6b3604b1 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirResolvedReifiedParameterReferenceBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirResolvedReifiedParameterReferenceBuilder.kt @@ -17,12 +17,9 @@ import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirResolvedReifiedParameterReference -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirResolvedReifiedParameterReferenceImpl import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirResolvedReifiedParameterReferenceBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { @@ -45,7 +42,7 @@ class FirResolvedReifiedParameterReferenceBuilder : FirAnnotationContainerBuilde @OptIn(ExperimentalContracts::class) inline fun buildResolvedReifiedParameterReference(init: FirResolvedReifiedParameterReferenceBuilder.() -> Unit): FirResolvedReifiedParameterReference { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirResolvedReifiedParameterReferenceBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirReturnExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirReturnExpressionBuilder.kt index a0b43fe4b10..709ac449d4f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirReturnExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirReturnExpressionBuilder.kt @@ -20,14 +20,8 @@ import org.jetbrains.kotlin.fir.declarations.FirFunction import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirReturnExpression -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirReturnExpressionImpl import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.types.constructClassLikeType -import org.jetbrains.kotlin.fir.types.impl.FirImplicitNothingTypeRef -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.name.StandardClassIds @FirBuilderDsl class FirReturnExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { @@ -57,7 +51,7 @@ class FirReturnExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionB @OptIn(ExperimentalContracts::class) inline fun buildReturnExpression(init: FirReturnExpressionBuilder.() -> Unit): FirReturnExpression { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirReturnExpressionBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSafeCallExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSafeCallExpressionBuilder.kt index 7c3735fd5c0..0f1afdb0e2b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSafeCallExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSafeCallExpressionBuilder.kt @@ -16,16 +16,9 @@ import org.jetbrains.kotlin.fir.FirExpressionRef import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.expressions.FirCheckedSafeCallSubject -import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.expressions.FirSafeCallExpression -import org.jetbrains.kotlin.fir.expressions.FirStatement -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder +import org.jetbrains.kotlin.fir.expressions.* import org.jetbrains.kotlin.fir.expressions.impl.FirSafeCallExpressionImpl import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirSafeCallExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { @@ -52,7 +45,7 @@ class FirSafeCallExpressionBuilder : FirAnnotationContainerBuilder, FirExpressio @OptIn(ExperimentalContracts::class) inline fun buildSafeCallExpression(init: FirSafeCallExpressionBuilder.() -> Unit): FirSafeCallExpression { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirSafeCallExpressionBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSmartCastExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSmartCastExpressionBuilder.kt index b7bb8f4d613..58a518129ef 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSmartCastExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSmartCastExpressionBuilder.kt @@ -11,21 +11,16 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* -import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirSmartCastExpression -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirSmartCastExpressionImpl import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.types.SmartcastStability @FirBuilderDsl @@ -62,7 +57,7 @@ class FirSmartCastExpressionBuilder : FirAnnotationContainerBuilder, FirExpressi @OptIn(ExperimentalContracts::class) inline fun buildSmartCastExpression(init: FirSmartCastExpressionBuilder.() -> Unit): FirSmartCastExpression { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirSmartCastExpressionBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSpreadArgumentExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSpreadArgumentExpressionBuilder.kt index f0958822326..185ab72f390 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSpreadArgumentExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSpreadArgumentExpressionBuilder.kt @@ -18,11 +18,8 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirSpreadArgumentExpression -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirSpreadArgumentExpressionImpl import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirSpreadArgumentExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { @@ -50,7 +47,7 @@ class FirSpreadArgumentExpressionBuilder : FirAnnotationContainerBuilder, FirExp @OptIn(ExperimentalContracts::class) inline fun buildSpreadArgumentExpression(init: FirSpreadArgumentExpressionBuilder.() -> Unit): FirSpreadArgumentExpression { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirSpreadArgumentExpressionBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirStringConcatenationCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirStringConcatenationCallBuilder.kt index e458e034f4f..fec589c839e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirStringConcatenationCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirStringConcatenationCallBuilder.kt @@ -18,15 +18,8 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirStringConcatenationCall -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirCallBuilder -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirStringConcatenationCallImpl import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.types.constructClassLikeType -import org.jetbrains.kotlin.fir.types.impl.FirImplicitStringTypeRef -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.name.StandardClassIds @FirBuilderDsl class FirStringConcatenationCallBuilder : FirCallBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { @@ -54,7 +47,7 @@ class FirStringConcatenationCallBuilder : FirCallBuilder, FirAnnotationContainer @OptIn(ExperimentalContracts::class) inline fun buildStringConcatenationCall(init: FirStringConcatenationCallBuilder.() -> Unit): FirStringConcatenationCall { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirStringConcatenationCallBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirThisReceiverExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirThisReceiverExpressionBuilder.kt index 3901364a7d3..bc65eef27c6 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirThisReceiverExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirThisReceiverExpressionBuilder.kt @@ -12,7 +12,6 @@ package org.jetbrains.kotlin.fir.expressions.builder import kotlin.contracts.* import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty @@ -21,14 +20,10 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirThisReceiverExpression import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder -import org.jetbrains.kotlin.fir.expressions.builder.FirQualifiedAccessExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirThisReceiverExpressionImpl -import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.references.FirThisReference import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirThisReceiverExpressionBuilder : FirQualifiedAccessExpressionBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { @@ -80,7 +75,7 @@ class FirThisReceiverExpressionBuilder : FirQualifiedAccessExpressionBuilder, Fi @OptIn(ExperimentalContracts::class) inline fun buildThisReceiverExpression(init: FirThisReceiverExpressionBuilder.() -> Unit): FirThisReceiverExpression { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirThisReceiverExpressionBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirThrowExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirThrowExpressionBuilder.kt index 5538fb26ee6..b8d2b74c2c1 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirThrowExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirThrowExpressionBuilder.kt @@ -18,14 +18,8 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirThrowExpression -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirThrowExpressionImpl import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.types.constructClassLikeType -import org.jetbrains.kotlin.fir.types.impl.FirImplicitNothingTypeRef -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.name.StandardClassIds @FirBuilderDsl class FirThrowExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { @@ -53,7 +47,7 @@ class FirThrowExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBu @OptIn(ExperimentalContracts::class) inline fun buildThrowExpression(init: FirThrowExpressionBuilder.() -> Unit): FirThrowExpression { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirThrowExpressionBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirTryExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirTryExpressionBuilder.kt index 08d15fd594a..8f41b1be834 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirTryExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirTryExpressionBuilder.kt @@ -19,13 +19,10 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirCatch import org.jetbrains.kotlin.fir.expressions.FirTryExpression -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirTryExpressionImpl import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.references.impl.FirStubReference import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirTryExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { @@ -54,7 +51,7 @@ class FirTryExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuil @OptIn(ExperimentalContracts::class) inline fun buildTryExpression(init: FirTryExpressionBuilder.() -> Unit): FirTryExpression { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirTryExpressionBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirTypeOperatorCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirTypeOperatorCallBuilder.kt index fcbf94ddaa3..8ec18f53b79 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirTypeOperatorCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirTypeOperatorCallBuilder.kt @@ -15,18 +15,10 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.expressions.FirArgumentList -import org.jetbrains.kotlin.fir.expressions.FirEmptyArgumentList -import org.jetbrains.kotlin.fir.expressions.FirOperation -import org.jetbrains.kotlin.fir.expressions.FirTypeOperatorCall -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirCallBuilder -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder +import org.jetbrains.kotlin.fir.expressions.* import org.jetbrains.kotlin.fir.expressions.impl.FirTypeOperatorCallImpl import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirTypeOperatorCallBuilder : FirCallBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { @@ -53,7 +45,7 @@ class FirTypeOperatorCallBuilder : FirCallBuilder, FirAnnotationContainerBuilder @OptIn(ExperimentalContracts::class) inline fun buildTypeOperatorCall(init: FirTypeOperatorCallBuilder.() -> Unit): FirTypeOperatorCall { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirTypeOperatorCallBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirUnitExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirUnitExpressionBuilder.kt index 330f804da15..f27686cbfce 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirUnitExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirUnitExpressionBuilder.kt @@ -18,13 +18,7 @@ import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess import org.jetbrains.kotlin.fir.expressions.impl.FirUnitExpression -import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.types.constructClassLikeType -import org.jetbrains.kotlin.fir.types.impl.FirImplicitUnitTypeRef -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.name.StandardClassIds @FirBuilderDsl class FirUnitExpressionBuilder : FirAnnotationContainerBuilder { @@ -44,7 +38,7 @@ class FirUnitExpressionBuilder : FirAnnotationContainerBuilder { @OptIn(ExperimentalContracts::class) inline fun buildUnitExpression(init: FirUnitExpressionBuilder.() -> Unit = {}): FirExpression { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirUnitExpressionBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirVarargArgumentsExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirVarargArgumentsExpressionBuilder.kt index 72c290de0fc..3f9a73eee88 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirVarargArgumentsExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirVarargArgumentsExpressionBuilder.kt @@ -18,12 +18,9 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirVarargArgumentsExpression -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirVarargArgumentsExpressionImpl import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirVarargArgumentsExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { @@ -48,7 +45,7 @@ class FirVarargArgumentsExpressionBuilder : FirAnnotationContainerBuilder, FirEx @OptIn(ExperimentalContracts::class) inline fun buildVarargArgumentsExpression(init: FirVarargArgumentsExpressionBuilder.() -> Unit): FirVarargArgumentsExpression { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirVarargArgumentsExpressionBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirVariableAssignmentBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirVariableAssignmentBuilder.kt index c439190b9cb..f9a1fc843ce 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirVariableAssignmentBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirVariableAssignmentBuilder.kt @@ -19,7 +19,6 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirVariableAssignment import org.jetbrains.kotlin.fir.expressions.impl.FirVariableAssignmentImpl -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirVariableAssignmentBuilder : FirAnnotationContainerBuilder { @@ -42,7 +41,7 @@ class FirVariableAssignmentBuilder : FirAnnotationContainerBuilder { @OptIn(ExperimentalContracts::class) inline fun buildVariableAssignment(init: FirVariableAssignmentBuilder.() -> Unit): FirVariableAssignment { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirVariableAssignmentBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenBranchBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenBranchBuilder.kt index 60f0e1c4fda..c743d18ed06 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenBranchBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenBranchBuilder.kt @@ -17,7 +17,6 @@ import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirWhenBranch import org.jetbrains.kotlin.fir.expressions.impl.FirWhenBranchImpl -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirWhenBranchBuilder { @@ -38,7 +37,7 @@ class FirWhenBranchBuilder { @OptIn(ExperimentalContracts::class) inline fun buildWhenBranch(init: FirWhenBranchBuilder.() -> Unit): FirWhenBranch { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirWhenBranchBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenExpressionBuilder.kt index 595c6690fdc..ae05511ec11 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenExpressionBuilder.kt @@ -16,18 +16,11 @@ import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.declarations.FirVariable -import org.jetbrains.kotlin.fir.expressions.ExhaustivenessStatus -import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.expressions.FirWhenBranch -import org.jetbrains.kotlin.fir.expressions.FirWhenExpression -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder +import org.jetbrains.kotlin.fir.expressions.* import org.jetbrains.kotlin.fir.expressions.impl.FirWhenExpressionImpl import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.references.impl.FirStubReference import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirWhenExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { @@ -60,7 +53,7 @@ class FirWhenExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBui @OptIn(ExperimentalContracts::class) inline fun buildWhenExpression(init: FirWhenExpressionBuilder.() -> Unit): FirWhenExpression { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirWhenExpressionBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenSubjectExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenSubjectExpressionBuilder.kt index 6c1b7b0bd27..f6813de7bae 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenSubjectExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenSubjectExpressionBuilder.kt @@ -19,13 +19,8 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirWhenExpression import org.jetbrains.kotlin.fir.expressions.FirWhenSubjectExpression -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirWhenSubjectExpressionImpl import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.types.constructClassLikeType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.name.StandardClassIds @FirBuilderDsl class FirWhenSubjectExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { @@ -53,7 +48,7 @@ class FirWhenSubjectExpressionBuilder : FirAnnotationContainerBuilder, FirExpres @OptIn(ExperimentalContracts::class) inline fun buildWhenSubjectExpression(init: FirWhenSubjectExpressionBuilder.() -> Unit): FirWhenSubjectExpression { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirWhenSubjectExpressionBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhileLoopBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhileLoopBuilder.kt index 1ef868bfe4d..b87ac8e05e2 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhileLoopBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhileLoopBuilder.kt @@ -20,9 +20,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirWhileLoop -import org.jetbrains.kotlin.fir.expressions.builder.FirLoopBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirWhileLoopImpl -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirWhileLoopBuilder : FirLoopBuilder, FirAnnotationContainerBuilder { @@ -47,7 +45,7 @@ class FirWhileLoopBuilder : FirLoopBuilder, FirAnnotationContainerBuilder { @OptIn(ExperimentalContracts::class) inline fun buildWhileLoop(init: FirWhileLoopBuilder.() -> Unit): FirWhileLoop { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirWhileLoopBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWrappedDelegateExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWrappedDelegateExpressionBuilder.kt index f152a15c3f3..e9c35196b04 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWrappedDelegateExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWrappedDelegateExpressionBuilder.kt @@ -18,11 +18,8 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirWrappedDelegateExpression -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirWrappedDelegateExpressionImpl import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirWrappedDelegateExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { @@ -52,7 +49,7 @@ class FirWrappedDelegateExpressionBuilder : FirAnnotationContainerBuilder, FirEx @OptIn(ExperimentalContracts::class) inline fun buildWrappedDelegateExpression(init: FirWrappedDelegateExpressionBuilder.() -> Unit): FirWrappedDelegateExpression { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirWrappedDelegateExpressionBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationCallImpl.kt index dc72f64b251..222c1e15d85 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationCallImpl.kt @@ -12,20 +12,17 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget -import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.expressions.FirAnnotationArgumentMapping -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall -import org.jetbrains.kotlin.fir.expressions.FirAnnotationResolvePhase -import org.jetbrains.kotlin.fir.expressions.FirArgumentList +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty +import org.jetbrains.kotlin.fir.expressions.* import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.coneTypeOrNull -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace internal class FirAnnotationCallImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationImpl.kt index c46bfe1a8cd..291228475ec 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationImpl.kt @@ -12,16 +12,18 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirAnnotationArgumentMapping +import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.coneTypeOrNull -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace internal class FirAnnotationImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirArrayLiteralImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirArrayLiteralImpl.kt index 9f8b2e4962c..0166e0d8186 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirArrayLiteralImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirArrayLiteralImpl.kt @@ -11,14 +11,16 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirArrayLiteral -import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace @OptIn(UnresolvedExpressionTypeAccess::class) internal class FirArrayLiteralImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAssignmentOperatorStatementImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAssignmentOperatorStatementImpl.kt index af4549c1d94..d9ff4e12349 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAssignmentOperatorStatementImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAssignmentOperatorStatementImpl.kt @@ -11,13 +11,15 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirAssignmentOperatorStatement import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirOperation -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace internal class FirAssignmentOperatorStatementImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAugmentedArraySetCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAugmentedArraySetCallImpl.kt index bad87a17c8c..0b02cbacf9e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAugmentedArraySetCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAugmentedArraySetCallImpl.kt @@ -11,15 +11,13 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.expressions.FirAugmentedArraySetCall -import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.expressions.FirFunctionCall -import org.jetbrains.kotlin.fir.expressions.FirOperation -import org.jetbrains.kotlin.fir.references.FirReference -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty +import org.jetbrains.kotlin.fir.expressions.* +import org.jetbrains.kotlin.fir.references.FirReference +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace internal class FirAugmentedArraySetCallImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBinaryLogicExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBinaryLogicExpressionImpl.kt index e3cff2df0c4..7759e98d285 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBinaryLogicExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBinaryLogicExpressionImpl.kt @@ -12,14 +12,16 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.contracts.description.LogicOperationKind +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBinaryLogicExpression import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace @OptIn(UnresolvedExpressionTypeAccess::class) internal class FirBinaryLogicExpressionImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBlockImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBlockImpl.kt index 9d0699fc72f..f248e7f0e29 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBlockImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBlockImpl.kt @@ -11,14 +11,16 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirStatement -import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace @OptIn(UnresolvedExpressionTypeAccess::class) internal class FirBlockImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBreakExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBreakExpressionImpl.kt index f61df5758d3..9501632e04b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBreakExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBreakExpressionImpl.kt @@ -12,17 +12,19 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirTarget +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBreakExpression import org.jetbrains.kotlin.fir.expressions.FirLoop +import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.constructClassLikeType import org.jetbrains.kotlin.fir.types.impl.FirImplicitNothingTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace import org.jetbrains.kotlin.name.StandardClassIds -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess internal class FirBreakExpressionImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCallableReferenceAccessImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCallableReferenceAccessImpl.kt index 7088d09c79d..79863fa4756 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCallableReferenceAccessImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCallableReferenceAccessImpl.kt @@ -11,19 +11,21 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fir.FirImplementationDetail +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirCallableReferenceAccess import org.jetbrains.kotlin.fir.expressions.FirExpression +import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess import org.jetbrains.kotlin.fir.references.FirNamedReference import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.FirImplementationDetail +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace @OptIn(UnresolvedExpressionTypeAccess::class) internal class FirCallableReferenceAccessImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCatchImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCatchImpl.kt index 8a44fb6c4a2..cde48a5b05f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCatchImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCatchImpl.kt @@ -14,7 +14,8 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.declarations.FirProperty import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirCatch -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor internal class FirCatchImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCheckNotNullCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCheckNotNullCallImpl.kt index 1f40bab73c0..cfbc7bad8e5 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCheckNotNullCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCheckNotNullCallImpl.kt @@ -11,15 +11,17 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirCheckNotNullCall +import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace @OptIn(UnresolvedExpressionTypeAccess::class) internal class FirCheckNotNullCallImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCheckedSafeCallSubjectImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCheckedSafeCallSubjectImpl.kt index d4d1d372a49..c7dc6851983 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCheckedSafeCallSubjectImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCheckedSafeCallSubjectImpl.kt @@ -12,14 +12,16 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirExpressionRef +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirCheckedSafeCallSubject import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace @OptIn(UnresolvedExpressionTypeAccess::class) internal class FirCheckedSafeCallSubjectImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirClassReferenceExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirClassReferenceExpressionImpl.kt index 06a54ebe962..890bb047d11 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirClassReferenceExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirClassReferenceExpressionImpl.kt @@ -11,14 +11,16 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.expressions.FirClassReferenceExpression -import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty +import org.jetbrains.kotlin.fir.expressions.FirAnnotation +import org.jetbrains.kotlin.fir.expressions.FirClassReferenceExpression import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace @OptIn(UnresolvedExpressionTypeAccess::class) internal class FirClassReferenceExpressionImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComparisonExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComparisonExpressionImpl.kt index e6740caa1f3..7769060bbbb 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComparisonExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComparisonExpressionImpl.kt @@ -11,17 +11,15 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.expressions.FirComparisonExpression -import org.jetbrains.kotlin.fir.expressions.FirFunctionCall -import org.jetbrains.kotlin.fir.expressions.FirOperation -import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.types.constructClassLikeType -import org.jetbrains.kotlin.name.StandardClassIds -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.expressions.* +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.constructClassLikeType +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace +import org.jetbrains.kotlin.name.StandardClassIds internal class FirComparisonExpressionImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComponentCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComponentCallImpl.kt index b0e0b26174e..135a6a23a69 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComponentCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComponentCallImpl.kt @@ -12,22 +12,19 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic -import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.expressions.FirArgumentList -import org.jetbrains.kotlin.fir.expressions.FirComponentCall -import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.expressions.FirFunctionCallOrigin +import org.jetbrains.kotlin.fir.expressions.* import org.jetbrains.kotlin.fir.references.FirNamedReference import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.references.impl.FirSimpleNamedReference import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess @OptIn(FirImplementationDetail::class, UnresolvedExpressionTypeAccess::class) internal class FirComponentCallImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirConstExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirConstExpressionImpl.kt index edd01d272c4..a0973c6cb97 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirConstExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirConstExpressionImpl.kt @@ -11,14 +11,16 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.expressions.FirConstExpression -import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.types.ConstantValueKind -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty +import org.jetbrains.kotlin.fir.expressions.FirAnnotation +import org.jetbrains.kotlin.fir.expressions.FirConstExpression import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace +import org.jetbrains.kotlin.types.ConstantValueKind @OptIn(UnresolvedExpressionTypeAccess::class) internal class FirConstExpressionImpl ( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirContinueExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirContinueExpressionImpl.kt index d983d356491..c322bcc7ca3 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirContinueExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirContinueExpressionImpl.kt @@ -12,17 +12,19 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirTarget +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirContinueExpression import org.jetbrains.kotlin.fir.expressions.FirLoop +import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.constructClassLikeType import org.jetbrains.kotlin.fir.types.impl.FirImplicitNothingTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace import org.jetbrains.kotlin.name.StandardClassIds -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess internal class FirContinueExpressionImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirDelegatedConstructorCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirDelegatedConstructorCallImpl.kt index 2d5c448118f..48b9d496c8b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirDelegatedConstructorCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirDelegatedConstructorCallImpl.kt @@ -11,6 +11,8 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall @@ -19,9 +21,9 @@ import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.references.impl.FirExplicitSuperReference import org.jetbrains.kotlin.fir.references.impl.FirExplicitThisReference import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace internal class FirDelegatedConstructorCallImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirDesugaredAssignmentValueReferenceExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirDesugaredAssignmentValueReferenceExpressionImpl.kt index 97a80fc4a7c..51a9b11a5dd 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirDesugaredAssignmentValueReferenceExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirDesugaredAssignmentValueReferenceExpressionImpl.kt @@ -12,14 +12,16 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirExpressionRef +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirDesugaredAssignmentValueReferenceExpression import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace @OptIn(UnresolvedExpressionTypeAccess::class) internal class FirDesugaredAssignmentValueReferenceExpressionImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirDoWhileLoopImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirDoWhileLoopImpl.kt index be2b2f5d11e..942bb989f41 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirDoWhileLoopImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirDoWhileLoopImpl.kt @@ -12,13 +12,15 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirLabel +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirDoWhileLoop import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace internal class FirDoWhileLoopImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirElseIfTrueCondition.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirElseIfTrueCondition.kt index 355ea256de6..83f7700ee45 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirElseIfTrueCondition.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirElseIfTrueCondition.kt @@ -12,16 +12,18 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression +import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.constructClassLikeType import org.jetbrains.kotlin.fir.types.impl.FirImplicitBooleanTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace import org.jetbrains.kotlin.name.StandardClassIds -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess class FirElseIfTrueCondition @FirImplementationDetail constructor( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirElvisExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirElvisExpressionImpl.kt index 7b16b5d84c8..4f73c9f014e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirElvisExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirElvisExpressionImpl.kt @@ -11,15 +11,17 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirElvisExpression import org.jetbrains.kotlin.fir.expressions.FirExpression +import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace @OptIn(UnresolvedExpressionTypeAccess::class) internal class FirElvisExpressionImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEmptyExpressionBlock.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEmptyExpressionBlock.kt index 99d8f77e748..26c648c4568 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEmptyExpressionBlock.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEmptyExpressionBlock.kt @@ -11,15 +11,13 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirStatement -import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor class FirEmptyExpressionBlock : FirBlock() { override val source: KtSourceElement? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEnumEntryDeserializedAccessExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEnumEntryDeserializedAccessExpressionImpl.kt index c211b608fdd..72fe797b7f3 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEnumEntryDeserializedAccessExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEnumEntryDeserializedAccessExpressionImpl.kt @@ -11,17 +11,19 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirEnumEntryDeserializedAccessExpression +import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.constructClassType import org.jetbrains.kotlin.fir.types.toLookupTag +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess internal class FirEnumEntryDeserializedAccessExpressionImpl( override var annotations: MutableOrEmptyList, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEqualityOperatorCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEqualityOperatorCallImpl.kt index 5bf8c7b3635..a8787c94f0a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEqualityOperatorCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEqualityOperatorCallImpl.kt @@ -11,17 +11,15 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.expressions.FirArgumentList -import org.jetbrains.kotlin.fir.expressions.FirEqualityOperatorCall -import org.jetbrains.kotlin.fir.expressions.FirOperation -import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.types.constructClassLikeType -import org.jetbrains.kotlin.name.StandardClassIds -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.expressions.* +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.constructClassLikeType +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace +import org.jetbrains.kotlin.name.StandardClassIds internal class FirEqualityOperatorCallImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorAnnotationCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorAnnotationCallImpl.kt index c20e3aa569a..b83a935e34d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorAnnotationCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorAnnotationCallImpl.kt @@ -12,21 +12,18 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic -import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.expressions.FirAnnotationArgumentMapping -import org.jetbrains.kotlin.fir.expressions.FirAnnotationResolvePhase -import org.jetbrains.kotlin.fir.expressions.FirArgumentList -import org.jetbrains.kotlin.fir.expressions.FirErrorAnnotationCall +import org.jetbrains.kotlin.fir.expressions.* import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.coneTypeOrNull -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace internal class FirErrorAnnotationCallImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorExpressionImpl.kt index 2ac9d65434a..b40e0ce0b8e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorExpressionImpl.kt @@ -12,17 +12,19 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.diagnostics.ConeStubDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirErrorExpression import org.jetbrains.kotlin.fir.expressions.FirExpression +import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess import org.jetbrains.kotlin.fir.types.ConeErrorType import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace internal class FirErrorExpressionImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorLoopImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorLoopImpl.kt index 5ff994b5b74..643233f3d31 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorLoopImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorLoopImpl.kt @@ -12,16 +12,17 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirLabel +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.diagnostics.ConeStubDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirErrorLoop import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.expressions.impl.FirEmptyExpressionBlock -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace internal class FirErrorLoopImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorResolvedQualifierImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorResolvedQualifierImpl.kt index ff91be5b3ab..8631b2b1c48 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorResolvedQualifierImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorResolvedQualifierImpl.kt @@ -11,18 +11,20 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirErrorResolvedQualifier +import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess @OptIn(UnresolvedExpressionTypeAccess::class) internal class FirErrorResolvedQualifierImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionStub.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionStub.kt index 4a4d3df8a07..a1c4837a287 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionStub.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionStub.kt @@ -12,13 +12,15 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail -import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty +import org.jetbrains.kotlin.fir.expressions.FirAnnotation +import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace @OptIn(UnresolvedExpressionTypeAccess::class) class FirExpressionStub @FirImplementationDetail constructor( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirFunctionCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirFunctionCallImpl.kt index df762b6ffec..fd86ccb8124 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirFunctionCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirFunctionCallImpl.kt @@ -12,20 +12,17 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic -import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.expressions.FirArgumentList -import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.expressions.FirFunctionCall -import org.jetbrains.kotlin.fir.expressions.FirFunctionCallOrigin +import org.jetbrains.kotlin.fir.expressions.* import org.jetbrains.kotlin.fir.references.FirNamedReference import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace @OptIn(UnresolvedExpressionTypeAccess::class) open class FirFunctionCallImpl @FirImplementationDetail constructor( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirGetClassCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirGetClassCallImpl.kt index 0dc94aee580..c8e3d9a3a9a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirGetClassCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirGetClassCallImpl.kt @@ -11,15 +11,13 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.expressions.FirArgumentList -import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.expressions.FirGetClassCall -import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.expressions.* +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace @OptIn(UnresolvedExpressionTypeAccess::class) internal class FirGetClassCallImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirImplicitInvokeCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirImplicitInvokeCallImpl.kt index 0b4a8859dc7..1c20da6f9ed 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirImplicitInvokeCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirImplicitInvokeCallImpl.kt @@ -11,21 +11,18 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fir.FirImplementationDetail +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic -import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.expressions.FirArgumentList -import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.expressions.FirFunctionCallOrigin -import org.jetbrains.kotlin.fir.expressions.FirImplicitInvokeCall +import org.jetbrains.kotlin.fir.expressions.* import org.jetbrains.kotlin.fir.references.FirNamedReference import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.FirImplementationDetail +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace @OptIn(UnresolvedExpressionTypeAccess::class) internal class FirImplicitInvokeCallImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirInaccessibleReceiverExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirInaccessibleReceiverExpressionImpl.kt index bb6c31e8a16..ae6f44e13b4 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirInaccessibleReceiverExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirInaccessibleReceiverExpressionImpl.kt @@ -11,15 +11,17 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirInaccessibleReceiverExpression +import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.references.FirThisReference import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace @OptIn(UnresolvedExpressionTypeAccess::class) internal class FirInaccessibleReceiverExpressionImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirIncrementDecrementExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirIncrementDecrementExpressionImpl.kt index 58178c64c4c..4f5a7523edf 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirIncrementDecrementExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirIncrementDecrementExpressionImpl.kt @@ -11,15 +11,17 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirIncrementDecrementExpression -import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace +import org.jetbrains.kotlin.name.Name @OptIn(UnresolvedExpressionTypeAccess::class) internal class FirIncrementDecrementExpressionImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirIntegerLiteralOperatorCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirIntegerLiteralOperatorCallImpl.kt index 15e0ae4b3c5..bbb228c3f22 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirIntegerLiteralOperatorCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirIntegerLiteralOperatorCallImpl.kt @@ -11,21 +11,18 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fir.FirImplementationDetail +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic -import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.expressions.FirArgumentList -import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.expressions.FirFunctionCallOrigin -import org.jetbrains.kotlin.fir.expressions.FirIntegerLiteralOperatorCall +import org.jetbrains.kotlin.fir.expressions.* import org.jetbrains.kotlin.fir.references.FirNamedReference import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.FirImplementationDetail +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace @OptIn(UnresolvedExpressionTypeAccess::class) internal class FirIntegerLiteralOperatorCallImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLambdaArgumentExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLambdaArgumentExpressionImpl.kt index 938a9f3e464..f3f8023457f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLambdaArgumentExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLambdaArgumentExpressionImpl.kt @@ -11,14 +11,16 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirLambdaArgumentExpression -import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace internal class FirLambdaArgumentExpressionImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyBlockImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyBlockImpl.kt index e638051c414..9fc6297adf4 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyBlockImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyBlockImpl.kt @@ -14,11 +14,10 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirLazyBlock import org.jetbrains.kotlin.fir.expressions.FirStatement -import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor internal class FirLazyBlockImpl : FirLazyBlock() { override val source: KtSourceElement? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyDelegatedConstructorCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyDelegatedConstructorCall.kt index 94c3828a4c2..c1c43c01afa 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyDelegatedConstructorCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyDelegatedConstructorCall.kt @@ -18,9 +18,8 @@ import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor class FirLazyDelegatedConstructorCall @FirImplementationDetail constructor( override var constructedTypeRef: FirTypeRef, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyExpressionImpl.kt index 6c17186ebef..c8ed17c0e53 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyExpressionImpl.kt @@ -13,11 +13,10 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirLazyExpression -import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor internal class FirLazyExpressionImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirMultiDelegatedConstructorCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirMultiDelegatedConstructorCallImpl.kt index 5cc50f66cc0..83dc66c5d5e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirMultiDelegatedConstructorCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirMultiDelegatedConstructorCallImpl.kt @@ -12,16 +12,12 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail -import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.expressions.FirArgumentList -import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall -import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.expressions.FirMultiDelegatedConstructorCall +import org.jetbrains.kotlin.fir.expressions.* import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace class FirMultiDelegatedConstructorCallImpl @FirImplementationDetail constructor( override val delegatedConstructorCalls: MutableList, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirNamedArgumentExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirNamedArgumentExpressionImpl.kt index 3f606257899..cab4f5f5940 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirNamedArgumentExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirNamedArgumentExpressionImpl.kt @@ -11,15 +11,17 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirNamedArgumentExpression -import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace +import org.jetbrains.kotlin.name.Name internal class FirNamedArgumentExpressionImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirPropertyAccessExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirPropertyAccessExpressionImpl.kt index 5462205c68a..84bb963b750 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirPropertyAccessExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirPropertyAccessExpressionImpl.kt @@ -12,17 +12,19 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirPropertyAccessExpression +import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace @OptIn(UnresolvedExpressionTypeAccess::class) class FirPropertyAccessExpressionImpl @FirImplementationDetail constructor( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirQualifiedErrorAccessExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirQualifiedErrorAccessExpressionImpl.kt index ab80ac31388..a7e0a87e55a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirQualifiedErrorAccessExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirQualifiedErrorAccessExpressionImpl.kt @@ -11,18 +11,16 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic -import org.jetbrains.kotlin.fir.diagnostics.ConeStubDiagnostic -import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.expressions.FirErrorExpression -import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.expressions.FirQualifiedErrorAccessExpression -import org.jetbrains.kotlin.fir.types.ConeErrorType -import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic +import org.jetbrains.kotlin.fir.diagnostics.ConeStubDiagnostic +import org.jetbrains.kotlin.fir.expressions.* +import org.jetbrains.kotlin.fir.types.ConeErrorType +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace internal class FirQualifiedErrorAccessExpressionImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedQualifierImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedQualifierImpl.kt index a09e8db6d14..89b7cb9f9d9 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedQualifierImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedQualifierImpl.kt @@ -11,19 +11,21 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.declarations.FirRegularClass import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirResolvedQualifier +import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess @OptIn(UnresolvedExpressionTypeAccess::class) internal class FirResolvedQualifierImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedReifiedParameterReferenceImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedReifiedParameterReferenceImpl.kt index 6e0e80546bd..f38edd192f0 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedReifiedParameterReferenceImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedReifiedParameterReferenceImpl.kt @@ -11,14 +11,16 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.expressions.FirResolvedReifiedParameterReference -import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol -import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty +import org.jetbrains.kotlin.fir.expressions.FirAnnotation +import org.jetbrains.kotlin.fir.expressions.FirResolvedReifiedParameterReference import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace @OptIn(UnresolvedExpressionTypeAccess::class) internal class FirResolvedReifiedParameterReferenceImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirReturnExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirReturnExpressionImpl.kt index e420e9a7acb..b4a53607476 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirReturnExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirReturnExpressionImpl.kt @@ -12,18 +12,20 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirTarget +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.declarations.FirFunction import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirReturnExpression +import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.constructClassLikeType import org.jetbrains.kotlin.fir.types.impl.FirImplicitNothingTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace import org.jetbrains.kotlin.name.StandardClassIds -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess internal class FirReturnExpressionImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSafeCallExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSafeCallExpressionImpl.kt index 09b42c83ea4..3a68b235b3f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSafeCallExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSafeCallExpressionImpl.kt @@ -12,16 +12,13 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirExpressionRef -import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.expressions.FirCheckedSafeCallSubject -import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.expressions.FirSafeCallExpression -import org.jetbrains.kotlin.fir.expressions.FirStatement -import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.expressions.* +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace @OptIn(UnresolvedExpressionTypeAccess::class) internal class FirSafeCallExpressionImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSmartCastExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSmartCastExpressionImpl.kt index b42b35d04fd..e867bf7e552 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSmartCastExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSmartCastExpressionImpl.kt @@ -13,16 +13,18 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fakeElement +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirSmartCastExpression +import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace import org.jetbrains.kotlin.types.SmartcastStability -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess @OptIn(UnresolvedExpressionTypeAccess::class) internal class FirSmartCastExpressionImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSpreadArgumentExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSpreadArgumentExpressionImpl.kt index 2abfb1f395a..7a2a7a95ae4 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSpreadArgumentExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSpreadArgumentExpressionImpl.kt @@ -11,14 +11,16 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirSpreadArgumentExpression -import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace internal class FirSpreadArgumentExpressionImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirStringConcatenationCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirStringConcatenationCallImpl.kt index 4dbd8c05d44..725f37e2e2e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirStringConcatenationCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirStringConcatenationCallImpl.kt @@ -11,17 +11,19 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirStringConcatenationCall +import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.constructClassLikeType import org.jetbrains.kotlin.fir.types.impl.FirImplicitStringTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace import org.jetbrains.kotlin.name.StandardClassIds -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess internal class FirStringConcatenationCallImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThisReceiverExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThisReceiverExpressionImpl.kt index a52cd3be571..a0b889eefc6 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThisReceiverExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThisReceiverExpressionImpl.kt @@ -11,19 +11,21 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fir.FirImplementationDetail +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirThisReceiverExpression +import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.references.FirThisReference import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess -import org.jetbrains.kotlin.fir.FirImplementationDetail +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace @OptIn(UnresolvedExpressionTypeAccess::class) internal class FirThisReceiverExpressionImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThrowExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThrowExpressionImpl.kt index 59b2636e9a6..ef00aee58ab 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThrowExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThrowExpressionImpl.kt @@ -11,17 +11,19 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirThrowExpression +import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.constructClassLikeType import org.jetbrains.kotlin.fir.types.impl.FirImplicitNothingTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace import org.jetbrains.kotlin.name.StandardClassIds -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess internal class FirThrowExpressionImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirTryExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirTryExpressionImpl.kt index 1f6c41c898e..b3da61d90fa 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirTryExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirTryExpressionImpl.kt @@ -11,16 +11,14 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.expressions.FirBlock -import org.jetbrains.kotlin.fir.expressions.FirCatch -import org.jetbrains.kotlin.fir.expressions.FirTryExpression -import org.jetbrains.kotlin.fir.references.FirReference -import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.expressions.* +import org.jetbrains.kotlin.fir.references.FirReference +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace @OptIn(UnresolvedExpressionTypeAccess::class) internal class FirTryExpressionImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirTypeOperatorCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirTypeOperatorCallImpl.kt index 51cd23c707a..3d9c410265d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirTypeOperatorCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirTypeOperatorCallImpl.kt @@ -11,16 +11,14 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.expressions.FirArgumentList -import org.jetbrains.kotlin.fir.expressions.FirOperation -import org.jetbrains.kotlin.fir.expressions.FirTypeOperatorCall -import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.expressions.* +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace @OptIn(UnresolvedExpressionTypeAccess::class) internal class FirTypeOperatorCallImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirUnitExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirUnitExpression.kt index b4793782573..016dab3f83c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirUnitExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirUnitExpression.kt @@ -12,16 +12,18 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression +import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.constructClassLikeType import org.jetbrains.kotlin.fir.types.impl.FirImplicitUnitTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace import org.jetbrains.kotlin.name.StandardClassIds -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess class FirUnitExpression @FirImplementationDetail constructor( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirVarargArgumentsExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirVarargArgumentsExpressionImpl.kt index 094c3e71975..6b710f67ef0 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirVarargArgumentsExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirVarargArgumentsExpressionImpl.kt @@ -11,15 +11,17 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirVarargArgumentsExpression +import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace @OptIn(UnresolvedExpressionTypeAccess::class) internal class FirVarargArgumentsExpressionImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirVariableAssignmentImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirVariableAssignmentImpl.kt index f64a2ba794e..3c240e5b8ef 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirVariableAssignmentImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirVariableAssignmentImpl.kt @@ -11,12 +11,14 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirVariableAssignment -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace internal class FirVariableAssignmentImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenBranchImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenBranchImpl.kt index f887d49d1c0..1ae2dc998db 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenBranchImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenBranchImpl.kt @@ -14,7 +14,8 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirWhenBranch -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor internal class FirWhenBranchImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenExpressionImpl.kt index 90d56b078d0..ed19565cdb4 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenExpressionImpl.kt @@ -11,18 +11,15 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.fir.declarations.FirVariable -import org.jetbrains.kotlin.fir.expressions.ExhaustivenessStatus -import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.expressions.FirWhenBranch -import org.jetbrains.kotlin.fir.expressions.FirWhenExpression -import org.jetbrains.kotlin.fir.references.FirReference -import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.declarations.FirVariable +import org.jetbrains.kotlin.fir.expressions.* +import org.jetbrains.kotlin.fir.references.FirReference +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace @OptIn(UnresolvedExpressionTypeAccess::class) internal class FirWhenExpressionImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenSubjectExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenSubjectExpressionImpl.kt index b83db762d29..b6cd86f4538 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenSubjectExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenSubjectExpressionImpl.kt @@ -12,16 +12,18 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirExpressionRef +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirWhenExpression import org.jetbrains.kotlin.fir.expressions.FirWhenSubjectExpression +import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.constructClassLikeType +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace import org.jetbrains.kotlin.name.StandardClassIds -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess internal class FirWhenSubjectExpressionImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhileLoopImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhileLoopImpl.kt index 52d7fdb0e67..9f7a0f7b976 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhileLoopImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhileLoopImpl.kt @@ -12,13 +12,15 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirLabel +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirWhileLoop -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace internal class FirWhileLoopImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWrappedDelegateExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWrappedDelegateExpressionImpl.kt index cbdf4f5d66b..6e87548e3dc 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWrappedDelegateExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWrappedDelegateExpressionImpl.kt @@ -11,14 +11,16 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirWrappedDelegateExpression -import org.jetbrains.kotlin.fir.types.ConeKotlinType -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.UnresolvedExpressionTypeAccess +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace internal class FirWrappedDelegateExpressionImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/impl/FirFileAnnotationsContainerImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/impl/FirFileAnnotationsContainerImpl.kt index 57835c098a5..8c8d293f759 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/impl/FirFileAnnotationsContainerImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/impl/FirFileAnnotationsContainerImpl.kt @@ -13,15 +13,16 @@ package org.jetbrains.kotlin.fir.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirFileAnnotationsContainer import org.jetbrains.kotlin.fir.FirModuleData +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.FirResolveState +import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess import org.jetbrains.kotlin.fir.declarations.asResolveState import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.symbols.impl.FirFileSymbol -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty -import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace @OptIn(ResolveStateAccess::class) internal class FirFileAnnotationsContainerImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/impl/FirFunctionTypeParameterImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/impl/FirFunctionTypeParameterImpl.kt index aabfa9b709a..3a11404bd41 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/impl/FirFunctionTypeParameterImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/impl/FirFunctionTypeParameterImpl.kt @@ -13,8 +13,9 @@ package org.jetbrains.kotlin.fir.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirFunctionTypeParameter import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.fir.visitors.* internal class FirFunctionTypeParameterImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/impl/FirLabelImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/impl/FirLabelImpl.kt index 05d450d0d40..dcd381bb941 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/impl/FirLabelImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/impl/FirLabelImpl.kt @@ -12,7 +12,8 @@ package org.jetbrains.kotlin.fir.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirLabel -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor internal class FirLabelImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/impl/FirPackageDirectiveImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/impl/FirPackageDirectiveImpl.kt index 57a08209831..83522779c5d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/impl/FirPackageDirectiveImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/impl/FirPackageDirectiveImpl.kt @@ -12,8 +12,9 @@ package org.jetbrains.kotlin.fir.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirPackageDirective +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.FqName -import org.jetbrains.kotlin.fir.visitors.* internal class FirPackageDirectiveImpl( override val source: KtSourceElement?, 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 befd8d995db..723518bab4f 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 @@ -11,8 +11,9 @@ package org.jetbrains.kotlin.fir.references import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.symbols.impl.FirBackingFieldSymbol +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.fir.visitors.* /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.backingFieldReference] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirControlFlowGraphReference.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirControlFlowGraphReference.kt index 2678361987e..d91ba3b8d99 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirControlFlowGraphReference.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirControlFlowGraphReference.kt @@ -10,7 +10,8 @@ package org.jetbrains.kotlin.fir.references import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.controlFlowGraphReference] 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 a409243b324..a53d1c66725 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 @@ -11,8 +11,9 @@ package org.jetbrains.kotlin.fir.references import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.symbols.impl.FirDelegateFieldSymbol +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.fir.visitors.* /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.delegateFieldReference] 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 1a60bbd5b3b..6440151ce8e 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 @@ -12,8 +12,9 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.diagnostics.FirDiagnosticHolder +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.fir.visitors.* /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.errorNamedReference] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirFromMissingDependenciesNamedReference.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirFromMissingDependenciesNamedReference.kt index ba9a6f68e91..760be07520f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirFromMissingDependenciesNamedReference.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirFromMissingDependenciesNamedReference.kt @@ -10,8 +10,9 @@ package org.jetbrains.kotlin.fir.references import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.fir.visitors.* /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.fromMissingDependenciesNamedReference] 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 6ad703d9f6a..865b8f01020 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 @@ -10,8 +10,9 @@ package org.jetbrains.kotlin.fir.references import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.fir.visitors.* /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.namedReference] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirNamedReferenceWithCandidateBase.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirNamedReferenceWithCandidateBase.kt index 0ce0040c021..e479b29ba6c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirNamedReferenceWithCandidateBase.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirNamedReferenceWithCandidateBase.kt @@ -11,8 +11,9 @@ package org.jetbrains.kotlin.fir.references import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.fir.visitors.* /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.namedReferenceWithCandidateBase] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirReference.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirReference.kt index c578b5b0ca9..52ad552e37b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirReference.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirReference.kt @@ -11,7 +11,8 @@ package org.jetbrains.kotlin.fir.references import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirPureAbstractElement -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.reference] 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 f9f3055d082..523eb07b999 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 @@ -13,8 +13,9 @@ import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.resolve.calls.CallableReferenceMappedArguments import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.fir.visitors.* /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.resolvedCallableReference] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirResolvedErrorReference.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirResolvedErrorReference.kt index e7f689f4850..a71fbcb083a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirResolvedErrorReference.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirResolvedErrorReference.kt @@ -13,8 +13,9 @@ import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.diagnostics.FirDiagnosticHolder import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.fir.visitors.* /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.resolvedErrorReference] 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 cceaae4b9d4..07c327b1ef6 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 @@ -11,8 +11,9 @@ package org.jetbrains.kotlin.fir.references import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.fir.visitors.* /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.resolvedNamedReference] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirSuperReference.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirSuperReference.kt index 7b7c664c834..a34302f05e9 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirSuperReference.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirSuperReference.kt @@ -11,7 +11,8 @@ package org.jetbrains.kotlin.fir.references import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.superReference] 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 afd3e10bd81..76d66935209 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 @@ -12,7 +12,8 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.thisReference] 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 7cc8f1a52b8..66db4c1001f 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 @@ -16,8 +16,6 @@ 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.impl.FirBackingFieldSymbol -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.name.Name @FirBuilderDsl class FirBackingFieldReferenceBuilder { @@ -36,7 +34,7 @@ class FirBackingFieldReferenceBuilder { @OptIn(ExperimentalContracts::class) inline fun buildBackingFieldReference(init: FirBackingFieldReferenceBuilder.() -> Unit): FirBackingFieldReference { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirBackingFieldReferenceBuilder().apply(init).build() } 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 4bd45973622..0903860cc10 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 @@ -16,8 +16,6 @@ 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.impl.FirDelegateFieldSymbol -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.name.Name @FirBuilderDsl class FirDelegateFieldReferenceBuilder { @@ -36,7 +34,7 @@ class FirDelegateFieldReferenceBuilder { @OptIn(ExperimentalContracts::class) inline fun buildDelegateFieldReference(init: FirDelegateFieldReferenceBuilder.() -> Unit): FirDelegateFieldReference { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirDelegateFieldReferenceBuilder().apply(init).build() } 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 81a84f24334..b7ed07da34f 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 @@ -16,8 +16,6 @@ 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.visitors.* -import org.jetbrains.kotlin.name.Name @FirBuilderDsl class FirErrorNamedReferenceBuilder { @@ -36,7 +34,7 @@ class FirErrorNamedReferenceBuilder { @OptIn(ExperimentalContracts::class) inline fun buildErrorNamedReference(init: FirErrorNamedReferenceBuilder.() -> Unit): FirErrorNamedReference { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirErrorNamedReferenceBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirExplicitSuperReferenceBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirExplicitSuperReferenceBuilder.kt index d1ee7acac34..d8bcac1a21f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirExplicitSuperReferenceBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirExplicitSuperReferenceBuilder.kt @@ -16,7 +16,6 @@ import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.references.FirSuperReference import org.jetbrains.kotlin.fir.references.impl.FirExplicitSuperReference import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirExplicitSuperReferenceBuilder { @@ -37,7 +36,7 @@ class FirExplicitSuperReferenceBuilder { @OptIn(ExperimentalContracts::class) inline fun buildExplicitSuperReference(init: FirExplicitSuperReferenceBuilder.() -> Unit): FirSuperReference { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirExplicitSuperReferenceBuilder().apply(init).build() } 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 3f82754263a..0d90c048d84 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 @@ -16,8 +16,6 @@ import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.references.FirThisReference import org.jetbrains.kotlin.fir.references.impl.FirExplicitThisReference -import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirExplicitThisReferenceBuilder { @@ -40,7 +38,7 @@ class FirExplicitThisReferenceBuilder { @OptIn(ExperimentalContracts::class) inline fun buildExplicitThisReference(init: FirExplicitThisReferenceBuilder.() -> Unit = {}): FirThisReference { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirExplicitThisReferenceBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirFromMissingDependenciesNamedReferenceBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirFromMissingDependenciesNamedReferenceBuilder.kt index 10fee1bc349..2323f6d8747 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirFromMissingDependenciesNamedReferenceBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirFromMissingDependenciesNamedReferenceBuilder.kt @@ -15,7 +15,6 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.references.FirFromMissingDependenciesNamedReference import org.jetbrains.kotlin.fir.references.impl.FirFromMissingDependenciesNamedReferenceImpl -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.Name @FirBuilderDsl @@ -35,7 +34,7 @@ class FirFromMissingDependenciesNamedReferenceBuilder { @OptIn(ExperimentalContracts::class) inline fun buildFromMissingDependenciesNamedReference(init: FirFromMissingDependenciesNamedReferenceBuilder.() -> Unit): FirFromMissingDependenciesNamedReference { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirFromMissingDependenciesNamedReferenceBuilder().apply(init).build() } 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 88136292c49..808294437ed 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 @@ -11,13 +11,11 @@ package org.jetbrains.kotlin.fir.references.builder import kotlin.contracts.* -import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.references.FirThisReference import org.jetbrains.kotlin.fir.references.impl.FirImplicitThisReference import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirImplicitThisReferenceBuilder { @@ -38,7 +36,7 @@ class FirImplicitThisReferenceBuilder { @OptIn(ExperimentalContracts::class) inline fun buildImplicitThisReference(init: FirImplicitThisReferenceBuilder.() -> Unit = {}): FirThisReference { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirImplicitThisReferenceBuilder().apply(init).build() } 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 c29281762eb..950c332bf54 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 @@ -17,7 +17,6 @@ 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.FirBasedSymbol -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.Name @FirBuilderDsl @@ -40,7 +39,7 @@ class FirPropertyFromParameterResolvedNamedReferenceBuilder { @OptIn(ExperimentalContracts::class) inline fun buildPropertyFromParameterResolvedNamedReference(init: FirPropertyFromParameterResolvedNamedReferenceBuilder.() -> Unit): FirResolvedNamedReference { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirPropertyFromParameterResolvedNamedReferenceBuilder().apply(init).build() } 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 a072200bdd8..1f7baa453fb 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 @@ -18,7 +18,6 @@ import org.jetbrains.kotlin.fir.references.impl.FirResolvedCallableReferenceImpl import org.jetbrains.kotlin.fir.resolve.calls.CallableReferenceMappedArguments 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 @FirBuilderDsl @@ -44,7 +43,7 @@ class FirResolvedCallableReferenceBuilder { @OptIn(ExperimentalContracts::class) inline fun buildResolvedCallableReference(init: FirResolvedCallableReferenceBuilder.() -> Unit): FirResolvedCallableReference { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirResolvedCallableReferenceBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirResolvedErrorReferenceBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirResolvedErrorReferenceBuilder.kt index 605240fef91..d6b00e87894 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirResolvedErrorReferenceBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/builder/FirResolvedErrorReferenceBuilder.kt @@ -17,7 +17,6 @@ import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.references.FirResolvedErrorReference import org.jetbrains.kotlin.fir.references.impl.FirResolvedErrorReferenceImpl import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.Name @FirBuilderDsl @@ -41,7 +40,7 @@ class FirResolvedErrorReferenceBuilder { @OptIn(ExperimentalContracts::class) inline fun buildResolvedErrorReference(init: FirResolvedErrorReferenceBuilder.() -> Unit): FirResolvedErrorReference { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirResolvedErrorReferenceBuilder().apply(init).build() } 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 e08f12bb963..9c8002d688a 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 @@ -16,7 +16,6 @@ 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.FirBasedSymbol -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.name.Name @FirBuilderDsl @@ -38,7 +37,7 @@ class FirResolvedNamedReferenceBuilder { @OptIn(ExperimentalContracts::class) inline fun buildResolvedNamedReference(init: FirResolvedNamedReferenceBuilder.() -> Unit): FirResolvedNamedReference { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirResolvedNamedReferenceBuilder().apply(init).build() } 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 7579eba3111..5cb6e63eb5b 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 @@ -16,7 +16,6 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail 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.visitors.* import org.jetbrains.kotlin.name.Name @FirBuilderDsl @@ -37,7 +36,7 @@ class FirSimpleNamedReferenceBuilder { @OptIn(ExperimentalContracts::class) inline fun buildSimpleNamedReference(init: FirSimpleNamedReferenceBuilder.() -> Unit): FirNamedReference { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirSimpleNamedReferenceBuilder().apply(init).build() } 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 1d60bb6a1c8..952955d0139 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 @@ -13,8 +13,9 @@ package org.jetbrains.kotlin.fir.references.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.references.FirBackingFieldReference import org.jetbrains.kotlin.fir.symbols.impl.FirBackingFieldSymbol +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.fir.visitors.* internal class FirBackingFieldReferenceImpl( override val source: KtSourceElement?, 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 b6eee09d438..12916286282 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 @@ -13,8 +13,9 @@ package org.jetbrains.kotlin.fir.references.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.references.FirDelegateFieldReference import org.jetbrains.kotlin.fir.symbols.impl.FirDelegateFieldSymbol +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.fir.visitors.* internal class FirDelegateFieldReferenceImpl( override val source: KtSourceElement?, 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 3a37cc706ff..86bbb543790 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 @@ -13,8 +13,9 @@ package org.jetbrains.kotlin.fir.references.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.references.FirErrorNamedReference +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.fir.visitors.* internal class FirErrorNamedReferenceImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirExplicitSuperReference.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirExplicitSuperReference.kt index 4b718eec410..1fe5b6270ae 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirExplicitSuperReference.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirExplicitSuperReference.kt @@ -13,7 +13,8 @@ package org.jetbrains.kotlin.fir.references.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.references.FirSuperReference import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor internal class FirExplicitSuperReference( override val source: KtSourceElement?, 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 c2fc0615765..8450ab3e425 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 @@ -14,7 +14,8 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.references.FirThisReference import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor internal class FirExplicitThisReference( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirFromMissingDependenciesNamedReferenceImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirFromMissingDependenciesNamedReferenceImpl.kt index 43730ad1757..a510f70795e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirFromMissingDependenciesNamedReferenceImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirFromMissingDependenciesNamedReferenceImpl.kt @@ -12,8 +12,9 @@ package org.jetbrains.kotlin.fir.references.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.references.FirFromMissingDependenciesNamedReference +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.fir.visitors.* internal class FirFromMissingDependenciesNamedReferenceImpl( override val source: KtSourceElement?, 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 deef3855060..cb5ae925922 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 @@ -14,7 +14,8 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.references.FirThisReference import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor internal class FirImplicitThisReference( override val boundSymbol: 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 f91c6a83c52..db7fa4d7ac7 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 @@ -14,8 +14,9 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.fir.visitors.* class FirPropertyFromParameterResolvedNamedReference @FirImplementationDetail constructor( override val source: KtSourceElement?, 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 068828fe630..7c129943757 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 @@ -15,8 +15,9 @@ import org.jetbrains.kotlin.fir.references.FirResolvedCallableReference import org.jetbrains.kotlin.fir.resolve.calls.CallableReferenceMappedArguments import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.fir.visitors.* internal class FirResolvedCallableReferenceImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirResolvedErrorReferenceImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirResolvedErrorReferenceImpl.kt index bc56f5dee08..bd48e573228 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirResolvedErrorReferenceImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirResolvedErrorReferenceImpl.kt @@ -14,8 +14,9 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.references.FirResolvedErrorReference import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.fir.visitors.* internal class FirResolvedErrorReferenceImpl( override val source: KtSourceElement?, 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 325ad51bbbb..64469d330b0 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 @@ -13,8 +13,9 @@ package org.jetbrains.kotlin.fir.references.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.fir.visitors.* internal class FirResolvedNamedReferenceImpl( override val source: KtSourceElement?, 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 ea1f51e6239..705351394e1 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 @@ -13,8 +13,9 @@ package org.jetbrains.kotlin.fir.references.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.references.FirNamedReference +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.fir.visitors.* class FirSimpleNamedReference @FirImplementationDetail constructor( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirStubReference.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirStubReference.kt index 9b51d1dfab6..eb96fc601b0 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirStubReference.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirStubReference.kt @@ -11,9 +11,9 @@ package org.jetbrains.kotlin.fir.references.impl import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.references.FirReference -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor object FirStubReference : FirReference() { override val source: KtSourceElement? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirDynamicTypeRef.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirDynamicTypeRef.kt index 1bb01022f94..c2efb62391d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirDynamicTypeRef.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirDynamicTypeRef.kt @@ -11,7 +11,8 @@ package org.jetbrains.kotlin.fir.types import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.dynamicTypeRef] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirErrorTypeRef.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirErrorTypeRef.kt index 4de18403863..d307c38e204 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirErrorTypeRef.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirErrorTypeRef.kt @@ -13,7 +13,8 @@ import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.diagnostics.FirDiagnosticHolder import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.errorTypeRef] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirFunctionTypeRef.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirFunctionTypeRef.kt index 8ff6506d9e2..e084d32cf3f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirFunctionTypeRef.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirFunctionTypeRef.kt @@ -12,7 +12,8 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirFunctionTypeParameter import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.functionTypeRef] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirImplicitTypeRef.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirImplicitTypeRef.kt index d19fed4a721..e337d94c02c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirImplicitTypeRef.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirImplicitTypeRef.kt @@ -11,7 +11,8 @@ package org.jetbrains.kotlin.fir.types import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.implicitTypeRef] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirIntersectionTypeRef.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirIntersectionTypeRef.kt index 6913043765d..71d34eb39b8 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirIntersectionTypeRef.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirIntersectionTypeRef.kt @@ -11,7 +11,8 @@ package org.jetbrains.kotlin.fir.types import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.intersectionTypeRef] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirPlaceholderProjection.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirPlaceholderProjection.kt index e372cb692b6..1a2367736d5 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirPlaceholderProjection.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirPlaceholderProjection.kt @@ -10,7 +10,8 @@ package org.jetbrains.kotlin.fir.types import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.placeholderProjection] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirResolvedTypeRef.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirResolvedTypeRef.kt index 674c02203fe..662d6593022 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirResolvedTypeRef.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirResolvedTypeRef.kt @@ -11,8 +11,9 @@ package org.jetbrains.kotlin.fir.types import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.mpp.TypeRefMarker -import org.jetbrains.kotlin.fir.visitors.* /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.resolvedTypeRef] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirStarProjection.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirStarProjection.kt index cce2c112b4a..41b945541ec 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirStarProjection.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirStarProjection.kt @@ -10,7 +10,8 @@ package org.jetbrains.kotlin.fir.types import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.starProjection] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeProjection.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeProjection.kt index 028db12fbdd..1287603fafa 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeProjection.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeProjection.kt @@ -11,7 +11,8 @@ package org.jetbrains.kotlin.fir.types import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirPureAbstractElement -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.typeProjection] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeProjectionWithVariance.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeProjectionWithVariance.kt index 3a411de5fff..c74e6db1f6a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeProjectionWithVariance.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeProjectionWithVariance.kt @@ -10,8 +10,9 @@ package org.jetbrains.kotlin.fir.types import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.types.Variance -import org.jetbrains.kotlin.fir.visitors.* /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.typeProjectionWithVariance] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeRef.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeRef.kt index 22cce712f57..a0de634d511 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeRef.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeRef.kt @@ -13,7 +13,8 @@ import org.jetbrains.kotlin.fir.FirAnnotationContainer import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirPureAbstractElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.typeRef] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeRefWithNullability.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeRefWithNullability.kt index d1bff3225f1..d48fd8f0004 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeRefWithNullability.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeRefWithNullability.kt @@ -11,7 +11,8 @@ package org.jetbrains.kotlin.fir.types import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.typeRefWithNullability] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirUserTypeRef.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirUserTypeRef.kt index cb9abb26f1f..486991b4af4 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirUserTypeRef.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirUserTypeRef.kt @@ -11,7 +11,8 @@ package org.jetbrains.kotlin.fir.types import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor /** * Generated from: [org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.userTypeRef] diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirDynamicTypeRefBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirDynamicTypeRefBuilder.kt index cf59a3e6d90..08dd5561579 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirDynamicTypeRefBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirDynamicTypeRefBuilder.kt @@ -18,7 +18,6 @@ import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.FirDynamicTypeRef import org.jetbrains.kotlin.fir.types.impl.FirDynamicTypeRefImpl -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirDynamicTypeRefBuilder : FirAnnotationContainerBuilder { @@ -39,7 +38,7 @@ class FirDynamicTypeRefBuilder : FirAnnotationContainerBuilder { @OptIn(ExperimentalContracts::class) inline fun buildDynamicTypeRef(init: FirDynamicTypeRefBuilder.() -> Unit): FirDynamicTypeRef { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirDynamicTypeRefBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirFunctionTypeRefBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirFunctionTypeRefBuilder.kt index da6154b06af..6469279d2e3 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirFunctionTypeRefBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirFunctionTypeRefBuilder.kt @@ -20,7 +20,6 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.FirFunctionTypeRef import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirFunctionTypeRefImpl -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirFunctionTypeRefBuilder : FirAnnotationContainerBuilder { @@ -51,7 +50,7 @@ class FirFunctionTypeRefBuilder : FirAnnotationContainerBuilder { @OptIn(ExperimentalContracts::class) inline fun buildFunctionTypeRef(init: FirFunctionTypeRefBuilder.() -> Unit): FirFunctionTypeRef { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirFunctionTypeRefBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirIntersectionTypeRefBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirIntersectionTypeRefBuilder.kt index 390df84a201..83e95b07b1e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirIntersectionTypeRefBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirIntersectionTypeRefBuilder.kt @@ -19,7 +19,6 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.FirIntersectionTypeRef import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirIntersectionTypeRefImpl -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirIntersectionTypeRefBuilder : FirAnnotationContainerBuilder { @@ -44,7 +43,7 @@ class FirIntersectionTypeRefBuilder : FirAnnotationContainerBuilder { @OptIn(ExperimentalContracts::class) inline fun buildIntersectionTypeRef(init: FirIntersectionTypeRefBuilder.() -> Unit): FirIntersectionTypeRef { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirIntersectionTypeRefBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirPlaceholderProjectionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirPlaceholderProjectionBuilder.kt index bdde9e60cd1..cfcec80c622 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirPlaceholderProjectionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirPlaceholderProjectionBuilder.kt @@ -15,7 +15,6 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.types.FirPlaceholderProjection import org.jetbrains.kotlin.fir.types.impl.FirPlaceholderProjectionImpl -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirPlaceholderProjectionBuilder { @@ -32,7 +31,7 @@ class FirPlaceholderProjectionBuilder { @OptIn(ExperimentalContracts::class) inline fun buildPlaceholderProjection(init: FirPlaceholderProjectionBuilder.() -> Unit = {}): FirPlaceholderProjection { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirPlaceholderProjectionBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirResolvedTypeRefBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirResolvedTypeRefBuilder.kt index e7e0f014b93..10b7bb806c8 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirResolvedTypeRefBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirResolvedTypeRefBuilder.kt @@ -21,7 +21,6 @@ import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirResolvedTypeRefImpl -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirResolvedTypeRefBuilder : FirAnnotationContainerBuilder { @@ -45,7 +44,7 @@ class FirResolvedTypeRefBuilder : FirAnnotationContainerBuilder { @OptIn(ExperimentalContracts::class) inline fun buildResolvedTypeRef(init: FirResolvedTypeRefBuilder.() -> Unit): FirResolvedTypeRef { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirResolvedTypeRefBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirStarProjectionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirStarProjectionBuilder.kt index 8158edeaf02..06a5f5f4caa 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirStarProjectionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirStarProjectionBuilder.kt @@ -15,7 +15,6 @@ import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.types.FirStarProjection import org.jetbrains.kotlin.fir.types.impl.FirStarProjectionImpl -import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirStarProjectionBuilder { @@ -32,7 +31,7 @@ class FirStarProjectionBuilder { @OptIn(ExperimentalContracts::class) inline fun buildStarProjection(init: FirStarProjectionBuilder.() -> Unit = {}): FirStarProjection { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirStarProjectionBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirTypeProjectionWithVarianceBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirTypeProjectionWithVarianceBuilder.kt index b94b8afe215..321640b8b53 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirTypeProjectionWithVarianceBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirTypeProjectionWithVarianceBuilder.kt @@ -16,7 +16,6 @@ import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.types.FirTypeProjectionWithVariance import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirTypeProjectionWithVarianceImpl -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.types.Variance @FirBuilderDsl @@ -38,7 +37,7 @@ class FirTypeProjectionWithVarianceBuilder { @OptIn(ExperimentalContracts::class) inline fun buildTypeProjectionWithVariance(init: FirTypeProjectionWithVarianceBuilder.() -> Unit): FirTypeProjectionWithVariance { contract { - callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) + callsInPlace(init, InvocationKind.EXACTLY_ONCE) } return FirTypeProjectionWithVarianceBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirDynamicTypeRefImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirDynamicTypeRefImpl.kt index 929ce17c6a8..cf36a0e4834 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirDynamicTypeRefImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirDynamicTypeRefImpl.kt @@ -11,11 +11,13 @@ package org.jetbrains.kotlin.fir.types.impl import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.types.FirDynamicTypeRef -import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.MutableOrEmptyList import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty +import org.jetbrains.kotlin.fir.expressions.FirAnnotation +import org.jetbrains.kotlin.fir.types.FirDynamicTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace internal class FirDynamicTypeRefImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirFunctionTypeRefImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirFunctionTypeRefImpl.kt index c0b2c234c83..ccf8a5bf32c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirFunctionTypeRefImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirFunctionTypeRefImpl.kt @@ -12,12 +12,14 @@ package org.jetbrains.kotlin.fir.types.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirFunctionTypeParameter +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.FirFunctionTypeRef import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace internal class FirFunctionTypeRefImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirIntersectionTypeRefImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirIntersectionTypeRefImpl.kt index 67c9edd7e7f..35eed33e222 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirIntersectionTypeRefImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirIntersectionTypeRefImpl.kt @@ -11,12 +11,14 @@ package org.jetbrains.kotlin.fir.types.impl import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.FirIntersectionTypeRef import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace internal class FirIntersectionTypeRefImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirPlaceholderProjectionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirPlaceholderProjectionImpl.kt index 62769b4740d..62a00fa24c5 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirPlaceholderProjectionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirPlaceholderProjectionImpl.kt @@ -12,7 +12,8 @@ package org.jetbrains.kotlin.fir.types.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.types.FirPlaceholderProjection -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor internal class FirPlaceholderProjectionImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirResolvedTypeRefImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirResolvedTypeRefImpl.kt index 07ddeb144f5..c08908385e9 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirResolvedTypeRefImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirResolvedTypeRefImpl.kt @@ -12,13 +12,15 @@ package org.jetbrains.kotlin.fir.types.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirImplementationDetail +import org.jetbrains.kotlin.fir.MutableOrEmptyList +import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.fir.MutableOrEmptyList -import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor +import org.jetbrains.kotlin.fir.visitors.transformInplace class FirResolvedTypeRefImpl @FirImplementationDetail constructor( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirStarProjectionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirStarProjectionImpl.kt index 52bdaed6f2b..a65f3770fa9 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirStarProjectionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirStarProjectionImpl.kt @@ -12,7 +12,8 @@ package org.jetbrains.kotlin.fir.types.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.types.FirStarProjection -import org.jetbrains.kotlin.fir.visitors.* +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor internal class FirStarProjectionImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirTypeProjectionWithVarianceImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirTypeProjectionWithVarianceImpl.kt index e73a0f0998e..0222c9a37ce 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirTypeProjectionWithVarianceImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirTypeProjectionWithVarianceImpl.kt @@ -13,8 +13,9 @@ package org.jetbrains.kotlin.fir.types.impl import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.types.FirTypeProjectionWithVariance import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.visitors.FirTransformer +import org.jetbrains.kotlin.fir.visitors.FirVisitor import org.jetbrains.kotlin.types.Variance -import org.jetbrains.kotlin.fir.visitors.* internal class FirTypeProjectionWithVarianceImpl( override val source: KtSourceElement?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirDefaultVisitor.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirDefaultVisitor.kt index 7c48a9dda80..b57527c7c7a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirDefaultVisitor.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirDefaultVisitor.kt @@ -8,162 +8,15 @@ package org.jetbrains.kotlin.fir.visitors -import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirAnnotationContainer -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.references.FirReference -import org.jetbrains.kotlin.fir.FirLabel -import org.jetbrains.kotlin.fir.expressions.FirResolvable import org.jetbrains.kotlin.fir.FirTargetElement -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirResolvedDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirControlFlowGraphOwner -import org.jetbrains.kotlin.fir.expressions.FirStatement -import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.expressions.FirLazyExpression -import org.jetbrains.kotlin.fir.declarations.FirContextReceiver -import org.jetbrains.kotlin.fir.FirElementWithResolveState -import org.jetbrains.kotlin.fir.FirFileAnnotationsContainer -import org.jetbrains.kotlin.fir.declarations.FirDeclaration -import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRefsOwner -import org.jetbrains.kotlin.fir.declarations.FirTypeParametersOwner -import org.jetbrains.kotlin.fir.declarations.FirMemberDeclaration -import org.jetbrains.kotlin.fir.declarations.FirAnonymousInitializer -import org.jetbrains.kotlin.fir.declarations.FirCallableDeclaration -import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef -import org.jetbrains.kotlin.fir.declarations.FirTypeParameter -import org.jetbrains.kotlin.fir.declarations.FirConstructedClassTypeParameterRef -import org.jetbrains.kotlin.fir.declarations.FirOuterClassTypeParameterRef -import org.jetbrains.kotlin.fir.declarations.FirVariable -import org.jetbrains.kotlin.fir.declarations.FirValueParameter -import org.jetbrains.kotlin.fir.declarations.FirReceiverParameter -import org.jetbrains.kotlin.fir.declarations.FirProperty -import org.jetbrains.kotlin.fir.declarations.FirField -import org.jetbrains.kotlin.fir.declarations.FirEnumEntry -import org.jetbrains.kotlin.fir.FirFunctionTypeParameter -import org.jetbrains.kotlin.fir.declarations.FirClassLikeDeclaration -import org.jetbrains.kotlin.fir.declarations.FirClass -import org.jetbrains.kotlin.fir.declarations.FirRegularClass -import org.jetbrains.kotlin.fir.declarations.FirTypeAlias -import org.jetbrains.kotlin.fir.declarations.FirFunction -import org.jetbrains.kotlin.fir.declarations.FirContractDescriptionOwner -import org.jetbrains.kotlin.fir.declarations.FirSimpleFunction -import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor -import org.jetbrains.kotlin.fir.declarations.FirBackingField -import org.jetbrains.kotlin.fir.declarations.FirConstructor -import org.jetbrains.kotlin.fir.declarations.FirFile -import org.jetbrains.kotlin.fir.declarations.FirScript -import org.jetbrains.kotlin.fir.declarations.FirCodeFragment -import org.jetbrains.kotlin.fir.FirPackageDirective -import org.jetbrains.kotlin.fir.declarations.FirAnonymousFunction -import org.jetbrains.kotlin.fir.expressions.FirAnonymousFunctionExpression -import org.jetbrains.kotlin.fir.declarations.FirAnonymousObject -import org.jetbrains.kotlin.fir.expressions.FirAnonymousObjectExpression -import org.jetbrains.kotlin.fir.diagnostics.FirDiagnosticHolder -import org.jetbrains.kotlin.fir.declarations.FirImport -import org.jetbrains.kotlin.fir.declarations.FirResolvedImport -import org.jetbrains.kotlin.fir.declarations.FirErrorImport -import org.jetbrains.kotlin.fir.expressions.FirLoop -import org.jetbrains.kotlin.fir.expressions.FirErrorLoop -import org.jetbrains.kotlin.fir.expressions.FirDoWhileLoop -import org.jetbrains.kotlin.fir.expressions.FirWhileLoop -import org.jetbrains.kotlin.fir.expressions.FirBlock -import org.jetbrains.kotlin.fir.expressions.FirLazyBlock -import org.jetbrains.kotlin.fir.expressions.FirBinaryLogicExpression -import org.jetbrains.kotlin.fir.expressions.FirJump -import org.jetbrains.kotlin.fir.expressions.FirLoopJump -import org.jetbrains.kotlin.fir.expressions.FirBreakExpression -import org.jetbrains.kotlin.fir.expressions.FirContinueExpression -import org.jetbrains.kotlin.fir.expressions.FirCatch -import org.jetbrains.kotlin.fir.expressions.FirTryExpression -import org.jetbrains.kotlin.fir.expressions.FirConstExpression -import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.types.FirStarProjection -import org.jetbrains.kotlin.fir.types.FirPlaceholderProjection -import org.jetbrains.kotlin.fir.types.FirTypeProjectionWithVariance -import org.jetbrains.kotlin.fir.expressions.FirArgumentList -import org.jetbrains.kotlin.fir.expressions.FirCall -import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall -import org.jetbrains.kotlin.fir.expressions.FirAnnotationArgumentMapping -import org.jetbrains.kotlin.fir.expressions.FirErrorAnnotationCall -import org.jetbrains.kotlin.fir.expressions.FirComparisonExpression -import org.jetbrains.kotlin.fir.expressions.FirTypeOperatorCall -import org.jetbrains.kotlin.fir.expressions.FirAssignmentOperatorStatement -import org.jetbrains.kotlin.fir.expressions.FirIncrementDecrementExpression -import org.jetbrains.kotlin.fir.expressions.FirEqualityOperatorCall -import org.jetbrains.kotlin.fir.expressions.FirWhenExpression -import org.jetbrains.kotlin.fir.expressions.FirWhenBranch -import org.jetbrains.kotlin.fir.expressions.FirContextReceiverArgumentListOwner -import org.jetbrains.kotlin.fir.expressions.FirCheckNotNullCall -import org.jetbrains.kotlin.fir.expressions.FirElvisExpression -import org.jetbrains.kotlin.fir.expressions.FirArrayLiteral -import org.jetbrains.kotlin.fir.expressions.FirAugmentedArraySetCall -import org.jetbrains.kotlin.fir.expressions.FirClassReferenceExpression -import org.jetbrains.kotlin.fir.expressions.FirErrorExpression -import org.jetbrains.kotlin.fir.declarations.FirErrorFunction -import org.jetbrains.kotlin.fir.declarations.FirErrorProperty -import org.jetbrains.kotlin.fir.declarations.FirErrorPrimaryConstructor -import org.jetbrains.kotlin.fir.declarations.FirDanglingModifierList -import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccessExpression -import org.jetbrains.kotlin.fir.expressions.FirQualifiedErrorAccessExpression -import org.jetbrains.kotlin.fir.expressions.FirPropertyAccessExpression -import org.jetbrains.kotlin.fir.expressions.FirFunctionCall -import org.jetbrains.kotlin.fir.expressions.FirIntegerLiteralOperatorCall -import org.jetbrains.kotlin.fir.expressions.FirImplicitInvokeCall -import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall -import org.jetbrains.kotlin.fir.expressions.FirMultiDelegatedConstructorCall -import org.jetbrains.kotlin.fir.expressions.FirComponentCall -import org.jetbrains.kotlin.fir.expressions.FirCallableReferenceAccess -import org.jetbrains.kotlin.fir.expressions.FirThisReceiverExpression -import org.jetbrains.kotlin.fir.expressions.FirInaccessibleReceiverExpression -import org.jetbrains.kotlin.fir.expressions.FirSmartCastExpression -import org.jetbrains.kotlin.fir.expressions.FirSafeCallExpression -import org.jetbrains.kotlin.fir.expressions.FirCheckedSafeCallSubject -import org.jetbrains.kotlin.fir.expressions.FirGetClassCall -import org.jetbrains.kotlin.fir.expressions.FirWrappedExpression -import org.jetbrains.kotlin.fir.expressions.FirWrappedArgumentExpression -import org.jetbrains.kotlin.fir.expressions.FirLambdaArgumentExpression -import org.jetbrains.kotlin.fir.expressions.FirSpreadArgumentExpression -import org.jetbrains.kotlin.fir.expressions.FirNamedArgumentExpression -import org.jetbrains.kotlin.fir.expressions.FirVarargArgumentsExpression -import org.jetbrains.kotlin.fir.expressions.FirResolvedQualifier -import org.jetbrains.kotlin.fir.expressions.FirErrorResolvedQualifier -import org.jetbrains.kotlin.fir.expressions.FirResolvedReifiedParameterReference -import org.jetbrains.kotlin.fir.expressions.FirReturnExpression -import org.jetbrains.kotlin.fir.expressions.FirStringConcatenationCall -import org.jetbrains.kotlin.fir.expressions.FirThrowExpression -import org.jetbrains.kotlin.fir.expressions.FirVariableAssignment -import org.jetbrains.kotlin.fir.expressions.FirWhenSubjectExpression -import org.jetbrains.kotlin.fir.expressions.FirDesugaredAssignmentValueReferenceExpression -import org.jetbrains.kotlin.fir.expressions.FirWrappedDelegateExpression -import org.jetbrains.kotlin.fir.expressions.FirEnumEntryDeserializedAccessExpression -import org.jetbrains.kotlin.fir.references.FirNamedReference -import org.jetbrains.kotlin.fir.references.FirNamedReferenceWithCandidateBase -import org.jetbrains.kotlin.fir.references.FirErrorNamedReference -import org.jetbrains.kotlin.fir.references.FirFromMissingDependenciesNamedReference -import org.jetbrains.kotlin.fir.references.FirSuperReference -import org.jetbrains.kotlin.fir.references.FirThisReference -import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference -import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference -import org.jetbrains.kotlin.fir.references.FirResolvedErrorReference -import org.jetbrains.kotlin.fir.references.FirDelegateFieldReference -import org.jetbrains.kotlin.fir.references.FirBackingFieldReference -import org.jetbrains.kotlin.fir.references.FirResolvedCallableReference -import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef -import org.jetbrains.kotlin.fir.types.FirErrorTypeRef -import org.jetbrains.kotlin.fir.types.FirTypeRefWithNullability -import org.jetbrains.kotlin.fir.types.FirUserTypeRef -import org.jetbrains.kotlin.fir.types.FirDynamicTypeRef -import org.jetbrains.kotlin.fir.types.FirFunctionTypeRef -import org.jetbrains.kotlin.fir.types.FirIntersectionTypeRef -import org.jetbrains.kotlin.fir.types.FirImplicitTypeRef -import org.jetbrains.kotlin.fir.contracts.FirContractElementDeclaration import org.jetbrains.kotlin.fir.contracts.FirEffectDeclaration -import org.jetbrains.kotlin.fir.contracts.FirContractDescription import org.jetbrains.kotlin.fir.contracts.FirLegacyRawContractDescription import org.jetbrains.kotlin.fir.contracts.FirRawContractDescription import org.jetbrains.kotlin.fir.contracts.FirResolvedContractDescription +import org.jetbrains.kotlin.fir.declarations.* +import org.jetbrains.kotlin.fir.expressions.* +import org.jetbrains.kotlin.fir.references.* +import org.jetbrains.kotlin.fir.types.* abstract class FirDefaultVisitor : FirVisitor() { override fun visitTypeRef(typeRef: FirTypeRef, data: D): R = visitAnnotationContainer(typeRef, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirDefaultVisitorVoid.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirDefaultVisitorVoid.kt index ee3d5b806ad..ff0134a13c9 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirDefaultVisitorVoid.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirDefaultVisitorVoid.kt @@ -8,162 +8,15 @@ package org.jetbrains.kotlin.fir.visitors -import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirAnnotationContainer -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.references.FirReference -import org.jetbrains.kotlin.fir.FirLabel -import org.jetbrains.kotlin.fir.expressions.FirResolvable import org.jetbrains.kotlin.fir.FirTargetElement -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirResolvedDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirControlFlowGraphOwner -import org.jetbrains.kotlin.fir.expressions.FirStatement -import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.expressions.FirLazyExpression -import org.jetbrains.kotlin.fir.declarations.FirContextReceiver -import org.jetbrains.kotlin.fir.FirElementWithResolveState -import org.jetbrains.kotlin.fir.FirFileAnnotationsContainer -import org.jetbrains.kotlin.fir.declarations.FirDeclaration -import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRefsOwner -import org.jetbrains.kotlin.fir.declarations.FirTypeParametersOwner -import org.jetbrains.kotlin.fir.declarations.FirMemberDeclaration -import org.jetbrains.kotlin.fir.declarations.FirAnonymousInitializer -import org.jetbrains.kotlin.fir.declarations.FirCallableDeclaration -import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef -import org.jetbrains.kotlin.fir.declarations.FirTypeParameter -import org.jetbrains.kotlin.fir.declarations.FirConstructedClassTypeParameterRef -import org.jetbrains.kotlin.fir.declarations.FirOuterClassTypeParameterRef -import org.jetbrains.kotlin.fir.declarations.FirVariable -import org.jetbrains.kotlin.fir.declarations.FirValueParameter -import org.jetbrains.kotlin.fir.declarations.FirReceiverParameter -import org.jetbrains.kotlin.fir.declarations.FirProperty -import org.jetbrains.kotlin.fir.declarations.FirField -import org.jetbrains.kotlin.fir.declarations.FirEnumEntry -import org.jetbrains.kotlin.fir.FirFunctionTypeParameter -import org.jetbrains.kotlin.fir.declarations.FirClassLikeDeclaration -import org.jetbrains.kotlin.fir.declarations.FirClass -import org.jetbrains.kotlin.fir.declarations.FirRegularClass -import org.jetbrains.kotlin.fir.declarations.FirTypeAlias -import org.jetbrains.kotlin.fir.declarations.FirFunction -import org.jetbrains.kotlin.fir.declarations.FirContractDescriptionOwner -import org.jetbrains.kotlin.fir.declarations.FirSimpleFunction -import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor -import org.jetbrains.kotlin.fir.declarations.FirBackingField -import org.jetbrains.kotlin.fir.declarations.FirConstructor -import org.jetbrains.kotlin.fir.declarations.FirFile -import org.jetbrains.kotlin.fir.declarations.FirScript -import org.jetbrains.kotlin.fir.declarations.FirCodeFragment -import org.jetbrains.kotlin.fir.FirPackageDirective -import org.jetbrains.kotlin.fir.declarations.FirAnonymousFunction -import org.jetbrains.kotlin.fir.expressions.FirAnonymousFunctionExpression -import org.jetbrains.kotlin.fir.declarations.FirAnonymousObject -import org.jetbrains.kotlin.fir.expressions.FirAnonymousObjectExpression -import org.jetbrains.kotlin.fir.diagnostics.FirDiagnosticHolder -import org.jetbrains.kotlin.fir.declarations.FirImport -import org.jetbrains.kotlin.fir.declarations.FirResolvedImport -import org.jetbrains.kotlin.fir.declarations.FirErrorImport -import org.jetbrains.kotlin.fir.expressions.FirLoop -import org.jetbrains.kotlin.fir.expressions.FirErrorLoop -import org.jetbrains.kotlin.fir.expressions.FirDoWhileLoop -import org.jetbrains.kotlin.fir.expressions.FirWhileLoop -import org.jetbrains.kotlin.fir.expressions.FirBlock -import org.jetbrains.kotlin.fir.expressions.FirLazyBlock -import org.jetbrains.kotlin.fir.expressions.FirBinaryLogicExpression -import org.jetbrains.kotlin.fir.expressions.FirJump -import org.jetbrains.kotlin.fir.expressions.FirLoopJump -import org.jetbrains.kotlin.fir.expressions.FirBreakExpression -import org.jetbrains.kotlin.fir.expressions.FirContinueExpression -import org.jetbrains.kotlin.fir.expressions.FirCatch -import org.jetbrains.kotlin.fir.expressions.FirTryExpression -import org.jetbrains.kotlin.fir.expressions.FirConstExpression -import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.types.FirStarProjection -import org.jetbrains.kotlin.fir.types.FirPlaceholderProjection -import org.jetbrains.kotlin.fir.types.FirTypeProjectionWithVariance -import org.jetbrains.kotlin.fir.expressions.FirArgumentList -import org.jetbrains.kotlin.fir.expressions.FirCall -import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall -import org.jetbrains.kotlin.fir.expressions.FirAnnotationArgumentMapping -import org.jetbrains.kotlin.fir.expressions.FirErrorAnnotationCall -import org.jetbrains.kotlin.fir.expressions.FirComparisonExpression -import org.jetbrains.kotlin.fir.expressions.FirTypeOperatorCall -import org.jetbrains.kotlin.fir.expressions.FirAssignmentOperatorStatement -import org.jetbrains.kotlin.fir.expressions.FirIncrementDecrementExpression -import org.jetbrains.kotlin.fir.expressions.FirEqualityOperatorCall -import org.jetbrains.kotlin.fir.expressions.FirWhenExpression -import org.jetbrains.kotlin.fir.expressions.FirWhenBranch -import org.jetbrains.kotlin.fir.expressions.FirContextReceiverArgumentListOwner -import org.jetbrains.kotlin.fir.expressions.FirCheckNotNullCall -import org.jetbrains.kotlin.fir.expressions.FirElvisExpression -import org.jetbrains.kotlin.fir.expressions.FirArrayLiteral -import org.jetbrains.kotlin.fir.expressions.FirAugmentedArraySetCall -import org.jetbrains.kotlin.fir.expressions.FirClassReferenceExpression -import org.jetbrains.kotlin.fir.expressions.FirErrorExpression -import org.jetbrains.kotlin.fir.declarations.FirErrorFunction -import org.jetbrains.kotlin.fir.declarations.FirErrorProperty -import org.jetbrains.kotlin.fir.declarations.FirErrorPrimaryConstructor -import org.jetbrains.kotlin.fir.declarations.FirDanglingModifierList -import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccessExpression -import org.jetbrains.kotlin.fir.expressions.FirQualifiedErrorAccessExpression -import org.jetbrains.kotlin.fir.expressions.FirPropertyAccessExpression -import org.jetbrains.kotlin.fir.expressions.FirFunctionCall -import org.jetbrains.kotlin.fir.expressions.FirIntegerLiteralOperatorCall -import org.jetbrains.kotlin.fir.expressions.FirImplicitInvokeCall -import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall -import org.jetbrains.kotlin.fir.expressions.FirMultiDelegatedConstructorCall -import org.jetbrains.kotlin.fir.expressions.FirComponentCall -import org.jetbrains.kotlin.fir.expressions.FirCallableReferenceAccess -import org.jetbrains.kotlin.fir.expressions.FirThisReceiverExpression -import org.jetbrains.kotlin.fir.expressions.FirInaccessibleReceiverExpression -import org.jetbrains.kotlin.fir.expressions.FirSmartCastExpression -import org.jetbrains.kotlin.fir.expressions.FirSafeCallExpression -import org.jetbrains.kotlin.fir.expressions.FirCheckedSafeCallSubject -import org.jetbrains.kotlin.fir.expressions.FirGetClassCall -import org.jetbrains.kotlin.fir.expressions.FirWrappedExpression -import org.jetbrains.kotlin.fir.expressions.FirWrappedArgumentExpression -import org.jetbrains.kotlin.fir.expressions.FirLambdaArgumentExpression -import org.jetbrains.kotlin.fir.expressions.FirSpreadArgumentExpression -import org.jetbrains.kotlin.fir.expressions.FirNamedArgumentExpression -import org.jetbrains.kotlin.fir.expressions.FirVarargArgumentsExpression -import org.jetbrains.kotlin.fir.expressions.FirResolvedQualifier -import org.jetbrains.kotlin.fir.expressions.FirErrorResolvedQualifier -import org.jetbrains.kotlin.fir.expressions.FirResolvedReifiedParameterReference -import org.jetbrains.kotlin.fir.expressions.FirReturnExpression -import org.jetbrains.kotlin.fir.expressions.FirStringConcatenationCall -import org.jetbrains.kotlin.fir.expressions.FirThrowExpression -import org.jetbrains.kotlin.fir.expressions.FirVariableAssignment -import org.jetbrains.kotlin.fir.expressions.FirWhenSubjectExpression -import org.jetbrains.kotlin.fir.expressions.FirDesugaredAssignmentValueReferenceExpression -import org.jetbrains.kotlin.fir.expressions.FirWrappedDelegateExpression -import org.jetbrains.kotlin.fir.expressions.FirEnumEntryDeserializedAccessExpression -import org.jetbrains.kotlin.fir.references.FirNamedReference -import org.jetbrains.kotlin.fir.references.FirNamedReferenceWithCandidateBase -import org.jetbrains.kotlin.fir.references.FirErrorNamedReference -import org.jetbrains.kotlin.fir.references.FirFromMissingDependenciesNamedReference -import org.jetbrains.kotlin.fir.references.FirSuperReference -import org.jetbrains.kotlin.fir.references.FirThisReference -import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference -import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference -import org.jetbrains.kotlin.fir.references.FirResolvedErrorReference -import org.jetbrains.kotlin.fir.references.FirDelegateFieldReference -import org.jetbrains.kotlin.fir.references.FirBackingFieldReference -import org.jetbrains.kotlin.fir.references.FirResolvedCallableReference -import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef -import org.jetbrains.kotlin.fir.types.FirErrorTypeRef -import org.jetbrains.kotlin.fir.types.FirTypeRefWithNullability -import org.jetbrains.kotlin.fir.types.FirUserTypeRef -import org.jetbrains.kotlin.fir.types.FirDynamicTypeRef -import org.jetbrains.kotlin.fir.types.FirFunctionTypeRef -import org.jetbrains.kotlin.fir.types.FirIntersectionTypeRef -import org.jetbrains.kotlin.fir.types.FirImplicitTypeRef -import org.jetbrains.kotlin.fir.contracts.FirContractElementDeclaration import org.jetbrains.kotlin.fir.contracts.FirEffectDeclaration -import org.jetbrains.kotlin.fir.contracts.FirContractDescription import org.jetbrains.kotlin.fir.contracts.FirLegacyRawContractDescription import org.jetbrains.kotlin.fir.contracts.FirRawContractDescription import org.jetbrains.kotlin.fir.contracts.FirResolvedContractDescription +import org.jetbrains.kotlin.fir.declarations.* +import org.jetbrains.kotlin.fir.expressions.* +import org.jetbrains.kotlin.fir.references.* +import org.jetbrains.kotlin.fir.types.* abstract class FirDefaultVisitorVoid : FirVisitorVoid() { override fun visitTypeRef(typeRef: FirTypeRef) = visitAnnotationContainer(typeRef) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirTransformer.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirTransformer.kt index 43b93bda4c8..ec7ca05baf9 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirTransformer.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirTransformer.kt @@ -8,162 +8,13 @@ package org.jetbrains.kotlin.fir.visitors -import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirAnnotationContainer -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.references.FirReference -import org.jetbrains.kotlin.fir.FirLabel -import org.jetbrains.kotlin.fir.expressions.FirResolvable -import org.jetbrains.kotlin.fir.FirTargetElement -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirResolvedDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirControlFlowGraphOwner -import org.jetbrains.kotlin.fir.expressions.FirStatement -import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.expressions.FirLazyExpression -import org.jetbrains.kotlin.fir.declarations.FirContextReceiver -import org.jetbrains.kotlin.fir.FirElementWithResolveState -import org.jetbrains.kotlin.fir.FirFileAnnotationsContainer -import org.jetbrains.kotlin.fir.declarations.FirDeclaration -import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRefsOwner -import org.jetbrains.kotlin.fir.declarations.FirTypeParametersOwner -import org.jetbrains.kotlin.fir.declarations.FirMemberDeclaration -import org.jetbrains.kotlin.fir.declarations.FirAnonymousInitializer -import org.jetbrains.kotlin.fir.declarations.FirCallableDeclaration -import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef -import org.jetbrains.kotlin.fir.declarations.FirTypeParameter -import org.jetbrains.kotlin.fir.declarations.FirConstructedClassTypeParameterRef -import org.jetbrains.kotlin.fir.declarations.FirOuterClassTypeParameterRef -import org.jetbrains.kotlin.fir.declarations.FirVariable -import org.jetbrains.kotlin.fir.declarations.FirValueParameter -import org.jetbrains.kotlin.fir.declarations.FirReceiverParameter -import org.jetbrains.kotlin.fir.declarations.FirProperty -import org.jetbrains.kotlin.fir.declarations.FirField -import org.jetbrains.kotlin.fir.declarations.FirEnumEntry -import org.jetbrains.kotlin.fir.FirFunctionTypeParameter -import org.jetbrains.kotlin.fir.declarations.FirClassLikeDeclaration -import org.jetbrains.kotlin.fir.declarations.FirClass -import org.jetbrains.kotlin.fir.declarations.FirRegularClass -import org.jetbrains.kotlin.fir.declarations.FirTypeAlias -import org.jetbrains.kotlin.fir.declarations.FirFunction -import org.jetbrains.kotlin.fir.declarations.FirContractDescriptionOwner -import org.jetbrains.kotlin.fir.declarations.FirSimpleFunction -import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor -import org.jetbrains.kotlin.fir.declarations.FirBackingField -import org.jetbrains.kotlin.fir.declarations.FirConstructor -import org.jetbrains.kotlin.fir.declarations.FirFile -import org.jetbrains.kotlin.fir.declarations.FirScript -import org.jetbrains.kotlin.fir.declarations.FirCodeFragment -import org.jetbrains.kotlin.fir.FirPackageDirective -import org.jetbrains.kotlin.fir.declarations.FirAnonymousFunction -import org.jetbrains.kotlin.fir.expressions.FirAnonymousFunctionExpression -import org.jetbrains.kotlin.fir.declarations.FirAnonymousObject -import org.jetbrains.kotlin.fir.expressions.FirAnonymousObjectExpression +import org.jetbrains.kotlin.fir.* +import org.jetbrains.kotlin.fir.contracts.* +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.diagnostics.FirDiagnosticHolder -import org.jetbrains.kotlin.fir.declarations.FirImport -import org.jetbrains.kotlin.fir.declarations.FirResolvedImport -import org.jetbrains.kotlin.fir.declarations.FirErrorImport -import org.jetbrains.kotlin.fir.expressions.FirLoop -import org.jetbrains.kotlin.fir.expressions.FirErrorLoop -import org.jetbrains.kotlin.fir.expressions.FirDoWhileLoop -import org.jetbrains.kotlin.fir.expressions.FirWhileLoop -import org.jetbrains.kotlin.fir.expressions.FirBlock -import org.jetbrains.kotlin.fir.expressions.FirLazyBlock -import org.jetbrains.kotlin.fir.expressions.FirBinaryLogicExpression -import org.jetbrains.kotlin.fir.expressions.FirJump -import org.jetbrains.kotlin.fir.expressions.FirLoopJump -import org.jetbrains.kotlin.fir.expressions.FirBreakExpression -import org.jetbrains.kotlin.fir.expressions.FirContinueExpression -import org.jetbrains.kotlin.fir.expressions.FirCatch -import org.jetbrains.kotlin.fir.expressions.FirTryExpression -import org.jetbrains.kotlin.fir.expressions.FirConstExpression -import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.types.FirStarProjection -import org.jetbrains.kotlin.fir.types.FirPlaceholderProjection -import org.jetbrains.kotlin.fir.types.FirTypeProjectionWithVariance -import org.jetbrains.kotlin.fir.expressions.FirArgumentList -import org.jetbrains.kotlin.fir.expressions.FirCall -import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall -import org.jetbrains.kotlin.fir.expressions.FirAnnotationArgumentMapping -import org.jetbrains.kotlin.fir.expressions.FirErrorAnnotationCall -import org.jetbrains.kotlin.fir.expressions.FirComparisonExpression -import org.jetbrains.kotlin.fir.expressions.FirTypeOperatorCall -import org.jetbrains.kotlin.fir.expressions.FirAssignmentOperatorStatement -import org.jetbrains.kotlin.fir.expressions.FirIncrementDecrementExpression -import org.jetbrains.kotlin.fir.expressions.FirEqualityOperatorCall -import org.jetbrains.kotlin.fir.expressions.FirWhenExpression -import org.jetbrains.kotlin.fir.expressions.FirWhenBranch -import org.jetbrains.kotlin.fir.expressions.FirContextReceiverArgumentListOwner -import org.jetbrains.kotlin.fir.expressions.FirCheckNotNullCall -import org.jetbrains.kotlin.fir.expressions.FirElvisExpression -import org.jetbrains.kotlin.fir.expressions.FirArrayLiteral -import org.jetbrains.kotlin.fir.expressions.FirAugmentedArraySetCall -import org.jetbrains.kotlin.fir.expressions.FirClassReferenceExpression -import org.jetbrains.kotlin.fir.expressions.FirErrorExpression -import org.jetbrains.kotlin.fir.declarations.FirErrorFunction -import org.jetbrains.kotlin.fir.declarations.FirErrorProperty -import org.jetbrains.kotlin.fir.declarations.FirErrorPrimaryConstructor -import org.jetbrains.kotlin.fir.declarations.FirDanglingModifierList -import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccessExpression -import org.jetbrains.kotlin.fir.expressions.FirQualifiedErrorAccessExpression -import org.jetbrains.kotlin.fir.expressions.FirPropertyAccessExpression -import org.jetbrains.kotlin.fir.expressions.FirFunctionCall -import org.jetbrains.kotlin.fir.expressions.FirIntegerLiteralOperatorCall -import org.jetbrains.kotlin.fir.expressions.FirImplicitInvokeCall -import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall -import org.jetbrains.kotlin.fir.expressions.FirMultiDelegatedConstructorCall -import org.jetbrains.kotlin.fir.expressions.FirComponentCall -import org.jetbrains.kotlin.fir.expressions.FirCallableReferenceAccess -import org.jetbrains.kotlin.fir.expressions.FirThisReceiverExpression -import org.jetbrains.kotlin.fir.expressions.FirInaccessibleReceiverExpression -import org.jetbrains.kotlin.fir.expressions.FirSmartCastExpression -import org.jetbrains.kotlin.fir.expressions.FirSafeCallExpression -import org.jetbrains.kotlin.fir.expressions.FirCheckedSafeCallSubject -import org.jetbrains.kotlin.fir.expressions.FirGetClassCall -import org.jetbrains.kotlin.fir.expressions.FirWrappedExpression -import org.jetbrains.kotlin.fir.expressions.FirWrappedArgumentExpression -import org.jetbrains.kotlin.fir.expressions.FirLambdaArgumentExpression -import org.jetbrains.kotlin.fir.expressions.FirSpreadArgumentExpression -import org.jetbrains.kotlin.fir.expressions.FirNamedArgumentExpression -import org.jetbrains.kotlin.fir.expressions.FirVarargArgumentsExpression -import org.jetbrains.kotlin.fir.expressions.FirResolvedQualifier -import org.jetbrains.kotlin.fir.expressions.FirErrorResolvedQualifier -import org.jetbrains.kotlin.fir.expressions.FirResolvedReifiedParameterReference -import org.jetbrains.kotlin.fir.expressions.FirReturnExpression -import org.jetbrains.kotlin.fir.expressions.FirStringConcatenationCall -import org.jetbrains.kotlin.fir.expressions.FirThrowExpression -import org.jetbrains.kotlin.fir.expressions.FirVariableAssignment -import org.jetbrains.kotlin.fir.expressions.FirWhenSubjectExpression -import org.jetbrains.kotlin.fir.expressions.FirDesugaredAssignmentValueReferenceExpression -import org.jetbrains.kotlin.fir.expressions.FirWrappedDelegateExpression -import org.jetbrains.kotlin.fir.expressions.FirEnumEntryDeserializedAccessExpression -import org.jetbrains.kotlin.fir.references.FirNamedReference -import org.jetbrains.kotlin.fir.references.FirNamedReferenceWithCandidateBase -import org.jetbrains.kotlin.fir.references.FirErrorNamedReference -import org.jetbrains.kotlin.fir.references.FirFromMissingDependenciesNamedReference -import org.jetbrains.kotlin.fir.references.FirSuperReference -import org.jetbrains.kotlin.fir.references.FirThisReference -import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference -import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference -import org.jetbrains.kotlin.fir.references.FirResolvedErrorReference -import org.jetbrains.kotlin.fir.references.FirDelegateFieldReference -import org.jetbrains.kotlin.fir.references.FirBackingFieldReference -import org.jetbrains.kotlin.fir.references.FirResolvedCallableReference -import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef -import org.jetbrains.kotlin.fir.types.FirErrorTypeRef -import org.jetbrains.kotlin.fir.types.FirTypeRefWithNullability -import org.jetbrains.kotlin.fir.types.FirUserTypeRef -import org.jetbrains.kotlin.fir.types.FirDynamicTypeRef -import org.jetbrains.kotlin.fir.types.FirFunctionTypeRef -import org.jetbrains.kotlin.fir.types.FirIntersectionTypeRef -import org.jetbrains.kotlin.fir.types.FirImplicitTypeRef -import org.jetbrains.kotlin.fir.contracts.FirContractElementDeclaration -import org.jetbrains.kotlin.fir.contracts.FirEffectDeclaration -import org.jetbrains.kotlin.fir.contracts.FirContractDescription -import org.jetbrains.kotlin.fir.contracts.FirLegacyRawContractDescription -import org.jetbrains.kotlin.fir.contracts.FirRawContractDescription -import org.jetbrains.kotlin.fir.contracts.FirResolvedContractDescription +import org.jetbrains.kotlin.fir.expressions.* +import org.jetbrains.kotlin.fir.references.* +import org.jetbrains.kotlin.fir.types.* abstract class FirTransformer : FirVisitor() { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirVisitor.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirVisitor.kt index 7d47cc248a4..eb4941bbe8c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirVisitor.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirVisitor.kt @@ -8,162 +8,13 @@ package org.jetbrains.kotlin.fir.visitors -import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirAnnotationContainer -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.references.FirReference -import org.jetbrains.kotlin.fir.FirLabel -import org.jetbrains.kotlin.fir.expressions.FirResolvable -import org.jetbrains.kotlin.fir.FirTargetElement -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirResolvedDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirControlFlowGraphOwner -import org.jetbrains.kotlin.fir.expressions.FirStatement -import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.expressions.FirLazyExpression -import org.jetbrains.kotlin.fir.declarations.FirContextReceiver -import org.jetbrains.kotlin.fir.FirElementWithResolveState -import org.jetbrains.kotlin.fir.FirFileAnnotationsContainer -import org.jetbrains.kotlin.fir.declarations.FirDeclaration -import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRefsOwner -import org.jetbrains.kotlin.fir.declarations.FirTypeParametersOwner -import org.jetbrains.kotlin.fir.declarations.FirMemberDeclaration -import org.jetbrains.kotlin.fir.declarations.FirAnonymousInitializer -import org.jetbrains.kotlin.fir.declarations.FirCallableDeclaration -import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef -import org.jetbrains.kotlin.fir.declarations.FirTypeParameter -import org.jetbrains.kotlin.fir.declarations.FirConstructedClassTypeParameterRef -import org.jetbrains.kotlin.fir.declarations.FirOuterClassTypeParameterRef -import org.jetbrains.kotlin.fir.declarations.FirVariable -import org.jetbrains.kotlin.fir.declarations.FirValueParameter -import org.jetbrains.kotlin.fir.declarations.FirReceiverParameter -import org.jetbrains.kotlin.fir.declarations.FirProperty -import org.jetbrains.kotlin.fir.declarations.FirField -import org.jetbrains.kotlin.fir.declarations.FirEnumEntry -import org.jetbrains.kotlin.fir.FirFunctionTypeParameter -import org.jetbrains.kotlin.fir.declarations.FirClassLikeDeclaration -import org.jetbrains.kotlin.fir.declarations.FirClass -import org.jetbrains.kotlin.fir.declarations.FirRegularClass -import org.jetbrains.kotlin.fir.declarations.FirTypeAlias -import org.jetbrains.kotlin.fir.declarations.FirFunction -import org.jetbrains.kotlin.fir.declarations.FirContractDescriptionOwner -import org.jetbrains.kotlin.fir.declarations.FirSimpleFunction -import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor -import org.jetbrains.kotlin.fir.declarations.FirBackingField -import org.jetbrains.kotlin.fir.declarations.FirConstructor -import org.jetbrains.kotlin.fir.declarations.FirFile -import org.jetbrains.kotlin.fir.declarations.FirScript -import org.jetbrains.kotlin.fir.declarations.FirCodeFragment -import org.jetbrains.kotlin.fir.FirPackageDirective -import org.jetbrains.kotlin.fir.declarations.FirAnonymousFunction -import org.jetbrains.kotlin.fir.expressions.FirAnonymousFunctionExpression -import org.jetbrains.kotlin.fir.declarations.FirAnonymousObject -import org.jetbrains.kotlin.fir.expressions.FirAnonymousObjectExpression +import org.jetbrains.kotlin.fir.* +import org.jetbrains.kotlin.fir.contracts.* +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.diagnostics.FirDiagnosticHolder -import org.jetbrains.kotlin.fir.declarations.FirImport -import org.jetbrains.kotlin.fir.declarations.FirResolvedImport -import org.jetbrains.kotlin.fir.declarations.FirErrorImport -import org.jetbrains.kotlin.fir.expressions.FirLoop -import org.jetbrains.kotlin.fir.expressions.FirErrorLoop -import org.jetbrains.kotlin.fir.expressions.FirDoWhileLoop -import org.jetbrains.kotlin.fir.expressions.FirWhileLoop -import org.jetbrains.kotlin.fir.expressions.FirBlock -import org.jetbrains.kotlin.fir.expressions.FirLazyBlock -import org.jetbrains.kotlin.fir.expressions.FirBinaryLogicExpression -import org.jetbrains.kotlin.fir.expressions.FirJump -import org.jetbrains.kotlin.fir.expressions.FirLoopJump -import org.jetbrains.kotlin.fir.expressions.FirBreakExpression -import org.jetbrains.kotlin.fir.expressions.FirContinueExpression -import org.jetbrains.kotlin.fir.expressions.FirCatch -import org.jetbrains.kotlin.fir.expressions.FirTryExpression -import org.jetbrains.kotlin.fir.expressions.FirConstExpression -import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.types.FirStarProjection -import org.jetbrains.kotlin.fir.types.FirPlaceholderProjection -import org.jetbrains.kotlin.fir.types.FirTypeProjectionWithVariance -import org.jetbrains.kotlin.fir.expressions.FirArgumentList -import org.jetbrains.kotlin.fir.expressions.FirCall -import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall -import org.jetbrains.kotlin.fir.expressions.FirAnnotationArgumentMapping -import org.jetbrains.kotlin.fir.expressions.FirErrorAnnotationCall -import org.jetbrains.kotlin.fir.expressions.FirComparisonExpression -import org.jetbrains.kotlin.fir.expressions.FirTypeOperatorCall -import org.jetbrains.kotlin.fir.expressions.FirAssignmentOperatorStatement -import org.jetbrains.kotlin.fir.expressions.FirIncrementDecrementExpression -import org.jetbrains.kotlin.fir.expressions.FirEqualityOperatorCall -import org.jetbrains.kotlin.fir.expressions.FirWhenExpression -import org.jetbrains.kotlin.fir.expressions.FirWhenBranch -import org.jetbrains.kotlin.fir.expressions.FirContextReceiverArgumentListOwner -import org.jetbrains.kotlin.fir.expressions.FirCheckNotNullCall -import org.jetbrains.kotlin.fir.expressions.FirElvisExpression -import org.jetbrains.kotlin.fir.expressions.FirArrayLiteral -import org.jetbrains.kotlin.fir.expressions.FirAugmentedArraySetCall -import org.jetbrains.kotlin.fir.expressions.FirClassReferenceExpression -import org.jetbrains.kotlin.fir.expressions.FirErrorExpression -import org.jetbrains.kotlin.fir.declarations.FirErrorFunction -import org.jetbrains.kotlin.fir.declarations.FirErrorProperty -import org.jetbrains.kotlin.fir.declarations.FirErrorPrimaryConstructor -import org.jetbrains.kotlin.fir.declarations.FirDanglingModifierList -import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccessExpression -import org.jetbrains.kotlin.fir.expressions.FirQualifiedErrorAccessExpression -import org.jetbrains.kotlin.fir.expressions.FirPropertyAccessExpression -import org.jetbrains.kotlin.fir.expressions.FirFunctionCall -import org.jetbrains.kotlin.fir.expressions.FirIntegerLiteralOperatorCall -import org.jetbrains.kotlin.fir.expressions.FirImplicitInvokeCall -import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall -import org.jetbrains.kotlin.fir.expressions.FirMultiDelegatedConstructorCall -import org.jetbrains.kotlin.fir.expressions.FirComponentCall -import org.jetbrains.kotlin.fir.expressions.FirCallableReferenceAccess -import org.jetbrains.kotlin.fir.expressions.FirThisReceiverExpression -import org.jetbrains.kotlin.fir.expressions.FirInaccessibleReceiverExpression -import org.jetbrains.kotlin.fir.expressions.FirSmartCastExpression -import org.jetbrains.kotlin.fir.expressions.FirSafeCallExpression -import org.jetbrains.kotlin.fir.expressions.FirCheckedSafeCallSubject -import org.jetbrains.kotlin.fir.expressions.FirGetClassCall -import org.jetbrains.kotlin.fir.expressions.FirWrappedExpression -import org.jetbrains.kotlin.fir.expressions.FirWrappedArgumentExpression -import org.jetbrains.kotlin.fir.expressions.FirLambdaArgumentExpression -import org.jetbrains.kotlin.fir.expressions.FirSpreadArgumentExpression -import org.jetbrains.kotlin.fir.expressions.FirNamedArgumentExpression -import org.jetbrains.kotlin.fir.expressions.FirVarargArgumentsExpression -import org.jetbrains.kotlin.fir.expressions.FirResolvedQualifier -import org.jetbrains.kotlin.fir.expressions.FirErrorResolvedQualifier -import org.jetbrains.kotlin.fir.expressions.FirResolvedReifiedParameterReference -import org.jetbrains.kotlin.fir.expressions.FirReturnExpression -import org.jetbrains.kotlin.fir.expressions.FirStringConcatenationCall -import org.jetbrains.kotlin.fir.expressions.FirThrowExpression -import org.jetbrains.kotlin.fir.expressions.FirVariableAssignment -import org.jetbrains.kotlin.fir.expressions.FirWhenSubjectExpression -import org.jetbrains.kotlin.fir.expressions.FirDesugaredAssignmentValueReferenceExpression -import org.jetbrains.kotlin.fir.expressions.FirWrappedDelegateExpression -import org.jetbrains.kotlin.fir.expressions.FirEnumEntryDeserializedAccessExpression -import org.jetbrains.kotlin.fir.references.FirNamedReference -import org.jetbrains.kotlin.fir.references.FirNamedReferenceWithCandidateBase -import org.jetbrains.kotlin.fir.references.FirErrorNamedReference -import org.jetbrains.kotlin.fir.references.FirFromMissingDependenciesNamedReference -import org.jetbrains.kotlin.fir.references.FirSuperReference -import org.jetbrains.kotlin.fir.references.FirThisReference -import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference -import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference -import org.jetbrains.kotlin.fir.references.FirResolvedErrorReference -import org.jetbrains.kotlin.fir.references.FirDelegateFieldReference -import org.jetbrains.kotlin.fir.references.FirBackingFieldReference -import org.jetbrains.kotlin.fir.references.FirResolvedCallableReference -import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef -import org.jetbrains.kotlin.fir.types.FirErrorTypeRef -import org.jetbrains.kotlin.fir.types.FirTypeRefWithNullability -import org.jetbrains.kotlin.fir.types.FirUserTypeRef -import org.jetbrains.kotlin.fir.types.FirDynamicTypeRef -import org.jetbrains.kotlin.fir.types.FirFunctionTypeRef -import org.jetbrains.kotlin.fir.types.FirIntersectionTypeRef -import org.jetbrains.kotlin.fir.types.FirImplicitTypeRef -import org.jetbrains.kotlin.fir.contracts.FirContractElementDeclaration -import org.jetbrains.kotlin.fir.contracts.FirEffectDeclaration -import org.jetbrains.kotlin.fir.contracts.FirContractDescription -import org.jetbrains.kotlin.fir.contracts.FirLegacyRawContractDescription -import org.jetbrains.kotlin.fir.contracts.FirRawContractDescription -import org.jetbrains.kotlin.fir.contracts.FirResolvedContractDescription +import org.jetbrains.kotlin.fir.expressions.* +import org.jetbrains.kotlin.fir.references.* +import org.jetbrains.kotlin.fir.types.* abstract class FirVisitor { abstract fun visitElement(element: FirElement, data: D): R diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirVisitorVoid.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirVisitorVoid.kt index 7dc1349e7c2..0c059395baa 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirVisitorVoid.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirVisitorVoid.kt @@ -8,162 +8,13 @@ package org.jetbrains.kotlin.fir.visitors -import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirAnnotationContainer -import org.jetbrains.kotlin.fir.types.FirTypeRef -import org.jetbrains.kotlin.fir.references.FirReference -import org.jetbrains.kotlin.fir.FirLabel -import org.jetbrains.kotlin.fir.expressions.FirResolvable -import org.jetbrains.kotlin.fir.FirTargetElement -import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirResolvedDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirControlFlowGraphOwner -import org.jetbrains.kotlin.fir.expressions.FirStatement -import org.jetbrains.kotlin.fir.expressions.FirExpression -import org.jetbrains.kotlin.fir.expressions.FirLazyExpression -import org.jetbrains.kotlin.fir.declarations.FirContextReceiver -import org.jetbrains.kotlin.fir.FirElementWithResolveState -import org.jetbrains.kotlin.fir.FirFileAnnotationsContainer -import org.jetbrains.kotlin.fir.declarations.FirDeclaration -import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRefsOwner -import org.jetbrains.kotlin.fir.declarations.FirTypeParametersOwner -import org.jetbrains.kotlin.fir.declarations.FirMemberDeclaration -import org.jetbrains.kotlin.fir.declarations.FirAnonymousInitializer -import org.jetbrains.kotlin.fir.declarations.FirCallableDeclaration -import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef -import org.jetbrains.kotlin.fir.declarations.FirTypeParameter -import org.jetbrains.kotlin.fir.declarations.FirConstructedClassTypeParameterRef -import org.jetbrains.kotlin.fir.declarations.FirOuterClassTypeParameterRef -import org.jetbrains.kotlin.fir.declarations.FirVariable -import org.jetbrains.kotlin.fir.declarations.FirValueParameter -import org.jetbrains.kotlin.fir.declarations.FirReceiverParameter -import org.jetbrains.kotlin.fir.declarations.FirProperty -import org.jetbrains.kotlin.fir.declarations.FirField -import org.jetbrains.kotlin.fir.declarations.FirEnumEntry -import org.jetbrains.kotlin.fir.FirFunctionTypeParameter -import org.jetbrains.kotlin.fir.declarations.FirClassLikeDeclaration -import org.jetbrains.kotlin.fir.declarations.FirClass -import org.jetbrains.kotlin.fir.declarations.FirRegularClass -import org.jetbrains.kotlin.fir.declarations.FirTypeAlias -import org.jetbrains.kotlin.fir.declarations.FirFunction -import org.jetbrains.kotlin.fir.declarations.FirContractDescriptionOwner -import org.jetbrains.kotlin.fir.declarations.FirSimpleFunction -import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor -import org.jetbrains.kotlin.fir.declarations.FirBackingField -import org.jetbrains.kotlin.fir.declarations.FirConstructor -import org.jetbrains.kotlin.fir.declarations.FirFile -import org.jetbrains.kotlin.fir.declarations.FirScript -import org.jetbrains.kotlin.fir.declarations.FirCodeFragment -import org.jetbrains.kotlin.fir.FirPackageDirective -import org.jetbrains.kotlin.fir.declarations.FirAnonymousFunction -import org.jetbrains.kotlin.fir.expressions.FirAnonymousFunctionExpression -import org.jetbrains.kotlin.fir.declarations.FirAnonymousObject -import org.jetbrains.kotlin.fir.expressions.FirAnonymousObjectExpression +import org.jetbrains.kotlin.fir.* +import org.jetbrains.kotlin.fir.contracts.* +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.diagnostics.FirDiagnosticHolder -import org.jetbrains.kotlin.fir.declarations.FirImport -import org.jetbrains.kotlin.fir.declarations.FirResolvedImport -import org.jetbrains.kotlin.fir.declarations.FirErrorImport -import org.jetbrains.kotlin.fir.expressions.FirLoop -import org.jetbrains.kotlin.fir.expressions.FirErrorLoop -import org.jetbrains.kotlin.fir.expressions.FirDoWhileLoop -import org.jetbrains.kotlin.fir.expressions.FirWhileLoop -import org.jetbrains.kotlin.fir.expressions.FirBlock -import org.jetbrains.kotlin.fir.expressions.FirLazyBlock -import org.jetbrains.kotlin.fir.expressions.FirBinaryLogicExpression -import org.jetbrains.kotlin.fir.expressions.FirJump -import org.jetbrains.kotlin.fir.expressions.FirLoopJump -import org.jetbrains.kotlin.fir.expressions.FirBreakExpression -import org.jetbrains.kotlin.fir.expressions.FirContinueExpression -import org.jetbrains.kotlin.fir.expressions.FirCatch -import org.jetbrains.kotlin.fir.expressions.FirTryExpression -import org.jetbrains.kotlin.fir.expressions.FirConstExpression -import org.jetbrains.kotlin.fir.types.FirTypeProjection -import org.jetbrains.kotlin.fir.types.FirStarProjection -import org.jetbrains.kotlin.fir.types.FirPlaceholderProjection -import org.jetbrains.kotlin.fir.types.FirTypeProjectionWithVariance -import org.jetbrains.kotlin.fir.expressions.FirArgumentList -import org.jetbrains.kotlin.fir.expressions.FirCall -import org.jetbrains.kotlin.fir.expressions.FirAnnotation -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall -import org.jetbrains.kotlin.fir.expressions.FirAnnotationArgumentMapping -import org.jetbrains.kotlin.fir.expressions.FirErrorAnnotationCall -import org.jetbrains.kotlin.fir.expressions.FirComparisonExpression -import org.jetbrains.kotlin.fir.expressions.FirTypeOperatorCall -import org.jetbrains.kotlin.fir.expressions.FirAssignmentOperatorStatement -import org.jetbrains.kotlin.fir.expressions.FirIncrementDecrementExpression -import org.jetbrains.kotlin.fir.expressions.FirEqualityOperatorCall -import org.jetbrains.kotlin.fir.expressions.FirWhenExpression -import org.jetbrains.kotlin.fir.expressions.FirWhenBranch -import org.jetbrains.kotlin.fir.expressions.FirContextReceiverArgumentListOwner -import org.jetbrains.kotlin.fir.expressions.FirCheckNotNullCall -import org.jetbrains.kotlin.fir.expressions.FirElvisExpression -import org.jetbrains.kotlin.fir.expressions.FirArrayLiteral -import org.jetbrains.kotlin.fir.expressions.FirAugmentedArraySetCall -import org.jetbrains.kotlin.fir.expressions.FirClassReferenceExpression -import org.jetbrains.kotlin.fir.expressions.FirErrorExpression -import org.jetbrains.kotlin.fir.declarations.FirErrorFunction -import org.jetbrains.kotlin.fir.declarations.FirErrorProperty -import org.jetbrains.kotlin.fir.declarations.FirErrorPrimaryConstructor -import org.jetbrains.kotlin.fir.declarations.FirDanglingModifierList -import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccessExpression -import org.jetbrains.kotlin.fir.expressions.FirQualifiedErrorAccessExpression -import org.jetbrains.kotlin.fir.expressions.FirPropertyAccessExpression -import org.jetbrains.kotlin.fir.expressions.FirFunctionCall -import org.jetbrains.kotlin.fir.expressions.FirIntegerLiteralOperatorCall -import org.jetbrains.kotlin.fir.expressions.FirImplicitInvokeCall -import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall -import org.jetbrains.kotlin.fir.expressions.FirMultiDelegatedConstructorCall -import org.jetbrains.kotlin.fir.expressions.FirComponentCall -import org.jetbrains.kotlin.fir.expressions.FirCallableReferenceAccess -import org.jetbrains.kotlin.fir.expressions.FirThisReceiverExpression -import org.jetbrains.kotlin.fir.expressions.FirInaccessibleReceiverExpression -import org.jetbrains.kotlin.fir.expressions.FirSmartCastExpression -import org.jetbrains.kotlin.fir.expressions.FirSafeCallExpression -import org.jetbrains.kotlin.fir.expressions.FirCheckedSafeCallSubject -import org.jetbrains.kotlin.fir.expressions.FirGetClassCall -import org.jetbrains.kotlin.fir.expressions.FirWrappedExpression -import org.jetbrains.kotlin.fir.expressions.FirWrappedArgumentExpression -import org.jetbrains.kotlin.fir.expressions.FirLambdaArgumentExpression -import org.jetbrains.kotlin.fir.expressions.FirSpreadArgumentExpression -import org.jetbrains.kotlin.fir.expressions.FirNamedArgumentExpression -import org.jetbrains.kotlin.fir.expressions.FirVarargArgumentsExpression -import org.jetbrains.kotlin.fir.expressions.FirResolvedQualifier -import org.jetbrains.kotlin.fir.expressions.FirErrorResolvedQualifier -import org.jetbrains.kotlin.fir.expressions.FirResolvedReifiedParameterReference -import org.jetbrains.kotlin.fir.expressions.FirReturnExpression -import org.jetbrains.kotlin.fir.expressions.FirStringConcatenationCall -import org.jetbrains.kotlin.fir.expressions.FirThrowExpression -import org.jetbrains.kotlin.fir.expressions.FirVariableAssignment -import org.jetbrains.kotlin.fir.expressions.FirWhenSubjectExpression -import org.jetbrains.kotlin.fir.expressions.FirDesugaredAssignmentValueReferenceExpression -import org.jetbrains.kotlin.fir.expressions.FirWrappedDelegateExpression -import org.jetbrains.kotlin.fir.expressions.FirEnumEntryDeserializedAccessExpression -import org.jetbrains.kotlin.fir.references.FirNamedReference -import org.jetbrains.kotlin.fir.references.FirNamedReferenceWithCandidateBase -import org.jetbrains.kotlin.fir.references.FirErrorNamedReference -import org.jetbrains.kotlin.fir.references.FirFromMissingDependenciesNamedReference -import org.jetbrains.kotlin.fir.references.FirSuperReference -import org.jetbrains.kotlin.fir.references.FirThisReference -import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference -import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference -import org.jetbrains.kotlin.fir.references.FirResolvedErrorReference -import org.jetbrains.kotlin.fir.references.FirDelegateFieldReference -import org.jetbrains.kotlin.fir.references.FirBackingFieldReference -import org.jetbrains.kotlin.fir.references.FirResolvedCallableReference -import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef -import org.jetbrains.kotlin.fir.types.FirErrorTypeRef -import org.jetbrains.kotlin.fir.types.FirTypeRefWithNullability -import org.jetbrains.kotlin.fir.types.FirUserTypeRef -import org.jetbrains.kotlin.fir.types.FirDynamicTypeRef -import org.jetbrains.kotlin.fir.types.FirFunctionTypeRef -import org.jetbrains.kotlin.fir.types.FirIntersectionTypeRef -import org.jetbrains.kotlin.fir.types.FirImplicitTypeRef -import org.jetbrains.kotlin.fir.contracts.FirContractElementDeclaration -import org.jetbrains.kotlin.fir.contracts.FirEffectDeclaration -import org.jetbrains.kotlin.fir.contracts.FirContractDescription -import org.jetbrains.kotlin.fir.contracts.FirLegacyRawContractDescription -import org.jetbrains.kotlin.fir.contracts.FirRawContractDescription -import org.jetbrains.kotlin.fir.contracts.FirResolvedContractDescription +import org.jetbrains.kotlin.fir.expressions.* +import org.jetbrains.kotlin.fir.references.* +import org.jetbrains.kotlin.fir.types.* abstract class FirVisitorVoid : FirVisitor() { abstract fun visitElement(element: FirElement) diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/BuilderConfigurator.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/BuilderConfigurator.kt index b13212c34be..6c2de9fadd7 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/BuilderConfigurator.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/BuilderConfigurator.kt @@ -447,7 +447,7 @@ object BuilderConfigurator : AbstractBuilderConfigurator(FirTree field = "attributes", fieldPredicate = { it.typeRef == declarationAttributesType } ) { - default(it, "${declarationAttributesType.type}()") + default(it, "${declarationAttributesType.typeName}()") } configureFieldInAllLeafBuilders( diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/ImplementationConfigurator.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/ImplementationConfigurator.kt index 1e4bf53fe71..ac1a5319aff 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/ImplementationConfigurator.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/ImplementationConfigurator.kt @@ -632,7 +632,7 @@ object ImplementationConfigurator : AbstractFirTreeImplementationConfigurator() configureFieldInAllImplementations( "status", - implementationPredicate = { it.type in implementationsWithoutStatusAndTypeParameters } + implementationPredicate = { it.typeName in implementationsWithoutStatusAndTypeParameters } ) { default(it, "FirResolvedDeclarationStatusImpl.DEFAULT_STATUS_FOR_STATUSLESS_DECLARATIONS") useTypes(resolvedDeclarationStatusImplType) @@ -640,7 +640,7 @@ object ImplementationConfigurator : AbstractFirTreeImplementationConfigurator() configureFieldInAllImplementations( "typeParameters", - implementationPredicate = { it.type in implementationsWithoutStatusAndTypeParameters } + implementationPredicate = { it.typeName in implementationsWithoutStatusAndTypeParameters } ) { defaultEmptyList(it) useTypes(resolvedDeclarationStatusImplType) @@ -650,7 +650,7 @@ object ImplementationConfigurator : AbstractFirTreeImplementationConfigurator() private fun configureAllImplementations() { configureFieldInAllImplementations( field = "controlFlowGraphReference", - implementationPredicate = { it.type != "FirAnonymousFunctionImpl" } + implementationPredicate = { it.typeName != "FirAnonymousFunctionImpl" } ) { defaultNull(it) } @@ -682,7 +682,7 @@ object ImplementationConfigurator : AbstractFirTreeImplementationConfigurator() ) configureFieldInAllImplementations( field = "typeRef", - implementationPredicate = { it.type !in implementationWithConfigurableTypeRef }, + implementationPredicate = { it.typeName !in implementationWithConfigurableTypeRef }, fieldPredicate = { it.defaultValueInImplementation == null } ) { default(it, "FirImplicitTypeRefImplWithoutSource") @@ -691,7 +691,7 @@ object ImplementationConfigurator : AbstractFirTreeImplementationConfigurator() configureFieldInAllImplementations( field = "lValueTypeRef", - implementationPredicate = { it.type in "FirVariableAssignmentImpl" }, + implementationPredicate = { it.typeName in "FirVariableAssignmentImpl" }, fieldPredicate = { it.defaultValueInImplementation == null } ) { default(it, "FirImplicitTypeRefImplWithoutSource") 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 04f7195d63a..36d4c66a844 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 @@ -50,7 +50,7 @@ object NodeConfigurator : AbstractFieldConfigurator(FirTreeBuild } typeParameterRef.configure { - +symbol(typeParameterSymbolType.type) + +symbol(typeParameterSymbolType.typeName) } typeParametersOwner.configure { @@ -85,7 +85,7 @@ object NodeConfigurator : AbstractFieldConfigurator(FirTreeBuild isMutable = true; isVolatile = true; isFinal = true; isLateinit = true customInitializationCall = "resolvePhase.asResolveState()" arbitraryImportables += phaseAsResolveStateExtentionImport - optInAnnotation = resolveStateAccessImport + optInAnnotation = resolveStateAccessAnnotation } +field("moduleData", firModuleDataType) @@ -137,7 +137,7 @@ object NodeConfigurator : AbstractFieldConfigurator(FirTreeBuild expression.configure { +field("coneTypeOrNull", coneKotlinTypeType, nullable = true, withReplace = true).apply { - optInAnnotation = unresolvedExpressionTypeAccessImport + optInAnnotation = unresolvedExpressionTypeAccessAnnotation } +annotations } 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 eba389108de..94e68cc426d 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 @@ -115,3 +115,14 @@ val errorTypeRefImplType = type("fir.types.impl", "FirErrorTypeRefImpl") val annotationResolvePhaseType = generatedType("expressions", "FirAnnotationResolvePhase") val typeRefMarkerType = type("mpp", "TypeRefMarker") + +val firVisitorType = type("fir.visitors", "FirVisitor", kind = TypeKind.Class) +val firVisitorVoidType = type("fir.visitors", "FirVisitorVoid", kind = TypeKind.Class) +val firDefaultVisitorType = type("fir.visitors", "FirDefaultVisitor", kind = TypeKind.Class) +val firDefaultVisitorVoidType = type("fir.visitors", "FirDefaultVisitorVoid", kind = TypeKind.Class) +val firTransformerType = type("fir.visitors", "FirTransformer", kind = TypeKind.Class) + +val resolveStateAccessAnnotation = type("fir.declarations", "ResolveStateAccess", kind = TypeKind.Class) +val unresolvedExpressionTypeAccessAnnotation = type("fir.expressions", "UnresolvedExpressionTypeAccess", kind = TypeKind.Class) +val firBuilderDslAnnotation = type("fir.builder", "FirBuilderDsl", kind = TypeKind.Class) +val experimentalContractsAnnotation = type("kotlin.contracts", "ExperimentalContracts", exactPackage = true, kind = TypeKind.Class) diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/context/AbstractBuilderConfigurator.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/context/AbstractBuilderConfigurator.kt index e7465c2b981..e5e6c7f1738 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/context/AbstractBuilderConfigurator.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/context/AbstractBuilderConfigurator.kt @@ -153,18 +153,18 @@ abstract class AbstractBuilderConfigurator(val firTr val message = buildString { appendLine("${this@extractImplementation} has multiple implementations:") for (implementation in allImplementations) { - appendLine(" - ${implementation.type}") + appendLine(" - ${implementation.typeName}") } appendLine("Please specify implementation is needed") } throw IllegalArgumentException(message) } } else { - allImplementations.firstOrNull { it.type == type } ?: this@AbstractBuilderConfigurator.run { + allImplementations.firstOrNull { it.typeName == type } ?: this@AbstractBuilderConfigurator.run { val message = buildString { appendLine("${this@extractImplementation} has not implementation $type. Existing implementations:") for (implementation in allImplementations) { - appendLine(" - ${implementation.type}") + appendLine(" - ${implementation.typeName}") } appendLine("Please specify implementation is needed") } diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/importables.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/importables.kt index 234790f6d26..4d67f90bbcd 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/importables.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/importables.kt @@ -5,11 +5,11 @@ package org.jetbrains.kotlin.fir.tree.generator +import org.jetbrains.kotlin.fir.tree.generator.printer.VISITOR_PACKAGE import org.jetbrains.kotlin.generators.tree.ArbitraryImportable val phaseAsResolveStateExtentionImport = ArbitraryImportable("org.jetbrains.kotlin.fir.declarations", "asResolveState") val resolvePhaseExtensionImport = ArbitraryImportable("org.jetbrains.kotlin.fir.declarations", "resolvePhase") -val resolveStateAccessImport = ArbitraryImportable("org.jetbrains.kotlin.fir.declarations", "ResolveStateAccess") val resolvedDeclarationStatusImport = ArbitraryImportable("org.jetbrains.kotlin.fir.declarations.impl", "FirResolvedDeclarationStatusImpl") val buildResolvedTypeRefImport = ArbitraryImportable("org.jetbrains.kotlin.fir.types.builder", "buildResolvedTypeRef") @@ -21,4 +21,5 @@ val coneTypeOrNullImport = ArbitraryImportable("org.jetbrains.kotlin.fir.types", val fakeSourceElementKindImport = ArbitraryImportable("org.jetbrains.kotlin", "KtFakeSourceElementKind") val fakeElementImport = ArbitraryImportable("org.jetbrains.kotlin", "fakeElement") -val unresolvedExpressionTypeAccessImport = ArbitraryImportable("org.jetbrains.kotlin.fir.expressions","UnresolvedExpressionTypeAccess") +val transformInPlaceImport = ArbitraryImportable(VISITOR_PACKAGE, "transformInplace") +val toMutableOrEmptyImport = ArbitraryImportable("org.jetbrains.kotlin.fir.builder", "toMutableOrEmpty") diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/model/Builder.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/model/Builder.kt index 2c441617af7..2d427f5c750 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/model/Builder.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/model/Builder.kt @@ -5,13 +5,11 @@ package org.jetbrains.kotlin.fir.tree.generator.model -import org.jetbrains.kotlin.generators.tree.FieldContainer -import org.jetbrains.kotlin.generators.tree.Importable -import org.jetbrains.kotlin.generators.tree.printer.generics +import org.jetbrains.kotlin.generators.tree.* private const val DEFAULT_BUILDER_PACKAGE = "org.jetbrains.kotlin.fir.tree.builder" -sealed class Builder : FieldContainer, Importable { +sealed class Builder : FieldContainer, TypeRef, Importable { val parents: MutableList = mutableListOf() val usedTypes: MutableList = mutableListOf() abstract override val allFields: List @@ -21,7 +19,7 @@ sealed class Builder : FieldContainer, Importable { override fun get(fieldName: String): FieldWithDefault { return allFields.firstOrNull { it.name == fieldName } - ?: throw IllegalArgumentException("Builder $type doesn't contains field $fieldName") + ?: throw IllegalArgumentException("Builder $typeName doesn't contains field $fieldName") } private val fieldsFromParentIndex: Map by lazy { @@ -33,18 +31,23 @@ sealed class Builder : FieldContainer, Importable { } fun isFromParent(field: Field): Boolean = fieldsFromParentIndex.getValue(field.name) + + override fun substitute(map: TypeParameterSubstitutionMap) = this } class LeafBuilder(val implementation: Implementation) : Builder() { - override val type: String + override val typeName: String get() = if (implementation.name != null) { "${implementation.name}Builder" } else { - "${implementation.element.type}Builder" + "${implementation.element.typeName}Builder" } - override val typeWithArguments: String - get() = type + implementation.element.generics + context(ImportCollector) + override fun renderTo(appendable: Appendable) { + addImport(this) + appendable.append(typeName) + } override val allFields: List by lazy { implementation.fieldsWithoutDefault } @@ -59,7 +62,7 @@ class LeafBuilder(val implementation: Implementation) : Builder() { var wantsCopy: Boolean = false } -class IntermediateBuilder(override val type: String) : Builder() { +class IntermediateBuilder(override val typeName: String) : Builder() { val fields: MutableList = mutableListOf() var materializedElement: Element? = null @@ -73,6 +76,9 @@ class IntermediateBuilder(override val type: String) : Builder() { override val uselessFields: List = emptyList() override var packageName: String = DEFAULT_BUILDER_PACKAGE - override val typeWithArguments: String - get() = type + context(ImportCollector) + override fun renderTo(appendable: Appendable) { + addImport(this) + appendable.append(typeName) + } } diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/model/Element.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/model/Element.kt index 630d4e19874..eda9e53dd69 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/model/Element.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/model/Element.kt @@ -33,9 +33,9 @@ class Element(override val name: String, override val propertyName: String, kind override var kDoc: String? = null override val fields = mutableSetOf() - override val type: String = "Fir$name" + override val typeName: String = "Fir$name" + override val packageName: String = BASE_PACKAGE + kind.packageName.let { if (it.isBlank()) it else "." + it } - override val fullQualifiedName: String get() = super.fullQualifiedName!! override val elementParents = mutableListOf() @@ -158,7 +158,7 @@ class Element(override val name: String, override val propertyName: String, kind } override fun toString(): String { - return typeWithArguments + return with(ImportCollector("")) { render() } } enum class Kind(val packageName: String) { diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/model/ElementUtils.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/model/ElementUtils.kt index c60d50a08ef..1b2e186ca8c 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/model/ElementUtils.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/model/ElementUtils.kt @@ -13,8 +13,8 @@ fun field(name: String, type: TypeRefWithNullability, nullable: Boolean = false, return SimpleField(name, type.copy(nullable), withReplace) } -fun field(type: TypeRefWithNullability, nullable: Boolean = false, withReplace: Boolean = false): Field { - return SimpleField(type.type.replaceFirstChar(Char::lowercaseChar), type.copy(nullable), withReplace) +fun field(type: ClassRef<*>, nullable: Boolean = false, withReplace: Boolean = false): Field { + return SimpleField(type.simpleName.replaceFirstChar(Char::lowercaseChar), type.copy(nullable), withReplace) } fun booleanField(name: String, withReplace: Boolean = false): Field { diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/model/Field.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/model/Field.kt index 0f7cf04d170..ecb34cfdf62 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/model/Field.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/model/Field.kt @@ -5,7 +5,6 @@ package org.jetbrains.kotlin.fir.tree.generator.model -import org.jetbrains.kotlin.fir.tree.generator.printer.generics import org.jetbrains.kotlin.generators.tree.* import org.jetbrains.kotlin.generators.tree.ElementOrRef as GenericElementOrRef @@ -104,7 +103,7 @@ class FieldWithDefault(val origin: Field) : Field() { get() = origin.customInitializationCall set(_) {} - override var optInAnnotation: ArbitraryImportable? + override var optInAnnotation: ClassRef<*>? get() = origin.optInAnnotation set(_) {} diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/model/Implementation.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/model/Implementation.kt index 52784c78dc1..20ed9f63c02 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/model/Implementation.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/model/Implementation.kt @@ -5,18 +5,13 @@ package org.jetbrains.kotlin.fir.tree.generator.model -import org.jetbrains.kotlin.fir.tree.generator.printer.generics import org.jetbrains.kotlin.generators.tree.* -import org.jetbrains.kotlin.generators.tree.printer.generics class ImplementationWithArg( val implementation: Implementation, val argument: Importable? ) : FieldContainer by implementation, ImplementationKindOwner by implementation { val element: Element get() = implementation.element - - override val typeWithArguments: String - get() = type + generics } class Implementation(val element: Element, val name: String?) : FieldContainer, ImplementationKindOwner { @@ -25,7 +20,8 @@ class Implementation(val element: Element, val name: String?) : FieldContainer, override val allParents: List get() = listOf(element) + parents val isDefault = name == null - override val type = name ?: element.type + "Impl" + override val typeName = name ?: (element.typeName + "Impl") + override val allFields = element.allFields.toMutableList().mapTo(mutableListOf()) { FieldWithDefault(it) } @@ -42,12 +38,19 @@ class Implementation(val element: Element, val name: String?) : FieldContainer, } } - override val typeWithArguments: String - get() = type + element.generics + context(ImportCollector) + override fun renderTo(appendable: Appendable) { + addImport(this) + appendable.append(this.typeName) + if (element.params.isNotEmpty()) { + element.params.joinTo(appendable, prefix = "<", postfix = ">") { it.name } + } + } + + override fun substitute(map: TypeParameterSubstitutionMap) = this override val packageName = element.packageName + ".impl" val usedTypes = mutableListOf() - val arbitraryImportables = mutableListOf() var isPublic = false var requiresOptIn = false diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/builder.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/builder.kt index 5ec871b09ca..7c46bdb0ba8 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/builder.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/builder.kt @@ -5,32 +5,38 @@ package org.jetbrains.kotlin.fir.tree.generator.printer -import org.jetbrains.kotlin.fir.tree.generator.declarationAttributesType +import org.jetbrains.kotlin.fir.tree.generator.* import org.jetbrains.kotlin.fir.tree.generator.model.* +import org.jetbrains.kotlin.generators.tree.ImportCollector import org.jetbrains.kotlin.generators.tree.StandardTypes import org.jetbrains.kotlin.generators.tree.printer.GeneratedFile import org.jetbrains.kotlin.generators.tree.printer.printGeneratedType +import org.jetbrains.kotlin.generators.tree.render import org.jetbrains.kotlin.utils.SmartPrinter import org.jetbrains.kotlin.utils.withIndent import java.io.File fun Builder.generateCode(generationPath: File): GeneratedFile = - printGeneratedType(generationPath, TREE_GENERATOR_README, packageName, type, fileSuppressions = listOf("DuplicatedCode", "unused")) { - val imports = collectImports() - imports.forEach { println("import $it") } - if (imports.isNotEmpty()) { - println() - } + printGeneratedType( + generationPath, + TREE_GENERATOR_README, + packageName, + typeName, + fileSuppressions = listOf("DuplicatedCode", "unused"), + ) { + println() + addAllImports(usedTypes) printBuilder(this@generateCode) } +context(ImportCollector) private fun SmartPrinter.printBuilder(builder: Builder) { if (builder is LeafBuilder && builder.allFields.isEmpty()) { printDslBuildFunction(builder, false) return } - println("@FirBuilderDsl") + println("@${firBuilderDslAnnotation.render()}") when (builder) { is IntermediateBuilder -> print("interface ") is LeafBuilder -> { @@ -40,9 +46,9 @@ private fun SmartPrinter.printBuilder(builder: Builder) { print("class ") } } - print(builder.typeWithArguments) + print(builder.render()) if (builder.parents.isNotEmpty()) { - print(builder.parents.joinToString(separator = ", ", prefix = " : ") { it.type }) + print(builder.parents.joinToString(separator = ", ", prefix = " : ") { it.render() }) } var hasRequiredFields = false println(" {") @@ -58,11 +64,11 @@ private fun SmartPrinter.printBuilder(builder: Builder) { println() } val buildType = when (builder) { - is LeafBuilder -> builder.implementation.element.typeWithArguments - is IntermediateBuilder -> builder.materializedElement!!.typeWithArguments.replace(Regex("<.>"), "<*>") + is LeafBuilder -> builder.implementation.element.render() + is IntermediateBuilder -> builder.materializedElement!!.withStarArgs().render() } if (builder is LeafBuilder && builder.implementation.isPublic) { - println("@OptIn(FirImplementationDetail::class)") + println("@OptIn(${firImplementationDetailType.render()}::class)") } if (builder.parents.isNotEmpty()) { print("override ") @@ -71,13 +77,16 @@ private fun SmartPrinter.printBuilder(builder: Builder) { if (builder is LeafBuilder) { println(" {") withIndent { - println("return ${builder.implementation.type}(") + println("return ${builder.implementation.render()}(") withIndent { for (field in builder.allFields) { if (field.invisibleField) continue val name = field.name print(name) - if (field.isMutableOrEmpty) print(".toMutableOrEmpty()") + if (field.isMutableOrEmpty) { + addImport(toMutableOrEmptyImport) + print(".toMutableOrEmpty()") + } println(",") } } @@ -132,15 +141,17 @@ private fun FieldWithDefault.needBackingField(fieldIsUseless: Boolean) = private fun FieldWithDefault.needNotNullDelegate(fieldIsUseless: Boolean) = needBackingField(fieldIsUseless) && (typeRef == StandardTypes.boolean || typeRef == StandardTypes.int) - -private fun SmartPrinter.printFieldInBuilder(field: FieldWithDefault, builder: Builder, fieldIsUseless: Boolean): Pair { +context(ImportCollector) +private fun SmartPrinter.printFieldInBuilder( + field: FieldWithDefault, + builder: Builder, + fieldIsUseless: Boolean, +): Pair { if (field.withGetter && !fieldIsUseless || field.invisibleField) return false to false if (field.origin is FieldList) { printFieldListInBuilder(field.origin, builder, fieldIsUseless) return true to false } - val name = field.name - val type = field.typeRef.typeWithArguments val defaultValue = if (fieldIsUseless) field.defaultValueInImplementation.also { requireNotNull(it) } else @@ -148,7 +159,7 @@ private fun SmartPrinter.printFieldInBuilder(field: FieldWithDefault, builder: B printDeprecationOnUselessFieldIfNeeded(field, builder, fieldIsUseless) printModifiers(builder, field, fieldIsUseless) - print("var $name: $type") + print("var ${field.name}: ${field.typeRef.render()}") var hasRequiredFields = false val needNewLine = when { fieldIsUseless -> { @@ -169,7 +180,7 @@ private fun SmartPrinter.printFieldInBuilder(field: FieldWithDefault, builder: B false } field.needNotNullDelegate(fieldIsUseless) -> { - println(" by kotlin.properties.Delegates.notNull<${field.typeRef.type}>()") + println(" by kotlin.properties.Delegates.notNull<${field.typeRef.render()}>()") hasRequiredFields = true true } @@ -200,14 +211,19 @@ private fun SmartPrinter.printFieldInBuilder(field: FieldWithDefault, builder: B private fun SmartPrinter.printDeprecationOnUselessFieldIfNeeded(field: Field, builder: Builder, fieldIsUseless: Boolean) { if (fieldIsUseless) { - println("@Deprecated(\"Modification of '${field.name}' has no impact for ${builder.type}\", level = DeprecationLevel.HIDDEN)") + println("@Deprecated(\"Modification of '${field.name}' has no impact for ${builder.typeName}\", level = DeprecationLevel.HIDDEN)") } } -private fun SmartPrinter.printFieldListInBuilder(field: FieldList, builder: Builder, fieldIsUseless: Boolean) { +context(ImportCollector) +private fun SmartPrinter.printFieldListInBuilder( + field: FieldList, + builder: Builder, + fieldIsUseless: Boolean, +) { printDeprecationOnUselessFieldIfNeeded(field, builder, fieldIsUseless) printModifiers(builder, field, fieldIsUseless) - print("val ${field.name}: ${field.getMutableType(forBuilder = true).typeWithArguments}") + print("val ${field.name}: ${field.getMutableType(forBuilder = true).render()}") if (builder is LeafBuilder) { print(" = mutableListOf()") } @@ -228,69 +244,71 @@ private fun SmartPrinter.printModifiers(builder: Builder, field: Field, fieldIsU } } +context(ImportCollector) private fun SmartPrinter.printDslBuildFunction( builder: LeafBuilder, hasRequiredFields: Boolean ) { val isEmpty = builder.allFields.isEmpty() if (!isEmpty) { - println("@OptIn(ExperimentalContracts::class)") + println("@OptIn(${experimentalContractsAnnotation.render()}::class)") print("inline ") - } else if(builder.implementation.isPublic) { - println("@OptIn(FirImplementationDetail::class)") + } else if (builder.implementation.isPublic) { + println("@OptIn(${firImplementationDetailType.render()}::class)") } print("fun ") builder.implementation.element.params.takeIf { it.isNotEmpty() }?.let { print(it.joinToString(separator = ", ", prefix = "<", postfix = "> ")) } - val builderType = builder.typeWithArguments val name = builder.implementation.name?.replaceFirst("Fir", "") ?: builder.implementation.element.name print("build${name}(") if (!isEmpty) { - print("init: $builderType.() -> Unit") + print("init: ${builder.render()}.() -> Unit") if (!hasRequiredFields) { print(" = {}") } } - println("): ${builder.implementation.element.typeWithArguments} {") + println("): ${builder.implementation.element.render()} {") withIndent { if (!isEmpty) { + addStarImport("kotlin.contracts") println("contract {") withIndent { - println("callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE)") + println("callsInPlace(init, InvocationKind.EXACTLY_ONCE)") } println("}") } print("return ") if (isEmpty) { - println("${builder.implementation.type}()") + println("${builder.implementation.render()}()") } else { - println("$builderType().apply(init).build()") + println("${builder.render()}().apply(init).build()") } } println("}") } +context(ImportCollector) private fun SmartPrinter.printDslBuildCopyFunction( builder: LeafBuilder, hasRequiredFields: Boolean, ) { val optIns = - builder.allFields.filter { !it.invisibleField }.mapNotNullTo(mutableSetOf("ExperimentalContracts")) { it.optInAnnotation?.type } - println("@OptIn(${optIns.joinToString { "$it::class" }})") + builder.allFields.filter { !it.invisibleField }.mapNotNullTo(mutableSetOf(experimentalContractsAnnotation)) { it.optInAnnotation } + println("@OptIn(${optIns.joinToString { "${it.render()}::class" }})") print("inline ") print("fun ") builder.implementation.element.params.takeIf { it.isNotEmpty() }?.let { print(it.joinToString(separator = ", ", prefix = "<", postfix = "> ")) } - val builderType = builder.typeWithArguments + val builderType = builder.render() val name = builder.implementation.name?.replaceFirst("Fir", "") ?: builder.implementation.element.name print("build${name}Copy(") - print("original: ${builder.implementation.element.typeWithArguments}, init: $builderType.() -> Unit") + print("original: ${builder.implementation.element.render()}, init: $builderType.() -> Unit") if (!hasRequiredFields) { print(" = {}") } - println("): ${builder.implementation.element.typeWithArguments} {") + println("): ${builder.implementation.element.render()} {") withIndent { println("contract {") withIndent { diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/element.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/element.kt index 8e1b57d575b..b229e3c1eaf 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/element.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/element.kt @@ -5,6 +5,8 @@ package org.jetbrains.kotlin.fir.tree.generator.printer +import org.jetbrains.kotlin.fir.tree.generator.* +import org.jetbrains.kotlin.fir.tree.generator.context.AbstractFirTreeBuilder import org.jetbrains.kotlin.fir.tree.generator.model.Element import org.jetbrains.kotlin.fir.tree.generator.model.Field import org.jetbrains.kotlin.fir.tree.generator.util.get @@ -15,15 +17,12 @@ import org.jetbrains.kotlin.utils.withIndent import java.io.File fun Element.generateCode(generationPath: File): GeneratedFile = - printGeneratedType(generationPath, TREE_GENERATOR_README, packageName, type) { - val imports = collectImports() - imports.forEach { println("import $it") } - if (imports.isNotEmpty()) { - println() - } + printGeneratedType(generationPath, TREE_GENERATOR_README, packageName, this.typeName) { + println() printElement(this@generateCode) } +context(ImportCollector) fun SmartPrinter.printElement(element: Element) { with(element) { val isInterface = kind == ImplementationKind.Interface || kind == ImplementationKind.SealedInterface @@ -40,13 +39,13 @@ fun SmartPrinter.printElement(element: Element) { } printKDoc(element.extendedKDoc()) - print("${kind!!.title} $type") + print("${kind!!.title} $typeName") print(typeParameters()) val parentRefs = element.parentRefs if (parentRefs.isNotEmpty()) { print( parentRefs.sortedBy { it.typeKind }.joinToString(prefix = " : ") { parent -> - parent.typeWithArguments + parent.inheritanceClauseParenthesis() + parent.render() + parent.inheritanceClauseParenthesis() } ) } @@ -66,8 +65,9 @@ fun SmartPrinter.printElement(element: Element) { if (allFields.isNotEmpty()) { println() } + override() - println("fun accept(visitor: FirVisitor, data: D): R =") + println("fun accept(visitor: ${firVisitorType.render()}, data: D): R =") withIndent { println("visitor.visit${element.name}(this, data)") } @@ -77,7 +77,13 @@ fun SmartPrinter.printElement(element: Element) { println() println("@Suppress(\"UNCHECKED_CAST\")") override() - println("fun transform(transformer: FirTransformer, data: D): E =") + println( + "fun transform(transformer: ", + firTransformerType.render(), + ", data: D): E =" + ) withIndent { println("transformer.transform$name(this, data) as E") } @@ -86,7 +92,7 @@ fun SmartPrinter.printElement(element: Element) { fun Field.replaceDeclaration(override: Boolean, overridenType: TypeRefWithNullability? = null, forceNullable: Boolean = false) { println() if (name == "source") { - println("@FirImplementationDetail") + println("@${firImplementationDetailType.render()}") } abstract() if (override) print("override ") @@ -95,7 +101,7 @@ fun SmartPrinter.printElement(element: Element) { allFields.filter { it.withReplace }.forEach { val override = overridenFields[it, it] && - !(it.name == "source" && fullQualifiedName.endsWith("FirQualifiedAccessExpression")) + !(it.name == "source" && element == FirTreeBuilder.qualifiedAccessExpression) it.replaceDeclaration(override, forceNullable = it.useNullableForReplace) for (overridenType in it.overridenTypes) { it.replaceDeclaration(true, overridenType) @@ -109,7 +115,7 @@ fun SmartPrinter.printElement(element: Element) { if (field.fromParent && field.parentHasSeparateTransform) { print("override ") } - println(field.transformFunctionDeclaration(typeWithArguments)) + println(field.transformFunctionDeclaration(element)) } if (needTransformOtherChildren) { println() @@ -117,7 +123,7 @@ fun SmartPrinter.printElement(element: Element) { if (element.elementParents.any { it.element.needTransformOtherChildren }) { print("override ") } - println(transformFunctionDeclaration("OtherChildren", typeWithArguments)) + println(transformFunctionDeclaration("OtherChildren", element)) } if (element.isRootElement) { @@ -125,16 +131,16 @@ fun SmartPrinter.printElement(element: Element) { "$element must be an interface" } println() - println("fun accept(visitor: FirVisitorVoid) = accept(visitor, null)") + println("fun accept(visitor: ${firVisitorVoidType.render()}) = accept(visitor, null)") if (element.hasAcceptChildrenMethod) { println() - println("fun acceptChildren(visitor: FirVisitor, data: D)") + println("fun acceptChildren(visitor: ${firVisitorType.render()}, data: D)") } println() - println("fun acceptChildren(visitor: FirVisitorVoid) = acceptChildren(visitor, null)") + println("fun acceptChildren(visitor: ${firVisitorVoidType.render()}) = acceptChildren(visitor, null)") if (element.hasTransformChildrenMethod) { println() - println("fun transformChildren(transformer: FirTransformer, data: D): FirElement") + println("fun transformChildren(transformer: ${firTransformerType.render()}, data: D): FirElement") } } } diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/field.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/field.kt index 8358e4aae36..b202f9797bf 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/field.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/field.kt @@ -6,11 +6,13 @@ package org.jetbrains.kotlin.fir.tree.generator.printer import org.jetbrains.kotlin.fir.tree.generator.model.Field +import org.jetbrains.kotlin.generators.tree.ImportCollector import org.jetbrains.kotlin.generators.tree.printer.printKDoc +import org.jetbrains.kotlin.generators.tree.render import org.jetbrains.kotlin.utils.SmartPrinter import org.jetbrains.kotlin.utils.withIndent - +context(ImportCollector) fun SmartPrinter.printField( field: Field, isImplementation: Boolean, @@ -27,7 +29,8 @@ fun SmartPrinter.printField( } field.optInAnnotation?.let { - println(if (inConstructor) "@property:${it.type}" else "@${it.type}") + val rendered = it.render() + println(if (inConstructor) "@property:$rendered" else "@$rendered") } modifiers() @@ -44,17 +47,18 @@ fun SmartPrinter.printField( print("val") } val type = if (isImplementation) field.getMutableType() else field.typeRef - print(" ${field.name}: ${type.typeWithArguments}") + print(" ${field.name}: ${type.render()}") if (inConstructor) print(",") println() } +context(ImportCollector) fun SmartPrinter.printFieldWithDefaultInImplementation(field: Field) { if (!field.isVal && field.isVolatile) { println("@Volatile") } field.optInAnnotation?.let { - println("@OptIn(${it.type}::class)") + println("@OptIn(${it.render()}::class)") } val defaultValue = field.defaultValueInImplementation print("override ") @@ -63,7 +67,7 @@ fun SmartPrinter.printFieldWithDefaultInImplementation(field: Field) { } else { print("var") } - print(" ${field.name}: ${field.getMutableType().typeWithArguments}") + print(" ${field.name}: ${field.getMutableType().render()}") if (field.withGetter) { println() pushIndent() diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/implementation.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/implementation.kt index 1c1cab79090..624f8b86241 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/implementation.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/implementation.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.fir.tree.generator.printer +import org.jetbrains.kotlin.fir.tree.generator.* import org.jetbrains.kotlin.fir.tree.generator.model.* -import org.jetbrains.kotlin.fir.tree.generator.pureAbstractElementType import org.jetbrains.kotlin.generators.tree.* import org.jetbrains.kotlin.generators.tree.printer.GeneratedFile import org.jetbrains.kotlin.generators.tree.printer.braces @@ -18,15 +18,19 @@ import org.jetbrains.kotlin.utils.withIndent import java.io.File fun Implementation.generateCode(generationPath: File): GeneratedFile = - printGeneratedType(generationPath, TREE_GENERATOR_README, packageName, type, fileSuppressions = listOf("DuplicatedCode", "unused")) { - val imports = collectImports() - imports.forEach { println("import $it") } - if (imports.isNotEmpty()) { - println() - } + printGeneratedType( + generationPath, + TREE_GENERATOR_README, + packageName, + this.typeName, + fileSuppressions = listOf("DuplicatedCode", "unused"), + ) { + println() + addAllImports(usedTypes) printImplementation(this@generateCode) } +context(ImportCollector) fun SmartPrinter.printImplementation(implementation: Implementation) { fun Field.transform() { when (this) { @@ -36,6 +40,7 @@ fun SmartPrinter.printImplementation(implementation: Implementation) { println("$name = ${name}${call()}transform(transformer, data)") is FieldList -> { + addImport(transformInPlaceImport) println("${name}.transformInplace(transformer, data)") } @@ -46,20 +51,22 @@ fun SmartPrinter.printImplementation(implementation: Implementation) { with(implementation) { buildSet { if (requiresOptIn) { - add("FirImplementationDetail") + add(firImplementationDetailType) } for (field in fieldsWithoutDefault) { - field.optInAnnotation?.let { add(it.type) } + field.optInAnnotation?.let { + add(it) + } } }.ifNotEmpty { - println("@OptIn(${joinToString { "$it::class" }})") + println("@OptIn(${joinToString { "${it.render()}::class" }})") } if (!isPublic) { print("internal ") } - print("${kind!!.title} $type") + print("${kind!!.title} ${this.typeName}") print(element.typeParameters(end = " ")) val isInterface = kind == ImplementationKind.Interface || kind == ImplementationKind.SealedInterface @@ -73,13 +80,13 @@ fun SmartPrinter.printImplementation(implementation: Implementation) { if (!isInterface && !isAbstract && fieldsWithoutDefault.isNotEmpty()) { if (isPublic) { - print(" @FirImplementationDetail constructor") + print(" @${firImplementationDetailType.render()} constructor") } println("(") withIndent { fieldsWithoutDefault.forEachIndexed { _, field -> if (field.isParameter) { - print("${field.name}: ${field.typeRef.typeWithArguments}") + print("${field.name}: ${field.typeRef.render()}") if (field.nullable) print("?") println(",") } else if (!field.isFinal) { @@ -92,9 +99,9 @@ fun SmartPrinter.printImplementation(implementation: Implementation) { print(" : ") if (needPureAbstractElement) { - print("${pureAbstractElementType.type}(), ") + print("${pureAbstractElementType.render()}(), ") } - print(allParents.joinToString { "${it.typeWithArguments}${it.kind.braces()}" }) + print(allParents.joinToString { "${it.render()}${it.kind.braces()}" }) println(" {") withIndent { if (isInterface || isAbstract) { @@ -114,13 +121,13 @@ fun SmartPrinter.printImplementation(implementation: Implementation) { val bindingCalls = element.allFields.filter { - it.withBindThis && it.typeRef.type.contains("Symbol") && it !is FieldList && it.name != "companionObjectSymbol" + it.withBindThis && it.hasSymbolType && it !is FieldList && it.name != "companionObjectSymbol" }.takeIf { it.isNotEmpty() && !isInterface && !isAbstract && - !element.type.contains("Reference") - && !element.type.contains("ResolvedQualifier") - && !element.type.endsWith("Ref") - && !element.type.endsWith("AnnotationsContainer") + !element.typeName.contains("Reference") + && !element.typeName.contains("ResolvedQualifier") + && !element.typeName.endsWith("Ref") + && !element.typeName.endsWith("AnnotationsContainer") }.orEmpty() val customCalls = fieldsWithoutDefault.filter { it.customInitializationCall != null } @@ -132,6 +139,7 @@ fun SmartPrinter.printImplementation(implementation: Implementation) { } for (customCall in customCalls) { + addAllImports(customCall.arbitraryImportables) println("${customCall.name} = ${customCall.customInitializationCall}") } } @@ -141,7 +149,7 @@ fun SmartPrinter.printImplementation(implementation: Implementation) { fun Field.acceptString(): String = "${name}${call()}accept(visitor, data)" if (hasAcceptChildrenMethod) { - print("override fun acceptChildren(visitor: FirVisitor, data: D) {") + print("override fun acceptChildren(visitor: ${firVisitorType.render()}, data: D) {") val walkableFields = walkableChildren if (walkableFields.isNotEmpty()) { @@ -170,7 +178,7 @@ fun SmartPrinter.printImplementation(implementation: Implementation) { } else -> { - if (type == "FirWhenExpressionImpl" && field.name == "subject") { + if (this.typeName == "FirWhenExpressionImpl" && field.name == "subject") { println( """ |val subjectVariable_ = subjectVariable @@ -206,7 +214,12 @@ fun SmartPrinter.printImplementation(implementation: Implementation) { if (hasTransformChildrenMethod) { abstract() - print("override fun transformChildren(transformer: FirTransformer, data: D): $typeWithArguments") + print( + "override fun transformChildren(transformer: ", + firTransformerType.render(), + ", data: D): ", + render(), + ) if (!isInterface && !isAbstract) { println(" {") withIndent { @@ -269,7 +282,7 @@ fun SmartPrinter.printImplementation(implementation: Implementation) { if (!field.needsSeparateTransform) continue println() abstract() - print("override ${field.transformFunctionDeclaration(typeWithArguments)}") + print("override ${field.transformFunctionDeclaration(this)}") if (isInterface || isAbstract) { println() continue @@ -278,7 +291,7 @@ fun SmartPrinter.printImplementation(implementation: Implementation) { withIndent { if (field.isMutable && field.isFirType) { // TODO: replace with smth normal - if (type == "FirWhenExpressionImpl" && field.name == "subject") { + if (this.typeName == "FirWhenExpressionImpl" && field.name == "subject") { println( """ |if (subjectVariable != null) { @@ -301,7 +314,12 @@ fun SmartPrinter.printImplementation(implementation: Implementation) { if (element.needTransformOtherChildren) { println() abstract() - print("override fun transformOtherChildren(transformer: FirTransformer, data: D): $typeWithArguments") + print( + "override fun transformOtherChildren(transformer: ", + firTransformerType.render(), + ", data: D): ", + render(), + ) if (isInterface || isAbstract) { println() } else { @@ -330,7 +348,7 @@ fun SmartPrinter.printImplementation(implementation: Implementation) { ) { println() if (field.name == "source") { - println("@FirImplementationDetail") + println("@${firImplementationDetailType.render()}") } abstract() print("override ${field.replaceFunctionDeclaration(overridenType, forceNullable)}") @@ -368,6 +386,7 @@ fun SmartPrinter.printImplementation(implementation: Implementation) { } print("${field.name} = $newValue") if (field.origin is FieldList && field.isMutableOrEmpty) { + addImport(toMutableOrEmptyImport) print(".toMutableOrEmpty()") } println() @@ -377,7 +396,7 @@ fun SmartPrinter.printImplementation(implementation: Implementation) { for (overridenType in field.overridenTypes) { generateReplace(field, overridenType) { - println("require($newValue is ${field.typeRef.typeWithArguments})") + println("require($newValue is ${field.typeRef.render()})") println("replace$capitalizedFieldName($newValue)") } } @@ -386,3 +405,6 @@ fun SmartPrinter.printImplementation(implementation: Implementation) { println("}") } } + +private val Field.hasSymbolType: Boolean + get() = (typeRef as? ClassRef<*>)?.simpleName?.contains("Symbol") ?: false diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/transformer.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/transformer.kt index 1266aa4c3a4..430946a0020 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/transformer.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/transformer.kt @@ -11,12 +11,12 @@ import org.jetbrains.kotlin.generators.tree.printer.GeneratedFile import org.jetbrains.kotlin.generators.tree.printer.multipleUpperBoundsList import org.jetbrains.kotlin.generators.tree.printer.printGeneratedType import org.jetbrains.kotlin.generators.tree.printer.typeParameters +import org.jetbrains.kotlin.generators.tree.render import org.jetbrains.kotlin.utils.withIndent import java.io.File fun printTransformer(elements: List, generationPath: File): GeneratedFile = printGeneratedType(generationPath, TREE_GENERATOR_README, VISITOR_PACKAGE, "FirTransformer") { - elements.forEach { println("import ${it.fullQualifiedName}") } println() println("abstract class FirTransformer : FirVisitor() {") println() @@ -29,8 +29,16 @@ fun printTransformer(elements: List, generationPath: File): GeneratedFi print("open fun ") element.typeParameters(end = " ").takeIf { it.isNotBlank() }?.let { print(it) } println( - "transform${element.name}($varName: ${element.typeWithArguments}, data: D): ${element.transformerType - .typeWithArguments}${element.multipleUpperBoundsList()} {", + "transform", + element.name, + "(", + varName, + ": ", + element.render(), + ", data: D): ", + element.transformerType.render(), + element.multipleUpperBoundsList(), + " {", ) withIndent { println("return transformElement($varName, data)") @@ -45,8 +53,16 @@ fun printTransformer(elements: List, generationPath: File): GeneratedFi element.typeParameters(end = " ").takeIf { it.isNotBlank() }?.let { print(it) } println( - "visit${element.name}($varName: ${element.typeWithArguments}, data: D): ${element.transformerType - .typeWithArguments}${element.multipleUpperBoundsList()} {", + "visit", + element.name, + "(", + varName, + ": ", + element.render(), + ", data: D): ", + element.transformerType.render(), + element.multipleUpperBoundsList(), + " {" ) withIndent { println("return transform${element.name}($varName, data)") diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/utils.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/utils.kt index 64d9a1beb5b..143fcaae65f 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/utils.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/utils.kt @@ -5,129 +5,33 @@ package org.jetbrains.kotlin.fir.tree.generator.printer -import org.jetbrains.kotlin.fir.tree.generator.context.AbstractFirTreeBuilder -import org.jetbrains.kotlin.fir.tree.generator.firImplementationDetailType +import org.jetbrains.kotlin.fir.tree.generator.firTransformerType import org.jetbrains.kotlin.fir.tree.generator.model.* -import org.jetbrains.kotlin.fir.tree.generator.pureAbstractElementType import org.jetbrains.kotlin.generators.tree.* -import org.jetbrains.kotlin.utils.addToStdlib.ifNotEmpty - -enum class ImportKind(val postfix: String) { - Element(""), Implementation(".impl"), Builder(".builder") -} - -fun Builder.collectImports(): List { - val parents = parents.mapNotNull { it.fullQualifiedName } - val builderDsl = "org.jetbrains.kotlin.fir.builder.FirBuilderDsl" - return when (this) { - is LeafBuilder -> implementation.collectImports( - parents, - ImportKind.Builder, - ) + implementation.fullQualifiedName!! + usedTypes.mapNotNull { it.fullQualifiedName } + builderDsl + "kotlin.contracts.*" - is IntermediateBuilder -> { - val fqns = buildList { - addAll(parents) - usedTypes.mapNotNullTo(this) { it.fullQualifiedName } - for (field in allFields) { - if (field.invisibleField) continue - // TODO: Use recursive import collection for TypeRefs - field.typeRef.fullQualifiedName?.let(this::add) - (field.typeRef as? ParametrizedTypeRef<*, *>)?.args?.values?.mapNotNullTo(this) { it.fullQualifiedName } - } - - add(materializedElement?.fullQualifiedName ?: throw IllegalStateException(type)) - add(builderDsl) - } - - fqns.filterRedundantImports(packageName, ImportKind.Builder) - } - }.sorted() -} - -fun Implementation.collectImports(base: List = emptyList(), kind: ImportKind = ImportKind.Implementation): List { - return element.collectImportsInternal( - base + listOf(element.fullQualifiedName) - + usedTypes.mapNotNull { it.fullQualifiedName } - + arbitraryImportables.mapNotNull { it.fullQualifiedName } - + parents.mapNotNull { it.fullQualifiedName } - + listOfNotNull( - pureAbstractElementType.fullQualifiedName.takeIf { needPureAbstractElement }, - firImplementationDetailType.fullQualifiedName.takeIf { isPublic || requiresOptIn }, - ), - kind, - ) -} - -fun Element.collectImports(): List { - val baseTypes = elementParents.mapTo(mutableListOf()) { it.fullQualifiedName!! } - baseTypes += AbstractFirTreeBuilder.baseFirElement.fullQualifiedName - baseTypes += elementParents.flatMap { it.args.values }.mapNotNull { it.fullQualifiedName } // TODO: Use recursive import collection for TypeRefs - if (needPureAbstractElement) { - baseTypes += pureAbstractElementType.fullQualifiedName - } - baseTypes.addAll(otherParents.map { it.fullQualifiedName }) - return collectImportsInternal( - baseTypes, - ImportKind.Element, - ) -} - -private fun Element.collectImportsInternal(base: List, kind: ImportKind): List { - val fqns = base + allFields.mapNotNull { it.typeRef.fullQualifiedName } + - allFields.flatMap { it.overridenTypes.mapNotNull { it.fullQualifiedName } + it.arbitraryImportables.mapNotNull { it.fullQualifiedName } } + - allFields.flatMap { (it.typeRef as? ParametrizedTypeRef<*, *>)?.args?.values?.mapNotNull { it.fullQualifiedName } ?: emptyList() } + // TODO: Use recursive import collection for TypeRefs - params.flatMap { it.bounds.mapNotNull { it.fullQualifiedName } } - val result = fqns.filterRedundantImports(packageName, kind).toMutableList() - - if (allFields.any { it is FieldList && it.isMutableOrEmpty }) { - result += when (kind) { - ImportKind.Implementation -> listOf( - "org.jetbrains.kotlin.fir.MutableOrEmptyList", - "org.jetbrains.kotlin.fir.builder.toMutableOrEmpty" - ) - ImportKind.Builder -> listOf("org.jetbrains.kotlin.fir.builder.toMutableOrEmpty") - else -> emptyList() - } - } - - allFields.mapNotNull { it.optInAnnotation?.fullQualifiedName }.distinct().ifNotEmpty { - result += this - } - - if (allFields.any { it.name == "source" && it.withReplace }) { - return (result + "org.jetbrains.kotlin.fir.FirImplementationDetail").distinct() - } - return result -} - -private fun List.filterRedundantImports( - packageName: String, - kind: ImportKind, -): List { - val realPackageName = "$packageName.${kind.postfix}" - return filter { fqn -> - !fqn.startsWith("kotlin.") && fqn.dropLastWhile { it != '.' } != realPackageName - }.distinct().sorted() + "$VISITOR_PACKAGE.*" -} - val Field.isVal: Boolean get() = (this is FieldList && !isMutableOrEmpty) || (this is FieldWithDefault && origin is FieldList && !origin.isMutableOrEmpty) || !isMutable - -fun Field.transformFunctionDeclaration(returnType: String): String { +context(ImportCollector) +fun Field.transformFunctionDeclaration(returnType: TypeRef): String { return transformFunctionDeclaration(name.replaceFirstChar(Char::uppercaseChar), returnType) } -fun transformFunctionDeclaration(transformName: String, returnType: String): String { - return "fun transform$transformName(transformer: FirTransformer, data: D): $returnType" +context(ImportCollector) +fun transformFunctionDeclaration(transformName: String, returnType: TypeRef): String { + return "fun transform$transformName(transformer: ${firTransformerType.render()}, data: D): " + + returnType.render() } -fun Field.replaceFunctionDeclaration(overridenType: TypeRefWithNullability? = null, forceNullable: Boolean = false): String { +context(ImportCollector) +fun Field.replaceFunctionDeclaration( + overridenType: TypeRefWithNullability? = null, + forceNullable: Boolean = false, +): String { val capName = name.replaceFirstChar(Char::uppercaseChar) val type = overridenType ?: typeRef val typeWithNullable = if (forceNullable) type.copy(nullable = true) else type - return "fun replace$capName(new$capName: ${typeWithNullable.typeWithArguments})" + return "fun replace$capName(new$capName: ${typeWithNullable.render()})" } fun Field.getMutableType(forBuilder: Boolean = false): TypeRef = when (this) { @@ -143,6 +47,3 @@ fun Field.getMutableType(forBuilder: Boolean = false): TypeRef = when (this) { fun Field.call(): String = if (nullable) "?." else "." val Element.safeDecapitalizedName: String get() = if (name == "Class") "klass" else name.replaceFirstChar(Char::lowercaseChar) - -val ImplementationWithArg.generics: String - get() = argument?.let { "<${it.type}>" } ?: "" diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/visitor.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/visitor.kt index ec6a6eb9c71..90fa7887163 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/visitor.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/visitor.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.generators.tree.printer.GeneratedFile import org.jetbrains.kotlin.generators.tree.printer.multipleUpperBoundsList import org.jetbrains.kotlin.generators.tree.printer.printGeneratedType import org.jetbrains.kotlin.generators.tree.printer.typeParameters +import org.jetbrains.kotlin.generators.tree.render import org.jetbrains.kotlin.utils.withIndent import java.io.File @@ -34,7 +35,6 @@ private fun Element.getNameOfSupertypeForDefaultVisiting(): String { fun printVisitor(elements: List, generationPath: File, visitSuperTypeByDefault: Boolean): GeneratedFile { val className = if (visitSuperTypeByDefault) "FirDefaultVisitor" else "FirVisitor" return printGeneratedType(generationPath, TREE_GENERATOR_README, VISITOR_PACKAGE, className) { - elements.forEach { println("import ${it.fullQualifiedName}") } println() print("abstract class $className ") @@ -57,7 +57,19 @@ fun printVisitor(elements: List, generationPath: File, visitSuperTypeBy } else { print("open") } - print(" fun ${typeParameters(end = " ")}visit$name($varName: $typeWithArguments, data: D): R${multipleUpperBoundsList()} = visit") + print( + " fun ", + typeParameters(end = " "), + "visit", + name, + "(", + varName, + ": ", + render(), + ", data: D): R", + multipleUpperBoundsList(), + " = visit" + ) if (visitSuperTypeByDefault) { print(element.getNameOfSupertypeForDefaultVisiting()) } else { @@ -75,7 +87,6 @@ fun printVisitor(elements: List, generationPath: File, visitSuperTypeBy fun printVisitorVoid(elements: List, generationPath: File): GeneratedFile = printGeneratedType(generationPath, TREE_GENERATOR_README, VISITOR_PACKAGE, "FirVisitorVoid") { - elements.forEach { println("import ${it.fullQualifiedName}") } println() println("abstract class FirVisitorVoid : FirVisitor() {") @@ -86,7 +97,19 @@ fun printVisitorVoid(elements: List, generationPath: File): GeneratedFi if (element == AbstractFirTreeBuilder.baseFirElement) continue with(element) { val varName = safeDecapitalizedName - println("open fun ${typeParameters(end = " ")}visit$name($varName: $typeWithArguments)${multipleUpperBoundsList()} {") + println( + "open fun ", + typeParameters(end = " "), + "visit", + name, + "(", + varName, + ": ", + render(), + ")", + multipleUpperBoundsList(), + " {" + ) withIndent { println("visitElement($varName)") } @@ -98,7 +121,19 @@ fun printVisitorVoid(elements: List, generationPath: File): GeneratedFi for (element in elements) { with(element) { val varName = safeDecapitalizedName - println("final override fun ${typeParameters(end = " ")}visit$name($varName: $typeWithArguments, data: Nothing?)${multipleUpperBoundsList()} {") + println( + "final override fun ", + typeParameters(end = " "), + "visit", + name, + "(", + varName, + ": ", + render(), + ", data: Nothing?)", + multipleUpperBoundsList(), + " {" + ) withIndent { println("visit$name($varName)") } @@ -112,7 +147,6 @@ fun printVisitorVoid(elements: List, generationPath: File): GeneratedFi fun printDefaultVisitorVoid(elements: List, generationPath: File): GeneratedFile = printGeneratedType(generationPath, TREE_GENERATOR_README, VISITOR_PACKAGE, "FirDefaultVisitorVoid") { - elements.forEach { println("import ${it.fullQualifiedName}") } println() println("abstract class FirDefaultVisitorVoid : FirVisitorVoid() {") @@ -121,7 +155,23 @@ fun printDefaultVisitorVoid(elements: List, generationPath: File): Gene if (!element.isAcceptableForDefaultVisiting()) continue with(element) { val varName = safeDecapitalizedName - println("override fun ${typeParameters(end = " ")}visit$name($varName: $typeWithArguments)${multipleUpperBoundsList()} = visit${element.getNameOfSupertypeForDefaultVisiting()}($varName)") + println( + "override fun ", + typeParameters(end = " "), + "visit", + name, + "(", + varName, + ": ", + render(), + ")", + multipleUpperBoundsList(), + " = visit", + getNameOfSupertypeForDefaultVisiting(), + "(", + varName, + ")" + ) println() } } diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/util/HierachyGraphGenerator.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/util/HierachyGraphGenerator.kt index 9faa6dacba6..2a5cafd4454 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/util/HierachyGraphGenerator.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/util/HierachyGraphGenerator.kt @@ -33,13 +33,13 @@ fun printHierarchyGraph(builder: AbstractFirTreeBuilder) { with(printer) { println("digraph FirTree {") elements.forEach { - println(" ${it.type} [color=${it.kind!!.toColor()}]") + println(" ${it.typeName} [color=${it.kind!!.toColor()}]") } println() val edges = mutableSetOf() elements.forEach { element -> element.allParents.forEach { parent -> - edges += Edge(parent.type, element.type) + edges += Edge(parent.typeName, element.typeName) } } edges.forEach { diff --git a/compiler/ir/ir.tree/tree-generator/src/org/jetbrains/kotlin/ir/generator/config/ConfigModel.kt b/compiler/ir/ir.tree/tree-generator/src/org/jetbrains/kotlin/ir/generator/config/ConfigModel.kt index 0267e4eb628..8a5a05509cf 100644 --- a/compiler/ir/ir.tree/tree-generator/src/org/jetbrains/kotlin/ir/generator/config/ConfigModel.kt +++ b/compiler/ir/ir.tree/tree-generator/src/org/jetbrains/kotlin/ir/generator/config/ConfigModel.kt @@ -10,7 +10,6 @@ import com.squareup.kotlinpoet.PropertySpec import com.squareup.kotlinpoet.TypeSpec import org.jetbrains.kotlin.generators.tree.* import org.jetbrains.kotlin.ir.generator.BASE_PACKAGE -import org.jetbrains.kotlin.ir.generator.model.Element import org.jetbrains.kotlin.ir.generator.util.* class Config( @@ -74,11 +73,10 @@ class ElementConfig( override fun toString() = element.name - override val packageName: String - get() = category.packageName - - override val type: String - get() = Element.elementName2typeName(name) + context(ImportCollector) + override fun renderTo(appendable: Appendable) { + renderingIsNotSupported() + } enum class Category(private val packageDir: String, val defaultVisitorParam: String) { Expression("expressions", "expression"), @@ -103,11 +101,10 @@ class ElementConfigRef( override fun toString() = element.name - override val type: String - get() = element.type - - override val packageName: String - get() = element.packageName + context(ImportCollector) + override fun renderTo(appendable: Appendable) { + renderingIsNotSupported() + } } sealed class UseFieldAsParameterInIrFactoryStrategy { diff --git a/compiler/ir/ir.tree/tree-generator/src/org/jetbrains/kotlin/ir/generator/model/Model.kt b/compiler/ir/ir.tree/tree-generator/src/org/jetbrains/kotlin/ir/generator/model/Model.kt index a152f178f20..719bc0ddf53 100644 --- a/compiler/ir/ir.tree/tree-generator/src/org/jetbrains/kotlin/ir/generator/model/Model.kt +++ b/compiler/ir/ir.tree/tree-generator/src/org/jetbrains/kotlin/ir/generator/model/Model.kt @@ -46,12 +46,9 @@ class Element( null -> null } - val typeName + override val typeName get() = elementName2typeName(name) - override val type: String - get() = typeName - var isLeaf = config.isForcedLeaf val childrenOrderOverride: List? = config.childrenOrderOverride override var walkableChildren: List = emptyList() diff --git a/compiler/ir/ir.tree/tree-generator/src/org/jetbrains/kotlin/ir/generator/model/Transformations.kt b/compiler/ir/ir.tree/tree-generator/src/org/jetbrains/kotlin/ir/generator/model/Transformations.kt index df8220a6a07..7bc9f25cb02 100644 --- a/compiler/ir/ir.tree/tree-generator/src/org/jetbrains/kotlin/ir/generator/model/Transformations.kt +++ b/compiler/ir/ir.tree/tree-generator/src/org/jetbrains/kotlin/ir/generator/model/Transformations.kt @@ -14,13 +14,11 @@ import org.jetbrains.kotlin.utils.addToStdlib.partitionIsInstance import org.jetbrains.kotlin.generators.tree.ElementRef as GenericElementRef private object InferredOverriddenType : TypeRefWithNullability { - override val type: String - get() = error("not supported") - override val packageName: String? - get() = null - override val typeWithArguments: String - get() = error("not supported") + context(ImportCollector) + override fun renderTo(appendable: Appendable) { + renderingIsNotSupported() + } override fun substitute(map: TypeParameterSubstitutionMap) = this diff --git a/compiler/ir/ir.tree/tree-generator/src/org/jetbrains/kotlin/ir/generator/print/Types.kt b/compiler/ir/ir.tree/tree-generator/src/org/jetbrains/kotlin/ir/generator/print/Types.kt index 03ae06fc190..662ee693236 100644 --- a/compiler/ir/ir.tree/tree-generator/src/org/jetbrains/kotlin/ir/generator/print/Types.kt +++ b/compiler/ir/ir.tree/tree-generator/src/org/jetbrains/kotlin/ir/generator/print/Types.kt @@ -14,14 +14,14 @@ import org.jetbrains.kotlin.ir.generator.util.* import org.jetbrains.kotlin.types.Variance import org.jetbrains.kotlin.generators.tree.ElementRef as GenericElementRef -fun Element.toPoet() = ClassName(packageName, typeName) +fun Element.toPoet() = ClassName(packageName, this.typeName) fun Element.toPoetSelfParameterized() = toPoet().parameterizedByIfAny(poetTypeVariables) fun Element.toPoetStarParameterized() = toPoet().parameterizedByIfAny(List(params.size) { STAR }) val Element.poetTypeVariables get() = params.map { TypeVariableName(it.name) } fun TypeRef.toPoet(): TypeName { return when (this) { - is GenericElementRef<*, *> -> ClassName(element.packageName!!, element.type).parameterizedByIfAny(typeArgsToPoet()) + is GenericElementRef<*, *> -> ClassName(element.packageName, element.typeName).parameterizedByIfAny(typeArgsToPoet()) is ClassRef<*> -> ClassName(packageName, simpleNames).parameterizedByIfAny(typeArgsToPoet()) is NamedTypeParameterRef -> TypeVariableName(name) is ElementConfigOrRef -> ClassName(this.element.category.packageName, elementName2typeName(element.name)).parameterizedByIfAny( diff --git a/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/AbstractElement.kt b/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/AbstractElement.kt index f80f925919c..c1c5f420e2d 100644 --- a/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/AbstractElement.kt +++ b/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/AbstractElement.kt @@ -5,8 +5,6 @@ package org.jetbrains.kotlin.generators.tree -import org.jetbrains.kotlin.generators.tree.printer.generics - /** * A class representing a FIR or IR tree element. */ @@ -43,8 +41,14 @@ abstract class AbstractElement : ElementOrRef, F override val allParents: List get() = elementParents.map { it.element } - final override val typeWithArguments: String - get() = type + generics + context(ImportCollector) + final override fun renderTo(appendable: Appendable) { + addImport(this) + appendable.append(typeName) + if (params.isNotEmpty()) { + params.joinTo(appendable, prefix = "<", postfix = ">") { it.name } + } + } abstract override val allFields: List @@ -66,4 +70,6 @@ abstract class AbstractElement : ElementOrRef, F @Suppress("UNCHECKED_CAST") override fun substitute(map: TypeParameterSubstitutionMap): Element = this as Element + + fun withStarArgs(): ElementRef = copy(params.associateWith { TypeRef.Star }) } diff --git a/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/AbstractField.kt b/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/AbstractField.kt index e7caa493b90..b2c928b2ce4 100644 --- a/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/AbstractField.kt +++ b/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/AbstractField.kt @@ -26,7 +26,7 @@ abstract class AbstractField { open val arbitraryImportables: MutableList = mutableListOf() - open var optInAnnotation: ArbitraryImportable? = null + open var optInAnnotation: ClassRef<*>? = null abstract val isMutable: Boolean open val withGetter: Boolean get() = false diff --git a/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/ArbitrarilyImportable.kt b/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/ArbitrarilyImportable.kt index bd0efb6c828..e9f908838a9 100644 --- a/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/ArbitrarilyImportable.kt +++ b/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/ArbitrarilyImportable.kt @@ -5,7 +5,4 @@ package org.jetbrains.kotlin.generators.tree -data class ArbitraryImportable(override val packageName: String, override val type: String) : Importable { - override val typeWithArguments: String - get() = type -} +data class ArbitraryImportable(override val packageName: String, override val typeName: String) : Importable diff --git a/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/ImplementationKindOwner.kt b/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/ImplementationKindOwner.kt index c00317a73ed..9c3225f04aa 100644 --- a/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/ImplementationKindOwner.kt +++ b/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/ImplementationKindOwner.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.generators.tree -interface ImplementationKindOwner : Importable { +interface ImplementationKindOwner : TypeRef, Importable { var kind: ImplementationKind? val allParents: List } diff --git a/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/ImportCollector.kt b/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/ImportCollector.kt new file mode 100644 index 00000000000..88e13708927 --- /dev/null +++ b/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/ImportCollector.kt @@ -0,0 +1,82 @@ +/* + * Copyright 2010-2023 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.generators.tree + +import java.util.SortedMap +import java.util.SortedSet + +/** + * Used to collect [TypeRef]s for printing a list of imports for those [TypeRef]s. + */ +class ImportCollector(currentPackage: String) { + + companion object { + private val STAR = sortedSetOf("*") + + /** + * The maximum number of imports from a single package before collapsing those imports to a star-import. + */ + private const val STAR_COLLAPSE_THRESHOLD = 4 + } + + /** + * A map of package names to a list of entities to import from that package. + */ + private val imports: SortedMap> = sortedMapOf() + + /** + * Entities from these packages will not be imported explicitly. + * + * See [the list of default imports](https://kotlinlang.org/docs/packages.html#default-imports). + */ + private val ignoredPackages = hashSetOf( + currentPackage, + "kotlin", + "kotlin.annotation", + "kotlin.collections", + "kotlin.comparisons", + "kotlin.io", + "kotlin.ranges", + "kotlin.sequences", + "kotlin.text", + "java.lang", + "kotlin.jvm", + ) + + private fun addImport(packageName: String, entity: String) { + if (packageName in ignoredPackages) return + val entities = imports.computeIfAbsent(packageName) { sortedSetOf() } + if (entities === STAR) return + if (entity == "*") { + imports[packageName] = STAR + return + } + entities.add(entity) + if (entities.size > STAR_COLLAPSE_THRESHOLD) { + imports[packageName] = STAR + } + } + + fun addImport(importable: Importable) { + addImport(importable.packageName, importable.typeName) + } + + fun addStarImport(packageName: String) { + addImport(packageName, "*") + } + + fun printAllImports(printer: Appendable) { + for ((packageName, entities) in imports) { + for (entity in entities) { + printer.append("import ", packageName, ".", entity, "\n") + } + } + } + + fun addAllImports(importables: Collection) { + importables.forEach(this::addImport) + } +} \ No newline at end of file diff --git a/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/Importable.kt b/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/Importable.kt index f9857e34b21..0ed109aa875 100644 --- a/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/Importable.kt +++ b/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/Importable.kt @@ -6,9 +6,11 @@ package org.jetbrains.kotlin.generators.tree interface Importable { - val type: String - val packageName: String? - val fullQualifiedName: String? get() = packageName?.let { "$it.${type.replace(Regex("<.+>"), "")}" } - val typeWithArguments: String + /** + * The name of the entity to import. + */ + val typeName: String + + val packageName: String } diff --git a/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/TypeRef.kt b/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/TypeRef.kt index b2725110254..bc3e99707a1 100644 --- a/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/TypeRef.kt +++ b/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/TypeRef.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.types.Variance import java.util.* import kotlin.reflect.KClass -interface TypeRef : Importable { +interface TypeRef { /** * Constructs a new [TypeRef] by recursively replacing referenced [TypeParameterRef]s with other types according to the provided @@ -18,23 +18,34 @@ interface TypeRef : Importable { */ fun substitute(map: TypeParameterSubstitutionMap): TypeRef + /** + * Prints this type to [appendable] with all its arguments and question marks, while recursively collecting + * `this` and other referenced types into the import collector passed as context. + */ + context(ImportCollector) + fun renderTo(appendable: Appendable) + object Star : TypeRef { - override val type: String - get() = "*" - - override val packageName: String? - get() = null - - override val typeWithArguments: String - get() = type override fun substitute(map: TypeParameterSubstitutionMap) = this - override fun toString(): String = type + override fun toString(): String = "*" + + context(ImportCollector) + override fun renderTo(appendable: Appendable) { + appendable.append(toString()) + } } } -sealed interface ClassOrElementRef : TypeRefWithNullability +/** + * Prints this type as a string with all its arguments and question marks, while recursively collecting + * `this` and other referenced types into the import collector passed as context. + */ +context(ImportCollector) +fun TypeRef.render(): String = buildString { renderTo(this) } + +sealed interface ClassOrElementRef : TypeRefWithNullability, Importable // Based on com.squareup.kotlinpoet.ClassName class ClassRef

private constructor( @@ -59,21 +70,25 @@ class ClassRef

private constructor( private val names = Collections.unmodifiableList(names) /** Fully qualified name using `.` as a separator, like `kotlin.collections.Map.Entry`. */ - val canonicalName: String = if (names[0].isEmpty()) - names.subList(1, names.size).joinToString(".") else - names.joinToString(".") + val canonicalName: String = if (names[0].isEmpty()) typeName else names.joinToString(".") /** Package name, like `"kotlin.collections"` for `Map.Entry`. */ - override val packageName: String get() = names[0] + override val packageName: String + get() = names[0] /** Simple name of this class, like `"Entry"` for `Map.Entry`. */ val simpleName: String get() = names[names.size - 1] - override val type: String - get() = simpleName + override val typeName: String + get() = simpleNames.joinToString(separator = ".") - override val fullQualifiedName: String - get() = canonicalName + context(ImportCollector) + override fun renderTo(appendable: Appendable) { + addImport(this) + simpleNames.joinTo(appendable, separator = ".") + renderArgsTo(appendable) + renderNullabilityTo(appendable) + } /** * The enclosing classes, outermost first, followed by the simple name. This is `["Map", "Entry"]` @@ -99,20 +114,14 @@ class ClassRef

private constructor( */ data class TypeRefWithVariance(val variance: Variance, val typeRef: T) : TypeRef { - override val type: String - get() = buildString { - if (variance != Variance.INVARIANT) { - append(variance) - append(" ") - } - append(typeRef.typeWithArguments) + context(ImportCollector) + override fun renderTo(appendable: Appendable) { + if (variance != Variance.INVARIANT) { + appendable.append(variance.label) + appendable.append(' ') } - - override val packageName: String? - get() = null - - override val typeWithArguments: String - get() = type + typeRef.renderTo(appendable) + } override fun substitute(map: TypeParameterSubstitutionMap): TypeRefWithVariance<*> = TypeRefWithVariance(variance, typeRef.substitute(map)) @@ -134,13 +143,22 @@ data class ElementRef, Field : Abstrac override fun copy(args: Map) = ElementRef(element, args, nullable) override fun copy(nullable: Boolean) = ElementRef(element, args, nullable) - override val type: String - get() = element.type - override val packageName: String? + override val typeName: String + get() = element.typeName + + override val packageName: String get() = element.packageName + context(ImportCollector) + override fun renderTo(appendable: Appendable) { + addImport(element) + appendable.append(element.typeName) + renderArgsTo(appendable) + renderNullabilityTo(appendable) + } + override fun toString() = buildString { - append(element.name) + append(element.typeName) append("<") append(args) append(">") @@ -161,14 +179,10 @@ data class PositionTypeParameterRef( ) : TypeParameterRef { override fun toString() = index.toString() - override val type: String - get() = error("Getting type from ${this::class.simpleName} is not supported") - - override val packageName: String? - get() = null - - override val typeWithArguments: String - get() = type + context(ImportCollector) + override fun renderTo(appendable: Appendable) { + renderingIsNotSupported() + } override fun copy(nullable: Boolean) = PositionTypeParameterRef(index, nullable) } @@ -187,13 +201,11 @@ open class NamedTypeParameterRef( override fun toString() = name - override val type: String - get() = name - - override val packageName: String? - get() = null - - override val typeWithArguments get() = name + context(ImportCollector) + override fun renderTo(appendable: Appendable) { + appendable.append(name) + renderNullabilityTo(appendable) + } final override fun copy(nullable: Boolean) = NamedTypeParameterRef(name, nullable) } @@ -204,6 +216,12 @@ interface TypeRefWithNullability : TypeRef { fun copy(nullable: Boolean): TypeRefWithNullability } +private fun TypeRefWithNullability.renderNullabilityTo(appendable: Appendable) { + if (nullable) { + appendable.append('?') + } +} + interface ParametrizedTypeRef, P : TypeParameterRef> : TypeRef { val args: Map @@ -211,16 +229,20 @@ interface ParametrizedTypeRef, P : TypeParam override fun substitute(map: TypeParameterSubstitutionMap): Self = copy(args.mapValues { it.value.substitute(map) }) +} - override val typeWithArguments: String - get() = type + generics + (if (nullable) "?" else "") +context(ImportCollector) +private fun ParametrizedTypeRef<*, *>.renderArgsTo(appendable: Appendable) { + if (args.isNotEmpty()) { + args.values.joinTo(appendable, prefix = "<", postfix = ">") { + it.renderTo(appendable) + "" + } + } } typealias TypeParameterSubstitutionMap = Map -val ParametrizedTypeRef<*, *>.generics: String - get() = if (args.isEmpty()) "" else args.values.joinToString(prefix = "<", postfix = ">") { it.typeWithArguments } - fun > ParametrizedTypeRef.withArgs( vararg args: Pair ) = copy(args.associate { (k, v) -> NamedTypeParameterRef(k) to v }) @@ -270,3 +292,5 @@ fun ClassOrElementRef.inheritanceClauseParenthesis(): String = when (this) { val TypeRef.nullable: Boolean get() = (this as? TypeRefWithNullability)?.nullable ?: false + +fun TypeRef.renderingIsNotSupported(): Nothing = error("Rendering is not supported for ${this::class.simpleName}") diff --git a/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/printer/common.kt b/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/printer/common.kt index 8f25831002a..e4fd8a79a3c 100644 --- a/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/printer/common.kt +++ b/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/printer/common.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.generators.tree.printer +import org.jetbrains.kotlin.generators.tree.ImportCollector import org.jetbrains.kotlin.utils.SmartPrinter import java.io.File @@ -23,11 +24,12 @@ fun printGeneratedType( packageName: String, typeName: String, fileSuppressions: List = emptyList(), - body: SmartPrinter.() -> Unit, + body: context(ImportCollector) SmartPrinter.() -> Unit, ): GeneratedFile { val stringBuilder = StringBuilder() val file = getPathForFile(generationPath, packageName, typeName) - SmartPrinter(stringBuilder).body() + val importCollector = ImportCollector(packageName) + body(importCollector, SmartPrinter(stringBuilder)) return GeneratedFile( file, buildString { @@ -43,6 +45,7 @@ fun printGeneratedType( } appendLine("package $packageName") appendLine() + importCollector.printAllImports(this) append(stringBuilder) } ) diff --git a/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/printer/printUtils.kt b/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/printer/printUtils.kt index d572c47e867..16579d157fb 100644 --- a/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/printer/printUtils.kt +++ b/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/printer/printUtils.kt @@ -7,6 +7,8 @@ package org.jetbrains.kotlin.generators.tree.printer import org.jetbrains.kotlin.generators.tree.AbstractElement import org.jetbrains.kotlin.generators.tree.ImplementationKind +import org.jetbrains.kotlin.generators.tree.ImportCollector +import org.jetbrains.kotlin.generators.tree.render import org.jetbrains.kotlin.utils.SmartPrinter /** @@ -17,9 +19,10 @@ import org.jetbrains.kotlin.utils.SmartPrinter * * @param end The string to add after the closing angle bracket of the type parameter list */ +context(ImportCollector) fun AbstractElement<*, *>.typeParameters(end: String = ""): String = params.takeIf { it.isNotEmpty() } ?.joinToString(", ", "<", ">$end") { param -> - param.name + (param.bounds.singleOrNull()?.let { " : ${it.typeWithArguments}" } ?: "") + param.name + (param.bounds.singleOrNull()?.let { " : ${it.render()}" } ?: "") } ?: "" /** @@ -28,12 +31,13 @@ fun AbstractElement<*, *>.typeParameters(end: String = ""): String = params.take * * Otherwise, an empty string. */ +context(ImportCollector) fun AbstractElement<*, *>.multipleUpperBoundsList(): String { val paramsWithMultipleUpperBounds = params.filter { it.bounds.size > 1 }.takeIf { it.isNotEmpty() } ?: return "" return buildString { append(" where ") paramsWithMultipleUpperBounds.joinTo(this, separator = ", ") { param -> - param.bounds.joinToString(", ") { bound -> "$param : ${bound.typeWithArguments}" } + param.bounds.joinToString(", ") { bound -> "$param : ${bound.render()}" } } append("") } @@ -48,11 +52,6 @@ fun ImplementationKind?.braces(): String = when (this) { else -> throw IllegalStateException(this.toString()) } -val AbstractElement<*, *>.generics: String - get() = params.takeIf { it.isNotEmpty() } - ?.let { it.joinToString(", ", "<", ">") { it.name } } - ?: "" - fun SmartPrinter.printKDoc(kDoc: String?) { if (kDoc == null) return println("/**")