From b09358fe173416ba6faf55cf0751004e112cde33 Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Sat, 4 Jul 2020 00:23:43 +0300
Subject: [PATCH] FIR IDE: rename KtFieldSymbol -> KtFirJavaFieldSymbol

---
 .../idea/frontend/api/symbols/KtVariableLikeSymbol.kt       | 2 +-
 .../kotlin/idea/frontend/api/fir/KtSymbolByFirBuilder.kt    | 2 +-
 .../{KtFirFieldSymbol.kt => KtFirJavaFieldSymbol.kt}        | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/{KtFirFieldSymbol.kt => KtFirJavaFieldSymbol.kt} (90%)

diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtVariableLikeSymbol.kt b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtVariableLikeSymbol.kt
index ad04761d309..d6956b5531e 100644
--- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtVariableLikeSymbol.kt
+++ b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtVariableLikeSymbol.kt
@@ -19,7 +19,7 @@ abstract class KtVariableSymbol : KtVariableLikeSymbol() {
     abstract val isVal: Boolean
 }
 
-abstract class KtFieldSymbol : KtVariableSymbol(), KtSymbolWithModality<KtCommonSymbolModality> {
+abstract class KtJavaFieldSymbol : KtVariableSymbol(), KtSymbolWithModality<KtCommonSymbolModality> {
     final override val symbolKind: KtSymbolKind get() = KtSymbolKind.MEMBER
 }
 
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/KtSymbolByFirBuilder.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/KtSymbolByFirBuilder.kt
index e72f532e224..50c226b32e1 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/KtSymbolByFirBuilder.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/KtSymbolByFirBuilder.kt
@@ -91,7 +91,7 @@ internal class KtSymbolByFirBuilder(
 
     fun buildTypeAliasSymbol(fir: FirTypeAlias) = symbolsCache.cache(fir) { KtFirTypeAliasSymbol(fir, token) }
     fun buildEnumEntrySymbol(fir: FirEnumEntry) = symbolsCache.cache(fir) { KtFirEnumEntrySymbol(fir, token, this) }
-    fun buildFieldSymbol(fir: FirField) = symbolsCache.cache(fir) { KtFirFieldSymbol(fir, token, this) }
+    fun buildFieldSymbol(fir: FirField) = symbolsCache.cache(fir) { KtFirJavaFieldSymbol(fir, token, this) }
     fun buildAnonymousFunctionSymbol(fir: FirAnonymousFunction) = symbolsCache.cache(fir) { KtFirAnonymousFunctionSymbol(fir, token, this) }
 
     fun buildVariableSymbol(fir: FirProperty): KtVariableSymbol = symbolsCache.cache(fir) {
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirFieldSymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirJavaFieldSymbol.kt
similarity index 90%
rename from idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirFieldSymbol.kt
rename to idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirJavaFieldSymbol.kt
index 7fc3cf3360f..3249f4ab2f6 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirFieldSymbol.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirJavaFieldSymbol.kt
@@ -15,15 +15,15 @@ import org.jetbrains.kotlin.idea.frontend.api.fir.KtSymbolByFirBuilder
 import org.jetbrains.kotlin.idea.frontend.api.fir.utils.cached
 import org.jetbrains.kotlin.idea.frontend.api.fir.utils.weakRef
 import org.jetbrains.kotlin.idea.frontend.api.symbols.KtCommonSymbolModality
-import org.jetbrains.kotlin.idea.frontend.api.symbols.KtFieldSymbol
+import org.jetbrains.kotlin.idea.frontend.api.symbols.KtJavaFieldSymbol
 import org.jetbrains.kotlin.idea.frontend.api.withValidityAssertion
 import org.jetbrains.kotlin.name.Name
 
-internal class KtFirFieldSymbol(
+internal class KtFirJavaFieldSymbol(
     fir: FirField,
     override val token: ValidityOwner,
     private val builder: KtSymbolByFirBuilder
-) : KtFieldSymbol(), KtFirSymbol<FirField> {
+) : KtJavaFieldSymbol(), KtFirSymbol<FirField> {
     override val fir: FirField by weakRef(fir)
     override val psi: PsiElement? by cached { fir.findPsi(fir.session) }