Rethrow for Better Stack Trace (#1532)

* Drop a trailing space * Rethrow exception from generated method * Generate async methods so throw actually helps
reactiveui · Jul 7, 2023 · 6a16c08 · 6a16c08
1 parent 4744780
commit 6a16c08
Show file tree

Hide file tree

Showing 3 changed files with 468 additions and 105 deletions.
diff --git a/InterfaceStubGenerator.Shared/InterfaceStubGenerator.cs b/InterfaceStubGenerator.Shared/InterfaceStubGenerator.cs
@@ -383,7 +383,15 @@ partial class {ns}{classDeclaration}
         /// <param name="isTopLevel">True if directly from the type we're generating for, false for methods found on base interfaces</param>
         void ProcessRefitMethod(StringBuilder source, IMethodSymbol methodSymbol, bool isTopLevel)
         {
-            WriteMethodOpening(source, methodSymbol, !isTopLevel);
+            var returnType = methodSymbol.ReturnType.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat);
+            var (isAsync, @return, configureAwait) = methodSymbol.ReturnType.MetadataName switch
+            {
+                "Task" => (true, "await (", ").ConfigureAwait(false)"),
+                "Task`1" or "ValueTask`1" => (true, "return await (", ").ConfigureAwait(false)"),
+                _ => (false, "return ", ""),
+            };
+
+            WriteMethodOpening(source, methodSymbol, !isTopLevel, isAsync);
 
             // Build the list of args for the array
             var argList = new List<string>();
@@ -411,7 +419,14 @@ void ProcessRefitMethod(StringBuilder source, IMethodSymbol methodSymbol, bool i
             source.Append(@$"
             var ______arguments = new object[] {{ {string.Join(", ", argList)} }};
             var ______func = requestBuilder.BuildRestResultFuncForMethod(""{methodSymbol.Name}"", new global::System.Type[] {{ {string.Join(", ", typeList)} }}{genericString} );
-            return ({methodSymbol.ReturnType.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)})______func(this.Client, ______arguments);
+            try
+            {{
+                {@return}({returnType})______func(this.Client, ______arguments){configureAwait};
+            }}
+            catch (global::System.Exception ex)
+            {{
+                throw ex;
+            }}
 ");
 
             WriteMethodClosing(source);
@@ -500,14 +515,15 @@ void ProcessNonRefitMethod<TContext>(TContext context, Action<TContext, Diagnost
             }            
         }
 
-        void WriteMethodOpening(StringBuilder source, IMethodSymbol methodSymbol, bool isExplicitInterface)
+        void WriteMethodOpening(StringBuilder source, IMethodSymbol methodSymbol, bool isExplicitInterface, bool isAsync = false)
         {
             var visibility = !isExplicitInterface ? "public " : string.Empty;
+            var async = isAsync ? "async " : "";
 
             source.Append(@$"
 
         /// <inheritdoc />
-        {visibility}{methodSymbol.ReturnType.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)} ");
+        {visibility}{async}{methodSymbol.ReturnType.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)} ");
 
             if(isExplicitInterface)
             {
@@ -527,8 +543,8 @@ void WriteMethodOpening(StringBuilder source, IMethodSymbol methodSymbol, bool i
 
                 source.Append(string.Join(", ", list));
             }
-            
-           source.Append(@$") {GenerateConstraints(methodSymbol.TypeParameters, isExplicitInterface)}
+
+            source.Append(@$"){GenerateConstraints(methodSymbol.TypeParameters, isExplicitInterface)}
         {{");
         }