chore: remove TaskCanceledException catch

PrismLibrary · Nov 14, 2023 · 56e4d88 · 56e4d88
1 parent 8a60502
commit 56e4d88
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 30 deletions.
diff --git a/src/Prism.Core/Commands/AsyncDelegateCommand.cs b/src/Prism.Core/Commands/AsyncDelegateCommand.cs
@@ -98,10 +98,6 @@ public async Task Execute(CancellationToken? cancellationToken = null)
             await _executeMethod(token)
                 .ConfigureAwait(false);
         }
-        catch (TaskCanceledException) when (token.IsCancellationRequested)
-        {
-            // Do nothing... the Task was cancelled
-        }
         catch (Exception ex)
         {
             if (!ExceptionHandler.CanHandle(ex))
@@ -145,23 +141,11 @@ public bool CanExecute()
     /// <param name="parameter">Command Parameter</param>
     protected override async void Execute(object? parameter)
     {
+        // We don't want to wrap this in a try/catch because we already handle
+        // or mean to rethrow the exception in the call with the CancellationToken.
         var cancellationToken = _getCancellationToken();
-        try
-        {
-            await Execute(cancellationToken)
-                .ConfigureAwait(false);
-        }
-        catch (TaskCanceledException) when (cancellationToken.IsCancellationRequested)
-        {
-            // Do nothing... the Task was cancelled
-        }
-        catch (Exception ex)
-        {
-            if (!ExceptionHandler.CanHandle(ex))
-                throw;
-
-            ExceptionHandler.Handle(ex, parameter);
-        }
+        await Execute(cancellationToken)
+            .ConfigureAwait(false);
     }
 
     /// <summary>

diff --git a/src/Prism.Core/Commands/AsyncDelegateCommand{T}.cs b/src/Prism.Core/Commands/AsyncDelegateCommand{T}.cs
@@ -101,10 +101,6 @@ public async Task Execute(T parameter, CancellationToken? cancellationToken = nu
             await _executeMethod(parameter, token)
                 .ConfigureAwait(false);
         }
-        catch (TaskCanceledException) when (token.IsCancellationRequested)
-        {
-            // Do nothing... the Task was cancelled
-        }
         catch (Exception ex)
         {
             if (!ExceptionHandler.CanHandle(ex))
@@ -149,22 +145,25 @@ public bool CanExecute(T parameter)
     protected override async void Execute(object? parameter)
     {
         var cancellationToken = _getCancellationToken();
+        T parameterAsT;
         try
         {
-            await Execute((T)parameter!, cancellationToken)
-                .ConfigureAwait(false);
-        }
-        catch (TaskCanceledException) when (cancellationToken.IsCancellationRequested)
-        {
-            // Do nothing... the Task was cancelled
+            parameterAsT = (T)parameter!;
         }
         catch (Exception ex)
         {
             if (!ExceptionHandler.CanHandle(ex))
                 throw;
 
             ExceptionHandler.Handle(ex, parameter);
+            return;
         }
+
+        // If we had an exception casting the parameter to T ,
+        // we would have already returned. We want to surface any
+        // exceptions thrown by the Execute method.
+        await Execute(parameterAsT, cancellationToken)
+            .ConfigureAwait(false);
     }
 
     /// <summary>