[FIR] Remove excess FirAnnotationContainer from some super types

This commit is contained in:
Ivan Kochurkin
2021-09-06 14:34:04 +03:00
committed by TeamCityServer
parent 55f33999f1
commit f3e754f314
3 changed files with 3 additions and 6 deletions
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.fir.types.jvm
import org.jetbrains.kotlin.fir.FirAnnotationContainer
import org.jetbrains.kotlin.fir.FirSourceElement
import org.jetbrains.kotlin.fir.builder.FirBuilderDsl
import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
@@ -24,7 +23,7 @@ class FirJavaTypeRef(
val type: JavaType,
annotationBuilder: () -> List<FirAnnotationCall>,
override val qualifier: MutableList<FirQualifierPart>
) : FirUserTypeRef(), FirAnnotationContainer {
) : FirUserTypeRef() {
override val customRenderer: Boolean
get() = true
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.fir.expressions.impl
import org.jetbrains.kotlin.fir.FirAnnotationContainer
import org.jetbrains.kotlin.fir.FirFakeSourceElementKind
import org.jetbrains.kotlin.fir.FirSourceElement
import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
@@ -21,7 +20,7 @@ import org.jetbrains.kotlin.fir.fakeElement
class FirSingleExpressionBlock(
var statement: FirStatement
) : FirBlock(), FirAnnotationContainer {
) : FirBlock() {
override val source: FirSourceElement?
get() = statement.source?.fakeElement(FirFakeSourceElementKind.SingleExpressionBlock)
override val annotations: MutableList<FirAnnotationCall> = mutableListOf()
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.fir.types.impl
import org.jetbrains.kotlin.fir.FirAnnotationContainer
import org.jetbrains.kotlin.fir.FirSourceElement
import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
import org.jetbrains.kotlin.fir.types.FirQualifierPart
@@ -20,7 +19,7 @@ class FirUserTypeRefImpl(
override val isMarkedNullable: Boolean,
override val qualifier: MutableList<FirQualifierPart>,
override val annotations: MutableList<FirAnnotationCall>
) : FirUserTypeRef(), FirAnnotationContainer {
) : FirUserTypeRef() {
override val customRenderer: Boolean
get() = false