Minor improvements and fixes

Author: elifarley

src/cedarscript_editor/__init__.py

@@ -1,13 +1,18 @@
 from ._version import __version__
 import re
 from .cedarscript_editor import CEDARScriptEditor
-from text_manipulation import IndentationInfo, IdentifierBoundaries, RangeSpec, read_file, write_file, bow_to_search_range
+from cedarscript_ast_parser import CEDARScriptASTParser
+from text_manipulation import (
+    IndentationInfo, IdentifierBoundaries, RangeSpec, read_file, write_file,
+    bow_to_search_range
+)
 
 __all__ = [
     "__version__", "find_commands", "CEDARScriptEditor", "IndentationInfo", "IdentifierBoundaries", "RangeSpec",
     "read_file", "write_file", "bow_to_search_range"
 ]
 
+
 def find_commands(content: str):
     # Regex pattern to match CEDARScript blocks
     pattern = r'```CEDARScript\n(.*?)```'

src/cedarscript_editor/cedarscript_editor.py

@@ -121,7 +121,6 @@ def _update_command(self, cmd: UpdateCommand):
         #     content='\n @0:print("This line will be inserted at the top")\n '
         # )
 
-
         # Example 2:
         # UPDATE FUNCTION
         # FROM FILE "tmp.benchmarks/2024-10-04-22-59-58--CEDARScript-Gemini-small/bowling/bowling.py"
@@ -150,7 +149,7 @@ def _update_command(self, cmd: UpdateCommand):
         src = read_file(file_path)
         lines = src.splitlines()
 
-        source_info: tuple[str, str | Sequence[str]] = (file_path, src)
+        source_info: tuple[LiteralString | str | bytes, str | Sequence[str]] = (file_path, src)
 
         def identifier_resolver(m: Marker):
             return self.find_identifier(source_info, m)
@@ -239,7 +238,7 @@ def _apply_action(action: EditingAction, lines: Sequence[str], range_spec: Range
     def _rm_command(self, cmd: RmFileCommand):
         file_path = os.path.join(self.root_path, cmd.file_path)
 
-    def _delete_function(self, cmd): # TODO
+    def _delete_function(self, cmd):  # TODO
         file_path = os.path.join(self.root_path, cmd.file_path)
 
     # def _create_command(self, cmd: CreateCommand):
@@ -285,7 +284,9 @@ def find_index_range_for_region(self,
         return index_range
 
 
-def find_marker_or_segment(action: EditingAction, lines: Sequence[str], search_range: RangeSpec) -> tuple[Marker, RangeSpec]:
+def find_marker_or_segment(
+        action: EditingAction, lines: Sequence[str], search_range: RangeSpec
+) -> tuple[Marker, RangeSpec]:
     marker: Marker | Segment | None = None
     match action:
         case MarkerCompatible() as marker_compatible:

src/text_manipulation/indentation_kit.py

@@ -215,7 +215,7 @@ def apply_relative_indents(self, content: str | Sequence[str], context_indent_co
             AssertionError: If the calculated indentation level for any line is negative.
         """
         # TODO Always send str?
-        lines = [line.lstrip() for line in content.splitlines() if line.strip()] if isinstance(content, str) else content
+        lines = [l.lstrip() for l in content.splitlines() if l.strip()] if isinstance(content, str) else content
 
         context_indent_level = self.char_count_to_level(context_indent_count)
         for i in range(len(lines)):

src/text_manipulation/range_spec.py

@@ -75,7 +75,7 @@ def from_line_marker(
                 search_marker.value: The line to search for.
                 search_marker.offset: The number of matches to skip before returning a result.
                           0 skips no match and returns the first match, 1 returns the second match, and so on.
-            :param search_range: The index to start the search from. Defaults to 0. The index to end the search at (exclusive).
+            :param search_range: The index to start the search from and to end the search at (exclusive).
                                   Defaults to (0, -1), which means search to the end of the list.
 
         :returns:

src/text_manipulation/text_editor_kit.py

@@ -1,16 +1,17 @@
 from collections.abc import Sequence
 from typing import Protocol, runtime_checkable
+from os import PathLike
 
 from cedarscript_ast_parser import Marker, RelativeMarker, RelativePositionType, Segment, MarkerType, BodyOrWhole
 from .range_spec import IdentifierBoundaries, RangeSpec
 
 
-def read_file(file_path: str) -> str:
+def read_file(file_path: str | PathLike) -> str:
     with open(file_path, 'r') as file:
         return file.read()
 
 
-def write_file(file_path: str, lines: Sequence[str]):
+def write_file(file_path: str | PathLike, lines: Sequence[str]):
     with open(file_path, 'w') as file:
         file.writelines([line + '\n' for line in lines])
 
@@ -90,8 +91,13 @@ def segment_to_search_range(
     start_index_for_end_marker = start_match_result.as_index
     if start_relpos.qualifier == RelativePositionType.AFTER:
         start_index_for_end_marker += -1
-    end_match_result = RangeSpec.from_line_marker(lines, end_relpos, RangeSpec(start_index_for_end_marker, search_range.end, start_match_result.indent))
-    assert end_match_result, f"Unable to find segment end `{end_relpos}` - Try: 1) using *exactly* the same characters from source; or 2) using a marker from below"
+    end_match_result = RangeSpec.from_line_marker(lines, end_relpos, RangeSpec(
+        start_index_for_end_marker, search_range.end, start_match_result.indent
+    ))
+    assert end_match_result, (
+        f"Unable to find segment end `{end_relpos}` - Try: "
+        f"1) using *exactly* the same characters from source; or 2) using a marker from below"
+    )
     if end_match_result.as_index > -1:
         one_after_end = end_match_result.as_index + 1
         end_match_result = RangeSpec(one_after_end, one_after_end, end_match_result.indent)