[FIR] Remove excess FirAnnotationContainer from some super types
This commit is contained in:
committed by
TeamCityServer
parent
55f33999f1
commit
f3e754f314
@@ -5,7 +5,6 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.fir.types.jvm
|
package org.jetbrains.kotlin.fir.types.jvm
|
||||||
|
|
||||||
import org.jetbrains.kotlin.fir.FirAnnotationContainer
|
|
||||||
import org.jetbrains.kotlin.fir.FirSourceElement
|
import org.jetbrains.kotlin.fir.FirSourceElement
|
||||||
import org.jetbrains.kotlin.fir.builder.FirBuilderDsl
|
import org.jetbrains.kotlin.fir.builder.FirBuilderDsl
|
||||||
import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
|
import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
|
||||||
@@ -24,7 +23,7 @@ class FirJavaTypeRef(
|
|||||||
val type: JavaType,
|
val type: JavaType,
|
||||||
annotationBuilder: () -> List<FirAnnotationCall>,
|
annotationBuilder: () -> List<FirAnnotationCall>,
|
||||||
override val qualifier: MutableList<FirQualifierPart>
|
override val qualifier: MutableList<FirQualifierPart>
|
||||||
) : FirUserTypeRef(), FirAnnotationContainer {
|
) : FirUserTypeRef() {
|
||||||
override val customRenderer: Boolean
|
override val customRenderer: Boolean
|
||||||
get() = true
|
get() = true
|
||||||
|
|
||||||
|
|||||||
+1
-2
@@ -5,7 +5,6 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.fir.expressions.impl
|
package org.jetbrains.kotlin.fir.expressions.impl
|
||||||
|
|
||||||
import org.jetbrains.kotlin.fir.FirAnnotationContainer
|
|
||||||
import org.jetbrains.kotlin.fir.FirFakeSourceElementKind
|
import org.jetbrains.kotlin.fir.FirFakeSourceElementKind
|
||||||
import org.jetbrains.kotlin.fir.FirSourceElement
|
import org.jetbrains.kotlin.fir.FirSourceElement
|
||||||
import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
|
import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
|
||||||
@@ -21,7 +20,7 @@ import org.jetbrains.kotlin.fir.fakeElement
|
|||||||
|
|
||||||
class FirSingleExpressionBlock(
|
class FirSingleExpressionBlock(
|
||||||
var statement: FirStatement
|
var statement: FirStatement
|
||||||
) : FirBlock(), FirAnnotationContainer {
|
) : FirBlock() {
|
||||||
override val source: FirSourceElement?
|
override val source: FirSourceElement?
|
||||||
get() = statement.source?.fakeElement(FirFakeSourceElementKind.SingleExpressionBlock)
|
get() = statement.source?.fakeElement(FirFakeSourceElementKind.SingleExpressionBlock)
|
||||||
override val annotations: MutableList<FirAnnotationCall> = mutableListOf()
|
override val annotations: MutableList<FirAnnotationCall> = mutableListOf()
|
||||||
|
|||||||
@@ -5,7 +5,6 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.fir.types.impl
|
package org.jetbrains.kotlin.fir.types.impl
|
||||||
|
|
||||||
import org.jetbrains.kotlin.fir.FirAnnotationContainer
|
|
||||||
import org.jetbrains.kotlin.fir.FirSourceElement
|
import org.jetbrains.kotlin.fir.FirSourceElement
|
||||||
import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
|
import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
|
||||||
import org.jetbrains.kotlin.fir.types.FirQualifierPart
|
import org.jetbrains.kotlin.fir.types.FirQualifierPart
|
||||||
@@ -20,7 +19,7 @@ class FirUserTypeRefImpl(
|
|||||||
override val isMarkedNullable: Boolean,
|
override val isMarkedNullable: Boolean,
|
||||||
override val qualifier: MutableList<FirQualifierPart>,
|
override val qualifier: MutableList<FirQualifierPart>,
|
||||||
override val annotations: MutableList<FirAnnotationCall>
|
override val annotations: MutableList<FirAnnotationCall>
|
||||||
) : FirUserTypeRef(), FirAnnotationContainer {
|
) : FirUserTypeRef() {
|
||||||
override val customRenderer: Boolean
|
override val customRenderer: Boolean
|
||||||
get() = false
|
get() = false
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user