[kotlin] K2 J2K: Move VarToValProcessing LocalVarToValInspectionBasedProcessing and fixValToVarDiagnosticBasedProcessing to JKTree

plugins/kotlin/j2k/k1.new.post-processing/src/org/jetbrains/kotlin/idea/j2k/post/processing/allProcessings.kt

@@ -122,19 +122,11 @@ private val inspectionLikePostProcessingGroup = InspectionLikeProcessingGroup(
 private val cleaningUpDiagnosticBasedPostProcessingGroup = DiagnosticBasedPostProcessingGroup(
     removeUselessCastDiagnosticBasedProcessing,
     removeUnnecessaryNotNullAssertionDiagnosticBasedProcessing,
-    fixValToVarDiagnosticBasedProcessing
 )
 
 private val inferringTypesPostProcessingGroup = NamedPostProcessingGroup(
     KotlinNJ2KServicesBundle.message("processing.step.inferring.types"),
     listOf(
-        InspectionLikeProcessingGroup(
-            processings = listOf(
-                VarToValProcessing(),
-                LocalVarToValInspectionBasedProcessing()
-            ),
-            runSingleTime = true
-        ),
         NullabilityInferenceProcessing(),
         MutabilityInferenceProcessing(),
         ClearUnknownInferenceLabelsProcessing()

plugins/kotlin/j2k/k1.new.post-processing/src/org/jetbrains/kotlin/idea/j2k/post/processing/processings/diagnosticBasedProcessings.kt

@@ -21,16 +21,6 @@ import org.jetbrains.kotlin.types.typeUtil.isSignedOrUnsignedNumberType
 import org.jetbrains.kotlin.types.typeUtil.isSubtypeOf
 import org.jetbrains.kotlin.types.typeUtil.makeNotNullable
 
-internal val fixValToVarDiagnosticBasedProcessing =
-    diagnosticBasedProcessing(
-        Errors.VAL_REASSIGNMENT, Errors.CAPTURED_VAL_INITIALIZATION, Errors.CAPTURED_MEMBER_VAL_INITIALIZATION
-    ) { element: KtExpression, _ ->
-        val property = element.unpackedReferenceToProperty() ?: return@diagnosticBasedProcessing
-        if (!property.isVar) {
-            property.valOrVarKeyword.replace(KtPsiFactory(element.project).createVarKeyword())
-        }
-    }
-
 internal val fixTypeMismatchDiagnosticBasedProcessing =
     diagnosticBasedProcessing(Errors.TYPE_MISMATCH) { element: PsiElement, diagnostic ->
         @Suppress("UNCHECKED_CAST")

plugins/kotlin/j2k/k1.new/src/org/jetbrains/kotlin/nj2k/newJ2KConversions.kt

@@ -62,5 +62,6 @@ fun getNewJ2KConversions(context: NewJ2kConverterContext): List<Conversion> = li
     FunctionalInterfacesConversion(context),
     FilterImportsConversion(context),
     AddElementsInfoConversion(context),
-    EnumSyntheticValuesMethodConversion(context)
+    EnumSyntheticValuesMethodConversion(context),
+    InferMutabilityOfLocalVariablesConversion(context)
 )

plugins/kotlin/j2k/k1.new/tests/test/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverterSingleFileTestGenerated.java

@@ -4283,6 +4283,39 @@ public void testPackageWithStaticImports() throws Exception {
         }
     }
 
+    @RunWith(JUnit3RunnerWithInners.class)
+    @TestMetadata("../../shared/tests/testData/newJ2k/mutability")
+    public static class Mutability extends AbstractNewJavaToKotlinConverterSingleFileTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+        }
+
+        @TestMetadata("initStatementWithRunBlock.java")
+        public void testInitStatementWithRunBlock() throws Exception {
+            runTest("../../shared/tests/testData/newJ2k/mutability/initStatementWithRunBlock.java");
+        }
+
+        @TestMetadata("mutableParameters.java")
+        public void testMutableParameters() throws Exception {
+            runTest("../../shared/tests/testData/newJ2k/mutability/mutableParameters.java");
+        }
+
+        @TestMetadata("NestedIfStatements.java")
+        public void testNestedIfStatements() throws Exception {
+            runTest("../../shared/tests/testData/newJ2k/mutability/NestedIfStatements.java");
+        }
+
+        @TestMetadata("tryCatchVariable.java")
+        public void testTryCatchVariable() throws Exception {
+            runTest("../../shared/tests/testData/newJ2k/mutability/tryCatchVariable.java");
+        }
+
+        @TestMetadata("ValAssignedInIfStatement.java")
+        public void testValAssignedInIfStatement() throws Exception {
+            runTest("../../shared/tests/testData/newJ2k/mutability/ValAssignedInIfStatement.java");
+        }
+    }
+
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/mutableCollections")
     public static class MutableCollections extends AbstractNewJavaToKotlinConverterSingleFileTest {

plugins/kotlin/j2k/k2/src/org/jetbrains/kotlin/j2k/K2J2KConversions.kt

@@ -64,5 +64,6 @@ internal fun getK2J2KConversions(context: NewJ2kConverterContext): List<Conversi
     RemoveRedundantQualifiersForCallsConversion(context),
     FunctionalInterfacesConversion(context),
     FilterImportsConversion(context),
-    EnumSyntheticValuesMethodConversion(context)
+    EnumSyntheticValuesMethodConversion(context),
+    InferMutabilityOfLocalVariablesConversion(context)
 )

