diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/EnhancedSwitchBackwardMigrationInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/EnhancedSwitchBackwardMigrationInspection.java
index 8da56e800019..ab850e84cd6d 100644
--- a/java/java-impl-inspections/src/com/intellij/codeInspection/EnhancedSwitchBackwardMigrationInspection.java
+++ b/java/java-impl-inspections/src/com/intellij/codeInspection/EnhancedSwitchBackwardMigrationInspection.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// 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.codeInspection;
 
 import com.intellij.codeInsight.BlockUtils;
@@ -27,7 +27,8 @@ public final class EnhancedSwitchBackwardMigrationInspection extends AbstractBas
   private static final SwitchMigrationCase[] ourCases = new SwitchMigrationCase[]{
     EnhancedSwitchBackwardMigrationInspection::inspectReturningSwitch,
     EnhancedSwitchBackwardMigrationInspection::inspectVariableSavingSwitch,
-    EnhancedSwitchBackwardMigrationInspection::inspectSwitchStatement
+    EnhancedSwitchBackwardMigrationInspection::inspectSwitchStatement,
+    EnhancedSwitchBackwardMigrationInspection::inspectAssignmentSwitch,
   };
 
   @NotNull
@@ -80,6 +81,13 @@ public final class EnhancedSwitchBackwardMigrationInspection extends AbstractBas
     return new VariableSavingReplacer(variable);
   }
 
+  private static Replacer inspectAssignmentSwitch(@NotNull PsiSwitchBlock switchBlock) {
+    if (!(switchBlock instanceof PsiSwitchExpression)) return null;
+    PsiAssignmentExpression assignment = tryCast(switchBlock.getParent(), PsiAssignmentExpression.class);
+    if (assignment == null || !(assignment.getLExpression() instanceof PsiReferenceExpression)) return null;
+    return new AssignmentReplacer(assignment);
+  }
+
   private static Replacer inspectSwitchStatement(@NotNull PsiSwitchBlock switchBlock) {
     if (!(switchBlock instanceof PsiSwitchStatement)) return null;
     return new SwitchStatementReplacer();
@@ -141,10 +149,11 @@ public final class EnhancedSwitchBackwardMigrationInspection extends AbstractBas
       PsiElementFactory factory = JavaPsiFacade.getElementFactory(block.getProject());
       PsiTypesUtil.replaceWithExplicitType(myVariable.getTypeElement());
       CommentTracker ct = new CommentTracker();
-      PsiSwitchStatement switchStatement = new VarSavingSwitchGenerator(block, myVariable).generate(ct);
+      PsiSwitchStatement switchStatement = new VarSavingSwitchGenerator(block, myVariable.getName(), "=").generate(ct);
       ct.markUnchanged(block);
       PsiDeclarationStatement variableDeclaration =
-        (PsiDeclarationStatement)factory.createStatementFromText(myVariable.getTypeElement().getText() + " " + myVariable.getName() + ";", myVariable);
+        (PsiDeclarationStatement)factory.createStatementFromText(myVariable.getTypeElement().getText() + " " + myVariable.getName() + ";",
+                                                                 myVariable);
 
       ct.markUnchanged(switchStatement);
       PsiStatement declaration = (PsiStatement)ct.replaceAndRestoreComments(myVariable.getParent(), variableDeclaration);
@@ -153,6 +162,24 @@ public final class EnhancedSwitchBackwardMigrationInspection extends AbstractBas
     }
   }
 
