ed script tests pass

Author: elifarley

src/cedarscript_editor/cedarscript_editor.py

@@ -200,12 +200,13 @@ def _apply_action(
 
             case ReplaceClause() | InsertClause():
                 match content:
-                    case (region, processed_content):
-                        content = processed_content
                     case str():
                         content = IndentationInfo.from_content(lines).apply_relative_indents(
                             content, range_spec.indent
                         )
+                    case Sequence():
+                        content = [line.rstrip() for line in content]
+
 
                 range_spec.write(content, lines)
 

src/cedarscript_editor/ed_script_filter.py

@@ -17,21 +17,23 @@ def process_ed_script(content: Sequence[str], ed_script: str) -> list[str]:
     Raises:
         RuntimeError: If ed command fails
     """
-    with tempfile.NamedTemporaryFile(mode='w', suffix='.txt') as content_file, \
-            tempfile.NamedTemporaryFile(mode='w', suffix='.ed') as script_file:
+    with tempfile.NamedTemporaryFile(mode='w', suffix='.txt') as content_file:
 
         # Write content and script to temp files
         content_file.write('\n'.join(content))
         content_file.flush()
 
-        script_file.write(ed_script)
-        script_file.flush()
-
         # Run ed
+        ed_script = ed_script.strip()
+        # 'H' to Enable verbose errors
+        match ed_script:
+            case '':
+                ed_script = 'H\nw\nq'
+            case _:
+                ed_script = f'H\n{ed_script}\nw\nq'
         process = subprocess.run(
             ['ed', content_file.name],
-            input=f'H\n',  # Enable verbose errors
-            stdin=open(script_file.name),
+            input=ed_script,
             capture_output=True,
             text=True
         )

tests/corpus/.update.identifier.ed-script-filter/1.py

@@ -1,6 +1,9 @@
 class BaseConverter:
-    def encode(self, i):
-        neg, value = self.convert(i, self.decimal_digits, self.digits, "-")
+    def __init(self, s):
+        def encode(self, i):
+            neg, value = (self.convert(i, self.decimal_digits, self.digits, "-"))
     def decode(self, s):
         neg, value = self.convert(s, self.digits, self.decimal_digits, self.sign)
+def xx(self, number, from_digits, to_digits, sign):
+    def convert(self, number, from_digits, to_digits, sign):
 def convert(self, number, from_digits, to_digits, sign):

tests/corpus/.update.identifier.ed-script-filter/chat.xml

@@ -0,0 +1,10 @@
+class BaseConverter:
+    def __init(self, s):
+        def encode(self, i):
+            neg, value = (self.convert(i, self.decimal_digits, self.digits, "-"))
+    def decode(self, s):
+        neg, value = self.convert(s, self.digits, self.decimal_digits, self.sign)
+def convert(self, number, from_digits, to_digits, sign):
+    b = def convert(self, number, from_digits, to_digits, sign):
+        def a():
+def convert(self, number, from_digits, to_digits, sign):

tests/corpus/.update.identifier.ed-script-filter/expected.1.py

@@ -1,10 +1,20 @@
 <no-train>
 ```CEDARScript
-UPDATE FILE "1.py"
+UPDATE FILE "1.txt"
 REPLACE WHOLE WITH CASE
   WHEN PREFIX 'def convert(' THEN SUB
-    r'(def convert\()self, '
+    r'self, '
+    r''
+  WHEN REGEX r'self\.convert' THEN SUB
+    r'self\.(convert)'
     r'\1'
+END;
+
+UPDATE FILE "1.py"
+REPLACE WHOLE WITH CASE
+  WHEN PREFIX 'def convert(' THEN SUB
+    r'self, '
+    r''
   WHEN REGEX r'self\.convert' THEN SUB
     r'self\.(convert)'
     r'\1'

tests/corpus/update.identifier.case-filter/1.py

@@ -1,6 +1,9 @@
 class BaseConverter:
-    def encode(self, i):
-        neg, value = convert(i, self.decimal_digits, self.digits, "-")
+    def __init(self, s):
+        def encode(self, i):
+            neg, value = (convert(i, self.decimal_digits, self.digits, "-"))
     def decode(self, s):
         neg, value = convert(s, self.digits, self.decimal_digits, self.sign)
+def xx(self, number, from_digits, to_digits, sign):
+    def convert(number, from_digits, to_digits, sign):
 def convert(number, from_digits, to_digits, sign):

tests/corpus/update.identifier.case-filter/1.txt

@@ -0,0 +1,10 @@
+class BaseConverter:
+    def __init(self, s):
+        def encode(self, i):
+            neg, value = (convert(i, self.decimal_digits, self.digits, "-"))
+    def decode(self, s):
+        neg, value = convert(s, self.digits, self.decimal_digits, self.sign)
+def convert(number, from_digits, to_digits, sign):
+    b = def convert(self, number, from_digits, to_digits, sign):
+        def a():
+def convert(number, from_digits, to_digits, sign):

tests/corpus/update.identifier.case-filter/chat.xml

@@ -0,0 +1,13 @@
+def calc1(a):
+    return a * 7.0
+def calc2(a):
+    c = ["x", str(calc1(
+        5), "xx")]
+    c = ["x", str(calc1(
+        6), "xx")]
+    c = ["x", str(calc1(#...
+        6), "xx")]
+    # Done...
+    return c
+def calc3(a):
+    return calc1(a)

tests/corpus/update.identifier.case-filter/expected.1.py

@@ -0,0 +1,10 @@
+class BaseConverter:
+    def __init(self, s):
+        def encode(self, i):
+            neg, value = (self.convert(i, self.decimal_digits, self.digits, "-"))
+    def decode(self, s):
+        neg, value = self.convert(s, self.digits, self.decimal_digits, self.sign)
+def convert(self, number, from_digits, to_digits, sign):
+    b = def convert(self, number, from_digits, to_digits, sign):
+        def a():
+def convert(self, number, from_digits, to_digits, sign):

tests/corpus/update.identifier.case-filter/expected.1.txt

@@ -0,0 +1,33 @@
+<no-train>
+```CEDARScript
+UPDATE FILE "1.txt"
+REPLACE WHOLE WITH ED r'''
+
+g/self\.convert/s/self\.\(convert\)/\1/g
+g/^def convert/s/self, //
+
+''';
+
+-- 1. Update the function signature of `calc1()` to add parameter `tax: float` as the first one and use the new parameter instead of `7`
+UPDATE FUNCTION "calc1"
+FROM FILE "1.py"
+REPLACE WHOLE WITH ED r'''
+
+g/def calc1/s/(/(tax: float, /
+g/return/s/7.*/tax/
+
+''';
+
+-- 2. Update the function signature of `calc2()` to add parameter `base_tax: float = 1.3` as the last one
+-- 3. Update ALL call sites of `calc1()` to pass `base_tax` as the first argument
+UPDATE FUNCTION "calc2"
+FROM FILE "1.py"
+REPLACE WHOLE WITH ED r'''
+
+g/def calc2/s/)/, base_tax: float = 1.3)/
+g/calc1(/s/\(calc1(\)/\1base_tax, /
+
+''';
+
+    ```
+</no-train>

tests/corpus/update.identifier.ed-script-filter/1.py

@@ -0,0 +1,13 @@
+def calc1(tax: float, a):
+    return a * tax
+def calc2(a, base_tax: float = 1.3):
+    c = ["x", str(calc1(base_tax,
+        5), "xx")]
+    c = ["x", str(calc1(base_tax,
+        6), "xx")]
+    c = ["x", str(calc1(base_tax, #...
+        6), "xx")]
+    # Done...
+    return c
+def calc3(a):
+    return calc1(a)

tests/corpus/update.identifier.ed-script-filter/1.txt

@@ -0,0 +1,10 @@
+class BaseConverter:
+    def __init(self, s):
+        def encode(self, i):
+            neg, value = (convert(i, self.decimal_digits, self.digits, "-"))
+    def decode(self, s):
+        neg, value = convert(s, self.digits, self.decimal_digits, self.sign)
+def convert(number, from_digits, to_digits, sign):
+    b = def convert(self, number, from_digits, to_digits, sign):
+        def a():
+def convert(number, from_digits, to_digits, sign):