extract method object: do not make static when already static (IDEA-98290)

java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectProcessor.java

@@ -682,7 +682,8 @@ public class ExtractMethodObjectProcessor extends BaseRefactoringProcessor {
     @Override
     public PsiElement processMatch(final Match match) throws IncorrectOperationException {
       final boolean makeStatic = myInnerMethod != null &&
-                                 RefactoringUtil.isInStaticContext(match.getMatchStart(), getExtractedMethod().getContainingClass());
+                                 RefactoringUtil.isInStaticContext(match.getMatchStart(), getExtractedMethod().getContainingClass()) &&
+                                 !myInnerMethod.getContainingClass().hasModifierProperty(PsiModifier.STATIC);
       final PsiElement element = super.processMatch(match);
       if (makeStatic) {
         myMadeStatic = true;

java/java-impl/src/com/intellij/refactoring/util/duplicates/DuplicatesImpl.java

@@ -193,7 +193,7 @@ public class DuplicatesImpl {
       if (duplicates.size() == 1) {
         previewMatch(project, duplicates.get(0), editor);
       }
-      final int answer = Messages.showYesNoDialog(project,
+      final int answer = ApplicationManager.getApplication().isUnitTestMode() ? 0 : Messages.showYesNoDialog(project,
         RefactoringBundle.message("0.has.detected.1.code.fragments.in.this.file.that.can.be.replaced.with.a.call.to.extracted.method",
         ApplicationNamesInfo.getInstance().getProductName(), duplicates.size()),
         "Process Duplicates", Messages.getQuestionIcon());

java/java-tests/testData/refactoring/extractMethodObject/multipleExitPoints/FromStaticContext.java

@@ -0,0 +1,12 @@
+class Bag {
+    Integer x;
+    Integer y;
+}
+
+class Foo {
+    public static void foo() {
+        Bag b = new Bag();
+        System.out.println(<selection>b</selection>.x);
+        System.out.println(b.x);
+    }
+}

java/java-tests/testData/refactoring/extractMethodObject/multipleExitPoints/FromStaticContext.java.after

@@ -0,0 +1,24 @@
+class Bag {
+    Integer x;
+    Integer y;
+}
+
+class Foo {
+    public static void foo() {
+        Bag b = new Bag();
+        System.out.println(new Inner(b).invoke().x);
+        System.out.println(new Inner(b).invoke().x);
+    }
+
+    private static class Inner {
+        private Bag b;
+
+        public Inner(Bag b) {
+            this.b = b;
+        }
+
+        public Bag invoke() {
+            return b;
+        }
+    }
+}

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

@@ -118,4 +118,8 @@ public class ExtractMethodObjectWithMultipleExitPointsTest extends LightRefactor
   public void testReturnExitStatement() throws Exception {
     doTest();
   }
+
+  public void testFromStaticContext() throws Exception {
+    doTest();
+  }
 }