Better wording when reporting ambiguity

Author: elifarley

src/cedarscript_editor/cedarscript_editor.py

@@ -50,8 +50,9 @@ def __init__(self, command_ordinal: int, description: str):
                 f"due to changes that left the file in an invalid state (check that by re-reading the file!)</note>"
             )
         super().__init__(
-            f"<error-details><error-location>COMMAND #{command_ordinal}</error-location>{note}"
-            f"<description>{description}</description>"
+            f"<error-details>\n<error-location>COMMAND #{command_ordinal}</error-location>"
+            f"\n<description>{description}</description>"
+            f"{note}"
             "<suggestion>NEVER apologize; just relax, take a deep breath, think step-by-step and write "
             "an in-depth analysis of what went wrong (specifying which command ordinal failed), "
             "then acknowledge which commands were already applied and concisely describe "

src/cedarscript_editor/tree_sitter_identifier_finder.py

@@ -145,7 +145,7 @@ def _find_identifier(language, source: Sequence[str], tree, query_scm: dict[str,
         return None
     if candidate_count > 1 and marker.offset is None:
         raise ValueError(
-            f"There are {candidate_count} {marker.type} identifiers named `{marker.value}`. "
+            f"The {marker.type} identifier named `{marker.value}` is ambiguous (found {candidate_count} matches). "
             f"Choose an `OFFSET` between 0 and {candidate_count - 1} to determine how many to skip. "
             f"Example to reference the *last* `{marker.value}`: `OFFSET {candidate_count - 1}`"
         )

src/text_manipulation/range_spec.py

@@ -192,10 +192,10 @@ def from_line_marker(
             match_type_count = len(matches[match_type])
             if search_term.offset is None and match_type_count > 1:
                 raise ValueError(
-                    f"There are {match_type_count} lines matching `{search_term.value}`. "
-                    "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"Line marker `{search_term.value}` is ambiguous (found {match_type_count} lines matching it) "
+                    "Suggestions: 1) To disambiguate, 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* "
+                    "a couple of lines long."
                     # 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: