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

[FIR] Don't duplicate annotations from enum entry to its initializer

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2021-06-30 14:03:19 +03:00
committed by TeamCityServer
parent 9f547171da
commit f1bf3c0d5a
6 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt
-1
View File
@@ -673,7 +673,6 @@ class DeclarationsConverter(
classKind = ClassKind.ENUM_ENTRY classKind = ClassKind.ENUM_ENTRY
scopeProvider = baseScopeProvider scopeProvider = baseScopeProvider
symbol = FirAnonymousObjectSymbol() symbol = FirAnonymousObjectSymbol()
annotations += modifiers.annotations
val enumClassWrapper = ClassWrapper( val enumClassWrapper = ClassWrapper(
enumEntryName, modifiers, ClassKind.ENUM_ENTRY, this, enumEntryName, modifiers, ClassKind.ENUM_ENTRY, this,
hasPrimaryConstructor = true, hasPrimaryConstructor = true,
compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt
-1
View File
@@ -793,7 +793,6 @@ open class RawFirBuilder(
scopeProvider = this@RawFirBuilder.baseScopeProvider scopeProvider = this@RawFirBuilder.baseScopeProvider
symbol = FirAnonymousObjectSymbol() symbol = FirAnonymousObjectSymbol()
extractAnnotationsTo(this)
val delegatedEntrySelfType = buildResolvedTypeRef { val delegatedEntrySelfType = buildResolvedTypeRef {
type = type =
ConeClassLikeTypeImpl(this@buildAnonymousObject.symbol.toLookupTag(), emptyArray(), isNullable = false) ConeClassLikeTypeImpl(this@buildAnonymousObject.symbol.toLookupTag(), emptyArray(), isNullable = false)
compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/annotation.lazyBodies.txt
Vendored
+2 -2
View File
@@ -29,14 +29,14 @@ FILE: annotation.kt
super<R|kotlin/Enum<My>|>() super<R|kotlin/Enum<My>|>()
} }
@base() public final static enum entry FIRST: R|My| = @base() object : R|My| { @base() public final static enum entry FIRST: R|My| = object : R|My| {
private constructor(): R|<anonymous>| { private constructor(): R|<anonymous>| {
super<R|My|>() super<R|My|>()
} }
} }
@base() public final static enum entry SECOND: R|My| = @base() object : R|My| { @base() public final static enum entry SECOND: R|My| = object : R|My| {
private constructor(): R|<anonymous>| { private constructor(): R|<anonymous>| {
super<R|My|>() super<R|My|>()
} }
compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/annotation.txt
Vendored
+2 -2
View File
@@ -29,14 +29,14 @@ FILE: annotation.kt
super<R|kotlin/Enum<My>|>() super<R|kotlin/Enum<My>|>()
} }
@base() public final static [ContainingClassKey=My] enum entry FIRST: R|My| = @base() object : R|My| { @base() public final static [ContainingClassKey=My] enum entry FIRST: R|My| = object : R|My| {
private [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| { private [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
super<R|My|>() super<R|My|>()
} }
} }
@base() public final static [ContainingClassKey=My] enum entry SECOND: R|My| = @base() object : R|My| { @base() public final static [ContainingClassKey=My] enum entry SECOND: R|My| = object : R|My| {
private [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| { private [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
super<R|My|>() super<R|My|>()
} }
compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.fir.kt.txt
Vendored
-1
View File
@@ -18,7 +18,6 @@ open enum class TestEnum : Enum<TestEnum> {
@TestAnn(x = "ENTRY2") @TestAnn(x = "ENTRY2")
ENTRY2 = ENTRY2() ENTRY2 = ENTRY2()
@TestAnn(x = "ENTRY2")
private enum entry class ENTRY2 : TestEnum { private enum entry class ENTRY2 : TestEnum {
private constructor() /* primary */ { private constructor() /* primary */ {
super/*TestEnum*/() super/*TestEnum*/()
compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.fir.txt
Vendored
-2
View File
@@ -45,8 +45,6 @@ FILE fqName:<root> fileName:/enumEntriesWithAnnotations.kt
init: EXPRESSION_BODY init: EXPRESSION_BODY
ENUM_CONSTRUCTOR_CALL 'private constructor <init> () [primary] declared in <root>.TestEnum.ENTRY2' ENUM_CONSTRUCTOR_CALL 'private constructor <init> () [primary] declared in <root>.TestEnum.ENTRY2'
class: CLASS ENUM_ENTRY name:ENTRY2 modality:FINAL visibility:private superTypes:[<root>.TestEnum] class: CLASS ENUM_ENTRY name:ENTRY2 modality:FINAL visibility:private superTypes:[<root>.TestEnum]
annotations:
TestAnn(x = 'ENTRY2')
$this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestEnum.ENTRY2 $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestEnum.ENTRY2
CONSTRUCTOR visibility:private <> () returnType:<root>.TestEnum.ENTRY2 [primary] CONSTRUCTOR visibility:private <> () returnType:<root>.TestEnum.ENTRY2 [primary]
BLOCK_BODY BLOCK_BODY