[java-highlighting] IDEA-324705 Non-final variable in guard: provide a fix to rewrite 'if' statement

GitOrigin-RevId: 99770663b569ed2bd6a8d6452e5b0bbe923f9d15

java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightControlFlowUtil.java

@@ -775,6 +775,10 @@ public final class HighlightControlFlowUtil {
       HighlightInfo.Builder builder = HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR).range(context).descriptionAndTooltip(message);
       IntentionAction action = QUICK_FIX_FACTORY.createVariableAccessFromInnerClassFix(variable, refGuardedPattern);
       builder.registerFix(action, null, null, null, null);
+      IntentionAction action2 = QUICK_FIX_FACTORY.createMakeVariableEffectivelyFinalFix(variable);
+      if (action2 != null) {
+        builder.registerFix(action2, null, null, null, null);
+      }
       ErrorFixExtensionPoint.registerFixes(builder, context, "guarded.pattern.variable.must.be.final");
       return builder;
     }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/mustBeFinal21/afterInsideWhenWIthIf.java

@@ -0,0 +1,15 @@
+// "Make 'mode' effectively final by moving initializer to the 'if' statement" "true-preview"
+class Test {
+  void test(Object o) {
+    int mode;
+    if (Math.random() > 0.5) {
+      mode = 3;
+    } else {
+        mode = 2;
+    }
+      switch (o) {
+      case Integer i when i == mode -> {}
+      default -> {}
+    }
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/mustBeFinal21/beforeInsideWhenWIthIf.java

@@ -0,0 +1,13 @@
+// "Make 'mode' effectively final by moving initializer to the 'if' statement" "true-preview"
+class Test {
+  void test(Object o) {
+    int mode = 2;
+    if (Math.random() > 0.5) {
+      mode = 3;
+    }
+    switch (o) {
+      case Integer i when i == mode<caret> -> {}
+      default -> {}
+    }
+  }
+}

java/java-tests/testSrc/com/intellij/codeInsight/daemon/impl/quickfix/VariableAccessFromSwitch21Test.java

@@ -0,0 +1,17 @@
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package com.intellij.codeInsight.daemon.impl.quickfix;
+
+import com.intellij.codeInsight.daemon.quickFix.LightQuickFixParameterizedTestCase;
+import com.intellij.pom.java.LanguageLevel;
+
+public class VariableAccessFromSwitch21Test extends LightQuickFixParameterizedTestCase {
+  @Override
+  protected String getBasePath() {
+    return "/codeInsight/daemonCodeAnalyzer/quickFix/mustBeFinal21";
+  }
+
+  @Override
+  protected LanguageLevel getLanguageLevel() {
+    return LanguageLevel.JDK_21;
+  }
+}