extract enum: do not include constants when user don't ask to; check that variable was already migrated and getter is already not needed (IDEA-103509)

java/java-tests/testData/refactoring/extractEnum/usageInVariableInitializer/after/EEnum.java

@@ -0,0 +1,12 @@
+public enum EEnum {
+    FOO(0);
+    private int value;
+
+    public int getValue() {
+        return value;
+    }
+
+    EEnum(int value) {
+        this.value = value;
+    }
+}

java/java-tests/testData/refactoring/extractEnum/usageInVariableInitializer/after/Test.java

@@ -0,0 +1,6 @@
+class Test {
+    public static final int BAR = 2;
+  void foo() {
+    System.out.println(EEnum.FOO.getValue());
+  }
+}

java/java-tests/testData/refactoring/extractEnum/usageInVariableInitializer/after/Usage.java

@@ -0,0 +1,9 @@
+class Usage {
+  void foo() {
+    EEnum i = EEnum.FOO;
+  }
+  
+  void bar(int i ) {
+    i = B;
+  }
+}

java/java-tests/testData/refactoring/extractEnum/usageInVariableInitializer/before/Test.java

@@ -0,0 +1,7 @@
+class Test {
+  public static final int FOO = 0;
+  public static final int BAR = 2;
+  void foo() {
+    System.out.println(FOO);
+  }
+}

java/java-tests/testData/refactoring/extractEnum/usageInVariableInitializer/before/Usage.java

@@ -0,0 +1,9 @@
+class Usage {
+  void foo() {
+    int i = Test.FOO;
+  }
+  
+  void bar(int i ) {
+    i = B;
+  }
+}

java/java-tests/testSrc/com/intellij/refactoring/ExtractEnumTest.java

@@ -59,6 +59,10 @@ public class ExtractEnumTest extends MultiFileTestCase {
     doTest(new RefactoringTestUtil.MemberDescriptor("FOO", PsiField.class, true));
   }
 
+  public void testUsageInVariableInitializer() throws Exception {
+    doTest(new RefactoringTestUtil.MemberDescriptor("FOO", PsiField.class, true));
+  }
+
   public void testForwardReferenceConflict() throws Exception {
     doTest("Unable to migrate statement to enum constant.", false,
            new RefactoringTestUtil.MemberDescriptor("FOO", PsiField.class, false),
@@ -149,6 +153,7 @@ public class ExtractEnumTest extends MultiFileTestCase {
             if (member.hasModifierProperty(PsiModifier.STATIC) && member.hasModifierProperty(PsiModifier.FINAL) && ((PsiField)member).hasInitializer()) {
               if (memberInfo.isToAbstract()) {
                 enumConstants.add(memberInfo);
+                memberInfo.setChecked(true);
               }
             }
           }