Wordwrap X::Method::NotFound message

Also tweak related Pair.ACCEPTS wording.
rakudo · Jul 4, 2020 · 1b84e03 · 1b84e03
1 parent eb589c0
commit 1b84e03
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/core.c/Exception.pm6 b/src/core.c/Exception.pm6
@@ -210,12 +210,13 @@ my class X::Method::NotFound is Exception {
             $message ~= ". Did you mean '%suggestions.keys()'?";
         }
         elsif +%suggestions > 1 {
-            $message ~= ". Did you mean any of these?\n    { %suggestions.sort(*.value)>>.key.head(4).join("\n    ") }\n";
+            $message ~= ". Did you mean any of these: { %suggestions.sort(*.value)>>.key.head(4).map( { "'$_'" } ).join(", ") }?";
         }
 
-        $.addendum
-          ?? "$message\n$.addendum"
+        ($.addendum
+          ?? "$message. $.addendum"
           !!  $message
+        ).naive-word-wrapper
     }
 }
 

diff --git a/src/core.c/Pair.pm6 b/src/core.c/Pair.pm6
@@ -64,8 +64,7 @@ my class Pair does Associative {
             invocant => $other,
             method   => $method,
             typename => $other.^name,
-            addendum => "Did you try to smartmatch against a Pair specifically?  If so, then the
-key of the Pair should be a valid method name, not '$method'."
+            addendum => "Or did you try to smartmatch against a Pair specifically?  If so, then the key of the Pair should be a valid method name, not '$method'."
           ).throw
         )
     }