Skip to content

Commit

Permalink
Cleanup other Xaml Replacement converters
Browse files Browse the repository at this point in the history
  • Loading branch information
@hughbe
hughbe committed Sep 20, 2023
1 parent ef2f09d commit 8b55ab8
Show file tree
Hide file tree
Showing 4 changed files with 60 additions and 195 deletions.
35 changes: 13 additions & 22 deletions src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Replacements/TypeTypeConverter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

using System.ComponentModel;
using System.Globalization;
using System.Windows.Markup;
using System.Xaml.Schema;
using XAML3 = System.Windows.Markup;

namespace System.Xaml.Replacements
{
Expand All @@ -15,51 +15,42 @@ namespace System.Xaml.Replacements
internal class TypeTypeConverter : TypeConverter
{
public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
{
return sourceType == typeof(string);
}
=> sourceType == typeof(string);

public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
{
string typeName = value as string;

if (null != context && null != typeName)
if (context != null && value is string typeName)
{
var typeResolver = GetService<XAML3.IXamlTypeResolver>(context);

if (null != typeResolver)
IXamlTypeResolver typeResolver = GetService<IXamlTypeResolver>(context);
if (typeResolver != null)
{
Type type = typeResolver.Resolve(typeName);
return type;
return typeResolver.Resolve(typeName);
}
}

return base.ConvertFrom(context, culture, value);
}

public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
{
return destinationType == typeof(string);
}
=> destinationType == typeof(string);

public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
{
Type type = value as Type;

if (context != null && type != null && destinationType == typeof(string))
if (context != null && value is Type type && destinationType == typeof(string))
{
string result = ConvertTypeToString(context, type);
if (result != null)
{
return result;
}
}

return base.ConvertTo(context, culture, value, destinationType);
}

private static string ConvertTypeToString(ITypeDescriptorContext context, Type type)
{
var schemaContextProvider = GetService<IXamlSchemaContextProvider>(context);
IXamlSchemaContextProvider schemaContextProvider = GetService<IXamlSchemaContextProvider>(context);
if (schemaContextProvider == null)
{
return null;
Expand All @@ -68,17 +59,17 @@ private static string ConvertTypeToString(ITypeDescriptorContext context, Type t
{
return null;
}

XamlType xamlType = schemaContextProvider.SchemaContext.GetXamlType(type);
if (xamlType == null)
{
return null;
}

return XamlTypeTypeConverter.ConvertXamlTypeToString(context, xamlType);
}

private static TService GetService<TService>(ITypeDescriptorContext context) where TService : class
{
return context.GetService(typeof(TService)) as TService;
}
=> context.GetService(typeof(TService)) as TService;
}
}
179 changes: 30 additions & 149 deletions src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Schema/BuiltInValueConverter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using System.Globalization;
using System.Windows.Markup;
using System.Xaml.Replacements;
using TypeListConverter = System.Xaml.Replacements.TypeListConverter;

namespace System.Xaml.Schema
{
Expand All @@ -22,15 +21,9 @@ internal BuiltInValueConverter(Type converterType, Func<TConverterBase> factory)
_factory = factory;
}

internal override bool IsPublic
{
get { return true; }
}
internal override bool IsPublic => true;

protected override TConverterBase CreateInstance()
{
return _factory.Invoke();
}
protected override TConverterBase CreateInstance() => _factory.Invoke();
}

internal static class BuiltInValueConverter
Expand Down Expand Up @@ -62,52 +55,16 @@ internal static class BuiltInValueConverter
private static XamlValueConverter<TypeConverter> s_Uri;

internal static XamlValueConverter<TypeConverter> Int32
{
get
{
if (s_Int32 is null)
{
s_Int32 = new BuiltInValueConverter<TypeConverter>(typeof(Int32Converter), () => new Int32Converter());
}
return s_Int32;
}
}
=> s_Int32 ??= new BuiltInValueConverter<TypeConverter>(typeof(Int32Converter), () => new Int32Converter());

internal static XamlValueConverter<TypeConverter> String
{
get
{
if (s_String is null)
{
s_String = new BuiltInValueConverter<TypeConverter>(typeof(StringConverter), () => new StringConverter());
}
return s_String;
}
}
=> s_String ??= new BuiltInValueConverter<TypeConverter>(typeof(StringConverter), () => new StringConverter());

internal static XamlValueConverter<TypeConverter> Object
{
get
{
if (s_Object is null)
{
s_Object = new XamlValueConverter<TypeConverter>(null, XamlLanguage.Object);
}
return s_Object;
}
}
=> s_Object ??= new XamlValueConverter<TypeConverter>(null, XamlLanguage.Object);

internal static XamlValueConverter<TypeConverter> Event
{
get
{
if (s_Delegate is null)
{
s_Delegate = new BuiltInValueConverter<TypeConverter>(typeof(EventConverter), () => new EventConverter());
}
return s_Delegate;
}
}
=> s_Delegate ??= new BuiltInValueConverter<TypeConverter>(typeof(EventConverter), () => new EventConverter());

internal static XamlValueConverter<TypeConverter> GetTypeConverter(Type targetType)
{
Expand All @@ -125,163 +82,83 @@ internal static XamlValueConverter<TypeConverter> GetTypeConverter(Type targetTy
}
if (typeof(Int16) == targetType)
{
if (s_Int16 is null)
{
s_Int16 = new BuiltInValueConverter<TypeConverter>(typeof(Int16Converter), () => new Int16Converter());
}
return s_Int16;
return s_Int16 ??= new BuiltInValueConverter<TypeConverter>(typeof(Int16Converter), () => new Int16Converter());
}
if (typeof(Int64) == targetType)
{
if (s_Int64 is null)
{
s_Int64 = new BuiltInValueConverter<TypeConverter>(typeof(Int64Converter), () => new Int64Converter());
}
return s_Int64;
return s_Int64 ??= new BuiltInValueConverter<TypeConverter>(typeof(Int64Converter), () => new Int64Converter());
}
if (typeof(UInt32) == targetType)
{
if (s_UInt32 is null)
{
s_UInt32 = new BuiltInValueConverter<TypeConverter>(typeof(UInt32Converter), () => new UInt32Converter());
}
return s_UInt32;
return s_UInt32 ??= new BuiltInValueConverter<TypeConverter>(typeof(UInt32Converter), () => new UInt32Converter());
}
if (typeof(UInt16) == targetType)
{
if (s_UInt16 is null)
{
s_UInt16 = new BuiltInValueConverter<TypeConverter>(typeof(UInt16Converter), () => new UInt16Converter());
}
return s_UInt16;
return s_UInt16 ??= new BuiltInValueConverter<TypeConverter>(typeof(UInt16Converter), () => new UInt16Converter());
}
if (typeof(UInt64) == targetType)
{
if (s_UInt64 is null)
{
s_UInt64 = new BuiltInValueConverter<TypeConverter>(typeof(UInt64Converter), () => new UInt64Converter());
}
return s_UInt64;
return s_UInt64 ??= new BuiltInValueConverter<TypeConverter>(typeof(UInt64Converter), () => new UInt64Converter());
}
if (typeof(Boolean) == targetType)
{
if (s_Boolean is null)
{
s_Boolean = new BuiltInValueConverter<TypeConverter>(typeof(BooleanConverter), () => new BooleanConverter());
}
return s_Boolean;
return s_Boolean ??= new BuiltInValueConverter<TypeConverter>(typeof(BooleanConverter), () => new BooleanConverter());
}
if (typeof(Double) == targetType)
{
if (s_Double is null)
{
s_Double = new BuiltInValueConverter<TypeConverter>(typeof(DoubleConverter), () => new DoubleConverter());
}
return s_Double;
return s_Double ??= new BuiltInValueConverter<TypeConverter>(typeof(DoubleConverter), () => new DoubleConverter());
}
if (typeof(Single) == targetType)
{
if (s_Single is null)
{
s_Single = new BuiltInValueConverter<TypeConverter>(typeof(SingleConverter), () => new SingleConverter());
}
return s_Single;
return s_Single ??= new BuiltInValueConverter<TypeConverter>(typeof(SingleConverter), () => new SingleConverter());
}
if (typeof(Byte) == targetType)
{
if (s_Byte is null)
{
s_Byte = new BuiltInValueConverter<TypeConverter>(typeof(ByteConverter), () => new ByteConverter());
}
return s_Byte;
return s_Byte ??= new BuiltInValueConverter<TypeConverter>(typeof(ByteConverter), () => new ByteConverter());
}
if (typeof(SByte) == targetType)
{
if (s_SByte is null)
{
s_SByte = new BuiltInValueConverter<TypeConverter>(typeof(SByteConverter), () => new SByteConverter());
}
return s_SByte;
return s_SByte ??= new BuiltInValueConverter<TypeConverter>(typeof(SByteConverter), () => new SByteConverter());
}
if (typeof(Char) == targetType)
{
if (s_Char is null)
{
s_Char = new BuiltInValueConverter<TypeConverter>(typeof(CharConverter), () => new CharConverter());
}
return s_Char;
return s_Char ??= new BuiltInValueConverter<TypeConverter>(typeof(CharConverter), () => new CharConverter());
}
if (typeof(Decimal) == targetType)
{
if (s_Decimal is null)
{
s_Decimal = new BuiltInValueConverter<TypeConverter>(typeof(DecimalConverter), () => new DecimalConverter());
}
return s_Decimal;
return s_Decimal ??= new BuiltInValueConverter<TypeConverter>(typeof(DecimalConverter), () => new DecimalConverter());
}
if (typeof(TimeSpan) == targetType)
{
if (s_TimeSpan is null)
{
s_TimeSpan = new BuiltInValueConverter<TypeConverter>(typeof(TimeSpanConverter), () => new TimeSpanConverter());
}
return s_TimeSpan;
return s_TimeSpan ??= new BuiltInValueConverter<TypeConverter>(typeof(TimeSpanConverter), () => new TimeSpanConverter());
}
if (typeof(Guid) == targetType)
{
if (s_Guid is null)
{
s_Guid = new BuiltInValueConverter<TypeConverter>(typeof(GuidConverter), () => new GuidConverter());
}
return s_Guid;
return s_Guid ??= new BuiltInValueConverter<TypeConverter>(typeof(GuidConverter), () => new GuidConverter());
}
if (typeof(Type).IsAssignableFrom(targetType))
{
if (s_Type is null)
{
s_Type = new BuiltInValueConverter<TypeConverter>(typeof(TypeTypeConverter), () => new TypeTypeConverter());
}
return s_Type;
return s_Type ??= new BuiltInValueConverter<TypeConverter>(typeof(System.Xaml.Replacements.TypeTypeConverter), () => new System.Xaml.Replacements.TypeTypeConverter());
}
if (typeof(Type[]).IsAssignableFrom(targetType))
{
if (s_TypeList is null)
{
s_TypeList = new BuiltInValueConverter<TypeConverter>(typeof(TypeListConverter), () => new TypeListConverter());
}
return s_TypeList;
return s_TypeList ??= new BuiltInValueConverter<TypeConverter>(typeof(System.Xaml.Replacements.TypeListConverter), () => new System.Xaml.Replacements.TypeListConverter());
}
if (typeof(DateTime) == targetType)
{
if (s_DateTime is null)
{
s_DateTime = new BuiltInValueConverter<TypeConverter>(typeof(DateTimeConverter2), () => new DateTimeConverter2());
}
return s_DateTime;
return s_DateTime ??= new BuiltInValueConverter<TypeConverter>(typeof(System.Xaml.Replacements.DateTimeConverter2), () => new System.Xaml.Replacements.DateTimeConverter2());
}
if (typeof(DateTimeOffset) == targetType)
{
if (s_DateTimeOffset is null)
{
s_DateTimeOffset = new BuiltInValueConverter<TypeConverter>(typeof(DateTimeOffsetConverter2), () => new DateTimeOffsetConverter2());
}
return s_DateTimeOffset;
return s_DateTimeOffset ??= new BuiltInValueConverter<TypeConverter>(typeof(System.Xaml.Replacements.DateTimeOffsetConverter2), () => new System.Xaml.Replacements.DateTimeOffsetConverter2());
}
if (typeof(CultureInfo).IsAssignableFrom(targetType))
{
if (s_CultureInfo is null)
{
s_CultureInfo = new BuiltInValueConverter<TypeConverter>(typeof(CultureInfoConverter), () => new CultureInfoConverter());
}
return s_CultureInfo;
return s_CultureInfo ??= new BuiltInValueConverter<TypeConverter>(typeof(CultureInfoConverter), () => new CultureInfoConverter());
}
if (typeof(Delegate).IsAssignableFrom(targetType))
{
if (s_Delegate is null)
{
s_Delegate = new BuiltInValueConverter<TypeConverter>(typeof(EventConverter), () => new EventConverter());
}
return s_Delegate;
return s_Delegate ??= new BuiltInValueConverter<TypeConverter>(typeof(EventConverter), () => new EventConverter());
}
if (typeof(Uri).IsAssignableFrom(targetType))
{
Expand Down Expand Up @@ -317,8 +194,10 @@ internal static XamlValueConverter<TypeConverter> GetTypeConverter(Type targetTy
s_Uri = new BuiltInValueConverter<TypeConverter>(stdConverter.GetType(), () => TypeDescriptor.GetConverter(typeof(Uri)));
}
}

return s_Uri;
}

return null;
}

Expand All @@ -332,8 +211,10 @@ internal static XamlValueConverter<ValueSerializer> GetValueSerializer(Type targ
ValueSerializer stringSerializer = ValueSerializer.GetSerializerFor(typeof(string));
s_StringSerializer = new BuiltInValueConverter<ValueSerializer>(stringSerializer.GetType(), () => stringSerializer);
}

return s_StringSerializer;
}

return null;
}
}
Expand Down
Loading

0 comments on commit 8b55ab8

Please sign in to comment.