fix: Adjust support for x:Bind edition

unoplatform · Nov 18, 2022 · 5d1de36 · 5d1de36
1 parent 15526cb
commit 5d1de36
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 12 deletions.
diff --git a/...ators/Uno.UI.SourceGenerators.netcore.Tests/MetadataUpdateTests/Given_HotReloadService.cs b/...ators/Uno.UI.SourceGenerators.netcore.Tests/MetadataUpdateTests/Given_HotReloadService.cs
@@ -51,6 +51,11 @@ public record DiagnosticsResult(string Id);
 			var scenarioName = Path.GetFileName(scenarioFolder);
 			var path = Path.Combine(scenarioFolder, "Scenario.json");
 
+			//if(scenarioName != "When_Simple_Xaml_Add_xBind_Simple_Property_Update")
+			//{
+			//	continue;
+			//}
+
 			if (File.Exists(path))
 			{
 				var scenarios = ReadScenarioConfig(path);

diff --git a/...dataUpdateTests/Scenarios/When_Simple_Xaml_Add_xBind_Simple_Property_Update/Scenario.json b/...dataUpdateTests/Scenarios/When_Simple_Xaml_Add_xBind_Simple_Property_Update/Scenario.json
@@ -4,11 +4,8 @@
 		"IsMono": false,
 		"PassResults": [
 			{
-				"MetadataUpdates": 0,
-				"Diagnostics": [
-					// MainPage_c2bc688a73eab5431d787dcd21fe32b9.cs(68,83): error ENC0049: Ceasing to capture variable '__that' requires restarting the application.
-					{ "Id": "ENC0049" }
-				]
+				"MetadataUpdates": 1,
+				"Diagnostics": []
 			}
 		]
 	},
@@ -17,11 +14,8 @@
 		"IsMono": true,
 		"PassResults": [
 			{
-				"MetadataUpdates": 0,
-				"Diagnostics": [
-					// MainPage_c2bc688a73eab5431d787dcd21fe32b9.cs(68,83): error ENC0049: Ceasing to capture variable '__that' requires restarting the application.
-					{ "Id": "ENC0049" }
-				]
+				"MetadataUpdates": 1,
+				"Diagnostics": []
 			}
 		]
 	}

diff --git a/...re.Tests/MetadataUpdateTests/Scenarios/When_Simple_Xaml_Single_xName_Change/Scenario.json b/...re.Tests/MetadataUpdateTests/Scenarios/When_Simple_Xaml_Single_xName_Change/Scenario.json
@@ -6,6 +6,7 @@
 			{
 				"MetadataUpdates": 0,
 				"Diagnostics": [
+					// error ENC0009: Updating the type of method requires restarting the application.
 					{ "Id": "ENC0009" }
 				]
 			}
@@ -18,6 +19,7 @@
 			{
 				"MetadataUpdates": 0,
 				"Diagnostics": [
+					// error ENC0009: Updating the type of method requires restarting the application.
 					{ "Id": "ENC0009" }
 				]
 			}

diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XamlFileGenerator.cs b/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XamlFileGenerator.cs
@@ -4313,6 +4313,10 @@ private string BuildXBindEvalFunction(XamlMemberDefinition member, XamlObjectDef
 				? ", new [] {" + string.Join(", ", formattedPaths) + "}"
 				: "";
 
+			var applyBindingParameters = _isHotReloadEnabled
+				? "__that, (___b, __that)"
+				: "___b";
+
 			if (isInsideDataTemplate)
 			{
 				var dataTypeObject = FindMember(dataTemplateObject!, "DataType", XamlConstants.XamlXmlNamespace);
@@ -4360,7 +4364,7 @@ string buildBindBack()
 					}
 				}
 
-				return $".BindingApply(___b => /*defaultBindMode{GetDefaultBindMode()}*/ global::Uno.UI.Xaml.BindingHelper.SetBindingXBindProvider(___b, null, ___ctx => ___ctx is {GetType(dataType)} ___tctx ? (object)({contextFunction}) : null, {buildBindBack()} {pathsArray}))";
+				return $".BindingApply({applyBindingParameters} => /*defaultBindMode{GetDefaultBindMode()}*/ global::Uno.UI.Xaml.BindingHelper.SetBindingXBindProvider(___b, null, ___ctx => ___ctx is {GetType(dataType)} ___tctx ? (object)({contextFunction}) : null, {buildBindBack()} {pathsArray}))";
 			}
 			else
 			{
@@ -4407,7 +4411,7 @@ string buildBindBack()
 				}
 
 				var bindFunction = $"___ctx is {_xClassName} ___tctx ? (object)({rawFunction}) : null";
-				return $".BindingApply(___b =>  /*defaultBindMode{GetDefaultBindMode()} {originalRawFunction}*/ global::Uno.UI.Xaml.BindingHelper.SetBindingXBindProvider(___b, __that, ___ctx => {bindFunction}, {buildBindBack()} {pathsArray}))";
+				return $".BindingApply({applyBindingParameters} =>  /*defaultBindMode{GetDefaultBindMode()} {originalRawFunction}*/ global::Uno.UI.Xaml.BindingHelper.SetBindingXBindProvider(___b, __that, ___ctx => {bindFunction}, {buildBindBack()} {pathsArray}))";
 			}
 		}
 

diff --git a/src/Uno.UI/UI/Xaml/Markup/ApplyExtensions.cs b/src/Uno.UI/UI/Xaml/Markup/ApplyExtensions.cs
@@ -7,6 +7,7 @@ namespace Uno.UI.Helpers.Xaml
 	public static class ApplyExtensions
 	{
 		public delegate Binding BindingApplyHandler(Binding binding);
+		public delegate Binding BindingApplyWithParamHandler(Binding binding, object that);
 
 		/// <summary>
 		/// Executes the provided apply handler on the binding instance. Used by the XAML code generator.
@@ -18,6 +19,16 @@ public static Binding BindingApply(this Binding instance, BindingApplyHandler ap
 			return instance;
 		}
 
+		/// <summary>
+		/// Executes the provided apply handler on the binding instance. Used by the XAML code generator.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public static Binding BindingApply(this Binding instance, object that, BindingApplyWithParamHandler apply)
+		{
+			apply(instance, that);
+			return instance;
+		}
+
 		/// <summary>
 		/// Executes the provided apply handler on the specified instance. Used by the XAML code generator.
 		/// </summary>