Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/BenchmarkDotNet/Helpers/FolderNameHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,13 @@ public static string ToFolderName(object? value)
return d.ToString("F", CultureInfo.InvariantCulture).Replace(".", "-");
}

if (ReflectionUtils.GetTypeInfo(value.GetType()).IsEnum)
var valueType = value.GetType();
if (valueType.IsEnum)
return value.ToString();
if (value is Type type)
return ToFolderName(type: type);
if (!ReflectionUtils.GetTypeInfo(value.GetType()).IsValueType)
return value.GetType().Name; // TODO
if (!valueType.IsValueType)
return valueType.Name;
if (value is TimeInterval interval)
return interval.Nanoseconds + "ns";

Expand Down
10 changes: 6 additions & 4 deletions src/BenchmarkDotNet/Helpers/SourceCodeHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,14 @@ public static string ToSourceCode(object? value)
return $"new {array.GetType().GetElementType()!.GetCorrectCSharpTypeName()}[] {{ {string.Join(", ", elementsSourceCode)} }}";
}
}
if (ReflectionUtils.GetTypeInfo(value.GetType()).IsEnum)
return $"({value.GetType().GetCorrectCSharpTypeName()})({ToInvariantCultureString(value)})";

var valueType = value.GetType();
if (valueType.IsEnum)
return $"({valueType.GetCorrectCSharpTypeName()})({ToInvariantCultureString(value)})";
if (value is Type type)
return "typeof(" + type.GetCorrectCSharpTypeName() + ")";
if (!ReflectionUtils.GetTypeInfo(value.GetType()).IsValueType)
return "System.Activator.CreateInstance<" + value.GetType().GetCorrectCSharpTypeName() + ">()";
if (!valueType.IsValueType)
return "System.Activator.CreateInstance<" + valueType.GetCorrectCSharpTypeName() + ">()";

switch (value) {
case TimeInterval interval:
Expand Down