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

FIR Java model: support static members & enum entries

Browse Source 
Related to KT-29218
This commit is contained in:
Mikhail Glukhikh
2019-03-01 16:09:51 +03:00
parent 0434a55ea2
commit 33fb3d154b
25 changed files with 136 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledJava/static/Enum.fir.txt
Vendored
+9
View File
@@ -1,2 +1,11 @@
public final enum class Enum : R|java/lang/Enum<test/Enum>| {
public final static property A(val): R|ft<test/Enum, test/Enum?>|!
public get(): R|ft<test/Enum, test/Enum?>|!
public final static property B(val): R|ft<test/Enum, test/Enum?>|!
public get(): R|ft<test/Enum, test/Enum?>|!
public final static property C(val): R|ft<test/Enum, test/Enum?>|!
public get(): R|ft<test/Enum, test/Enum?>|!
}
compiler/testData/loadJava/compiledJava/static/Simple.fir.txt
Vendored
+2
View File
@@ -1,4 +1,6 @@
public open class Simple : R|java/lang/Object| {
public open static operator function bar(): R|kotlin/Unit|
public open operator function foo(): R|kotlin/Unit|
}
compiler/testData/loadJava/compiledJava/static/StaticFinal.fir.txt
Vendored
+18
View File
@@ -1,2 +1,20 @@
public open class StaticFinal : R|java/lang/Object| {
public final static property publicNonNull(val): R|ft<kotlin/String, kotlin/String?>|!
public get(): R|ft<kotlin/String, kotlin/String?>|!
public final static property publicNull(val): R|ft<kotlin/String, kotlin/String?>|!
public get(): R|ft<kotlin/String, kotlin/String?>|!
public/*package*/ final static property packageNonNull(val): R|ft<kotlin/String, kotlin/String?>|!
public/*package*/ get(): R|ft<kotlin/String, kotlin/String?>|!
public/*package*/ final static property packageNull(val): R|ft<kotlin/String, kotlin/String?>|!
public/*package*/ get(): R|ft<kotlin/String, kotlin/String?>|!
private final static property privateNonNull(val): R|ft<kotlin/String, kotlin/String?>|!
private get(): R|ft<kotlin/String, kotlin/String?>|!
private final static property privateNull(val): R|ft<kotlin/String, kotlin/String?>|!
private get(): R|ft<kotlin/String, kotlin/String?>|!
}
compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.fir.txt
Vendored
+16
View File
@@ -1,2 +1,18 @@
public final enum class StaticMembersInEnum : R|java/lang/Enum<test/StaticMembersInEnum>| {
public final static property ENTRY(val): R|ft<test/StaticMembersInEnum, test/StaticMembersInEnum?>|!
public get(): R|ft<test/StaticMembersInEnum, test/StaticMembersInEnum?>|!
public open static property STATIC_FIELD(var): R|kotlin/Int|
public get(): R|kotlin/Int|
public set(value: R|kotlin/Int|): kotlin/Unit
public final static property CONSTANT(val): R|ft<test/StaticMembersInEnum, test/StaticMembersInEnum?>|!
public get(): R|ft<test/StaticMembersInEnum, test/StaticMembersInEnum?>|!
public open static operator function foo(): R|kotlin/Unit|
public open static operator function values(x: R|kotlin/Int|): R|kotlin/Unit|
public open static operator function valueOf(x: R|kotlin/Int|): R|kotlin/Unit|
}