plugins/kotlin/j2k/k2/tests/test/org/jetbrains/kotlin/j2k/k2/K2JavaToKotlinConverterSingleFileTestGenerated.java

@@ -4283,6 +4283,39 @@ public void testPackageWithStaticImports() throws Exception {
         }
     }
 
+    @RunWith(JUnit3RunnerWithInners.class)
+    @TestMetadata("../../shared/tests/testData/newJ2k/mutability")
+    public static class Mutability extends AbstractK2JavaToKotlinConverterSingleFileTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+        }
+
+        @TestMetadata("initStatementWithRunBlock.java")
+        public void testInitStatementWithRunBlock() throws Exception {
+            runTest("../../shared/tests/testData/newJ2k/mutability/initStatementWithRunBlock.java");
+        }
+
+        @TestMetadata("mutableParameters.java")
+        public void testMutableParameters() throws Exception {
+            runTest("../../shared/tests/testData/newJ2k/mutability/mutableParameters.java");
+        }
+
+        @TestMetadata("NestedIfStatements.java")
+        public void testNestedIfStatements() throws Exception {
+            runTest("../../shared/tests/testData/newJ2k/mutability/NestedIfStatements.java");
+        }
+
+        @TestMetadata("tryCatchVariable.java")
+        public void testTryCatchVariable() throws Exception {
+            runTest("../../shared/tests/testData/newJ2k/mutability/tryCatchVariable.java");
+        }
+
+        @TestMetadata("ValAssignedInIfStatement.java")
+        public void testValAssignedInIfStatement() throws Exception {
+            runTest("../../shared/tests/testData/newJ2k/mutability/ValAssignedInIfStatement.java");
+        }
+    }
+
     @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../../shared/tests/testData/newJ2k/mutableCollections")
     public static class MutableCollections extends AbstractK2JavaToKotlinConverterSingleFileTest {

plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/nj2k/conversions/ClassMemberConversion.kt

@@ -10,11 +10,10 @@ import org.jetbrains.kotlin.nj2k.*
 import org.jetbrains.kotlin.nj2k.externalCodeProcessing.JKFieldDataFromJava
 import org.jetbrains.kotlin.nj2k.externalCodeProcessing.JKPhysicalMethodData
 import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.Visibility.PRIVATE
+import org.jetbrains.kotlin.nj2k.tree.Mutability.*
 import org.jetbrains.kotlin.nj2k.tree.Modality.FINAL
-import org.jetbrains.kotlin.nj2k.tree.Mutability.IMMUTABLE
-import org.jetbrains.kotlin.nj2k.tree.Mutability.MUTABLE
 import org.jetbrains.kotlin.nj2k.tree.OtherModifier.STATIC
-import org.jetbrains.kotlin.nj2k.tree.Visibility.PRIVATE
 import org.jetbrains.kotlin.nj2k.types.JKJavaArrayType
 import org.jetbrains.kotlin.nj2k.types.arrayInnerType
 import org.jetbrains.kotlin.nj2k.types.isStringType
@@ -83,7 +82,18 @@ class ClassMemberConversion(context: NewJ2kConverterContext) : RecursiveConversi
     context(KtAnalysisSession)
     private fun JKField.convert() {
         removeStaticModifierFromAnonymousClassMember()
-        mutability = if (modality == FINAL) IMMUTABLE else MUTABLE
+        val hasMutableAnnotation = annotationList.annotations.any { MUTABLE_ANNOTATIONS.contains(it.classSymbol.fqName) }
+        val scope = when {
+            parentOfType<JKConstructor>() != null -> parentOfType<JKFile>()
+            parentOfType<JKClass>()?.visibility == PRIVATE && parentOfType<JKClass>()?.parentOfType<JKClass>() == null -> parentOfType<JKClass>()
+            else -> parentOfType<JKTreeRoot>() ?: parentOfType<JKFile>()
+        }
+        mutability = when {
+            modality == FINAL && initializer is JKStubExpression -> IMMUTABLE
+            hasMutableAnnotation -> MUTABLE
+            scope == null -> UNKNOWN
+            else -> inferMutabilityFromWritableUsages(scope, context)
+        }
         modality = FINAL
 
         if (isExternallyAccessible()) {

plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/nj2k/conversions/InferMutabilityOfLocalVariablesConversion.kt

@@ -0,0 +1,18 @@
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+
+package org.jetbrains.kotlin.nj2k.conversions
+
+import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
+import org.jetbrains.kotlin.nj2k.*
+import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.Mutability.UNKNOWN
+
+class InferMutabilityOfLocalVariablesConversion(context: NewJ2kConverterContext) : RecursiveConversion(context) {
+    context(KtAnalysisSession)
+    override fun applyToElement(element: JKTreeElement): JKTreeElement {
+        if (element !is JKLocalVariable || element.mutability != UNKNOWN) return recurse(element)
+        val scope = element.parentOfType<JKMethod>() ?: element.parentOfType<JKFile>() ?: element
+        element.mutability = element.inferMutabilityFromWritableUsages(scope, context)
+        return recurse(element)
+    }
+}

plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/nj2k/expressions.kt

@@ -19,6 +19,7 @@ import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.nj2k.symbols.JKMethodSymbol
 import org.jetbrains.kotlin.nj2k.symbols.JKSymbol
 import org.jetbrains.kotlin.nj2k.tree.*
+import org.jetbrains.kotlin.nj2k.tree.Modality.FINAL
 import org.jetbrains.kotlin.nj2k.tree.JKClass.ClassKind.INTERFACE
 import org.jetbrains.kotlin.nj2k.tree.JKLiteralExpression.LiteralType
 import org.jetbrains.kotlin.nj2k.types.JKNoType
@@ -182,9 +183,6 @@ fun JKExpression.unboxFieldReference(): JKFieldAccessExpression? = when {
     else -> null
 }
 
-fun JKFieldAccessExpression.asAssignmentFromTarget(): JKKtAssignmentStatement? =
-    parent.safeAs<JKKtAssignmentStatement>()?.takeIf { it.field == this }
-
 fun JKFieldAccessExpression.isInDecrementOrIncrement(): Boolean =
     when (parent.safeAs<JKUnaryExpression>()?.operator?.token) {
         JKOperatorToken.PLUSPLUS, JKOperatorToken.MINUSMINUS -> true
@@ -195,13 +193,6 @@ context(KtAnalysisSession)
 fun JKVariable.hasUsages(scope: JKTreeElement, context: NewJ2kConverterContext): Boolean =
     findUsages(scope, context).isNotEmpty()
 
-context(KtAnalysisSession)
-fun JKVariable.hasWritableUsages(scope: JKTreeElement, context: NewJ2kConverterContext): Boolean =
-    findUsages(scope, context).any {
-        it.asAssignmentFromTarget() != null
-                || it.isInDecrementOrIncrement()
-    }
-
 fun equalsExpression(left: JKExpression, right: JKExpression, typeFactory: JKTypeFactory) =
     JKBinaryExpression(
         left,
@@ -222,7 +213,7 @@ fun createCompanion(declarations: List<JKDeclaration>): JKClass =
         JKAnnotationList(),
         emptyList(),
         JKVisibilityModifierElement(Visibility.PUBLIC),
-        JKModalityModifierElement(Modality.FINAL)
+        JKModalityModifierElement(FINAL)
     )
 
 fun JKClass.getCompanion(): JKClass? =