From ad0fad5fadd0788a575f7fb6f6b92942d4ad5399 Mon Sep 17 00:00:00 2001
From: Ivan Kylchik <ivan.kylchik@jetbrains.com>
Date: Tue, 11 Jul 2023 14:33:34 +0200
Subject: [PATCH] [FIR] Drop `isStatic` field from `FirJavaFieldBuilder`

It is not used anywhere, and it looks like the proper way to set
`isStatic` is through the `status` field.
---
 .../fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaFacade.kt  | 1 -
 .../org/jetbrains/kotlin/fir/java/declarations/FirJavaField.kt   | 1 -
 .../kotlin/fir/java/enhancement/SignatureEnhancement.kt          | 1 -
 3 files changed, 3 deletions(-)

diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaFacade.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaFacade.kt
index df8f6cb0440..d187683bcdf 100644
--- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaFacade.kt
+++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaFacade.kt
@@ -540,7 +540,6 @@ abstract class FirJavaFacade(
                 modality = javaField.modality
                 returnTypeRef = returnType.toFirJavaTypeRef(session)
                 isVar = !javaField.isFinal
-                isStatic = javaField.isStatic
                 annotationBuilder = { javaField.convertAnnotationsToFir(session) }
 
                 lazyInitializer = lazy {
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 1ed7d5f8712..8346ba87736 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
@@ -178,7 +178,6 @@ class FirJavaField @FirImplementationDetail constructor(
 internal class FirJavaFieldBuilder : FirFieldBuilder() {
     var modality: Modality? = null
     lateinit var visibility: Visibility
-    var isStatic: Boolean by Delegates.notNull()
     var isFromSource: Boolean by Delegates.notNull()
     lateinit var annotationBuilder: () -> List<FirAnnotation>
     var lazyInitializer: Lazy<FirExpression?>? = null
diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/SignatureEnhancement.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/SignatureEnhancement.kt
index 8cc91cdb425..032ecc21204 100644
--- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/SignatureEnhancement.kt
+++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/SignatureEnhancement.kt
@@ -132,7 +132,6 @@ class FirSignatureEnhancement(
                     visibility = firElement.visibility
                     modality = firElement.modality
                     isVar = firElement.isVar
-                    isStatic = firElement.isStatic
                     annotationBuilder = { firElement.annotations }
                     status = firElement.status
                     if (firElement is FirJavaField) {