Handle EdScript content with ReplaceClause

Author: elifarley

src/cedarscript_editor/cedarscript_editor.py

@@ -4,7 +4,8 @@
 
 from cedarscript_ast_parser import Command, RmFileCommand, MvFileCommand, UpdateCommand, \
     SelectCommand, CreateCommand, IdentifierFromFile, Segment, Marker, MoveClause, DeleteClause, \
-    InsertClause, ReplaceClause, EditingAction, BodyOrWhole, RegionClause, MarkerType
+    InsertClause, ReplaceClause, EditingAction, BodyOrWhole, RegionClause, MarkerType, EdScript
+from ed_script_filter import process_ed_script
 from cedarscript_ast_parser.cedarscript_ast_parser import MarkerCompatible, RelativeMarker, \
     RelativePositionType, Region, SingleFileClause
 from text_manipulation import (
@@ -148,6 +149,13 @@ def _update_command(self, cmd: UpdateCommand):
 
 
         match content:
+            case EdScript() as ed_script:
+                if not isinstance(action, ReplaceClause):
+                    raise ValueError("ED scripts can only be used with REPLACE actions")
+                # Process ED script on just the lines in the search range
+                range_lines = search_range.read(lines)
+                processed_lines = process_ed_script(range_lines, ed_script.script)
+                content = processed_lines
             case str() | [str(), *_] | (str(), *_):
                 pass
             case (region, relindent_level):
@@ -161,10 +169,6 @@ def _update_command(self, cmd: UpdateCommand):
             case _:
                 match action:
                     case MoveClause(insert_position=region, relative_indentation=relindent_level):
-                        # dest_range = restrict_search_range_for_marker(
-                        #     region, action, lines, RangeSpec.EMPTY, identifier_finder
-                        # )
-                        # TODO Are the 3 lines above needed?
                         content = IndentationInfo.shift_indentation(
                             move_src_range.read(lines), lines, search_range.indent, relindent_level
                         )

src/cedarscript_editor/ed_script_filter.py

@@ -0,0 +1,66 @@
+import subprocess
+import tempfile
+import os
+from typing import Union, Sequence
+from pathlib import Path
+
+
+def process_ed_script(file_input: Union[str, Path, Sequence[str]], ed_script: str, is_path: bool = False) -> list[str]:
+    """
+    Process an ed script on file content or file by streaming to the ed command.
+
+    Args:
+        file_input: Either file content as string, path to file, or sequence of strings
+        ed_script (str): The ed script commands as a string
+        is_path (bool): If True, file_input is treated as a path, otherwise as content
+
+    Returns:
+        list[str]: The modified content as a list of strings (lines)
+
+    Raises:
+        FileNotFoundError: If is_path is True and the file doesn't exist
+        RuntimeError: If ed command fails
+    """
+    temp_filename = None
+
+    try:
+        if is_path:
+            # Convert to Path object for better path handling
+            file_path = Path(file_input)
+            if not file_path.exists():
+                raise FileNotFoundError(f"File not found: {file_path}")
+            input_file = str(file_path.absolute())
+        else:
+            # Create a temporary file for the content
+            with tempfile.NamedTemporaryFile(mode='w', delete=False) as temp_file:
+                # Handle both string and sequence input
+                if isinstance(file_input, str):
+                    temp_file.write(file_input)
+                else:
+                    temp_file.write('\n'.join(file_input))
+                temp_filename = input_file = temp_file.name
+
+        # Run ed with the script as input
+        process = subprocess.Popen(
+            ['ed', '-s', input_file],  # -s for silent mode
+            stdin=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            text=True
+        )
+
+        # Send the ed script and get output
+        _, errors = process.communicate(ed_script + 'w\nq\n')  # write and quit commands
+
+        if process.returncode != 0:
+            raise RuntimeError(f"ed failed with error: {errors}")
+
+        # Read the modified content and return as list of strings
+        with open(input_file, 'r') as f:
+            result = f.read().splitlines()
+
+        return result
+
+    finally:
+        # Clean up the temporary file if we created one
+        if temp_filename and os.path.exists(temp_filename):
+            os.unlink(temp_filename)