Skip to content

Commit

Permalink
test(hr): Fix rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
@dr1rrb
dr1rrb committed Dec 5, 2024
1 parent abd915b commit fb04847
Show file tree
Hide file tree
Showing 3 changed files with 103 additions and 89 deletions.
4 changes: 2 additions & 2 deletions ...ourceGenerators/Uno.UI.SourceGenerators.Tests/XamlCodeGeneratorTests/Given_LazyLoading.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public MainPage()
"""
}
},
ReferenceAssemblies = ReferenceAssemblies.Net.Net70.AddPackages(ImmutableArray.Create(new PackageIdentity("Uno.WinUI", "5.0.118"))),
ReferenceAssemblies = _Dotnet.Current.WithUnoPackage(),
DisableBuildReferences = true,
}.AddGeneratedSources();

Expand Down Expand Up @@ -114,7 +114,7 @@ public string InnerText
"""
}
},
ReferenceAssemblies = ReferenceAssemblies.Net.Net70.AddPackages(ImmutableArray.Create(new PackageIdentity("Uno.WinUI", "5.0.118"))),
ReferenceAssemblies = _Dotnet.Current.WithUnoPackage(),
DisableBuildReferences = true,
}.AddGeneratedSources();

Expand Down
59 changes: 33 additions & 26 deletions ...GeneratorTests/Out/WDLSNVS/XamlCodeGenerator_MainPage_d6cd66944958ced0c513e0a04797b51d.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ private void InitializeComponent()
Text = "Immediate content",
// Source 0\MainPage.xaml (Line 10:4)
}
.MainPage_d6cd66944958ced0c513e0a04797b51d_XamlApply((MainPage_d6cd66944958ced0c513e0a04797b51dXamlApplyExtensions.XamlApplyHandler0)(c0 =>
.MainPage_d6cd66944958ced0c513e0a04797b51d_XamlApply((MainPage_d6cd66944958ced0c513e0a04797b51dXamlApplyExtensions.XamlApplyHandler0)(__p1 =>
{
global::Uno.UI.FrameworkElementHelper.SetBaseUri(c0, __baseUri_MainPage_d6cd66944958ced0c513e0a04797b51d);
c0.CreationComplete();
global::Uno.UI.FrameworkElementHelper.SetBaseUri(__p1, __baseUri_MainPage_d6cd66944958ced0c513e0a04797b51d);
__p1.CreationComplete();
}
))
,
Expand All @@ -80,52 +80,52 @@ private void InitializeComponent()
Text = "Lazy Content",
// Source 0\MainPage.xaml (Line 12:5)
}
.MainPage_d6cd66944958ced0c513e0a04797b51d_XamlApply((MainPage_d6cd66944958ced0c513e0a04797b51dXamlApplyExtensions.XamlApplyHandler0)(c1 =>
.MainPage_d6cd66944958ced0c513e0a04797b51d_XamlApply((MainPage_d6cd66944958ced0c513e0a04797b51dXamlApplyExtensions.XamlApplyHandler0)(__p1 =>
{
global::Uno.UI.FrameworkElementHelper.SetBaseUri(c1, __baseUri_MainPage_d6cd66944958ced0c513e0a04797b51d);
c1.CreationComplete();
global::Uno.UI.FrameworkElementHelper.SetBaseUri(__p1, __baseUri_MainPage_d6cd66944958ced0c513e0a04797b51d);
__p1.CreationComplete();
}
))
}
.MainPage_d6cd66944958ced0c513e0a04797b51d_XamlApply((MainPage_d6cd66944958ced0c513e0a04797b51dXamlApplyExtensions.XamlApplyHandler1)(c2 =>
.MainPage_d6cd66944958ced0c513e0a04797b51d_XamlApply((MainPage_d6cd66944958ced0c513e0a04797b51dXamlApplyExtensions.XamlApplyHandler1)(__p1 =>
{
__nameScope.RegisterName("LazyLoadedBorder", c2);
__that.LazyLoadedBorder = c2;
// DeferLoadStrategy Lazy
global::Uno.UI.FrameworkElementHelper.SetBaseUri(c2, __baseUri_MainPage_d6cd66944958ced0c513e0a04797b51d);
c2.CreationComplete();
__nameScope.RegisterName("LazyLoadedBorder", __p1);
__that.LazyLoadedBorder = __p1;
// DeferLoadStrategy Lazy
global::Uno.UI.FrameworkElementHelper.SetBaseUri(__p1, __baseUri_MainPage_d6cd66944958ced0c513e0a04797b51d);
__p1.CreationComplete();
}
))
) .MainPage_d6cd66944958ced0c513e0a04797b51d_XamlApply((MainPage_d6cd66944958ced0c513e0a04797b51dXamlApplyExtensions.XamlApplyHandler2)(c3 =>
) .MainPage_d6cd66944958ced0c513e0a04797b51d_XamlApply((MainPage_d6cd66944958ced0c513e0a04797b51dXamlApplyExtensions.XamlApplyHandler2)(__p1 =>
{
c3.Name = "LazyLoadedBorder";
_LazyLoadedBorderSubject.ElementInstance = c3;
__p1.Name = "LazyLoadedBorder";
_LazyLoadedBorderSubject.ElementInstance = __p1;
}
))
,
}
}
.MainPage_d6cd66944958ced0c513e0a04797b51d_XamlApply((MainPage_d6cd66944958ced0c513e0a04797b51dXamlApplyExtensions.XamlApplyHandler3)(c4 =>
.MainPage_d6cd66944958ced0c513e0a04797b51d_XamlApply((MainPage_d6cd66944958ced0c513e0a04797b51dXamlApplyExtensions.XamlApplyHandler3)(__p1 =>
{
global::Uno.UI.FrameworkElementHelper.SetBaseUri(c4, __baseUri_MainPage_d6cd66944958ced0c513e0a04797b51d);
c4.CreationComplete();
global::Uno.UI.FrameworkElementHelper.SetBaseUri(__p1, __baseUri_MainPage_d6cd66944958ced0c513e0a04797b51d);
__p1.CreationComplete();
}
))
;

this
.GenericApply(((c5) =>
.MainPage_d6cd66944958ced0c513e0a04797b51d_XamlApply((MainPage_d6cd66944958ced0c513e0a04797b51dXamlApplyExtensions.XamlApplyHandler4)(__p1 =>
{
// Source 0\MainPage.xaml (Line 1:2)
// WARNING Property c5.base does not exist on {http://schemas.microsoft.com/winfx/2006/xaml/presentation}Page, the namespace is http://www.w3.org/XML/1998/namespace. This error was considered irrelevant by the XamlFileGenerator
// Source 0\MainPage.xaml (Line 1:2)

// WARNING Property __p1.base does not exist on {http://schemas.microsoft.com/winfx/2006/xaml/presentation}Page, the namespace is http://www.w3.org/XML/1998/namespace. This error was considered irrelevant by the XamlFileGenerator
}
))
.GenericApply(((c6) =>
.MainPage_d6cd66944958ced0c513e0a04797b51d_XamlApply((MainPage_d6cd66944958ced0c513e0a04797b51dXamlApplyExtensions.XamlApplyHandler4)(__p1 =>
{
// Class TestRepro.MainPage
global::Uno.UI.FrameworkElementHelper.SetBaseUri(c6, __baseUri_MainPage_d6cd66944958ced0c513e0a04797b51d);
c6.CreationComplete();
// Class TestRepro.MainPage
global::Uno.UI.FrameworkElementHelper.SetBaseUri(__p1, __baseUri_MainPage_d6cd66944958ced0c513e0a04797b51d);
__p1.CreationComplete();
}
))
;
Expand Down Expand Up @@ -179,5 +179,12 @@ static class MainPage_d6cd66944958ced0c513e0a04797b51dXamlApplyExtensions
handler(instance);
return instance;
}
public delegate void XamlApplyHandler4(global::Microsoft.UI.Xaml.Controls.Page instance);
[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
public static global::Microsoft.UI.Xaml.Controls.Page MainPage_d6cd66944958ced0c513e0a04797b51d_XamlApply(this global::Microsoft.UI.Xaml.Controls.Page instance, XamlApplyHandler4 handler)
{
handler(instance);
return instance;
}
}
}
129 changes: 68 additions & 61 deletions ...deGeneratorTests/Out/WLCHB/XamlCodeGenerator_MainPage_d6cd66944958ced0c513e0a04797b51d.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,89 +61,89 @@ private void InitializeComponent()
Name = "innerTextBlock",
// Source 0\MainPage.xaml (Line 10:4)
}
.MainPage_d6cd66944958ced0c513e0a04797b51d_XamlApply((MainPage_d6cd66944958ced0c513e0a04797b51dXamlApplyExtensions.XamlApplyHandler0)(c0 =>
.MainPage_d6cd66944958ced0c513e0a04797b51d_XamlApply((MainPage_d6cd66944958ced0c513e0a04797b51dXamlApplyExtensions.XamlApplyHandler0)(__p1 =>
{
/* _isTopLevelDictionary:False */
__that._component_0 = c0;
__nameScope.RegisterName("innerTextBlock", c0);
__that.innerTextBlock = c0;
// FieldModifier public
c0.SetBinding(
global::Microsoft.UI.Xaml.Controls.TextBlock.TextProperty,
new Microsoft.UI.Xaml.Data.Binding()
{
Mode = global::Microsoft.UI.Xaml.Data.BindingMode.OneWay,
}
.BindingApply(___b => /*defaultBindModeOneTime InnerText*/ global::Uno.UI.Xaml.BindingHelper.SetBindingXBindProvider(___b, __that, ___ctx => ___ctx is global::TestRepro.MainPage ___tctx ? (TryGetInstance_xBind_1(___tctx, out var bindResult1) ? (true, bindResult1) : (false, default)) : (false, default), null , new [] {"InnerText"}))
);
global::Uno.UI.FrameworkElementHelper.SetBaseUri(c0, __baseUri_MainPage_d6cd66944958ced0c513e0a04797b51d);
c0.CreationComplete();
/* _isTopLevelDictionary:False */
__that._component_0 = __p1;
__nameScope.RegisterName("innerTextBlock", __p1);
__that.innerTextBlock = __p1;
// FieldModifier public
__p1.SetBinding(
global::Microsoft.UI.Xaml.Controls.TextBlock.TextProperty,
new Microsoft.UI.Xaml.Data.Binding()
{
Mode = global::Microsoft.UI.Xaml.Data.BindingMode.OneWay,
}
.BindingApply(___b => /*defaultBindModeOneTime InnerText*/ global::Uno.UI.Xaml.BindingHelper.SetBindingXBindProvider(___b, __that, ___ctx => ___ctx is global::TestRepro.MainPage ___tctx ? (TryGetInstance_xBind_1(___tctx, out var bindResult1) ? (true, bindResult1) : (false, default)) : (false, default), null , new [] {"InnerText"}))
);
global::Uno.UI.FrameworkElementHelper.SetBaseUri(__p1, __baseUri_MainPage_d6cd66944958ced0c513e0a04797b51d);
__p1.CreationComplete();
}
))
,
}
.MainPage_d6cd66944958ced0c513e0a04797b51d_XamlApply((MainPage_d6cd66944958ced0c513e0a04797b51dXamlApplyExtensions.XamlApplyHandler1)(c1 =>
.MainPage_d6cd66944958ced0c513e0a04797b51d_XamlApply((MainPage_d6cd66944958ced0c513e0a04797b51dXamlApplyExtensions.XamlApplyHandler1)(__p1 =>
{
__nameScope.RegisterName("topLevelContent", c1);
__that.topLevelContent = c1;
// FieldModifier public
// Load false
global::Uno.UI.FrameworkElementHelper.SetBaseUri(c1, __baseUri_MainPage_d6cd66944958ced0c513e0a04797b51d);
c1.CreationComplete();
__nameScope.RegisterName("topLevelContent", __p1);
__that.topLevelContent = __p1;
// FieldModifier public
// Load false
global::Uno.UI.FrameworkElementHelper.SetBaseUri(__p1, __baseUri_MainPage_d6cd66944958ced0c513e0a04797b51d);
__p1.CreationComplete();
}
))
) .MainPage_d6cd66944958ced0c513e0a04797b51d_XamlApply((MainPage_d6cd66944958ced0c513e0a04797b51dXamlApplyExtensions.XamlApplyHandler2)(c2 =>
) .MainPage_d6cd66944958ced0c513e0a04797b51d_XamlApply((MainPage_d6cd66944958ced0c513e0a04797b51dXamlApplyExtensions.XamlApplyHandler2)(__p1 =>
{
__p1.Name = "topLevelContent";
_topLevelContentSubject.ElementInstance = __p1;
__that._component_1 = __p1;
var _component_1_update_That = (this as global::Uno.UI.DataBinding.IWeakReferenceProvider).WeakReference;
var _component_1_update_subject_capture = _topLevelContentSubject;
void _component_1_update(global::Microsoft.UI.Xaml.ElementStub sender)
{
c2.Name = "topLevelContent";
_topLevelContentSubject.ElementInstance = c2;
__that._component_1 = c2;
var _component_1_update_That = (this as global::Uno.UI.DataBinding.IWeakReferenceProvider).WeakReference;
var _component_1_update_subject_capture = _topLevelContentSubject;
void _component_1_update(global::Microsoft.UI.Xaml.ElementStub sender)
if (_component_1_update_That.Target is global::TestRepro.MainPage that)
{
if (_component_1_update_That.Target is global::TestRepro.MainPage that)
if (sender.IsMaterialized)
{
if (sender.IsMaterialized)
{
that.Bindings.UpdateResources();
that.Bindings.NotifyXLoad("topLevelContent");
}
else
{
_topLevelContentSubject.ElementInstance = null;
_innerTextBlockSubject.ElementInstance = null;
_innerTextBlockSubject.ElementInstance = null;
}
that.Bindings.UpdateResources();
that.Bindings.NotifyXLoad("topLevelContent");
}
}
c2.MaterializationChanged += _component_1_update;
var owner = this;
void _component_1_materializing(object sender)
{
if (_component_1_update_That.Target is global::TestRepro.MainPage that)
else
{
that._component_0.ApplyXBind();
that._component_0.UpdateResourceBindings();
_topLevelContentSubject.ElementInstance = null;
_innerTextBlockSubject.ElementInstance = null;
_innerTextBlockSubject.ElementInstance = null;
}
}
c2.Materializing += _component_1_materializing;
}
__p1.MaterializationChanged += _component_1_update;
var owner = this;
void _component_1_materializing(object sender)
{
if (_component_1_update_That.Target is global::TestRepro.MainPage that)
{
that._component_0.ApplyXBind();
that._component_0.UpdateResourceBindings();
}
}
__p1.Materializing += _component_1_materializing;
}
))
;

this
.GenericApply(((c3) =>
.MainPage_d6cd66944958ced0c513e0a04797b51d_XamlApply((MainPage_d6cd66944958ced0c513e0a04797b51dXamlApplyExtensions.XamlApplyHandler3)(__p1 =>
{
// Source 0\MainPage.xaml (Line 1:2)
// WARNING Property c3.base does not exist on {http://schemas.microsoft.com/winfx/2006/xaml/presentation}Page, the namespace is http://www.w3.org/XML/1998/namespace. This error was considered irrelevant by the XamlFileGenerator
// Source 0\MainPage.xaml (Line 1:2)

// WARNING Property __p1.base does not exist on {http://schemas.microsoft.com/winfx/2006/xaml/presentation}Page, the namespace is http://www.w3.org/XML/1998/namespace. This error was considered irrelevant by the XamlFileGenerator
}
))
.GenericApply(((c4) =>
.MainPage_d6cd66944958ced0c513e0a04797b51d_XamlApply((MainPage_d6cd66944958ced0c513e0a04797b51dXamlApplyExtensions.XamlApplyHandler3)(__p1 =>
{
// Class TestRepro.MainPage
global::Uno.UI.FrameworkElementHelper.SetBaseUri(c4, __baseUri_MainPage_d6cd66944958ced0c513e0a04797b51d);
c4.CreationComplete();
// Class TestRepro.MainPage
global::Uno.UI.FrameworkElementHelper.SetBaseUri(__p1, __baseUri_MainPage_d6cd66944958ced0c513e0a04797b51d);
__p1.CreationComplete();
}
))
;
Expand Down Expand Up @@ -182,7 +182,7 @@ void _component_1_materializing(object sender)
_topLevelContentSubject.ElementInstance = value;
}
}
private global::Microsoft.UI.Xaml.Markup.ComponentHolder _component_0_Holder = new global::Microsoft.UI.Xaml.Markup.ComponentHolder(isWeak: true);
private global::Microsoft.UI.Xaml.Markup.ComponentHolder _component_0_Holder = new global::Microsoft.UI.Xaml.Markup.ComponentHolder(isWeak: true);
private global::Microsoft.UI.Xaml.Controls.TextBlock _component_0
{
get
Expand All @@ -194,7 +194,7 @@ void _component_1_materializing(object sender)
_component_0_Holder.Instance = value;
}
}
private global::Microsoft.UI.Xaml.Markup.ComponentHolder _component_1_Holder = new global::Microsoft.UI.Xaml.Markup.ComponentHolder(isWeak: false);
private global::Microsoft.UI.Xaml.Markup.ComponentHolder _component_1_Holder = new global::Microsoft.UI.Xaml.Markup.ComponentHolder(isWeak: false);
private global::Microsoft.UI.Xaml.ElementStub _component_1
{
get
Expand Down Expand Up @@ -284,5 +284,12 @@ static class MainPage_d6cd66944958ced0c513e0a04797b51dXamlApplyExtensions
handler(instance);
return instance;
}
public delegate void XamlApplyHandler3(global::Microsoft.UI.Xaml.Controls.Page instance);
[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
public static global::Microsoft.UI.Xaml.Controls.Page MainPage_d6cd66944958ced0c513e0a04797b51d_XamlApply(this global::Microsoft.UI.Xaml.Controls.Page instance, XamlApplyHandler3 handler)
{
handler(instance);
return instance;
}
}
}

0 comments on commit fb04847

Please sign in to comment.