+  private static final class AssignmentReplacer implements Replacer {
+    private final @NotNull PsiAssignmentExpression myAssignment;
+
+    private AssignmentReplacer(@NotNull PsiAssignmentExpression assignment) {
+      myAssignment = assignment;
+    }
+
+    @Override
+    public void replace(PsiSwitchBlock block) {
+      PsiExpression expression = myAssignment.getLExpression();
+      if (!(expression instanceof PsiReferenceExpression)) return;
+      CommentTracker ct = new CommentTracker();
+      String sign = myAssignment.getOperationSign().getText();
+      PsiSwitchStatement switchStatement = new VarSavingSwitchGenerator(block, expression.getText(), sign).generate(ct);
+      ct.replaceAndRestoreComments(myAssignment.getParent(), switchStatement);
+    }
+  }
+
   private static class SwitchStatementReplacer implements Replacer {
     @Override
     public void replace(PsiSwitchBlock block) {
@@ -288,18 +315,20 @@ public final class EnhancedSwitchBackwardMigrationInspection extends AbstractBas
   }
 
   private static class VarSavingSwitchGenerator extends SwitchGenerator {
-    private final @NotNull PsiLocalVariable myVariable;
+    private final @NotNull String myReferenceText;
+    private final @NotNull String mySign;
 
-    VarSavingSwitchGenerator(PsiSwitchBlock switchBlock, @NotNull PsiLocalVariable variable) {
+    VarSavingSwitchGenerator(PsiSwitchBlock switchBlock, @NotNull String referenceText, @NotNull String sign) {
       super(switchBlock);
-      myVariable = variable;
+      myReferenceText = referenceText;
+      mySign = sign;
     }
 
     @Override
     void handleYieldInside(@NotNull PsiYieldStatement yieldStatement, CommentTracker ct) {
       PsiExpression valueExpression = yieldStatement.getExpression();
       assert valueExpression != null;
-      String assignText = myVariable.getName() + " = " + ct.text(valueExpression) + ";\n";
+      String assignText = myReferenceText + " " + mySign + " " + ct.text(valueExpression) + ";\n";
       PsiStatement assignment = myFactory.createStatementFromText(assignText, valueExpression);
       PsiStatement newAssignment = (PsiStatement)ct.replace(yieldStatement, assignment);
       BlockUtils.addAfter(newAssignment, myFactory.createStatementFromText("break;", null));
@@ -310,7 +339,7 @@ public final class EnhancedSwitchBackwardMigrationInspection extends AbstractBas
       if (statement instanceof PsiThrowStatement) {
         return ct.text(statement);
       }
-      return myVariable.getName() + " = " + ct.text(statement) + "\nbreak;";
+      return myReferenceText + " " + mySign + " " + ct.text(statement) + "\nbreak;";
     }
   }
 
diff --git a/java/java-tests/testData/inspection/switchExpressionBackwardMigration/afterSwitchVarAssigning.java b/java/java-tests/testData/inspection/switchExpressionBackwardMigration/afterSwitchVarDeclaration.java
similarity index 100%
rename from java/java-tests/testData/inspection/switchExpressionBackwardMigration/afterSwitchVarAssigning.java
rename to java/java-tests/testData/inspection/switchExpressionBackwardMigration/afterSwitchVarDeclaration.java
diff --git a/java/java-tests/testData/inspection/switchExpressionBackwardMigration/afterSwitchVarAssigningComments.java b/java/java-tests/testData/inspection/switchExpressionBackwardMigration/afterSwitchVarDeclarationComments.java
similarity index 100%
rename from java/java-tests/testData/inspection/switchExpressionBackwardMigration/afterSwitchVarAssigningComments.java
rename to java/java-tests/testData/inspection/switchExpressionBackwardMigration/afterSwitchVarDeclarationComments.java
diff --git a/java/java-tests/testData/inspection/switchExpressionBackwardMigration/afterSwitchVarAssigningInferred.java b/java/java-tests/testData/inspection/switchExpressionBackwardMigration/afterSwitchVarDeclarationInferred.java
similarity index 100%
rename from java/java-tests/testData/inspection/switchExpressionBackwardMigration/afterSwitchVarAssigningInferred.java
rename to java/java-tests/testData/inspection/switchExpressionBackwardMigration/afterSwitchVarDeclarationInferred.java
diff --git a/java/java-tests/testData/inspection/switchExpressionBackwardMigration/afterSwitchVarAssigningThrow.java b/java/java-tests/testData/inspection/switchExpressionBackwardMigration/afterSwitchVarDeclarationThrow.java
similarity index 100%
rename from java/java-tests/testData/inspection/switchExpressionBackwardMigration/afterSwitchVarAssigningThrow.java
rename to java/java-tests/testData/inspection/switchExpressionBackwardMigration/afterSwitchVarDeclarationThrow.java
diff --git a/java/java-tests/testData/inspection/switchExpressionBackwardMigration/afterVarAssigning.java b/java/java-tests/testData/inspection/switchExpressionBackwardMigration/afterVarAssigning.java
new file mode 100644
index 000000000000..cf3b1871f549
--- /dev/null
+++ b/java/java-tests/testData/inspection/switchExpressionBackwardMigration/afterVarAssigning.java
@@ -0,0 +1,24 @@
+// "Replace with old style 'switch' statement" "true"
+
+class SwitchExpressionMigration {
+  int x;
+  void test(X x) {
+      switch (x) {
+          case A:
+              this.x *= 1;
+              break;
+          case B:
+              this.x *= 2;
+              break;
+          case C:
+              this.x *= 3;
+              break;
+          default:
+              throw new IllegalArgumentException();
+      }
+  }
+
+  enum X {
+    A, B, C
+  }
+}
diff --git a/java/java-tests/testData/inspection/switchExpressionBackwardMigration/afterAssigningExhaustiveEnum.java b/java/java-tests/testData/inspection/switchExpressionBackwardMigration/afterVarDeclarationExhaustiveEnum.java
similarity index 100%
rename from java/java-tests/testData/inspection/switchExpressionBackwardMigration/afterAssigningExhaustiveEnum.java
rename to java/java-tests/testData/inspection/switchExpressionBackwardMigration/afterVarDeclarationExhaustiveEnum.java
diff --git a/java/java-tests/testData/inspection/switchExpressionBackwardMigration/beforeSwitchVarAssigning.java b/java/java-tests/testData/inspection/switchExpressionBackwardMigration/beforeSwitchVarDeclaration.java
similarity index 100%
rename from java/java-tests/testData/inspection/switchExpressionBackwardMigration/beforeSwitchVarAssigning.java
rename to java/java-tests/testData/inspection/switchExpressionBackwardMigration/beforeSwitchVarDeclaration.java
diff --git a/java/java-tests/testData/inspection/switchExpressionBackwardMigration/beforeSwitchVarAssigningComments.java b/java/java-tests/testData/inspection/switchExpressionBackwardMigration/beforeSwitchVarDeclarationComments.java
similarity index 100%
rename from java/java-tests/testData/inspection/switchExpressionBackwardMigration/beforeSwitchVarAssigningComments.java
rename to java/java-tests/testData/inspection/switchExpressionBackwardMigration/beforeSwitchVarDeclarationComments.java
diff --git a/java/java-tests/testData/inspection/switchExpressionBackwardMigration/beforeSwitchVarAssigningInferred.java b/java/java-tests/testData/inspection/switchExpressionBackwardMigration/beforeSwitchVarDeclarationInferred.java
similarity index 100%
rename from java/java-tests/testData/inspection/switchExpressionBackwardMigration/beforeSwitchVarAssigningInferred.java
rename to java/java-tests/testData/inspection/switchExpressionBackwardMigration/beforeSwitchVarDeclarationInferred.java
diff --git a/java/java-tests/testData/inspection/switchExpressionBackwardMigration/beforeSwitchVarAssigningThrow.java b/java/java-tests/testData/inspection/switchExpressionBackwardMigration/beforeSwitchVarDeclarationThrow.java
similarity index 100%
rename from java/java-tests/testData/inspection/switchExpressionBackwardMigration/beforeSwitchVarAssigningThrow.java
rename to java/java-tests/testData/inspection/switchExpressionBackwardMigration/beforeSwitchVarDeclarationThrow.java
diff --git a/java/java-tests/testData/inspection/switchExpressionBackwardMigration/beforeVarAssigning.java b/java/java-tests/testData/inspection/switchExpressionBackwardMigration/beforeVarAssigning.java
new file mode 100644
index 000000000000..8ef518c03c8a
--- /dev/null
+++ b/java/java-tests/testData/inspection/switchExpressionBackwardMigration/beforeVarAssigning.java
@@ -0,0 +1,16 @@
+// "Replace with old style 'switch' statement" "true"
+
+class SwitchExpressionMigration {
+  int x;
+  void test(X x) {
+    this.x *= <caret>switch (x) {
+      case A -> 1;
+      case B -> 2;
+      case C -> 3;
+    };
+  }
+
+  enum X {
+    A, B, C
+  }
+}
diff --git a/java/java-tests/testData/inspection/switchExpressionBackwardMigration/beforeAssigningExhaustiveEnum.java b/java/java-tests/testData/inspection/switchExpressionBackwardMigration/beforeVarDeclarationExhaustiveEnum.java
similarity index 100%
rename from java/java-tests/testData/inspection/switchExpressionBackwardMigration/beforeAssigningExhaustiveEnum.java
rename to java/java-tests/testData/inspection/switchExpressionBackwardMigration/beforeVarDeclarationExhaustiveEnum.java