Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change the ObjectToTypeName value converter to give prettier C# names. #400

Merged
merged 9 commits into from
Mar 26, 2019
Merged

Change the ObjectToTypeName value converter to give prettier C# names. #400

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3608b0b
Change the ObjectToTypeName value converter to give prettier C# names.
dfkeenan Mar 2, 2019
246b642
Add xunit.runner.visualstudio NuGet to Xenko.Core.Presnetation.Tests …
dfkeenan Mar 4, 2019
de3006d
Re-wrote ObjectToTypeConverter to use a custom method that handles nu…
dfkeenan Mar 4, 2019
86ca034
Add unit tests for ObjectToTypeName value converter.
dfkeenan Mar 9, 2019
9540610
Fixed typos in unit test comments.
dfkeenan Mar 9, 2019
33748e2
Address PR review issues.
dfkeenan Mar 21, 2019
2916137
Add missing licence notice to the top of TestTypeExtensions.
dfkeenan Mar 21, 2019
cdcca5c
More review issues fixed.
dfkeenan Mar 26, 2019
8488f1b
[Presentation] Reorder using clauses
xen2 Mar 26, 2019
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
16 changes: 15 additions & 1 deletion sources/presentation/Xenko.Core.Presentation/ValueConverters/ObjectToTypeName.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
using System;
using System.Globalization;
using Xenko.Core.Annotations;
using System.CodeDom;
using Microsoft.CSharp;
using System.Text.RegularExpressions;

namespace Xenko.Core.Presentation.ValueConverters
{
Expand All @@ -19,11 +22,22 @@ public class ObjectToTypeName : OneWayValueConverter<ObjectToTypeName>
/// </summary>
public const string NullObjectType = "(None)";

private readonly CSharpCodeProvider codeProvider = new CSharpCodeProvider();

/// <inheritdoc/>
[NotNull]
public override object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
return value?.GetType().Name ?? NullObjectType;
if (value == null) return NullObjectType;

Type valueType = value.GetType();
var fullTypeName = codeProvider.GetTypeOutput(new CodeTypeReference(valueType));

//Change System.Nullable to "Type?" format
var typeName = Regex.Replace(fullTypeName, @"System\.Nullable<([^>]*)>", "$1?");
dfkeenan marked this conversation as resolved.
Show resolved Hide resolved

//Simplify name. i.e. remove namespaces etc.
return Regex.Replace(typeName, @"[^,<>]*\.", "");
}
}
}