From 6c313895df460a011474466887b5cca7366836d2 Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Wed, 15 May 2019 15:51:25 +0300 Subject: [PATCH] [FIR] Do not enhance java fields to firProperty --- .../fir/java/declarations/FirJavaField.kt | 3 ++- .../java/scopes/JavaClassEnhancementScope.kt | 26 +++++++++---------- .../fir/java/scopes/JavaClassUseSiteScope.kt | 2 +- .../scopes/impl/AbstractFirOverrideScope.kt | 1 + .../enhancement/jsr305/NonNullNever.fir.txt | 4 +-- .../enhancement/jsr305/Simple.fir.txt | 4 +-- .../enhancement/jsr305/Strange.fir.txt | 4 +-- .../FieldsAreNullable.fir.txt | 8 ++---- .../OverridingDefaultQualifier.fir.txt | 4 +-- .../ParametersAreNonnullByDefault.fir.txt | 4 +-- ...rametersAreNonnullByDefaultPackage.fir.txt | 8 ++---- .../SpringNullable.fir.txt | 4 +-- .../SpringNullablePackage.fir.txt | 4 +-- .../signatureAnnotations/DefaultEnum.fir.txt | 12 +++------ .../org/jetbrains/kotlin/fir/FirRenderer.kt | 6 +++++ .../compiledJava/ClassWithConstVal.fir.txt | 6 ++--- .../loadJava/compiledJava/FieldAsVar.fir.txt | 4 +-- .../compiledJava/FieldOfArrayType.fir.txt | 4 +-- .../compiledJava/FinalFieldAsVal.fir.txt | 3 +-- .../PackageLocalVisibility.fir.txt | 12 +++------ .../compiledJava/PrivateMembers.fir.txt | 8 ++---- .../loadJava/compiledJava/TwoFields.fir.txt | 8 ++---- .../annotations/AnnotatedEnumEntry.fir.txt | 9 +++---- .../annotations/AnnotatedField.fir.txt | 6 ++--- .../EnumConstructorParameter.fir.txt | 3 +-- .../annotations/StringConstantInParam.fir.txt | 3 +-- .../compiledJava/enum/EnumMembers.fir.txt | 9 +++---- .../enum/EnumWithSpecializedEntry.fir.txt | 6 ++--- .../compiledJava/enum/JavaEnum.fir.txt | 6 ++--- .../PropertyArrayTypes.fir.txt | 12 +++------ .../PropertyComplexTypes.fir.txt | 16 +++--------- .../PropertySimpleType.fir.txt | 8 ++---- .../compiledJava/notNull/NotNullField.fir.txt | 4 +-- .../ProtectedPackageProperty.fir.txt | 4 +-- .../loadJava/compiledJava/static/Enum.fir.txt | 9 +++---- .../compiledJava/static/StaticFinal.fir.txt | 18 +++++-------- .../static/StaticMembersInEnum.fir.txt | 10 +++---- 37 files changed, 86 insertions(+), 176 deletions(-) diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaField.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaField.kt index 57902015c0f..d204204f402 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaField.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaField.kt @@ -13,6 +13,7 @@ import org.jetbrains.kotlin.fir.declarations.impl.FirAbstractCallableMember import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.java.types.FirJavaTypeRef import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol +import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.name.Name class FirJavaField( @@ -21,7 +22,7 @@ class FirJavaField( name: Name, visibility: Visibility, modality: Modality?, - returnTypeRef: FirJavaTypeRef, + returnTypeRef: FirTypeRef, override val isVar: Boolean, isStatic: Boolean ) : FirAbstractCallableMember( diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassEnhancementScope.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassEnhancementScope.kt index 9f797e6fab3..5a8f0348d20 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassEnhancementScope.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassEnhancementScope.kt @@ -59,7 +59,7 @@ class JavaClassEnhancementScope( useSiteScope.processPropertiesByName(name) process@{ original -> val field = enhancements.getOrPut(original) { enhance(original, name) } - processor(field as ConePropertySymbol) + processor(field as ConeVariableSymbol) } return super.processPropertiesByName(name, processor) @@ -78,28 +78,26 @@ class JavaClassEnhancementScope( private fun enhance( original: ConeVariableSymbol, name: Name - ): ConePropertySymbol { + ): ConeVariableSymbol { when (val firElement = (original as FirBasedSymbol<*>).fir) { is FirJavaField -> { - + if (firElement.returnTypeRef !is FirJavaTypeRef) return original val memberContext = context.copyWithNewDefaultTypeQualifiers(typeQualifierResolver, jsr305State, firElement.annotations) val newReturnTypeRef = enhanceReturnType(firElement, emptyList(), memberContext, null) val symbol = FirPropertySymbol(original.callableId) with(firElement) { - FirMemberPropertyImpl( - this@JavaClassEnhancementScope.session, null, symbol, name, - visibility, modality, isExpect, isActual, isOverride, - isConst = false, isLateInit = false, - receiverTypeRef = null, - returnTypeRef = newReturnTypeRef, - isVar = isVar, initializer = null, - getter = FirDefaultPropertyGetter(this@JavaClassEnhancementScope.session, null, newReturnTypeRef, visibility), - setter = FirDefaultPropertySetter(this@JavaClassEnhancementScope.session, null, newReturnTypeRef, visibility), - delegate = null + FirJavaField( + session, + symbol, + name, + visibility, + modality, + newReturnTypeRef, + isVar, + isStatic ).apply { annotations += firElement.annotations - status.isStatic = firElement.isStatic } } return symbol diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassUseSiteScope.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassUseSiteScope.kt index dda77a7660d..567336fa311 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassUseSiteScope.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassUseSiteScope.kt @@ -126,7 +126,7 @@ class JavaClassUseSiteScope( } } is FirPropertySymbol -> { - val self = fir as FirProperty + val self = fir as? FirProperty ?: return null candidates.firstOrNull { val member = (it as FirFunctionSymbol).fir as FirNamedFunction self.modality != Modality.FINAL && isOverriddenPropertyCheck(member, self) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/AbstractFirOverrideScope.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/AbstractFirOverrideScope.kt index 2cf162d58af..17b72eac58b 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/AbstractFirOverrideScope.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/AbstractFirOverrideScope.kt @@ -70,6 +70,7 @@ abstract class AbstractFirOverrideScope(val session: FirSession) : FirScope { self.receiverTypeRef, ConeSubstitutor.Empty // TODO ) + is FirField -> false else -> error("Unknown fir callable type: $declaration, $self") } } diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/NonNullNever.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/NonNullNever.fir.txt index 4a29455f226..54615ef2bb2 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/NonNullNever.fir.txt +++ b/compiler/fir/resolve/testData/enhancement/jsr305/NonNullNever.fir.txt @@ -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|? diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/Simple.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/Simple.fir.txt index 866a7c1b10a..d50c277836f 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/Simple.fir.txt +++ b/compiler/fir/resolve/testData/enhancement/jsr305/Simple.fir.txt @@ -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|? diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/Strange.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/Strange.fir.txt index 8c819d2630e..78ab5f83aee 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/Strange.fir.txt +++ b/compiler/fir/resolve/testData/enhancement/jsr305/Strange.fir.txt @@ -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|! - public get(): R|ft|! - public set(value: R|ft|!): kotlin/Unit + @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.UNKNOWN|()) public open field field: R|ft|! @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|? diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/FieldsAreNullable.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/FieldsAreNullable.fir.txt index ed3aeae9acb..37ae9bcb24d 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/FieldsAreNullable.fir.txt +++ b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/FieldsAreNullable.fir.txt @@ -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|!, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence|?): R|ft|! diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt index 0cd5042ebc2..0ce805fb595 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt +++ b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt @@ -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| diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefault.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefault.fir.txt index 04062da61e0..6abb6bd8fd4 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefault.fir.txt +++ b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefault.fir.txt @@ -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|! diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefaultPackage.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefaultPackage.fir.txt index 5e107cc782b..f5971430d74 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefaultPackage.fir.txt +++ b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefaultPackage.fir.txt @@ -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|!, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence|?): R|ft|! @@ -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|!, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence|?): R|ft|! diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullable.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullable.fir.txt index ec0a5885afa..bdcba5b0cdd 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullable.fir.txt +++ b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullable.fir.txt @@ -1,7 +1,5 @@ @R|spr/NonNullApi|() public open class A : R|kotlin/Any| { - public open var field: R|ft|! - public get(): R|ft|! - public set(value: R|ft|!): kotlin/Unit + public open field field: R|ft|! public open operator fun foo(x: R|kotlin/String|, @R|spr/Nullable|() y: R|kotlin/CharSequence|?): R|kotlin/String| diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullablePackage.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullablePackage.fir.txt index 1a451944159..ac16b4f66d3 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullablePackage.fir.txt +++ b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullablePackage.fir.txt @@ -1,7 +1,5 @@ public open class A : R|kotlin/Any| { - public open var field: R|ft|! - public get(): R|ft|! - public set(value: R|ft|!): kotlin/Unit + public open field field: R|ft|! public open operator fun foo(x: R|ft|!, @R|spr/Nullable|() y: R|kotlin/CharSequence|?): R|ft|! diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultEnum.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultEnum.fir.txt index 0423e2548b1..b822ceeeca9 100644 --- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultEnum.fir.txt +++ b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultEnum.fir.txt @@ -9,18 +9,14 @@ public/*package*/ open class A : R|kotlin/Any| { } public final enum class Mixed : R|kotlin/Enum| { - public final static val NOT_ENTRY_EITHER: R|ft|! - public get(): R|ft|! + public final static field NOT_ENTRY_EITHER: R|ft|! } public final enum class Signs : R|kotlin/Enum| { - public final static val HELLO: R|ft|! - public get(): R|ft|! + public final static field HELLO: R|ft|! - public final static val WORLD: R|ft|! - public get(): R|ft|! + public final static field WORLD: R|ft|! - public final static val X: R|ft|! - public get(): R|ft|! + public final static field X: R|ft|! } diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt index c7a9e7b2567..9069e819598 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt @@ -276,6 +276,7 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() { is FirTypeAlias -> "typealias" is FirNamedFunction -> "fun" is FirProperty -> if (declaration.isVal) "val" else "var" + is FirField -> "field" is FirVariable -> if (declaration.isVal) "lval" else "lvar" else -> "unknown" } @@ -335,6 +336,11 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() { } } + override fun visitField(field: FirField) { + visitVariable(field) + println() + } + override fun visitProperty(property: FirProperty) { visitVariable(property) println() diff --git a/compiler/testData/loadJava/compiledJava/ClassWithConstVal.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithConstVal.fir.txt index b64d96614a3..1221b0d6f52 100644 --- a/compiler/testData/loadJava/compiledJava/ClassWithConstVal.fir.txt +++ b/compiler/testData/loadJava/compiledJava/ClassWithConstVal.fir.txt @@ -1,8 +1,6 @@ public final class ClassWithConstVal : R|kotlin/Any| { - public final val f: R|kotlin/Int| - public get(): R|kotlin/Int| + public final field f: R|kotlin/Int| - public final val f2: R|kotlin/Int| - public get(): R|kotlin/Int| + public final field f2: R|kotlin/Int| } diff --git a/compiler/testData/loadJava/compiledJava/FieldAsVar.fir.txt b/compiler/testData/loadJava/compiledJava/FieldAsVar.fir.txt index 5804f20b3a9..a327559a686 100644 --- a/compiler/testData/loadJava/compiledJava/FieldAsVar.fir.txt +++ b/compiler/testData/loadJava/compiledJava/FieldAsVar.fir.txt @@ -1,6 +1,4 @@ public final class FieldAsVar : R|kotlin/Any| { - public open var f: R|kotlin/Int| - public get(): R|kotlin/Int| - public set(value: R|kotlin/Int|): kotlin/Unit + public open field f: R|kotlin/Int| } diff --git a/compiler/testData/loadJava/compiledJava/FieldOfArrayType.fir.txt b/compiler/testData/loadJava/compiledJava/FieldOfArrayType.fir.txt index da5119a0157..eed9c46c9fb 100644 --- a/compiler/testData/loadJava/compiledJava/FieldOfArrayType.fir.txt +++ b/compiler/testData/loadJava/compiledJava/FieldOfArrayType.fir.txt @@ -1,6 +1,4 @@ public open class FieldOfArrayType : R|kotlin/Any| { - public open var files: R|kotlin/Array>| - public get(): R|kotlin/Array>| - public set(value: R|kotlin/Array>|): kotlin/Unit + public open field files: R|kotlin/Array>| } diff --git a/compiler/testData/loadJava/compiledJava/FinalFieldAsVal.fir.txt b/compiler/testData/loadJava/compiledJava/FinalFieldAsVal.fir.txt index fa25aa32894..f9ab633ee46 100644 --- a/compiler/testData/loadJava/compiledJava/FinalFieldAsVal.fir.txt +++ b/compiler/testData/loadJava/compiledJava/FinalFieldAsVal.fir.txt @@ -1,5 +1,4 @@ public final class FinalFieldAsVal : R|kotlin/Any| { - public final val f: R|kotlin/Int| - public get(): R|kotlin/Int| + public final field f: R|kotlin/Int| } diff --git a/compiler/testData/loadJava/compiledJava/PackageLocalVisibility.fir.txt b/compiler/testData/loadJava/compiledJava/PackageLocalVisibility.fir.txt index 95c40b8ffdb..5e27a1623a2 100644 --- a/compiler/testData/loadJava/compiledJava/PackageLocalVisibility.fir.txt +++ b/compiler/testData/loadJava/compiledJava/PackageLocalVisibility.fir.txt @@ -1,17 +1,11 @@ public open class Frame : R|kotlin/Any| { - public/*package*/ open var accessibleContext: R|ft|! - public/*package*/ get(): R|ft|! - public/*package*/ set(value: R|ft|!): kotlin/Unit + public/*package*/ open field accessibleContext: R|ft|! } public open class JFrame : R|awt/Frame| { - protected/*protected and package*/ open var accessibleContext: R|ft|! - protected/*protected and package*/ get(): R|ft|! - protected/*protected and package*/ set(value: R|ft|!): kotlin/Unit + protected/*protected and package*/ open field accessibleContext: R|ft|! - public/*package*/ open var accessibleContext: R|ft|! - public/*package*/ get(): R|ft|! - public/*package*/ set(value: R|ft|!): kotlin/Unit + public/*package*/ open field accessibleContext: R|ft|! public constructor(): R|test/JFrame| diff --git a/compiler/testData/loadJava/compiledJava/PrivateMembers.fir.txt b/compiler/testData/loadJava/compiledJava/PrivateMembers.fir.txt index 943232202ff..d13762cf15c 100644 --- a/compiler/testData/loadJava/compiledJava/PrivateMembers.fir.txt +++ b/compiler/testData/loadJava/compiledJava/PrivateMembers.fir.txt @@ -1,11 +1,7 @@ public open class PrivateMembers : R|kotlin/Any| { - private open var field: R|kotlin/Int| - private get(): R|kotlin/Int| - private set(value: R|kotlin/Int|): kotlin/Unit + private open field field: R|kotlin/Int| - private open static var staticField: R|kotlin/Int| - private get(): R|kotlin/Int| - private set(value: R|kotlin/Int|): kotlin/Unit + private open static field staticField: R|kotlin/Int| private open operator fun method(): R|kotlin/Unit| diff --git a/compiler/testData/loadJava/compiledJava/TwoFields.fir.txt b/compiler/testData/loadJava/compiledJava/TwoFields.fir.txt index 738156800a3..b6659e7eee0 100644 --- a/compiler/testData/loadJava/compiledJava/TwoFields.fir.txt +++ b/compiler/testData/loadJava/compiledJava/TwoFields.fir.txt @@ -1,10 +1,6 @@ public final class TwoFields : R|kotlin/Any| { - public open var a: R|kotlin/Int| - public get(): R|kotlin/Int| - public set(value: R|kotlin/Int|): kotlin/Unit + public open field a: R|kotlin/Int| - public open var b: R|kotlin/Short| - public get(): R|kotlin/Short| - public set(value: R|kotlin/Short|): kotlin/Unit + public open field b: R|kotlin/Short| } diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.fir.txt index aa1e77ce7df..21ffead5751 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.fir.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.fir.txt @@ -1,11 +1,8 @@ public final enum class AnnotatedEnumEntry : R|kotlin/Enum| { - @R|test/AnnotatedEnumEntry.Anno|(String(a)) public final static val E1: R|ft|! - public get(): R|ft|! + @R|test/AnnotatedEnumEntry.Anno|(String(a)) public final static field E1: R|ft|! - @R|test/AnnotatedEnumEntry.Anno|(String(b)) @R|test/AnnotatedEnumEntry.Anno2|() public final static val E2: R|ft|! - public get(): R|ft|! + @R|test/AnnotatedEnumEntry.Anno|(String(b)) @R|test/AnnotatedEnumEntry.Anno2|() public final static field E2: R|ft|! - public final static val E3: R|ft|! - public get(): R|ft|! + public final static field E3: R|ft|! } diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedField.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedField.fir.txt index 7481c733e08..b2d712700c2 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedField.fir.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedField.fir.txt @@ -1,8 +1,6 @@ public open class AnnotatedField : R|kotlin/Any| { - @R|test/AnnotatedField.Anno|(String(static)) public final static val x: R|kotlin/Int| - public get(): R|kotlin/Int| + @R|test/AnnotatedField.Anno|(String(static)) public final static field x: R|kotlin/Int| - @R|test/AnnotatedField.Anno|(String(member)) public final val y: R|kotlin/Int| - public get(): R|kotlin/Int| + @R|test/AnnotatedField.Anno|(String(member)) public final field y: R|kotlin/Int| } diff --git a/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.fir.txt index e35018306fd..2bfec87a9f9 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.fir.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.fir.txt @@ -1,6 +1,5 @@ public final enum class EnumConstructorParameter : R|kotlin/Enum| { - public final static val INSTANCE: R|ft|! - public get(): R|ft|! + public final static field INSTANCE: R|ft|! private constructor(@R|test/EnumConstructorParameter.Anno|(String(string)) s: R|ft|!): R|test/EnumConstructorParameter| diff --git a/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.fir.txt index dc4c17e61a5..a271731ce54 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.fir.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.fir.txt @@ -1,5 +1,4 @@ public abstract interface StringConstantInParam : R|kotlin/Any| { - public final static val HEL: R|ft|! - public get(): R|ft|! + public final static field HEL: R|ft|! } diff --git a/compiler/testData/loadJava/compiledJava/enum/EnumMembers.fir.txt b/compiler/testData/loadJava/compiledJava/enum/EnumMembers.fir.txt index c6b279ae0c2..c713d383cf5 100644 --- a/compiler/testData/loadJava/compiledJava/enum/EnumMembers.fir.txt +++ b/compiler/testData/loadJava/compiledJava/enum/EnumMembers.fir.txt @@ -1,12 +1,9 @@ public final enum class EnumMembers : R|kotlin/Enum| { - public final static val FIRST: R|ft|! - public get(): R|ft|! + public final static field FIRST: R|ft|! - public final static val SECOND: R|ft|! - public get(): R|ft|! + public final static field SECOND: R|ft|! - public final val isFirst: R|kotlin/Boolean| - public get(): R|kotlin/Boolean| + public final field isFirst: R|kotlin/Boolean| public open operator fun first(): R|kotlin/Boolean| diff --git a/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.fir.txt b/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.fir.txt index 0a80c49523a..c364e8cd8e9 100644 --- a/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.fir.txt +++ b/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.fir.txt @@ -1,8 +1,6 @@ public open enum class EnumWithSpecializedEntry : R|kotlin/Enum| { - public final static val E1: R|ft|! - public get(): R|ft|! + public final static field E1: R|ft|! - public final static val E2: R|ft|! - public get(): R|ft|! + public final static field E2: R|ft|! } diff --git a/compiler/testData/loadJava/compiledJava/enum/JavaEnum.fir.txt b/compiler/testData/loadJava/compiledJava/enum/JavaEnum.fir.txt index 68d1797c12c..9ebe41e1696 100644 --- a/compiler/testData/loadJava/compiledJava/enum/JavaEnum.fir.txt +++ b/compiler/testData/loadJava/compiledJava/enum/JavaEnum.fir.txt @@ -1,8 +1,6 @@ public final enum class JavaEnum : R|kotlin/Enum| { - public final static val ENTRY: R|ft|! - public get(): R|ft|! + public final static field ENTRY: R|ft|! - public final static val ANOTHER: R|ft|! - public get(): R|ft|! + public final static field ANOTHER: R|ft|! } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt index e653b43bf66..e9c5ad005c3 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt @@ -1,14 +1,8 @@ public open class PropertyArrayTypes : R|kotlin/Any| { - public open var arrayOfArrays: R|kotlin/Array>, kotlin/Array>?>>| - public get(): R|kotlin/Array>, kotlin/Array>?>>| - public set(value: R|kotlin/Array>, kotlin/Array>?>>|): kotlin/Unit + public open field arrayOfArrays: R|kotlin/Array>, kotlin/Array>?>>| - public open var array: R|kotlin/Array>| - public get(): R|kotlin/Array>| - public set(value: R|kotlin/Array>|): kotlin/Unit + public open field array: R|kotlin/Array>| - public open var genericArray: R|kotlin/Array>| - public get(): R|kotlin/Array>| - public set(value: R|kotlin/Array>|): kotlin/Unit + public open field genericArray: R|kotlin/Array>| } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt index 1345a09f4a4..9c9fb0a7bec 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt @@ -1,18 +1,10 @@ public open class PropertyComplexTypes : R|kotlin/Any| { - public open var genericType: R|ft|! - public get(): R|ft|! - public set(value: R|ft|!): kotlin/Unit + public open field genericType: R|ft|! - public open var listDefinedGeneric: R|ft>, java/util/ArrayList>?>|! - public get(): R|ft>, java/util/ArrayList>?>|! - public set(value: R|ft>, java/util/ArrayList>?>|!): kotlin/Unit + public open field listDefinedGeneric: R|ft>, java/util/ArrayList>?>|! - public open var listGeneric: R|ft>, java/util/ArrayList>?>|! - public get(): R|ft>, java/util/ArrayList>?>|! - public set(value: R|ft>, java/util/ArrayList>?>|!): kotlin/Unit + public open field listGeneric: R|ft>, java/util/ArrayList>?>|! - public open var listOfGenericList: R|ft>, java/util/ArrayList>?>>, java/util/ArrayList>, java/util/ArrayList>?>>?>|! - public get(): R|ft>, java/util/ArrayList>?>>, java/util/ArrayList>, java/util/ArrayList>?>>?>|! - public set(value: R|ft>, java/util/ArrayList>?>>, java/util/ArrayList>, java/util/ArrayList>?>>?>|!): kotlin/Unit + public open field listOfGenericList: R|ft>, java/util/ArrayList>?>>, java/util/ArrayList>, java/util/ArrayList>?>>?>|! } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.fir.txt index 6119ba72702..fe45b3b4282 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.fir.txt @@ -1,10 +1,6 @@ public open class PropertySimpleType : R|kotlin/Any| { - public open var fieldOne: R|ft|! - public get(): R|ft|! - public set(value: R|ft|!): kotlin/Unit + public open field fieldOne: R|ft|! - public open var fieldTwo: R|ft|! - public get(): R|ft|! - public set(value: R|ft|!): kotlin/Unit + public open field fieldTwo: R|ft|! } diff --git a/compiler/testData/loadJava/compiledJava/notNull/NotNullField.fir.txt b/compiler/testData/loadJava/compiledJava/notNull/NotNullField.fir.txt index 3af32e72c0a..2f97824a9c3 100644 --- a/compiler/testData/loadJava/compiledJava/notNull/NotNullField.fir.txt +++ b/compiler/testData/loadJava/compiledJava/notNull/NotNullField.fir.txt @@ -1,6 +1,4 @@ public open class NotNullField : R|kotlin/Any| { - @R|org/jetbrains/annotations/NotNull|() public open var hi: R|kotlin/String| - public get(): R|kotlin/String| - public set(value: R|kotlin/String|): kotlin/Unit + @R|org/jetbrains/annotations/NotNull|() public open field hi: R|kotlin/String| } diff --git a/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageProperty.fir.txt b/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageProperty.fir.txt index 99753f00219..83035e8bd22 100644 --- a/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageProperty.fir.txt +++ b/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageProperty.fir.txt @@ -1,6 +1,4 @@ public open class ProtectedPackageProperty : R|kotlin/Any| { - protected/*protected and package*/ open var foo: R|kotlin/Int| - protected/*protected and package*/ get(): R|kotlin/Int| - protected/*protected and package*/ set(value: R|kotlin/Int|): kotlin/Unit + protected/*protected and package*/ open field foo: R|kotlin/Int| } diff --git a/compiler/testData/loadJava/compiledJava/static/Enum.fir.txt b/compiler/testData/loadJava/compiledJava/static/Enum.fir.txt index e64aaa8f5bc..9ba1e24125c 100644 --- a/compiler/testData/loadJava/compiledJava/static/Enum.fir.txt +++ b/compiler/testData/loadJava/compiledJava/static/Enum.fir.txt @@ -1,11 +1,8 @@ public final enum class Enum : R|kotlin/Enum| { - public final static val A: R|ft|! - public get(): R|ft|! + public final static field A: R|ft|! - public final static val B: R|ft|! - public get(): R|ft|! + public final static field B: R|ft|! - public final static val C: R|ft|! - public get(): R|ft|! + public final static field C: R|ft|! } diff --git a/compiler/testData/loadJava/compiledJava/static/StaticFinal.fir.txt b/compiler/testData/loadJava/compiledJava/static/StaticFinal.fir.txt index cca5ab91cac..9b89d6841ce 100644 --- a/compiler/testData/loadJava/compiledJava/static/StaticFinal.fir.txt +++ b/compiler/testData/loadJava/compiledJava/static/StaticFinal.fir.txt @@ -1,20 +1,14 @@ public open class StaticFinal : R|kotlin/Any| { - public final static val publicNonNull: R|ft|! - public get(): R|ft|! + public final static field publicNonNull: R|ft|! - public final static val publicNull: R|ft|! - public get(): R|ft|! + public final static field publicNull: R|ft|! - public/*package*/ final static val packageNonNull: R|ft|! - public/*package*/ get(): R|ft|! + public/*package*/ final static field packageNonNull: R|ft|! - public/*package*/ final static val packageNull: R|ft|! - public/*package*/ get(): R|ft|! + public/*package*/ final static field packageNull: R|ft|! - private final static val privateNonNull: R|ft|! - private get(): R|ft|! + private final static field privateNonNull: R|ft|! - private final static val privateNull: R|ft|! - private get(): R|ft|! + private final static field privateNull: R|ft|! } diff --git a/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.fir.txt b/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.fir.txt index 30ec78c69ed..8010e3431d9 100644 --- a/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.fir.txt +++ b/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.fir.txt @@ -1,13 +1,9 @@ public final enum class StaticMembersInEnum : R|kotlin/Enum| { - public final static val ENTRY: R|ft|! - public get(): R|ft|! + public final static field ENTRY: R|ft|! - public open static var STATIC_FIELD: R|kotlin/Int| - public get(): R|kotlin/Int| - public set(value: R|kotlin/Int|): kotlin/Unit + public open static field STATIC_FIELD: R|kotlin/Int| - public final static val CONSTANT: R|ft|! - public get(): R|ft|! + public final static field CONSTANT: R|ft|! public open static operator fun foo(): R|kotlin/Unit|