extract method: adjust params to be final in case of local classes (IDEA-97253)

java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java

@@ -881,7 +881,7 @@ public class ExtractMethodProcessor implements MatchProvider {
             final int index = ArrayUtil.find(parameters, resolved);
             if (index >= 0) {
               final PsiParameter param = parameters[index];
-              if (!param.hasModifierProperty(PsiModifier.FINAL) && RefactoringUtil.isInsideAnonymous(expression, method)) {
+              if (!param.hasModifierProperty(PsiModifier.FINAL) && RefactoringUtil.isInsideAnonymousOrLocal(expression, method)) {
                 try {
                   PsiUtil.setModifierProperty(param, PsiModifier.FINAL, true);
                 }

java/java-impl/src/com/intellij/refactoring/makeStatic/InternalUsageInfo.java

@@ -48,7 +48,7 @@ class InternalUsageInfo extends UsageInfo{
 
   public boolean isInsideAnonymous() {
     if(myIsInsideAnonymous == null) {
-      myIsInsideAnonymous = Boolean.valueOf(RefactoringUtil.isInsideAnonymous(getElement(), null));
+      myIsInsideAnonymous = Boolean.valueOf(RefactoringUtil.isInsideAnonymousOrLocal(getElement(), null));
     }
 
     return myIsInsideAnonymous.booleanValue();

java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java

@@ -828,9 +828,12 @@ public class RefactoringUtil {
     removeFinalParameters(method);
   }
 
-  public static boolean isInsideAnonymous(PsiElement element, PsiElement upTo) {
+  public static boolean isInsideAnonymousOrLocal(PsiElement element, PsiElement upTo) {
     for (PsiElement current = element; current != null && current != upTo; current = current.getParent()) {
       if (current instanceof PsiAnonymousClass) return true;
+      if (current instanceof PsiClass && current.getParent() instanceof PsiDeclarationStatement) {
+        return true;
+      }
     }
     return false;
   }

java/java-tests/testData/refactoring/extractMethod/FinalParams4LocalClasses.java

@@ -0,0 +1,11 @@
+class Test {
+
+    public static void main(String[] args) {
+        final String s = "text";
+        <selection>class A {
+            {
+                System.out.println(s);
+            }
+        }</selection>
+    }
+}

java/java-tests/testData/refactoring/extractMethod/FinalParams4LocalClasses_after.java

@@ -0,0 +1,15 @@
+class Test {
+
+    public static void main(String[] args) {
+        final String s = "text";
+        newMethod(s);
+    }
+
+    private static void newMethod(final String s) {
+        class A {
+            {
+                System.out.println(s);
+            }
+        }
+    }
+}

java/java-tests/testData/refactoring/extractMethod/ParamsUsedInLocalClass_after.java

@@ -7,7 +7,7 @@ class A {
         System.out.println("");
     }
 
-    private boolean newMethod(int abc, boolean b) {
+    private boolean newMethod(final int abc, boolean b) {
         if (b) {
           class T {
             void bar() {

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

@@ -558,6 +558,10 @@ public class ExtractMethodTest extends LightCodeInsightTestCase {
     doTest();
   }
 
+  public void testFinalParams4LocalClasses() throws Exception {
+    doTest();
+  }
+  
   private void doTestDisabledParam() throws PrepareFailedException {
     final CodeStyleSettings settings = CodeStyleSettingsManager.getSettings(getProject());
     settings.ELSE_ON_NEW_LINE = true;