[FIR] Move declaration attributes to declaration builders

This commit is contained in:
Dmitriy Novozhilov
2020-10-13 12:09:58 +03:00
parent 0b51fd03e2
commit e07f63d26c
44 changed files with 83 additions and 37 deletions
@@ -42,6 +42,7 @@ class FirJavaMethod @FirImplementationDetail constructor(
source: FirSourceElement?,
session: FirSession,
resolvePhase: FirResolvePhase,
attributes: FirDeclarationAttributes,
returnTypeRef: FirTypeRef,
receiverTypeRef: FirTypeRef?,
typeParameters: MutableList<FirTypeParameter>,
@@ -57,6 +58,7 @@ class FirJavaMethod @FirImplementationDetail constructor(
session,
resolvePhase,
FirDeclarationOrigin.Java,
attributes,
returnTypeRef,
receiverTypeRef,
valueParameters,
@@ -94,6 +96,7 @@ class FirJavaMethodBuilder : FirSimpleFunctionBuilder() {
source,
session,
resolvePhase,
attributes,
returnTypeRef as FirJavaTypeRef,
receiverTypeRef = null,
typeParameters,
@@ -9,6 +9,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail
import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.FirSourceElement
import org.jetbrains.kotlin.fir.builder.FirBuilderDsl
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.FirValueParameter
@@ -25,6 +26,7 @@ class FirJavaValueParameter @FirImplementationDetail constructor(
source: FirSourceElement?,
session: FirSession,
resolvePhase: FirResolvePhase,
attributes: FirDeclarationAttributes,
returnTypeRef: FirTypeRef,
name: Name,
symbol: FirVariableSymbol<FirValueParameter>,
@@ -38,6 +40,7 @@ class FirJavaValueParameter @FirImplementationDetail constructor(
session,
resolvePhase,
FirDeclarationOrigin.Java,
attributes,
returnTypeRef,
name,
symbol,
@@ -56,6 +59,7 @@ class FirJavaValueParameterBuilder : FirValueParameterBuilder() {
source,
session,
resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES,
attributes,
returnTypeRef,
name,
symbol = FirVariableSymbol(name),