Skip to content

Commit

Permalink
fix(reg): Fix HR no allowing to remove x:Bind as first change
Browse files Browse the repository at this point in the history
  • Loading branch information
@dr1rrb
dr1rrb committed Dec 13, 2024
1 parent 797c168 commit 7aae564
Show file tree
Hide file tree
Showing 28 changed files with 282 additions and 253 deletions.
30 changes: 15 additions & 15 deletions ...orTests/Out/SOSLIIOFDOTAFE/XamlCodeGenerator_MainPage_d6cd66944958ced0c513e0a04797b51d.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,13 +131,13 @@ private void InitializeComponent()
OnInitializeCompleted();

Bindings = new MainPage_Bindings(this);
((global::Microsoft.UI.Xaml.FrameworkElement)this).Loading += (s, e) =>
{
__that.Bindings.UpdateResources();
}
;
((global::Microsoft.UI.Xaml.FrameworkElement)this).Loading += __UpdateBindingsAndResources;
}
partial void OnInitializeCompleted();
private void __UpdateBindingsAndResources(global::Microsoft.UI.Xaml.FrameworkElement s, object e)
{
this.Bindings.UpdateResources();
}
private void ApplyMethod_1(global::Microsoft.UI.Xaml.Style __p1, MainPage __that, global::Microsoft.UI.Xaml.NameScope __nameScope)
{
global::Uno.UI.Helpers.MarkupHelper.SetElementProperty(__p1, "OriginalSourceLocation", "file:///C:/Project/0/MainPage.xaml#L7:6");
Expand Down Expand Up @@ -364,14 +364,9 @@ public _View Build(object __ResourceOwner_1)
}
.GenericApply(__that, __nameScope, (ApplyMethod_19 ))
;
if (__rootInstance is FrameworkElement __fe)
if (__rootInstance is FrameworkElement __fe)
{
var owner = this;
__fe.Loading += delegate
{
_component_0.UpdateResourceBindings();
}
;
__fe.Loading += __UpdateBindingsAndResources;
}
if (__rootInstance is DependencyObject d)
{
Expand All @@ -384,7 +379,7 @@ public _View Build(object __ResourceOwner_1)
}
return __rootInstance;
}
private global::Microsoft.UI.Xaml.Markup.ComponentHolder _component_0_Holder { get; set; } = new global::Microsoft.UI.Xaml.Markup.ComponentHolder(isWeak: true);
private global::Microsoft.UI.Xaml.Markup.ComponentHolder _component_0_Holder { get; } = new global::Microsoft.UI.Xaml.Markup.ComponentHolder(isWeak: true);
private global::Microsoft.UI.Xaml.Controls.Button _component_0
{
get
Expand All @@ -395,6 +390,11 @@ public _View Build(object __ResourceOwner_1)
{
_component_0_Holder.Instance = value;
}
}
private void __UpdateBindingsAndResources(global::Microsoft.UI.Xaml.FrameworkElement s, object e)
{
var owner = this;
_component_0.UpdateResourceBindings();
}
private void ApplyMethod_17(global::Microsoft.UI.Xaml.Controls.TextBlock __p1, _MainPage_d6cd66944958ced0c513e0a04797b51d_TestReproMainPageSC0 __that, global::Microsoft.UI.Xaml.NameScope __nameScope)
{
Expand Down Expand Up @@ -468,7 +468,7 @@ private void ApplyMethod_20(global::Microsoft.UI.Xaml.Controls.TextBlock __p1, _
}

}
private global::Microsoft.UI.Xaml.Markup.ComponentHolder _component_0_Holder { get; set; } = new global::Microsoft.UI.Xaml.Markup.ComponentHolder(isWeak: true);
private global::Microsoft.UI.Xaml.Markup.ComponentHolder _component_0_Holder { get; } = new global::Microsoft.UI.Xaml.Markup.ComponentHolder(isWeak: true);
private global::Microsoft.UI.Xaml.Controls.ListView _component_0
{
get
Expand All @@ -480,7 +480,7 @@ private void ApplyMethod_20(global::Microsoft.UI.Xaml.Controls.TextBlock __p1, _
_component_0_Holder.Instance = value;
}
}
private global::Microsoft.UI.Xaml.Markup.ComponentHolder _component_1_Holder { get; set; } = new global::Microsoft.UI.Xaml.Markup.ComponentHolder(isWeak: true);
private global::Microsoft.UI.Xaml.Markup.ComponentHolder _component_1_Holder { get; } = new global::Microsoft.UI.Xaml.Markup.ComponentHolder(isWeak: true);
private global::Microsoft.UI.Xaml.Controls.Page _component_1
{
get
Expand Down
28 changes: 14 additions & 14 deletions ...eratorTests/Out/SOSLIOFPLR/XamlCodeGenerator_MainPage_d6cd66944958ced0c513e0a04797b51d.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,13 +127,13 @@ private void InitializeComponent()
OnInitializeCompleted();

Bindings = new MainPage_Bindings(this);
((global::Microsoft.UI.Xaml.FrameworkElement)this).Loading += (s, e) =>
{
__that.Bindings.UpdateResources();
}
;
((global::Microsoft.UI.Xaml.FrameworkElement)this).Loading += __UpdateBindingsAndResources;
}
partial void OnInitializeCompleted();
private void __UpdateBindingsAndResources(global::Microsoft.UI.Xaml.FrameworkElement s, object e)
{
this.Bindings.UpdateResources();
}
private void ApplyMethod_1(global::Microsoft.UI.Xaml.Style __p1, MainPage __that, global::Microsoft.UI.Xaml.NameScope __nameScope)
{
global::Uno.UI.Helpers.MarkupHelper.SetElementProperty(__p1, "OriginalSourceLocation", "file:///C:/Project/0/MainPage.xaml#L7:6");
Expand Down Expand Up @@ -214,14 +214,9 @@ public _View Build(object __ResourceOwner_1)
}
.GenericApply(__that, __nameScope, (ApplyMethod_12 ))
;
if (__rootInstance is FrameworkElement __fe)
if (__rootInstance is FrameworkElement __fe)
{
var owner = this;
__fe.Loading += delegate
{
_component_0.UpdateResourceBindings();
}
;
__fe.Loading += __UpdateBindingsAndResources;
}
if (__rootInstance is DependencyObject d)
{
Expand All @@ -234,7 +229,7 @@ public _View Build(object __ResourceOwner_1)
}
return __rootInstance;
}
private global::Microsoft.UI.Xaml.Markup.ComponentHolder _component_0_Holder { get; set; } = new global::Microsoft.UI.Xaml.Markup.ComponentHolder(isWeak: true);
private global::Microsoft.UI.Xaml.Markup.ComponentHolder _component_0_Holder { get; } = new global::Microsoft.UI.Xaml.Markup.ComponentHolder(isWeak: true);
private global::Microsoft.UI.Xaml.Controls.Button _component_0
{
get
Expand All @@ -245,6 +240,11 @@ public _View Build(object __ResourceOwner_1)
{
_component_0_Holder.Instance = value;
}
}
private void __UpdateBindingsAndResources(global::Microsoft.UI.Xaml.FrameworkElement s, object e)
{
var owner = this;
_component_0.UpdateResourceBindings();
}
private void ApplyMethod_10(global::Microsoft.UI.Xaml.Controls.TextBlock __p1, _MainPage_d6cd66944958ced0c513e0a04797b51d_TestReproMainPageSC0 __that, global::Microsoft.UI.Xaml.NameScope __nameScope)
{
Expand Down Expand Up @@ -275,7 +275,7 @@ private void ApplyMethod_12(global::Microsoft.UI.Xaml.Controls.StackPanel __p1,
}

}
private global::Microsoft.UI.Xaml.Markup.ComponentHolder _component_0_Holder { get; set; } = new global::Microsoft.UI.Xaml.Markup.ComponentHolder(isWeak: true);
private global::Microsoft.UI.Xaml.Markup.ComponentHolder _component_0_Holder { get; } = new global::Microsoft.UI.Xaml.Markup.ComponentHolder(isWeak: true);
private global::Microsoft.UI.Xaml.Controls.Page _component_0
{
get
Expand Down
12 changes: 6 additions & 6 deletions ...eratorTests/Out/SOSLIOFPLS/XamlCodeGenerator_MainPage_d6cd66944958ced0c513e0a04797b51d.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,13 @@ private void InitializeComponent()
OnInitializeCompleted();

Bindings = new MainPage_Bindings(this);
((global::Microsoft.UI.Xaml.FrameworkElement)this).Loading += (s, e) =>
{
__that.Bindings.UpdateResources();
}
;
((global::Microsoft.UI.Xaml.FrameworkElement)this).Loading += __UpdateBindingsAndResources;
}
partial void OnInitializeCompleted();
private void __UpdateBindingsAndResources(global::Microsoft.UI.Xaml.FrameworkElement s, object e)
{
this.Bindings.UpdateResources();
}
private void ApplyMethod_1(global::Microsoft.UI.Xaml.Style __p1, MainPage __that, global::Microsoft.UI.Xaml.NameScope __nameScope)
{
global::Uno.UI.Helpers.MarkupHelper.SetElementProperty(__p1, "OriginalSourceLocation", "file:///C:/Project/0/MainPage.xaml#L7:6");
Expand Down Expand Up @@ -155,7 +155,7 @@ private void ApplyMethod_8(global::Microsoft.UI.Xaml.Controls.Page __p1, MainPag
__p1.CreationComplete();
}

private global::Microsoft.UI.Xaml.Markup.ComponentHolder _component_0_Holder { get; set; } = new global::Microsoft.UI.Xaml.Markup.ComponentHolder(isWeak: true);
private global::Microsoft.UI.Xaml.Markup.ComponentHolder _component_0_Holder { get; } = new global::Microsoft.UI.Xaml.Markup.ComponentHolder(isWeak: true);
private global::Microsoft.UI.Xaml.Controls.Page _component_0
{
get
Expand Down
12 changes: 6 additions & 6 deletions ...neratorTests/Out/SOSLIOFRT/XamlCodeGenerator_MainPage_d6cd66944958ced0c513e0a04797b51d.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,13 @@ private void InitializeComponent()
OnInitializeCompleted();

Bindings = new MainPage_Bindings(this);
((global::Microsoft.UI.Xaml.FrameworkElement)this).Loading += (s, e) =>
{
__that.Bindings.UpdateResources();
}
;
((global::Microsoft.UI.Xaml.FrameworkElement)this).Loading += __UpdateBindingsAndResources;
}
partial void OnInitializeCompleted();
private void __UpdateBindingsAndResources(global::Microsoft.UI.Xaml.FrameworkElement s, object e)
{
this.Bindings.UpdateResources();
}
private void ApplyMethod_0(global::Microsoft.UI.Xaml.Controls.TextBlock __p1, MainPage __that, global::Microsoft.UI.Xaml.NameScope __nameScope)
{
global::Uno.UI.FrameworkElementHelper.SetBaseUri(__p1, __baseUri_MainPage_d6cd66944958ced0c513e0a04797b51d, "file:///C:/Project/0/MainPage.xaml", 9, 3);
Expand Down Expand Up @@ -121,7 +121,7 @@ private void ApplyMethod_3(global::Microsoft.UI.Xaml.Controls.Page __p1, MainPag
__p1.CreationComplete();
}

private global::Microsoft.UI.Xaml.Markup.ComponentHolder _component_0_Holder { get; set; } = new global::Microsoft.UI.Xaml.Markup.ComponentHolder(isWeak: true);
private global::Microsoft.UI.Xaml.Markup.ComponentHolder _component_0_Holder { get; } = new global::Microsoft.UI.Xaml.Markup.ComponentHolder(isWeak: true);
private global::Microsoft.UI.Xaml.Controls.Page _component_0
{
get
Expand Down
12 changes: 6 additions & 6 deletions ...CodeGeneratorTests/Out/TAA/XamlCodeGenerator_MainPage_d6cd66944958ced0c513e0a04797b51d.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,14 +108,14 @@ private void InitializeComponent()
OnInitializeCompleted();

Bindings = new MainPage_Bindings(this);
((global::Microsoft.UI.Xaml.FrameworkElement)this).Loading += (s, e) =>
{
__that.Bindings.Update();
__that.Bindings.UpdateResources();
}
;
((global::Microsoft.UI.Xaml.FrameworkElement)this).Loading += __UpdateBindingsAndResources;
}
partial void OnInitializeCompleted();
private void __UpdateBindingsAndResources(global::Microsoft.UI.Xaml.FrameworkElement s, object e)
{
this.Bindings.Update();
this.Bindings.UpdateResources();
}
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
{
Expand Down
10 changes: 5 additions & 5 deletions ...eneratorTests/Out/TBTNSICB/XamlCodeGenerator_MainPage_d6cd66944958ced0c513e0a04797b51d.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,13 @@ private void InitializeComponent()
OnInitializeCompleted();

Bindings = new MainPage_Bindings(this);
((global::Microsoft.UI.Xaml.FrameworkElement)this).Loading += (s, e) =>
{
__that.Bindings.UpdateResources();
}
;
((global::Microsoft.UI.Xaml.FrameworkElement)this).Loading += __UpdateBindingsAndResources;
}
partial void OnInitializeCompleted();
private void __UpdateBindingsAndResources(global::Microsoft.UI.Xaml.FrameworkElement s, object e)
{
this.Bindings.UpdateResources();
}
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.Page _component_0
{
Expand Down
48 changes: 24 additions & 24 deletions ...Out/TDBMIDTIRD/XamlCodeGenerator_MyResourceDictionary_92716e07ff456818f6d4125e055d4d57.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,15 +97,9 @@ public _View Build(object __ResourceOwner_1)
}
))
;
if (__rootInstance is FrameworkElement __fe)
if (__rootInstance is FrameworkElement __fe)
{
var owner = this;
__fe.Loading += delegate
{
_component_0.UpdateResourceBindings();
_component_0.ApplyXBind();
}
;
__fe.Loading += __UpdateBindingsAndResources;
}
if (__rootInstance is DependencyObject d)
{
Expand Down Expand Up @@ -142,6 +136,12 @@ public _View Build(object __ResourceOwner_1)
_tbSubject.ElementInstance = value;
}
}
private void __UpdateBindingsAndResources(global::Microsoft.UI.Xaml.FrameworkElement s, object e)
{
var owner = this;
_component_0.UpdateResourceBindings();
_component_0.ApplyXBind();
}
private static bool TryGetInstance_xBind_1(global::TestRepro.MyModel ___tctx, out object o)
{
o = null;
Expand Down Expand Up @@ -276,15 +276,9 @@ public _View Build(object __ResourceOwner_1)
}
))
;
if (__rootInstance is FrameworkElement __fe)
if (__rootInstance is FrameworkElement __fe)
{
var owner = this;
__fe.Loading += delegate
{
_component_0.UpdateResourceBindings();
_component_0.ApplyXBind();
}
;
__fe.Loading += __UpdateBindingsAndResources;
}
if (__rootInstance is DependencyObject d)
{
Expand Down Expand Up @@ -321,6 +315,12 @@ public _View Build(object __ResourceOwner_1)
_tbSubject.ElementInstance = value;
}
}
private void __UpdateBindingsAndResources(global::Microsoft.UI.Xaml.FrameworkElement s, object e)
{
var owner = this;
_component_0.UpdateResourceBindings();
_component_0.ApplyXBind();
}
private static bool TryGetInstance_xBind_2(global::TestRepro.MyModel ___tctx, out object o)
{
o = null;
Expand Down Expand Up @@ -370,15 +370,9 @@ public _View Build(object __ResourceOwner_1)
}
))
;
if (__rootInstance is FrameworkElement __fe)
if (__rootInstance is FrameworkElement __fe)
{
var owner = this;
__fe.Loading += delegate
{
_component_0.UpdateResourceBindings();
_component_0.ApplyXBind();
}
;
__fe.Loading += __UpdateBindingsAndResources;
}
if (__rootInstance is DependencyObject d)
{
Expand Down Expand Up @@ -415,6 +409,12 @@ public _View Build(object __ResourceOwner_1)
_tbSubject.ElementInstance = value;
}
}
private void __UpdateBindingsAndResources(global::Microsoft.UI.Xaml.FrameworkElement s, object e)
{
var owner = this;
_component_0.UpdateResourceBindings();
_component_0.ApplyXBind();
}
private static bool TryGetInstance_xBind_3(global::TestRepro.MyModel ___tctx, out object o)
{
o = null;
Expand Down
12 changes: 6 additions & 6 deletions ...deGeneratorTests/Out/TIDFA/XamlCodeGenerator_MainPage_d6cd66944958ced0c513e0a04797b51d.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,14 @@ private void InitializeComponent()
OnInitializeCompleted();

Bindings = new MainPage_Bindings(this);
((global::Microsoft.UI.Xaml.FrameworkElement)this).Loading += (s, e) =>
{
__that.Bindings.Update();
__that.Bindings.UpdateResources();
}
;
((global::Microsoft.UI.Xaml.FrameworkElement)this).Loading += __UpdateBindingsAndResources;
}
partial void OnInitializeCompleted();
private void __UpdateBindingsAndResources(global::Microsoft.UI.Xaml.FrameworkElement s, object e)
{
this.Bindings.Update();
this.Bindings.UpdateResources();
}
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.TextBox _component_0
{
Expand Down
12 changes: 6 additions & 6 deletions ...CodeGeneratorTests/Out/TIM/XamlCodeGenerator_MainPage_d6cd66944958ced0c513e0a04797b51d.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,14 +158,14 @@ private void InitializeComponent()
OnInitializeCompleted();

Bindings = new MainPage_Bindings(this);
((global::Microsoft.UI.Xaml.FrameworkElement)this).Loading += (s, e) =>
{
__that.Bindings.Update();
__that.Bindings.UpdateResources();
}
;
((global::Microsoft.UI.Xaml.FrameworkElement)this).Loading += __UpdateBindingsAndResources;
}
partial void OnInitializeCompleted();
private void __UpdateBindingsAndResources(global::Microsoft.UI.Xaml.FrameworkElement s, object e)
{
this.Bindings.Update();
this.Bindings.UpdateResources();
}
private global::System.Action<global::Microsoft.UI.Xaml.Controls.Primitives.ButtonBase> __0_Click_P1_Button_Click_Builder;
private global::System.Action<global::Microsoft.UI.Xaml.Controls.Primitives.ButtonBase> __1_Click_P2_Button_Click_Builder;
private global::System.Action<global::Microsoft.UI.Xaml.Controls.Primitives.ButtonBase> __2_Click_P3_Button_Click_Builder;
Expand Down
10 changes: 5 additions & 5 deletions ...eneratorTests/Out/TMEWSFEL/XamlCodeGenerator_MainPage_d6cd66944958ced0c513e0a04797b51d.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,13 @@ private void InitializeComponent()
OnInitializeCompleted();

Bindings = new MainPage_Bindings(this);
((global::Microsoft.UI.Xaml.FrameworkElement)this).Loading += (s, e) =>
{
__that.Bindings.UpdateResources();
}
;
((global::Microsoft.UI.Xaml.FrameworkElement)this).Loading += __UpdateBindingsAndResources;
}
partial void OnInitializeCompleted();
private void __UpdateBindingsAndResources(global::Microsoft.UI.Xaml.FrameworkElement s, object e)
{
this.Bindings.UpdateResources();
}
private global::Microsoft.UI.Xaml.Markup.ComponentHolder _component_0_Holder = new global::Microsoft.UI.Xaml.Markup.ComponentHolder(isWeak: true);
private global::TestRepro.BasePage _component_0
{
Expand Down
Loading

0 comments on commit 7aae564

Please sign in to comment.