PY-61591 The scope of a class' variable does not extend to contained blocks

GitOrigin-RevId: 871bb3584f9c72f91aced9e86909feccf0a901d7

python/python-psi-impl/src/com/jetbrains/python/refactoring/extractmethod/PyExtractMethodUtil.java

@@ -736,9 +736,11 @@ public final class PyExtractMethodUtil {
         myFunction = s -> {
           ScopeOwner owner = parent;
           while (owner != null) {
-            final Scope scope = ControlFlowCache.getScope(owner);
-            if (scope.containsDeclaration(s)) {
-              return false;
+            if (!(owner instanceof PyClass)) {
+              final Scope scope = ControlFlowCache.getScope(owner);
+              if (scope.containsDeclaration(s)) {
+                return false;
+              }
             }
             owner = ScopeUtil.getScopeOwner(owner);
           }

python/testData/refactoring/extractmethod/InnerFunctionWithSameNameAsOuterMethod.after.py

@@ -0,0 +1,9 @@
+class A:
+    def foo(self): ...
+
+    def bar(self):
+        def baz():
+            foo()
+
+        def foo():
+            print('baz')

python/testData/refactoring/extractmethod/InnerFunctionWithSameNameAsOuterMethod.before.py

@@ -0,0 +1,6 @@
+class A:
+    def foo(self): ...
+
+    def bar(self):
+        def baz():
+            <selection>print('baz')</selection>

python/testSrc/com/jetbrains/python/refactoring/PyExtractMethodTest.java

@@ -391,4 +391,9 @@ public class PyExtractMethodTest extends LightMarkedTestCase {
   public void testMethodNameCanShadowModuleFunction() {
     doTest("_require_instance");
   }
+
+  // PY-61591
+  public void testInnerFunctionWithSameNameAsOuterMethod() {
+    doTest("foo");
+  }
 }