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

Handle phase for FirEnumEntry correctly

Browse Source
This commit is contained in:
Mikhail Glukhikh
2019-12-30 18:33:46 +03:00
parent 05ee6fdd77
commit 2f6a48f70c
4 changed files with 10 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/FirStatusResolveTransformer.kt
+4
View File
@@ -92,6 +92,10 @@ class FirStatusResolveTransformer : FirAbstractTreeTransformer<FirDeclarationSta
return transformDeclaration(property, data) return transformDeclaration(property, data)
} }
override fun transformEnumEntry(enumEntry: FirEnumEntry, data: FirDeclarationStatus?): CompositeTransformResult<FirDeclaration> {
return transformDeclaration(enumEntry, data)
}
override fun transformValueParameter( override fun transformValueParameter(
valueParameter: FirValueParameter, valueParameter: FirValueParameter,
data: FirDeclarationStatus? data: FirDeclarationStatus?
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTypeResolveTransformer.kt
+3
View File
@@ -59,6 +59,9 @@ class FirTypeResolveTransformer : FirAbstractTreeTransformerWithSuperTypes(
} }
} }
override fun transformEnumEntry(enumEntry: FirEnumEntry, data: Nothing?): CompositeTransformResult<FirDeclaration> {
return transformDeclaration(enumEntry, data)
}
override fun transformProperty(property: FirProperty, data: Nothing?): CompositeTransformResult<FirDeclaration> { override fun transformProperty(property: FirProperty, data: Nothing?): CompositeTransformResult<FirDeclaration> {
return withScopeCleanup { return withScopeCleanup {
compiler/fir/resolve/testData/resolve/expresssions/enumEntryUse.kt
Vendored
+1 -1
View File
@@ -17,6 +17,6 @@ fun test() {
useEnum(TestEnum.SECOND) useEnum(TestEnum.SECOND)
useEnum(TestEnum.THIRD) useEnum(TestEnum.THIRD)
<!INAPPLICABLE_CANDIDATE!>useVararg<!>(TestEnum.FIRST, TestEnum.SECOND) useVararg(TestEnum.FIRST, TestEnum.SECOND)
<!INAPPLICABLE_CANDIDATE!>useVararg<!>(1, 2, 3, 4, 5) <!INAPPLICABLE_CANDIDATE!>useVararg<!>(1, 2, 3, 4, 5)
} }
compiler/fir/resolve/testData/resolve/expresssions/enumEntryUse.txt
Vendored
+2 -2
View File
@@ -39,12 +39,12 @@ FILE: enumEntryUse.kt
} }
public final fun useEnum(some: R|TestEnum|): R|kotlin/Unit| { public final fun useEnum(some: R|TestEnum|): R|kotlin/Unit| {
} }
public final fun useVararg(vararg some: R|kotlin/Array<kotlin/Array<kotlin/Array<kotlin/Array<kotlin/Array<kotlin/Array<TestEnum>>>>>>|): R|kotlin/Unit| { public final fun useVararg(vararg some: R|kotlin/Array<TestEnum>|): R|kotlin/Unit| {
} }
public final fun test(): R|kotlin/Unit| { public final fun test(): R|kotlin/Unit| {
R|/use|(Q|TestEnum|.R|/TestEnum.FIRST|) R|/use|(Q|TestEnum|.R|/TestEnum.FIRST|)
R|/useEnum|(Q|TestEnum|.R|/TestEnum.SECOND|) R|/useEnum|(Q|TestEnum|.R|/TestEnum.SECOND|)
R|/useEnum|(Q|TestEnum|.R|/TestEnum.THIRD|) R|/useEnum|(Q|TestEnum|.R|/TestEnum.THIRD|)
<Inapplicable(INAPPLICABLE): [/useVararg]>#(Q|TestEnum|.R|/TestEnum.FIRST|, Q|TestEnum|.R|/TestEnum.SECOND|) R|/useVararg|(Q|TestEnum|.R|/TestEnum.FIRST|, Q|TestEnum|.R|/TestEnum.SECOND|)
<Inapplicable(INAPPLICABLE): [/useVararg]>#(Int(1), Int(2), Int(3), Int(4), Int(5)) <Inapplicable(INAPPLICABLE): [/useVararg]>#(Int(1), Int(2), Int(3), Int(4), Int(5))
} }