Skip to content

Commit e2d948d

Browse files
committed
Fix warning again
1 parent b1a0422 commit e2d948d

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

src/Foundatio.Mediator/HandlerGenerator.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ private static void GenerateHandleMethod(IndentedStringBuilder source, HandlerIn
258258

259259
if (handler.ReturnType.IsResult)
260260
{
261-
variables[WellKnownTypes.Result] = "handlerResult";
261+
variables[WellKnownTypes.Result] = "handlerResult!";
262262
}
263263

264264
if (handler.ReturnType.IsTuple)
@@ -269,7 +269,7 @@ private static void GenerateHandleMethod(IndentedStringBuilder source, HandlerIn
269269

270270
if (tupleItem.TypeFullName.StartsWith(WellKnownTypes.ResultOfT.Replace("`1", "<")))
271271
{
272-
variables[WellKnownTypes.Result] = $"handlerResult.{tupleItem.Name}";
272+
variables[WellKnownTypes.Result] = $"handlerResult.{tupleItem.Name}!";
273273
}
274274
}
275275
}
@@ -539,7 +539,9 @@ private static string BuildParameters(IndentedStringBuilder source, EquatableArr
539539
}
540540
else if (param.Type.IsResult && param.Type.FullName == WellKnownTypes.Result && variables != null && variables.TryGetValue(WellKnownTypes.Result, out string? resultVariableName))
541541
{
542-
parameterValues.Add($"{resultVariableName}!");
542+
// Special case: parameter is base Result type, but a Result<T> is available
543+
// The null-forgiving operator is already added when storing in variables
544+
parameterValues.Add(resultVariableName);
543545
}
544546
else
545547
{

0 commit comments

Comments
 (0)