Awesomify and test unit-scope sub error

Fixes #1364
rakudo · Jan 5, 2018 · 900c1b5 · 900c1b5
1 parent ffabfdb
commit 900c1b5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/src/Perl6/Grammar.nqp b/src/Perl6/Grammar.nqp
@@ -2803,7 +2803,11 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
         || ';'
             {
                 if $<deflongname> ne 'MAIN' {
-                    $/.typed_panic("X::UnitScope::Invalid", what => "sub", where => "except on a MAIN sub");
+                    $/.typed_panic("X::UnitScope::Invalid", what => "sub",
+                        where => "except on a MAIN sub", suggestion =>
+                        'Please use the block form. If you did not mean to '
+                        ~ "declare a unit-scoped sub,\nperhaps you accidentally " ~ "placed a semicolon right after routine's definition?"
+                    );
                 }
                 unless $*begin_compunit {
                     $/.typed_panic("X::UnitScope::TooLate", what => "sub");

diff --git a/src/core/Exception.pm b/src/core/Exception.pm
@@ -2793,9 +2793,9 @@ my class X::EXPORTHOW::Conflict does X::Comp {
 my class X::UnitScope::Invalid does X::Syntax {
     has $.what;
     has $.where;
+    has Str:D $.suggestion = 'Please use the block form.';
     method message() {
-        "A unit-scoped $.what definition is not allowed $.where;\n"
-        ~ "Please use the block form."
+        "A unit-scoped $.what definition is not allowed $.where;\n$!suggestion"
     }
 }
 

diff --git a/t/05-messages/02-errors.t b/t/05-messages/02-errors.t
@@ -2,7 +2,7 @@ use lib <t/packages/>;
 use Test;
 use Test::Helpers;
 
-plan 30;
+plan 31;
 
 # RT #132295
 
@@ -256,4 +256,9 @@ subtest 'cannot use Int type object as an operand' => {
         'A Rational instance cannot be powered by an Int type object';
 }
 
+# https://github.com/rakudo/rakudo/issues/1364
+throws-like ｢sub meows;｣, X::UnitScope::Invalid, :message(/
+    "placed a semicolon right after routine's definition"
+/), 'unit-scoped sub def mentions potential unwanted semicolon';
+
 # vim: ft=perl6 expandtab sw=4