fix: Fix bug in RangeSpec when search term offset exceeds match count

Author: elifarley

src/cedarscript_editor/cedarscript_editor.py

@@ -119,7 +119,7 @@ def _update_command(self, cmd: UpdateCommand):
                 #   action.insertclause.insert_position=FUNCTION(score)
                 #   target.as_marker = FUNCTION(roll) (the one to delete)
                 search_range = RangeSpec.EMPTY
-                move_src_range = restrict_search_range(action, target, identifier_finder)
+                move_src_range = restrict_search_range(action, target, identifier_finder, lines)
             case _:
                 move_src_range = None
                 # Set range_spec to cover the identifier

src/text_manipulation/range_spec.py

@@ -187,6 +187,7 @@ def from_line_marker(
                 matches['partial'].append((i, reference_indent))
 
         offset = search_term.offset or 0
+        max_match_count = max([len(m) for m in matches.values()])
         for match_type in MATCH_TYPES:
             match_type_count = len(matches[match_type])
             if search_term.offset is None and match_type_count > 1:
@@ -201,9 +202,10 @@ def from_line_marker(
                     # `LINE '{search_term.value.strip()}' OFFSET {match_type_count - 1}`"
                     # ' (See `offset_clause` in `<grammar.js>` for details on OFFSET)'
                 )
-            if match_type_count and (search_term.offset or 0) >= match_type_count:
+
+            if match_type_count and offset >= max_match_count:
                 raise ValueError(
-                    f"There are only {match_type_count} lines matching `{search_term.value}`, "
+                    f"There are only {max_match_count} lines matching `{search_term.value}`, "
                     f"but 'OFFSET' was set to {search_term.offset} (you can skip at most {match_type_count-1} of those)"
                 )