jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-04-20 00:21:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIR Java: fix constructor enhancements

Browse Source 
Before this commit,
we generated regular member functions as constructor enhancement.
Now, we generate constructors as constructor enhancement.
This commit is contained in:
Mikhail Glukhikh
2019-04-16 16:26:07 +03:00
parent 2e966a7ded
commit 2476c0299f
18 changed files with 75 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/testData/loadJava/compiledJava/MyException.fir.txt vendored
View File

@@ -1,4 +1,4 @@
public open class MyException : R|java/lang/Object| {
public final fun MyException(message: R|ft<kotlin/String, kotlin/String?>|!, cause: R|ft<kotlin/Throwable, kotlin/Throwable?>|!): R|test/MyException|
public constructor(message: R|ft<kotlin/String, kotlin/String?>|!, cause: R|ft<kotlin/Throwable, kotlin/Throwable?>|!): R|test/MyException|
}

2
compiler/testData/loadJava/compiledJava/PackageLocalVisibility.fir.txt vendored
View File

@@ -13,6 +13,6 @@ public open class JFrame : R|awt/Frame| {
public/*package*/ get(): R|ft<kotlin/String, kotlin/String?>|!
public/*package*/ set(value: R|ft<kotlin/String, kotlin/String?>|!): kotlin/Unit
public final fun JFrame(): R|test/JFrame|
public constructor(): R|test/JFrame|
}

2
compiler/testData/loadJava/compiledJava/PrivateMembers.fir.txt vendored
View File

@@ -11,6 +11,6 @@ public open class PrivateMembers : R|java/lang/Object| {
private open static operator fun staticMethod(): R|kotlin/Unit|
private final fun PrivateMembers(): R|test/PrivateMembers|
private constructor(): R|test/PrivateMembers|
}

2
compiler/testData/loadJava/compiledJava/Simple.fir.txt vendored
View File

@@ -1,4 +1,4 @@
public final class Simple : R|java/lang/Object| {
public final fun Simple(): R|test/Simple|
public constructor(): R|test/Simple|
}

2
compiler/testData/loadJava/compiledJava/annotations/AnnotatedConstructor.fir.txt vendored
View File

@@ -1,4 +1,4 @@
public open class AnnotatedConstructor : R|java/lang/Object| {
@R|test/AnnotatedConstructor.Anno|(String(constructor)) public final fun AnnotatedConstructor(): R|test/AnnotatedConstructor|
@R|test/AnnotatedConstructor.Anno|(String(constructor)) public constructor(): R|test/AnnotatedConstructor|
}

4
compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.fir.txt vendored
View File

@@ -2,8 +2,8 @@ public final enum class EnumConstructorParameter : R|java/lang/Enum<test/EnumCon
public final static val INSTANCE: R|ft<test/EnumConstructorParameter, test/EnumConstructorParameter?>|!
public get(): R|ft<test/EnumConstructorParameter, test/EnumConstructorParameter?>|!
private final fun EnumConstructorParameter(@R|test/EnumConstructorParameter.Anno|(String(string)) s: R|ft<kotlin/String, kotlin/String?>|!): R|test/EnumConstructorParameter|
private constructor(@R|test/EnumConstructorParameter.Anno|(String(string)) s: R|ft<kotlin/String, kotlin/String?>|!): R|test/EnumConstructorParameter|
private final fun EnumConstructorParameter(x: R|kotlin/Int|): R|test/EnumConstructorParameter|
private constructor(x: R|kotlin/Int|): R|test/EnumConstructorParameter|
}

2
compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericDeep.fir.txt vendored
View File

@@ -1,4 +1,4 @@
public open class ConstructorGenericDeep : R|java/lang/Object| {
public final fun ConstructorGenericDeep(cl: R|ft<java/lang/Class<ft<P, P?>>, java/lang/Class<ft<P, P?>>?>|!): R|test/ConstructorGenericDeep|
public constructor(cl: R|ft<java/lang/Class<ft<P, P?>>, java/lang/Class<ft<P, P?>>?>|!): R|test/ConstructorGenericDeep|
}

2
compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericSimple.fir.txt vendored
View File

