Browse Source

fix: Address review

pull/9415/head
Giuseppe Lippolis 4 years ago
parent
commit
5e52a59897
  1. 2
      src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlLanguageParseIntrinsics.cs
  2. 4
      src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlWellKnownTypes.cs

2
src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlLanguageParseIntrinsics.cs

@ -285,7 +285,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
, types.UriConstructor
, new List<IXamlAstValueNode>()
{
new XamlConstantNode(node, types.String, uriText),
new XamlConstantNode(node, context.Configuration.WellKnownTypes.String, uriText),
new XamlConstantNode(node, types.UriKind, (int)kind),
});
return true;

4
src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlWellKnownTypes.cs

@ -105,7 +105,6 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
public IXamlType IResourceDictionary { get; }
public IXamlType ResourceDictionary { get; }
public IXamlMethod ResourceDictionaryDeferredAdd { get; }
public IXamlType String { get; }
public IXamlType UriKind { get; }
public IXamlConstructor UriConstructor { get; }
@ -239,9 +238,8 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
cfg.TypeSystem.GetType("System.Func`2").MakeGenericType(
cfg.TypeSystem.GetType("System.IServiceProvider"),
XamlIlTypes.Object));
String = cfg.TypeSystem.GetType("System.String");
UriKind = cfg.TypeSystem.GetType("System.UriKind");
UriConstructor = Uri.GetConstructor(new List<IXamlType>() { String, UriKind });
UriConstructor = Uri.GetConstructor(new List<IXamlType>() { cfg.WellKnownTypes.String, UriKind });
}
}

Loading…
Cancel
Save