Fixed bug in 'restrict_search_range'

Author: elifarley

src/cedarscript_editor/cedarscript_editor.py

@@ -101,48 +101,6 @@ def _update_command(self, cmd: UpdateCommand):
         content = cmd.content or []
         file_path = os.path.join(self.root_path, target.file_path)
 
-        # Example 1:
-        # UPDATE FILE "tmp.benchmarks/2024-10-04-22-59-58--CEDARScript-Gemini-small/bowling/bowling.py"
-        # INSERT INSIDE FUNCTION "__init__" TOP
-        # WITH CONTENT '''
-        #  @0:print("This line will be inserted at the top")
-        #  ''';
-        # After parsing ->
-        # UpdateCommand(
-        #     type='update',
-        #     target=SingleFileClause(file_path='tmp.benchmarks/2024-10-04-22-59-58--CEDARScript-Gemini-small/bowling
-        #     /bowling.py'),
-        #     action=InsertClause(insert_position=RelativeMarker(type=<MarkerType.FUNCTION: 'function'>,
-        #     value='__init__',
-        #     offset=None)),
-        #     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"
-        # WHERE NAME = "__init__"
-        # REPLACE SEGMENT
-        # STARTING AFTER LINE "def __init__(self):"
-        # ENDING AFTER LINE "def __init__(self):"
-        # WITH CONTENT '''
-        #  @0:print("This line will be inserted at the top")
-        #  ''';
-        # After parsing ->
-        # UpdateCommand(
-        # type='update',
-        # target=IdentifierFromFile(file_path='bowling.py',
-        # where_clause=WhereClause(field='NAME', operator='=', value='__init__'),
-        # identifier_type='FUNCTION', offset=None
-        # ),
-        # action=ReplaceClause(
-        # region=Segment(
-        # start=RelativeMarker(type=<MarkerType.LINE: 'line'>, value='def __init__(self):', offset=None),
-        # end=RelativeMarker(type=<MarkerType.LINE: 'line'>, value='def __init__(self):', offset=None)
-        # )),
-        # content='\n @0:print("This line will be inserted at the top")\n '
-        # )
-
         src = read_file(file_path)
         lines = src.splitlines()
 
@@ -348,7 +306,7 @@ def restrict_search_range(action, target, identifier_finder: IdentifierFinder) -
                         case BodyOrWhole() | RelativePositionType():
                             return identifier_boundaries.location_to_search_range(region)
                         case Marker() as inner_marker:
-                            match identifier_finder(inner_marker):
+                            match identifier_finder(inner_marker, identifier_boundaries.whole):
                                 case IdentifierBoundaries() as inner_boundaries:
                                     return inner_boundaries.whole
                                 case RangeSpec() as inner_range_spec:

src/cedarscript_editor/tree_sitter_identifier_finder.py

@@ -11,7 +11,7 @@
 
 _log = logging.getLogger(__name__)
 
-IdentifierFinder: TypeAlias = Callable[[Marker], IdentifierBoundaries | RangeSpec | None]
+IdentifierFinder: TypeAlias = Callable[[Marker | Segment, RangeSpec | None], IdentifierBoundaries | RangeSpec | None]
 
 
 def find_identifier(source_info: tuple[str, str | Sequence[str]], search_rage: RangeSpec = RangeSpec.EMPTY) -> IdentifierFinder:
@@ -37,7 +37,7 @@ def _select_finder(file_path: str, source: str, search_range: RangeSpec = RangeS
 
     source = source.splitlines()
 
-    def find_by_marker(mos: Marker | Segment) -> IdentifierBoundaries | RangeSpec | None:
+    def find_by_marker(mos: Marker | Segment, search_range: RangeSpec | None = None) -> IdentifierBoundaries | RangeSpec | None:
         match mos:
 
             case Marker(MarkerType.LINE) | Segment():

…us/x.update.identifier.replace.line/1.py …rpus/update.identifier.replace.line/1.pytests/corpus/x.update.identifier.replace.line/1.py renamed to tests/corpus/update.identifier.replace.line/1.py tests/corpus/x.update.identifier.replace.line/1.py renamed to tests/corpus/update.identifier.replace.line/1.py

@@ -4,7 +4,7 @@ UPDATE FUNCTION "fun2"
 FROM FILE "1.py"
 REPLACE LINE "def fun2(self, a, b, c):"
 WITH CONTENT '''
-@0:def fun2(a, b, c)::
+µ@0:def fun2(a, b, c):
 ''';
 
 UPDATE FUNCTION "calculate"