WIP. Fix test 'x.update.identifier.move.whole.2'

Author: elifarley

src/cedarscript_editor/cedarscript_editor.py

@@ -184,26 +184,28 @@ def _update_command(self, cmd: UpdateCommand):
         match content:
             case str() | [str(), *_] | (str(), *_):
                 pass
-            case (region, relindent):
-                dest_indent = search_range.indent
+            case (region, relindent_level):
+                dest_indent_count = search_range.indent
                 content_range = restrict_search_range_for_marker(
                     region, action, lines, RangeSpec.EMPTY, identifier_finder
                 )
                 content = content_range.read(lines)
-                count = dest_indent + (relindent or 0)
+                count = dest_indent_count + (relindent_level or 0)
                 content = IndentationInfo.from_content(content).shift_indentation(
                     content, count
                 )
                 content = (region, content)
             case _:
                 match action:
-                    case MoveClause(insert_position=region, relative_indentation=relindent):
-                        dest_range = restrict_search_range_for_marker(
-                            region, action, lines, RangeSpec.EMPTY, identifier_finder
-                        )
-                        dest_indent = dest_range.indent
+                    case MoveClause(insert_position=region, relative_indentation=relindent_level):
+                        # dest_range = restrict_search_range_for_marker(
+                        #     region, action, lines, RangeSpec.EMPTY, identifier_finder
+                        # )
+                        # TODO Make sure 3 lines above are not needed
+                        dest_range = search_range
+                        dest_indent_count = dest_range.indent
                         content = move_src_range.read(lines)
-                        shift_count = dest_indent + (relindent or 0)
+                        shift_count = dest_indent_count + (relindent_level or 0) # TODO Fix
                         content = IndentationInfo.from_content(content).shift_indentation(
                             content, shift_count
                         )

src/text_manipulation/indentation_kit.py

@@ -210,6 +210,7 @@ def level_to_chars(self, level: int) -> str:
         """
         return level * self.char_count * self.char
 
+    # TODO Revise
     def shift_indentation(self, lines: Sequence[str], target_base_indentation_count: int) -> list[str]:
         """
         Shift the indentation of a sequence of lines based on a target base indentation count.

tests/corpus/test-1/chat.xml …at.make-top-level-from-method.1/chat.xmltests/corpus/test-1/chat.xml renamed to tests/corpus/chat.make-top-level-from-method.1/chat.xml tests/corpus/test-1/chat.xml renamed to tests/corpus/chat.make-top-level-from-method.1/chat.xml

@@ -0,0 +1,8 @@
+<no-train>
+```CEDARScript
+-- A02 becomes inner of b
+UPDATE FUNCTION "b" FROM FILE "main.py"
+MOVE WHOLE INSERT BEFORE CLASS "A02"
+RELATIVE INDENTATION -1;
+```
+</no-train>

tests/corpus/test-1/expected.main.py …top-level-from-method.1/expected.main.pytests/corpus/test-1/expected.main.py renamed to tests/corpus/chat.make-top-level-from-method.1/expected.main.py tests/corpus/test-1/expected.main.py renamed to tests/corpus/chat.make-top-level-from-method.1/expected.main.py

@@ -0,0 +1,25 @@
+class A0:
+    ...
+    class A01:
+        ...
+    def b(self, obj, field_name, label):
+        """Check an item of `raw_id_fields`, i.e. check that field named
+        `field_name` exists in model `model` and is a ForeignKey or a
+        ManyToManyField."""
+        class A02:
+            ...
+class A:
+    def a(self):
+        pass
+    def pst(self):
+        pass # 1st
+    def pst(self):
+        pass # 2nd
+class A1:
+    class A2:
+        class A3:
+            pass
+        class A4:
+            pass
+    class A5:
+        pass

tests/corpus/test-1/main.py …hat.make-top-level-from-method.1/main.pytests/corpus/test-1/main.py renamed to tests/corpus/chat.make-top-level-from-method.1/main.py tests/corpus/test-1/main.py renamed to tests/corpus/chat.make-top-level-from-method.1/main.py

@@ -0,0 +1,25 @@
+class A0:
+    ...
+    class A01:
+        ...
+        class A02:
+            ...
+class A:
+    def a(self):
+        pass
+    def b(self, obj, field_name, label):
+        """Check an item of `raw_id_fields`, i.e. check that field named
+        `field_name` exists in model `model` and is a ForeignKey or a
+        ManyToManyField."""
+    def pst(self):
+        pass # 1st
+    def pst(self):
+        pass # 2nd
+class A1:
+    class A2:
+        class A3:
+            pass
+        class A4:
+            pass
+    class A5:
+        pass

tests/corpus/update.identifier.move.whole.1/chat.xml

@@ -0,0 +1,10 @@
+<no-train>
+```CEDARScript
+UPDATE FUNCTION "_check_raw_id_fields_item"
+FROM FILE "main.py"
+REPLACE LINE "def _check_raw_id_fields_item(self, obj, field_name, label):"
+WITH CONTENT '''
+@0:def _check_raw_id_fields_item(obj, field_name, label):
+''';
+```
+</no-train>

tests/corpus/update.identifier.move.whole.1/expected.main.py

@@ -0,0 +1,4 @@
+def _check_raw_id_fields_item(obj, field_name, label):
+    """Check an item of `raw_id_fields`, i.e. check that field named
+    `field_name` exists in model `model` and is a ForeignKey or a
+    ManyToManyField."""