@@ -1,4 +1,4 @@
public open class ConstructorGenericSimple : R|java/lang/Object| {
public final fun ConstructorGenericSimple(p: R|ft<P, P?>|!): R|test/ConstructorGenericSimple|
public constructor(p: R|ft<P, P?>|!): R|test/ConstructorGenericSimple|
}

2
compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericUpperBound.fir.txt vendored
View File

@@ -1,4 +1,4 @@
public open class ConstructorGenericUpperBound : R|java/lang/Object| {
public final fun ConstructorGenericUpperBound(p: R|ft<P, P?>|!): R|test/ConstructorGenericUpperBound|
public constructor(p: R|ft<P, P?>|!): R|test/ConstructorGenericUpperBound|
}

2
compiler/testData/loadJava/compiledJava/enum/EnumMembers.fir.txt vendored
View File

@@ -10,6 +10,6 @@ public final enum class EnumMembers : R|java/lang/Enum<test/EnumMembers>| {
public open operator fun first(): R|kotlin/Boolean|
private final fun EnumMembers(isFirst: R|kotlin/Boolean|): R|test/EnumMembers|
private constructor(isFirst: R|kotlin/Boolean|): R|test/EnumMembers|
}

2
compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.fir.txt vendored
View File

@@ -1,4 +1,4 @@
public open class ConstructorWithNewTypeParams<T> : R|java/lang/Object| {
public final fun ConstructorWithNewTypeParams(first: R|ft<U, U?>|!): R|test/ConstructorWithNewTypeParams|
public constructor(first: R|ft<U, U?>|!): R|test/ConstructorWithNewTypeParams|
}

2
compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.fir.txt vendored
View File

@@ -1,4 +1,4 @@
public open class ConstructorWithParentTypeParams<T> : R|java/lang/Object| {
public final fun ConstructorWithParentTypeParams(first: R|ft<T, T?>|!): R|test/ConstructorWithParentTypeParams|
public constructor(first: R|ft<T, T?>|!): R|test/ConstructorWithParentTypeParams|
}

2
compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithSeveralParams.fir.txt vendored
View File

@@ -1,4 +1,4 @@
public open class ConstructorWithSeveralParams : R|java/lang/Object| {
public final fun ConstructorWithSeveralParams(integer: R|ft<kotlin/Int, kotlin/Int?>|!, intBasic: R|kotlin/Int|, collection: R|ft<java/util/ArrayList<ft<kotlin/String, kotlin/String?>>, java/util/ArrayList<ft<kotlin/String, kotlin/String?>>?>|!): R|test/ConstructorWithSeveralParams|
public constructor(integer: R|ft<kotlin/Int, kotlin/Int?>|!, intBasic: R|kotlin/Int|, collection: R|ft<java/util/ArrayList<ft<kotlin/String, kotlin/String?>>, java/util/ArrayList<ft<kotlin/String, kotlin/String?>>?>|!): R|test/ConstructorWithSeveralParams|
}

2
compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithoutParams.fir.txt vendored
View File

@@ -1,4 +1,4 @@
public open class ConstructorWithoutParams : R|java/lang/Object| {
public final fun ConstructorWithoutParams(): R|test/ConstructorWithoutParams|
public constructor(): R|test/ConstructorWithoutParams|
}

2
compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.fir.txt vendored
View File

@@ -1,4 +1,4 @@
public open class Constructor : R|java/lang/Object| {
public final fun Constructor(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|!): R|test/Constructor|
public constructor(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|!): R|test/Constructor|
}

2
compiler/testData/loadJava/compiledJava/sam/adapters/ConstructorWithAnnotations.fir.txt vendored
View File

@@ -1,4 +1,4 @@
public open class ConstructorWithAnnotations : R|java/lang/Object| {
public final fun ConstructorWithAnnotations(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|!, @R|org/jetbrains/annotations/NotNull|() s: R|kotlin/String|): R|test/ConstructorWithAnnotations|
public constructor(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|!, @R|org/jetbrains/annotations/NotNull|() s: R|kotlin/String|): R|test/ConstructorWithAnnotations|
}