convert to local for switch block: add decl before switch (IDEA-181440)

java/java-impl/src/com/intellij/codeInspection/varScopeCanBeNarrowed/BaseConvertToLocalQuickFix.java

@@ -132,7 +132,14 @@ public abstract class BaseConvertToLocalQuickFix<V extends PsiVariable> implemen
       variable,
       references,
       delete,
-      declaration -> anchorBlock.addBefore(declaration, anchor)
+      declaration -> {
+        PsiElement parent = anchorBlock.getParent();
+        if (parent instanceof PsiSwitchStatement) {
+          PsiElement switchContainer = parent.getParent();
+          return switchContainer.addBefore(declaration, parent);
+        }
+        return anchorBlock.addBefore(declaration, anchor);
+      }
     );
   }
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convert2Local/afterInSwitchCases.java

@@ -0,0 +1,18 @@
+// "Convert to local" "true"
+class TestFieldConversion
+{
+
+    public void someMethod(int s) {
+        int someInt = 0;
+        switch (s) {
+      case 1:
+        System.out.println(someInt);
+        break;
+      case 3:
+        System.out.println(someInt);
+        break;
+      default:
+        break;
+    }
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convert2Local/beforeInSwitchCases.java

@@ -0,0 +1,18 @@
+// "Convert to local" "true"
+class TestFieldConversion
+{
+  private int som<caret>eInt = 0;
+
+  public void someMethod(int s) {
+    switch (s) {
+      case 1:
+        System.out.println(someInt);
+        break;
+      case 3:
+        System.out.println(someInt);
+        break;
+      default:
+        break;
+    }
+  }
+}