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

[FIR] Do not enhance java fields to firProperty

Browse Source
This commit is contained in:
Simon Ogorodnik
2019-05-15 15:51:25 +03:00
committed by Mikhail Glukhikh
parent 397aaa189e
commit 6c313895df
37 changed files with 86 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/testData/enhancement/jsr305/NonNullNever.fir.txt
Vendored
+1 -3
View File
@@ -1,9 +1,7 @@
@R|java/lang/annotation/Documented|() @R|javax/annotation/meta/TypeQualifierNickname|() @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.NEVER|()) @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) public abstract annotation class MyNullable : R|kotlin/Annotation| {
}
public open class NonNullNever : R|kotlin/Any| {
@R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.NEVER|()) public open var field: R|kotlin/String|?
public get(): R|kotlin/String|?
public set(value: R|kotlin/String|?): kotlin/Unit
@R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.NEVER|()) public open field field: R|kotlin/String|?
@R|MyNullable|() public open operator fun foo(@R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.NEVER|()) x: R|kotlin/String|?, @R|MyNullable|() y: R|kotlin/CharSequence|?): R|kotlin/String|?
compiler/fir/resolve/testData/enhancement/jsr305/Simple.fir.txt
Vendored
+1 -3
View File
@@ -1,7 +1,5 @@
public open class Simple : R|kotlin/Any| {
@R|javax/annotation/Nullable|() public open var field: R|kotlin/String|?
public get(): R|kotlin/String|?
public set(value: R|kotlin/String|?): kotlin/Unit
@R|javax/annotation/Nullable|() public open field field: R|kotlin/String|?
@R|javax/annotation/Nullable|() public open operator fun foo(@R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence|?): R|kotlin/String|?
compiler/fir/resolve/testData/enhancement/jsr305/Strange.fir.txt
Vendored
+1 -3
View File
@@ -1,7 +1,5 @@
public open class Strange : R|kotlin/Any| {
@R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.UNKNOWN|()) public open var field: R|ft<kotlin/String, kotlin/String?>|!
public get(): R|ft<kotlin/String, kotlin/String?>|!
public set(value: R|ft<kotlin/String, kotlin/String?>|!): kotlin/Unit
@R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.UNKNOWN|()) public open field field: R|ft<kotlin/String, kotlin/String?>|!
@R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.MAYBE|()) public open operator fun foo(@R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.ALWAYS|()) x: R|kotlin/String|, @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.NEVER|()) y: R|kotlin/CharSequence|?): R|kotlin/String|?
compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/FieldsAreNullable.fir.txt
Vendored
+2 -6
View File
@@ -1,11 +1,7 @@
@R|FieldsAreNullable|() public open class A : R|kotlin/Any| {
public open var field: R|kotlin/String|?
public get(): R|kotlin/String|?
public set(value: R|kotlin/String|?): kotlin/Unit
public open field field: R|kotlin/String|?
@R|javax/annotation/Nonnull|() public open var nonNullField: R|kotlin/String|
public get(): R|kotlin/String|
public set(value: R|kotlin/String|): kotlin/Unit
@R|javax/annotation/Nonnull|() public open field nonNullField: R|kotlin/String|
public open operator fun foo(q: R|ft<kotlin/String, kotlin/String?>|!, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence|?): R|ft<kotlin/String, kotlin/String?>|!
compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt
Vendored
+1 -3
View File
@@ -1,7 +1,5 @@
@R|NonNullApi|() public open class A : R|kotlin/Any| {
public open var field: R|kotlin/String|
public get(): R|kotlin/String|
public set(value: R|kotlin/String|): kotlin/Unit
public open field field: R|kotlin/String|
public open operator fun foo(x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence|?): R|kotlin/String|
compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefault.fir.txt
Vendored
+1 -3
View File
@@ -1,7 +1,5 @@
@R|javax/annotation/ParametersAreNonnullByDefault|() public open class A : R|kotlin/Any| {
@R|javax/annotation/Nullable|() public open var field: R|kotlin/String|?
public get(): R|kotlin/String|?
public set(value: R|kotlin/String|?): kotlin/Unit
@R|javax/annotation/Nullable|() public open field field: R|kotlin/String|?
public open operator fun foo(q: R|kotlin/String|, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence|?): R|ft<kotlin/String, kotlin/String?>|!
compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefaultPackage.fir.txt
Vendored
+2 -6
View File
@@ -1,7 +1,5 @@
public open class A : R|kotlin/Any| {
@R|javax/annotation/Nullable|() public open var field: R|kotlin/String|?
public get(): R|kotlin/String|?
public set(value: R|kotlin/String|?): kotlin/Unit
@R|javax/annotation/Nullable|() public open field field: R|kotlin/String|?
public open operator fun foo(q: R|ft<kotlin/String, kotlin/String?>|!, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence|?): R|ft<kotlin/String, kotlin/String?>|!
@@ -9,9 +7,7 @@ public open class A : R|kotlin/Any| {
}
public open class A2 : R|kotlin/Any| {
@R|javax/annotation/Nullable|() public open var field: R|kotlin/String|?
public get(): R|kotlin/String|?
public set(value: R|kotlin/String|?): kotlin/Unit
@R|javax/annotation/Nullable|() public open field field: R|kotlin/String|?
public open operator fun foo(q: R|ft<kotlin/String, kotlin/String?>|!, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence|?): R|ft<kotlin/String, kotlin/String?>|!
compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullable.fir.txt
Vendored
+1 -3
View File
@@ -1,7 +1,5 @@
@R|spr/NonNullApi|() public open class A : R|kotlin/Any| {
public open var field: R|ft<kotlin/String, kotlin/String?>|!
public get(): R|ft<kotlin/String, kotlin/String?>|!
public set(value: R|ft<kotlin/String, kotlin/String?>|!): kotlin/Unit
public open field field: R|ft<kotlin/String, kotlin/String?>|!
public open operator fun foo(x: R|kotlin/String|, @R|spr/Nullable|() y: R|kotlin/CharSequence|?): R|kotlin/String|
compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullablePackage.fir.txt
Vendored
+1 -3
View File
@@ -1,7 +1,5 @@
public open class A : R|kotlin/Any| {
public open var field: R|ft<kotlin/String, kotlin/String?>|!
public get(): R|ft<kotlin/String, kotlin/String?>|!
public set(value: R|ft<kotlin/String, kotlin/String?>|!): kotlin/Unit
public open field field: R|ft<kotlin/String, kotlin/String?>|!
public open operator fun foo(x: R|ft<kotlin/String, kotlin/String?>|!, @R|spr/Nullable|() y: R|kotlin/CharSequence|?): R|ft<kotlin/String, kotlin/String?>|!
compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultEnum.fir.txt
Vendored
+4 -8
View File
@@ -9,18 +9,14 @@ public/*package*/ open class A : R|kotlin/Any| {
}
public final enum class Mixed : R|kotlin/Enum<Mixed>| {
public final static val NOT_ENTRY_EITHER: R|ft<Mixed, Mixed?>|!
public get(): R|ft<Mixed, Mixed?>|!
public final static field NOT_ENTRY_EITHER: R|ft<Mixed, Mixed?>|!
}
public final enum class Signs : R|kotlin/Enum<Signs>| {
public final static val HELLO: R|ft<Signs, Signs?>|!
public get(): R|ft<Signs, Signs?>|!
public final static field HELLO: R|ft<Signs, Signs?>|!
public final static val WORLD: R|ft<Signs, Signs?>|!
public get(): R|ft<Signs, Signs?>|!
public final static field WORLD: R|ft<Signs, Signs?>|!
public final static val X: R|ft<Signs, Signs?>|!
public get(): R|ft<Signs, Signs?>|!
public final static field X: R|ft<Signs, Signs?>|!
}