diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/MethodExtractor.kt b/java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/MethodExtractor.kt
index 07acfc07fa66..ab701c667796 100644
--- a/java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/MethodExtractor.kt
+++ b/java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/MethodExtractor.kt
@@ -137,7 +137,7 @@ class MethodExtractor {
     val annotationAvailable = ExtractMethodHelper.isNullabilityAvailable(options)
     return ExtractMethodPopupProvider(
       annotateDefault = if (hasAnnotation && annotationAvailable) needsNullabilityAnnotations(options.project) else null,
-      makeStaticDefault = if (showStatic) false else null,
+      makeStaticDefault = if (showStatic) !makeStaticAndPassFields else null,
       staticPassFields = makeStaticAndPassFields
     )
   }
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/AvoidChangeSignatureForLocalRefsInCandidate_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/AvoidChangeSignatureForLocalRefsInCandidate_after.java
index e02f411e66dd..d75c8000a318 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/AvoidChangeSignatureForLocalRefsInCandidate_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/AvoidChangeSignatureForLocalRefsInCandidate_after.java
@@ -4,7 +4,7 @@ public class Test{
         extracted();
     }
 
-    private void extracted() {
+    private static void extracted() {
         String local = "local";
         System.out.println("one");
         System.out.println("two");
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/AvoidChangeSignatureForLocalRefsInPattern_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/AvoidChangeSignatureForLocalRefsInPattern_after.java
index 24ffcddfe08e..e44fa207e46f 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/AvoidChangeSignatureForLocalRefsInPattern_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/AvoidChangeSignatureForLocalRefsInPattern_after.java
@@ -10,7 +10,7 @@ public class Test{
         extracted();
     }
 
-    private void extracted() {
+    private static void extracted() {
         String local = "local";
         System.out.println("one");
         System.out.println(local.toLowerCase());
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ChangedVariableDeclaredOnce_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ChangedVariableDeclaredOnce_after.java
index 3b0098f7a646..f05147c7638f 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ChangedVariableDeclaredOnce_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ChangedVariableDeclaredOnce_after.java
@@ -8,7 +8,7 @@ public class Test {
     }
 
     @NotNull
-    private String getString() {
+    private static String getString() {
         String s = "42";
         return s;
     }
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ConditionalExitPoint_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ConditionalExitPoint_after.java
index 5c9ec1e33e0a..60b93535ad6e 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ConditionalExitPoint_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ConditionalExitPoint_after.java
@@ -7,7 +7,7 @@ public class Test {
         return i;
     }
 
-    private boolean extracted(int i) {
+    private static boolean extracted(int i) {
         if (i == 42) {
             return true;
         } else if (i == 17) {
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ConditionalYield_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ConditionalYield_after.java
index 8a2e8a864f93..93f0b3cbe988 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ConditionalYield_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ConditionalYield_after.java
@@ -14,7 +14,7 @@ public class Test {
     }
 
     @Nullable
-    private String getString() {
+    private static String getString() {
         if (new Random().nextBoolean()) {
           System.out.println();
             return "one";
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ConflictedNamesFiltered_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ConflictedNamesFiltered_after.java
index 47dd53292347..aaab411ef2b9 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ConflictedNamesFiltered_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ConflictedNamesFiltered_after.java
@@ -4,7 +4,7 @@ class Test {
         System.out.println(x);
     }
 
-    private int getAnInt() {
+    private static int getAnInt() {
         int x = 42;
         return x;
     }
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/DiamondTypesConsideredAsEqual_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/DiamondTypesConsideredAsEqual_after.java
index e2ec598b12da..4e7bf18550c4 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/DiamondTypesConsideredAsEqual_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/DiamondTypesConsideredAsEqual_after.java
@@ -11,7 +11,7 @@ class T {
   }
 
     @NotNull
-    private ArrayList<String> getList1() {
+    private static ArrayList<String> getList1() {
         return new ArrayList<>();
     }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/DuplicatedExpressionAndChangeSignature_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/DuplicatedExpressionAndChangeSignature_after.java
index b4631ab6347a..5b7583107a44 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/DuplicatedExpressionAndChangeSignature_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/DuplicatedExpressionAndChangeSignature_after.java
@@ -7,7 +7,7 @@ class Test {
   }
 
     @NotNull
-    private byte[] getBytes(String one) {
+    private static byte[] getBytes(String one) {
         return one.getBytes();
     }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ExactDuplicates_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ExactDuplicates_after.java
index d7e510fd771d..651f179b36a5 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ExactDuplicates_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ExactDuplicates_after.java
@@ -4,7 +4,7 @@ class Test {
         extracted();
     }
 
-    private void extracted() {
+    private static void extracted() {
         System.out.println();
     }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ExpressionDuplicates_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ExpressionDuplicates_after.java
index 28acd846dc9c..17c5448f146e 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ExpressionDuplicates_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ExpressionDuplicates_after.java
@@ -6,7 +6,7 @@ public class Test {
     }
 
     @NotNull
-    private String getR(String p) {
+    private static String getR(String p) {
         return p.toLowerCase();
     }
 
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/FoldReturnExpression_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/FoldReturnExpression_after.java
index 84fda9d84297..72f901d721d1 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/FoldReturnExpression_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/FoldReturnExpression_after.java
@@ -3,7 +3,7 @@ public class Test {
     return getString(s[i]);
   }
 
-    private String getString(String s) {
+    private static String getString(String s) {
         return s;
     }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/GeneratedDefault_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/GeneratedDefault_after.java
index a77288b0eb08..88e9dc7874db 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/GeneratedDefault_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/GeneratedDefault_after.java
@@ -4,7 +4,7 @@ class Test {
         System.out.println(x);
     }
 
-    private int getX1() {
+    private static int getX1() {
         int x = 42;
         return x;
     }
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/IDEA278872_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/IDEA278872_after.java
index 18c24983a595..e5f737b0497e 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/IDEA278872_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/IDEA278872_after.java
@@ -8,7 +8,7 @@ class Test {
     }
 
     @NotNull
-    private String getString() {
+    private static String getString() {
         final String str = "atata";
         do {
           System.out.println();
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/LocalAssignmentDuplicates_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/LocalAssignmentDuplicates_after.java
index 090aa7d4aa23..8fad6b5bb4c6 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/LocalAssignmentDuplicates_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/LocalAssignmentDuplicates_after.java
@@ -4,7 +4,7 @@ public class Sample2 {
         extracted();
     }
 
-    private void extracted() {
+    private static void extracted() {
         int a = 1;
         int b = 2;
         a = 42;
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/NormalizedOnSwitchRule_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/NormalizedOnSwitchRule_after.java
index dc3a0a1d2694..e2dedfa4d9d1 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/NormalizedOnSwitchRule_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/NormalizedOnSwitchRule_after.java
@@ -9,7 +9,7 @@ public class Test1 {
         }
     }
 
-    private void extracted() {
+    private static void extracted() {
         System.out.println("one");
         System.out.println("two");
     }
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/OverlappingRanges_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/OverlappingRanges_after.java
index f5b2f140ed5e..7f41fc8d4024 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/OverlappingRanges_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/OverlappingRanges_after.java
@@ -6,7 +6,7 @@ public class Test {
         System.out.println();
     }
 
-    private void extracted() {
+    private static void extracted() {
         System.out.println();
         System.out.println();
         System.out.println();
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ParameterGrouping_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ParameterGrouping_after.java
index efc681177209..10e94e1ce2b0 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ParameterGrouping_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ParameterGrouping_after.java
@@ -3,7 +3,7 @@ class Test {
         extracted("string", "string");
     }
 
-    private void extracted(String string, String string1) {
+    private static void extracted(String string, String string1) {
         System.out.println(string);
         System.out.println(string1);
     }
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/RenamedExactDuplicate_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/RenamedExactDuplicate_after.java
index 0810a342f3b3..1b824ab017b8 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/RenamedExactDuplicate_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/RenamedExactDuplicate_after.java
@@ -4,7 +4,7 @@ class Test {
         renamed();
     }
 
-    private void renamed() {
+    private static void renamed() {
         System.out.println();
     }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/RenamedParametrizedDuplicate_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/RenamedParametrizedDuplicate_after.java
index a56019911df2..dd2a895bc42e 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/RenamedParametrizedDuplicate_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/RenamedParametrizedDuplicate_after.java
@@ -4,7 +4,7 @@ class Test {
         int avgB = average(100, 200);
     }
 
-    private int average(int x, int x1) {
+    private static int average(int x, int x1) {
         return x + x1 / 2;
     }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ShortenClassReferences_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ShortenClassReferences_after.java
index a6ab74c55681..6d66cf700ab2 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ShortenClassReferences_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ShortenClassReferences_after.java
@@ -7,7 +7,7 @@ class Test {
         extracted(s);
     }
 
-    private void extracted(Stream<Object> s) {
+    private static void extracted(Stream<Object> s) {
         System.out.println(s);
     }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/SpecificCatch_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/SpecificCatch_after.java
index ba73d4862733..468c14cde6c5 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/SpecificCatch_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/SpecificCatch_after.java
@@ -12,7 +12,7 @@ public class Test {
         return y;
     }
 
-    private int getY(int x, int y) throws FileNotFoundException {
+    private static int getY(int x, int y) throws FileNotFoundException {
         new Scanner(new File("file.txt"));
         y = y + x;
         y = y / x;
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/Statement_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/Statement_after.java
index 0ce31a11a430..2a9d0f7ee20e 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/Statement_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/Statement_after.java
@@ -3,7 +3,7 @@ class Test {
         extracted();
     }
 
-    private void extracted() {
+    private static void extracted() {
         System.out.println();
     }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/TemplateRenamesInsertedCallOnly_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/TemplateRenamesInsertedCallOnly_after.java
index 72d4a5e57e2a..923f519197f1 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/TemplateRenamesInsertedCallOnly_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/TemplateRenamesInsertedCallOnly_after.java
@@ -11,7 +11,7 @@ public abstract class Test {
   }
 
     @NotNull
-    private String renamed() {
+    private static String renamed() {
         return "4" + "2";
     }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ThreeDuplicates_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ThreeDuplicates_after.java
index 721e96614cd9..57d052a94787 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ThreeDuplicates_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ThreeDuplicates_after.java
@@ -3,7 +3,7 @@ class Test {
         sayHello("Hello!", "user");
     }
 
-    private void sayHello(String s, String user) {
+    private static void sayHello(String s, String user) {
         System.out.println(s);
         System.out.println(user);
     }
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ValidRename_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ValidRename_after.java
index c17f0e661236..ec415d98e9c3 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ValidRename_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ValidRename_after.java
@@ -3,7 +3,7 @@ class Test {
         valid();
     }
 
-    private void valid() {
+    private static void valid() {
         System.out.println();
     }
 
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/VariableGetterSuggested_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/VariableGetterSuggested_after.java
index 7257af399e90..44487e028c2f 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/VariableGetterSuggested_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/VariableGetterSuggested_after.java
@@ -4,7 +4,7 @@ class Test {
         System.out.println(x);
     }
 
-    private int getX() {
+    private static int getX() {
         int x = 42;
         return x;
     }
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/WrongLocalAssignmentDuplicates_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/WrongLocalAssignmentDuplicates_after.java
index 6063a8f66674..60e8484835bc 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/WrongLocalAssignmentDuplicates_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/WrongLocalAssignmentDuplicates_after.java
@@ -4,7 +4,7 @@ public class Sample2 {
         extracted();
     }
 
-    private void extracted() {
+    private static void extracted() {
         int a = 1;
         int b = 2;
         a = 42;
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/YieldWithDuplicate_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/YieldWithDuplicate_after.java
index 3b08b4005104..e79052340611 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/YieldWithDuplicate_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/YieldWithDuplicate_after.java
@@ -13,7 +13,7 @@ public class Test {
         };
     }
 
-    private String getString(String one) {
+    private static String getString(String one) {
         System.out.println();
         return one;
     }