ReturnParameter fix for lambda_method (#11)

* ReturnParameter fix for lambda_method

* Bump version
This commit is contained in:
Ben Adams
2017-11-12 00:22:42 +01:00
committed by GitHub
parent 310a7b30cb
commit e7a2f46ff6
3 changed files with 71 additions and 4 deletions

View File

@@ -9,7 +9,7 @@
<RepositoryType>git</RepositoryType>
<IncludeSymbols>true</IncludeSymbols>
<IncludeSource>true</IncludeSource>
<Version>0.0.2</Version>
<Version>0.0.3</Version>
</PropertyGroup>
<PropertyGroup>

View File

@@ -59,8 +59,8 @@ namespace System.Diagnostics
var fileName = frame.GetFileName();
var row = frame.GetFileLineNumber();
var column = frame.GetFileColumnNumber();
if (string.IsNullOrEmpty(fileName))
var ilOffset = frame.GetILOffset();
if (string.IsNullOrEmpty(fileName) && ilOffset >= 0)
{
// .NET Framework and older versions of mono don't support portable PDBs
// so we read it manually to get file name and line information
@@ -168,7 +168,20 @@ namespace System.Diagnostics
if (method is System.Reflection.MethodInfo mi)
{
methodDisplayInfo.ReturnParameter = GetParameter(mi.ReturnParameter);
var returnParameter = mi.ReturnParameter;
if (returnParameter != null)
{
methodDisplayInfo.ReturnParameter = GetParameter(mi.ReturnParameter);
}
else if (mi.ReturnType != null)
{
methodDisplayInfo.ReturnParameter = new ResolvedParameter
{
Prefix = "",
Name = "",
Type = TypeNameHelper.GetTypeDisplayName(mi.ReturnType, fullName: false, includeGenericParameterNames: true).ToString(),
};
}
}
if (method.IsGenericMethod)