azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIR] Cleanup annotations transform in FirExpressionsResolveTransformer

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-09-18 13:36:54 +03:00
parent 0e91c8f048
commit f069857492
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt
+3 -3
View File
@@ -338,7 +338,7 @@ open class FirExpressionsResolveTransformer(transformer: FirBodyResolveTransform
): CompositeTransformResult<FirStatement> { ): CompositeTransformResult<FirStatement> {
require(assignmentOperatorStatement.operation != FirOperation.ASSIGN) require(assignmentOperatorStatement.operation != FirOperation.ASSIGN)
assignmentOperatorStatement.annotations.forEach { it.accept(this, data) } assignmentOperatorStatement.transformAnnotations(transformer, ResolutionMode.ContextIndependent)
val leftArgument = assignmentOperatorStatement.leftArgument.transformSingle(transformer, ResolutionMode.ContextIndependent) val leftArgument = assignmentOperatorStatement.leftArgument.transformSingle(transformer, ResolutionMode.ContextIndependent)
val rightArgument = assignmentOperatorStatement.rightArgument.transformSingle(transformer, ResolutionMode.ContextDependent) val rightArgument = assignmentOperatorStatement.rightArgument.transformSingle(transformer, ResolutionMode.ContextDependent)
@@ -571,7 +571,7 @@ open class FirExpressionsResolveTransformer(transformer: FirBodyResolveTransform
data: ResolutionMode, data: ResolutionMode,
): CompositeTransformResult<FirStatement> { ): CompositeTransformResult<FirStatement> {
// val resolvedAssignment = transformCallee(variableAssignment) // val resolvedAssignment = transformCallee(variableAssignment)
variableAssignment.annotations.forEach { it.accept(this, data) } variableAssignment.transformAnnotations(transformer, ResolutionMode.ContextIndependent)
val resolvedAssignment = callResolver.resolveVariableAccessAndSelectCandidate(variableAssignment) val resolvedAssignment = callResolver.resolveVariableAccessAndSelectCandidate(variableAssignment)
val result = if (resolvedAssignment is FirVariableAssignment) { val result = if (resolvedAssignment is FirVariableAssignment) {
val completeAssignment = callCompleter.completeCall(resolvedAssignment, noExpectedType).result // TODO: check val completeAssignment = callCompleter.completeCall(resolvedAssignment, noExpectedType).result // TODO: check
@@ -697,7 +697,7 @@ open class FirExpressionsResolveTransformer(transformer: FirBodyResolveTransform
constExpression: FirConstExpression<T>, constExpression: FirConstExpression<T>,
data: ResolutionMode, data: ResolutionMode,
): CompositeTransformResult<FirStatement> { ): CompositeTransformResult<FirStatement> {
constExpression.annotations.forEach { it.accept(this, data) } constExpression.transformAnnotations(transformer, ResolutionMode.ContextIndependent)
val type = when (val kind = constExpression.kind) { val type = when (val kind = constExpression.kind) {
FirConstKind.IntegerLiteral, FirConstKind.UnsignedIntegerLiteral -> { FirConstKind.IntegerLiteral, FirConstKind.UnsignedIntegerLiteral -> {