Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use innerException for Task.AsUniTask #486

Merged
merged 4 commits into from
Sep 8, 2023
+36 −2
Merged

Use innerException for Task.AsUniTask #486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8eac07a
Use innerException for Task.AsUniTask
hadashiA Sep 1, 2023
6fb4f2d
Support exception unwrapping for AsUniTask of Task.WhenAll
hadashiA Sep 1, 2023
2d67499
Use InnerException when only be one
hadashiA Sep 7, 2023
bc27f6c
Fix test
hadashiA Sep 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions src/UniTask.NetCoreTests/TaskExtensionsTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
using System;
using System.Threading.Tasks;
using Cysharp.Threading.Tasks;
using Xunit;

namespace NetCoreTests
{
public class TaskExtensionsTest
{
[Fact]
public async Task PropagateException()
{
await Assert.ThrowsAsync<InvalidOperationException>(async () =>
{
await ThrowAsync().AsUniTask();
});

await Assert.ThrowsAsync<InvalidOperationException>(async () =>
{
await ThrowOrValueAsync().AsUniTask();
});
}

async Task ThrowAsync()
{
throw new InvalidOperationException();
}

async Task<int> ThrowOrValueAsync()

Check warning on line 29 in src/UniTask.NetCoreTests/TaskExtensionsTest.cs

View workflow job for this annotation

GitHub Actions / build-dotnet 

This async method lacks 'await' operators and will run synchronously. Consider using the 'await' operator to await non-blocking API calls, or 'await Task.Run(...)' to do CPU-bound work on a background thread.
{
throw new InvalidOperationException();
}
}
}
4 changes: 2 additions & 2 deletions src/UniTask/Assets/Plugins/UniTask/Runtime/UniTaskExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public static UniTask<T> AsUniTask<T>(this Task<T> task, bool useCurrentSynchron
p.TrySetCanceled();
break;
case TaskStatus.Faulted:
p.TrySetException(x.Exception);
p.TrySetException(x.Exception.InnerExceptions.Count == 1 ? x.Exception.InnerException : x.Exception);
break;
case TaskStatus.RanToCompletion:
p.TrySetResult(x.Result);
Expand Down Expand Up @@ -58,7 +58,7 @@ public static UniTask AsUniTask(this Task task, bool useCurrentSynchronizationCo
p.TrySetCanceled();
break;
case TaskStatus.Faulted:
p.TrySetException(x.Exception);
p.TrySetException(x.Exception.InnerExceptions.Count == 1 ? x.Exception.InnerException : x.Exception);
break;
case TaskStatus.RanToCompletion:
p.TrySetResult();
Expand Down
Loading