Merge pull request #1992 from mojolicious/jhthorsen/async-await-at-line

Improved "at ... line ..." reporting for rejected async method

Author: mergify[bot]

lib/Mojo/Promise.pm

@@ -1,7 +1,7 @@
 package Mojo::Promise;
 use Mojo::Base -base;
 
-use Carp qw(carp);
+use Carp qw(carp croak);
 use Mojo::Exception;
 use Mojo::IOLoop;
 use Scalar::Util qw(blessed);
@@ -18,8 +18,9 @@ sub AWAIT_FAIL         { _settle_await(reject  => @_) }
 sub AWAIT_GET {
   my $self    = shift;
   my @results = @{$self->{results} // []};
-  die $results[0] unless $self->{status} eq 'resolve';
-  return wantarray ? @results : $results[0];
+  return wantarray ? @results : $results[0] if $self->{status} eq 'resolve';
+  die $results[0]                           if ref $results[0] || $results[0] =~ m!\n!;
+  croak $results[0];
 }
 
 sub AWAIT_IS_CANCELLED {undef}

t/mojo/promise_async_await.t

@@ -137,6 +137,12 @@ subtest 'Exception handling and async/await' => sub {
   $t->get_ok('/four')->status_is(500)->content_like(qr/this went perfectly/);
 };
 
+subtest 'Exception handling with file and line reporting' => sub {
+  my $error;
+  reject_p()->catch(sub { $error = shift })->wait;
+  like $error, qr/^Rejected promise at .*promise_async_await\.t line \d+\.$/, 'right content';
+};
+
 subtest 'Exception handling without "Unhandled rejected promise" warning' => sub {
   my ($error, @warn);
   local $SIG{__WARN__} = sub { push @warn, $_[0] };