From f3e754f31416e700eaffeef010c67c3c6998cfb1 Mon Sep 17 00:00:00 2001
From: Ivan Kochurkin <ivan.kochurkin@jetbrains.com>
Date: Mon, 6 Sep 2021 14:34:04 +0300
Subject: [PATCH] [FIR] Remove excess FirAnnotationContainer from some super
 types

---
 .../src/org/jetbrains/kotlin/fir/types/jvm/FirJavaTypeRef.kt   | 3 +--
 .../kotlin/fir/expressions/impl/FirSingleExpressionBlock.kt    | 3 +--
 .../org/jetbrains/kotlin/fir/types/impl/FirUserTypeRefImpl.kt  | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/types/jvm/FirJavaTypeRef.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/types/jvm/FirJavaTypeRef.kt
index 7ab96d0ba8c..d6d8a9969b5 100644
--- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/types/jvm/FirJavaTypeRef.kt
+++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/types/jvm/FirJavaTypeRef.kt
@@ -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
 
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirSingleExpressionBlock.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirSingleExpressionBlock.kt
index 04815dfb3cb..11b2236f958 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirSingleExpressionBlock.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirSingleExpressionBlock.kt
@@ -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()
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirUserTypeRefImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirUserTypeRefImpl.kt
index e74dfb78fdb..1d0011a6c64 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirUserTypeRefImpl.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirUserTypeRefImpl.kt
@@ -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