[FIR] DFA: add missing unwrap for FirDesugaredAssignmentValueReferenceExpression

^KT-60319 Fixed
^KT-61407 Fixed

analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java

@@ -8248,6 +8248,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
                 runTest("compiler/testData/diagnostics/tests/dataFlow/CalleeExpression.kt");
             }
 
+            @Test
+            @TestMetadata("desugaredAssignment.kt")
+            public void testDesugaredAssignment() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/dataFlow/desugaredAssignment.kt");
+            }
+
             @Test
             @TestMetadata("EmptyIf.kt")
             public void testEmptyIf() throws Exception {

analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java

@@ -8248,6 +8248,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
                 runTest("compiler/testData/diagnostics/tests/dataFlow/CalleeExpression.kt");
             }
 
+            @Test
+            @TestMetadata("desugaredAssignment.kt")
+            public void testDesugaredAssignment() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/dataFlow/desugaredAssignment.kt");
+            }
+
             @Test
             @TestMetadata("EmptyIf.kt")
             public void testEmptyIf() throws Exception {

compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java

@@ -8248,6 +8248,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
                 runTest("compiler/testData/diagnostics/tests/dataFlow/CalleeExpression.kt");
             }
 
+            @Test
+            @TestMetadata("desugaredAssignment.kt")
+            public void testDesugaredAssignment() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/dataFlow/desugaredAssignment.kt");
+            }
+
             @Test
             @TestMetadata("EmptyIf.kt")
             public void testEmptyIf() throws Exception {

compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java

@@ -8254,6 +8254,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
                 runTest("compiler/testData/diagnostics/tests/dataFlow/CalleeExpression.kt");
             }
 
+            @Test
+            @TestMetadata("desugaredAssignment.kt")
+            public void testDesugaredAssignment() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/dataFlow/desugaredAssignment.kt");
+            }
+
             @Test
             @TestMetadata("EmptyIf.kt")
             public void testEmptyIf() throws Exception {

compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/util.kt

@@ -82,6 +82,6 @@ fun FirElement.unwrapElement(): FirElement = when (this) {
     is FirSafeCallExpression -> selector.unwrapElement()
     is FirCheckedSafeCallSubject -> originalReceiverRef.value.unwrapElement()
     is FirCheckNotNullCall -> argument.unwrapElement()
+    is FirDesugaredAssignmentValueReferenceExpression -> expressionRef.value.unwrapElement()
     else -> this
 }
-

compiler/testData/diagnostics/tests/dataFlow/desugaredAssignment.fir.kt

@@ -0,0 +1,17 @@
+// WITH_STDLIB
+package usage
+
+class MyClass1
+open class ABC {
+    open val nestedBlocks = ArrayList<MyClass1>()
+
+    fun makeInjectionBlocks() {
+        val l: List<Any> = listOf(1)
+        for (b in l) {
+            when (b) {
+                is Int -> <!ASSIGNMENT_TYPE_MISMATCH!><!VAL_REASSIGNMENT!>nestedBlocks<!> += b<!>
+                else -> {}
+            }
+        }
+    }
+}

compiler/testData/diagnostics/tests/dataFlow/desugaredAssignment.kt

@@ -0,0 +1,17 @@
+// WITH_STDLIB
+package usage
+
+class MyClass1
+open class ABC {
+    open val nestedBlocks = ArrayList<MyClass1>()
+
+    fun makeInjectionBlocks() {
+        val l: List<Any> = listOf(1)
+        for (b in l) {
+            when (b) {
+                is Int -> <!TYPE_MISMATCH!><!VAL_REASSIGNMENT!>nestedBlocks<!> += b<!>
+                else -> {}
+            }
+        }
+    }
+}

compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java

@@ -8254,6 +8254,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
                 runTest("compiler/testData/diagnostics/tests/dataFlow/CalleeExpression.kt");
             }
 
+            @Test
+            @TestMetadata("desugaredAssignment.kt")
+            public void testDesugaredAssignment() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/dataFlow/desugaredAssignment.kt");
+            }
+
             @Test
             @TestMetadata("EmptyIf.kt")
             public void testEmptyIf() throws Exception {