From 633c29a2de745c2b34361d7f402992c628057fd8 Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Thu, 22 Nov 2018 13:03:09 +0300
Subject: [PATCH] New J2K: Fix when final fields become vars

---
 .../kotlin/j2k/conversions/FieldToPropertyConversion.kt        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/FieldToPropertyConversion.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/FieldToPropertyConversion.kt
index 80008dbdcc8..470dd34702d 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/FieldToPropertyConversion.kt
+++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/FieldToPropertyConversion.kt
@@ -94,7 +94,8 @@ class FieldToPropertyConversion(private val context: ConversionContext) : Recurs
             ktSetter
         ).also {
             it.modifierList.mutability =
-                    if (it.modifierList.visibilityOrNull() == JKAccessModifier.Visibility.PRIVATE && ktSetter is JKKtEmptyGetterOrSetter)
+                    if (it.modifierList.isFinal()) Mutability.NonMutable
+                    else if (it.modifierList.visibilityOrNull() == JKAccessModifier.Visibility.PRIVATE && ktSetter is JKKtEmptyGetterOrSetter)
                         Mutability.NonMutable
                     else Mutability.Mutable