Timerix/DTLib.Demystifier
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed #72

Browse Source 
The `type.IsDefined(typeof(CompilerGeneratedAttribute))` check removed, since it led to the exclusion of `async lambdas`.
This commit is contained in:
samtrion 2019-12-06 11:25:15 +01:00 committed by Ben Adams
parent 58dadce795
commit 4f9f191f7f
2 changed files with 76 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Ben.Demystifier/EnhancedStackTrace.Frames.cs
View File

@ -116,10 +116,10 @@ namespace System.Diagnostics
var subMethodName = method.Name; var subMethodName = method.Name;
var methodName = method.Name; var methodName = method.Name;
if (type != null && type.IsDefined(typeof(CompilerGeneratedAttribute)) && var isAsyncStateMachine = typeof(IAsyncStateMachine).IsAssignableFrom(type);
(typeof(IAsyncStateMachine).IsAssignableFrom(type) || typeof(IEnumerator).IsAssignableFrom(type))) if (isAsyncStateMachine || typeof(IEnumerator).IsAssignableFrom(type))
{ {
methodDisplayInfo.IsAsync = typeof(IAsyncStateMachine).IsAssignableFrom(type); methodDisplayInfo.IsAsync = isAsyncStateMachine;
// Convert StateMachine methods to correct overload +MoveNext() // Convert StateMachine methods to correct overload +MoveNext()
if (!TryResolveStateMachineMethod(ref method, out type)) if (!TryResolveStateMachineMethod(ref method, out type))

76
test/Ben.Demystifier.Test/MethodTests.cs
View File

@ -2,6 +2,7 @@ namespace Ben.Demystifier.Test
{ {
using System; using System;
using System.Diagnostics; using System.Diagnostics;
using System.Threading.Tasks;
using Xunit; using Xunit;
public class MethodTests public class MethodTests
@ -24,10 +25,10 @@ namespace Ben.Demystifier.Test
stackTrace = LineEndingsHelper.RemoveLineEndings(stackTrace); stackTrace = LineEndingsHelper.RemoveLineEndings(stackTrace);
var trace = string.Join(string.Empty, stackTrace.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries)); var trace = string.Join(string.Empty, stackTrace.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries));
var expected = string.Join(string.Empty, new[] { var expected = string.Join(string.Empty,
"System.ArgumentException: Value does not fall within the expected range.", "System.ArgumentException: Value does not fall within the expected range.",
" at bool Ben.Demystifier.Test.MethodTests.MethodWithNullableInt(int? number)", " at bool Ben.Demystifier.Test.MethodTests.MethodWithNullableInt(int? number)",
" at void Ben.Demystifier.Test.MethodTests.DemistifiesMethodWithNullableInt()"}); " at void Ben.Demystifier.Test.MethodTests.DemistifiesMethodWithNullableInt()");
Assert.Equal(expected, trace); Assert.Equal(expected, trace);
} }
@ -50,10 +51,65 @@ namespace Ben.Demystifier.Test
stackTrace = LineEndingsHelper.RemoveLineEndings(stackTrace); stackTrace = LineEndingsHelper.RemoveLineEndings(stackTrace);
var trace = string.Join(string.Empty, stackTrace.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries)); var trace = string.Join(string.Empty, stackTrace.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries));
var expected = string.Join(string.Empty, new[] { var expected = string.Join(string.Empty,
"System.ArgumentException: Value does not fall within the expected range.", "System.ArgumentException: Value does not fall within the expected range.",
" at bool Ben.Demystifier.Test.MethodTests.MethodWithDynamic(dynamic value)", " at bool Ben.Demystifier.Test.MethodTests.MethodWithDynamic(dynamic value)",
" at void Ben.Demystifier.Test.MethodTests.DemistifiesMethodWithDynamic()"}); " at void Ben.Demystifier.Test.MethodTests.DemistifiesMethodWithDynamic()");
Assert.Equal(expected, trace);
}
[Fact]
public void DemistifiesMethodWithLambda()
{
Exception dex = null;
try
{
MethodWithLambda();
}
catch (Exception e)
{
dex = e.Demystify();
}
// Assert
var stackTrace = dex.ToString();
stackTrace = LineEndingsHelper.RemoveLineEndings(stackTrace);
var trace = string.Join(string.Empty, stackTrace.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries));
var expected = string.Join(string.Empty,
"System.ArgumentException: Value does not fall within the expected range.",
" at void Ben.Demystifier.Test.MethodTests.MethodWithLambda()+() => { }",
" at void Ben.Demystifier.Test.MethodTests.MethodWithLambda()",
" at void Ben.Demystifier.Test.MethodTests.DemistifiesMethodWithLambda()");
Assert.Equal(expected, trace);
}
[Fact]
public void DemistifiesMethodWithAsyncLambda()
{
Exception dex = null;
try
{
MethodWithAsyncLambda();
}
catch (Exception e)
{
dex = e.Demystify();
}
// Assert
var stackTrace = dex.ToString();
stackTrace = LineEndingsHelper.RemoveLineEndings(stackTrace);
var trace = string.Join(string.Empty, stackTrace.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries));
var expected = string.Join(string.Empty,
"System.ArgumentException: Value does not fall within the expected range.",
" at async void Ben.Demystifier.Test.MethodTests.MethodWithAsyncLambda()+(?) => { }",
" at void Ben.Demystifier.Test.MethodTests.MethodWithAsyncLambda()",
" at void Ben.Demystifier.Test.MethodTests.DemistifiesMethodWithAsyncLambda()");
Assert.Equal(expected, trace); Assert.Equal(expected, trace);
} }
@ -61,5 +117,17 @@ namespace Ben.Demystifier.Test
private bool MethodWithNullableInt(int? number) => throw new ArgumentException(); private bool MethodWithNullableInt(int? number) => throw new ArgumentException();
private bool MethodWithDynamic(dynamic value) => throw new ArgumentException(); private bool MethodWithDynamic(dynamic value) => throw new ArgumentException();
private void MethodWithLambda()
{
Action action = () => throw new ArgumentException();
action();
}
private void MethodWithAsyncLambda()
{
Func<Task> action = async () => throw new ArgumentException();
action().ConfigureAwait(false).GetAwaiter().GetResult();
}
} }
} }