Fix indentation level handling

Author: elifarley

src/cedarscript_editor/cedarscript_editor.py

@@ -185,14 +185,12 @@ def _update_command(self, cmd: UpdateCommand):
             case str() | [str(), *_] | (str(), *_):
                 pass
             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_count + (relindent_level or 0)
-                content = IndentationInfo.from_content(content).shift_indentation(
-                    content, count
+                content = IndentationInfo.from_content(lines).update_min_indent_level(content).shift_indentation(
+                    content, search_range.indent, relindent_level
                 )
                 content = (region, content)
             case _:
@@ -201,13 +199,10 @@ def _update_command(self, cmd: UpdateCommand):
                         # 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
+                        # TODO Are the 3 lines above needed?
                         content = move_src_range.read(lines)
-                        shift_count = dest_indent_count + (relindent_level or 0) # TODO Fix
-                        content = IndentationInfo.from_content(content).shift_indentation(
-                            content, shift_count
+                        content = IndentationInfo.from_content(lines).update_min_indent_level(content).shift_indentation(
+                            content, search_range.indent, relindent_level
                         )
                     case DeleteClause():
                         pass

src/text_manipulation/indentation_kit.py

@@ -174,6 +174,9 @@ def from_content(cls, content: str | Sequence[str]) -> 'IndentationInfo':
 
         return cls(char_count, dominant_char, min_indent_level, consistency, message)
 
+    def update_min_indent_level(self, content: str | Sequence[str]) -> 'IndentationInfo':
+        return self._replace(min_indent_level=IndentationInfo.from_content(content).min_indent_level)
+
     def level_difference(self, base_indentation_count: int) -> int:
         """
         Calculate the difference in indentation levels.
@@ -211,7 +214,9 @@ 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]:
+    def shift_indentation(
+            self, lines: Sequence[str], target_base_indentation_count: int, relindent_level: int | None
+    ) -> list[str]:
         """
         Shift the indentation of a sequence of lines based on a target base indentation count.
 
@@ -222,6 +227,7 @@ def shift_indentation(self, lines: Sequence[str], target_base_indentation_count:
         Args:
             lines (Sequence[str]): A sequence of strings representing the lines to be adjusted.
             target_base_indentation_count (int): The target base indentation count to adjust to.
+            relindent_level (int|None):
 
         Returns:
             list[str]: A new list of strings with adjusted indentation.
@@ -238,6 +244,7 @@ def shift_indentation(self, lines: Sequence[str], target_base_indentation_count:
             >>> info.shift_indentation(lines, 8)
             ['        def example():', '            print('Hello')']
         """
+        target_base_indentation_count += self.char_count * (relindent_level or 0)
         raw_line_adjuster = self._shift_indentation_fun(target_base_indentation_count)
         # Return the transformed lines
         return [raw_line_adjuster(line) for line in lines]