Fixes

Author: elifarley

src/cedarscript_editor/cedarscript_editor.py

@@ -7,9 +7,9 @@
     InsertClause, ReplaceClause, EditingAction, BodyOrWhole, RegionClause, MarkerType
 from cedarscript_ast_parser.cedarscript_ast_parser import MarkerCompatible, RelativeMarker, \
     RelativePositionType
-from text_manipulation.indentation_kit import IndentationInfo
-from text_manipulation.range_spec import IdentifierBoundaries, RangeSpec
-from text_manipulation.text_editor_kit import read_file, write_file, bow_to_search_range
+from text_manipulation import IndentationInfo
+from text_manipulation import IdentifierBoundaries, RangeSpec
+from text_manipulation import read_file, write_file, bow_to_search_range
 
 from .identifier_selector import select_finder
 
@@ -58,7 +58,9 @@ def __init__(self, command_ordinal: int, description: str):
             "the state at which the file was left (saying what needs to be done now), "
             f"then write new commands that will fix the problem{previous_cmd_notes} "
             "(you'll get a one-million dollar tip if you get it right!) "
-            "Use descriptive comment before each command; If showing CEDARScript commands to the user, *DON'T* enclose them in ```CEDARSCript and ``` otherwise they will be executed!</suggestion></error-details>"
+            "Use descriptive comment before each command; If showing CEDARScript commands to the user, "
+            "*DON'T* enclose them in ```CEDARSCript and ``` otherwise they will be executed!"
+            "</suggestion></error-details>"
         )
 
 
@@ -150,7 +152,7 @@ def _update_command(self, cmd: UpdateCommand):
         src = read_file(file_path)
         lines = src.splitlines()
 
-        source_info: tuple[LiteralString | str | bytes, str | Sequence[str]] = (file_path, src)
+        source_info: tuple[str | bytes, str | Sequence[str]] = (file_path, src)
 
         def identifier_resolver(m: Marker):
             return self.find_identifier(source_info, m)

src/text_manipulation/range_spec.py

@@ -9,6 +9,7 @@
 
 MATCH_TYPES = ('exact', 'stripped', 'normalized', 'partial')
 
+
 @total_ordering
 class RangeSpec(NamedTuple):
     start: int
@@ -40,7 +41,7 @@ def as_index(self) -> int | None:
 
     @property
     def collapsed(self):
-        return self.set_length(0)
+        return self.set_line_count(0)
 
     def set_line_count(self, range_len: int):
         return self._replace(end=self.start + range_len)
@@ -156,16 +157,19 @@ def from_line_marker(
             if search_term.offset is None and match_type_count > 1:
                 raise ValueError(
                     f"There are {match_type_count} lines matching `{search_term.value}`. "
-                    f"Suggestions: 1) Try using a *different line* as marker (a couple lines before or after the one you tried); "
-                    f"2) If you wanted to *REPLACE* line, try instead to replace a *SEGMENT* of a couple of lines."
-                    # f"Add an `OFFSET` (after the line marker) and a number between 0 and {match_type_count - 1} to determine how many to skip. "
-                    # f"Example to reference the *last* one of those: `LINE '{search_term.value.strip()}' OFFSET {match_type_count - 1}`"
+                    "Suggestions: 1) Try using a *different line* as marker (a couple lines before or after the one "
+                    "you tried); 2) If you wanted to *REPLACE* line, "
+                    "try instead to replace a *SEGMENT* of a couple of lines."
+                    # f"Add an `OFFSET` (after the line marker) and a number between 0 and {match_type_count - 1}
+                    # to determine how many to skip. "
+                    # f"Example to reference the *last* one of those:
+                    # `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:
                 raise ValueError(
                     f"There are only {match_type_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)"
+                    f"but 'OFFSET' was set to {search_term.offset} (you can skip at most {match_type_count-1} of those)"
                 )
 
             if offset < match_type_count: