fix: [macOS] Add NativeCtorGenerator support

unoplatform · Apr 2, 2020 · 210b30b · 210b30b
1 parent bc2841f
commit 210b30b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators/NativeCtor/NativeCtorsGenerator.cs b/src/SourceGenerators/Uno.UI.SourceGenerators/NativeCtor/NativeCtorsGenerator.cs
@@ -20,8 +20,9 @@ public override void Execute(SourceGeneratorContext context)
 		private class SerializationMethodsGenerator : SymbolVisitor
 		{ 
 			private readonly SourceGeneratorContext _context; 
-			private readonly Compilation _comp; 
-			private readonly INamedTypeSymbol _iosViewSymbol; 
+			private readonly Compilation _comp;
+			private readonly INamedTypeSymbol _iosViewSymbol;
+			private readonly INamedTypeSymbol _macosViewSymbol;
 			private readonly INamedTypeSymbol _androidViewSymbol; 
 			private readonly INamedTypeSymbol _intPtrSymbol; 
 			private readonly INamedTypeSymbol _jniHandleOwnershipSymbol;
@@ -39,7 +40,7 @@ private class SerializationMethodsGenerator : SymbolVisitor
 
 namespace {0}
 {{
-#if __IOS__
+#if __IOS__ || __MACOS__
 	[global::Foundation.Register]
 #endif
 	partial class {1}
@@ -58,7 +59,7 @@ partial class {1}
 		/// </remarks>
 		public {3}(IntPtr javaReference, global::Android.Runtime.JniHandleOwnership transfer) : base (javaReference, transfer) {{ }}
 #endif
-#if __IOS__
+#if __IOS__ || __MACOS__
 		/// <summary>
 		/// Native constructor, do not use explicitly.
 		/// </summary>
@@ -79,6 +80,7 @@ public SerializationMethodsGenerator(SourceGeneratorContext context)
 				_comp = context.Compilation;
 
 				_iosViewSymbol = context.Compilation.GetTypeByMetadataName("UIKit.UIView");
+				_macosViewSymbol = context.Compilation.GetTypeByMetadataName("AppKit.NSView");
 				_androidViewSymbol = context.Compilation.GetTypeByMetadataName("Android.Views.View");
 				_intPtrSymbol = context.Compilation.GetTypeByMetadataName("System.IntPtr");
 				_jniHandleOwnershipSymbol = context.Compilation.GetTypeByMetadataName("Android.Runtime.JniHandleOwnership");
@@ -117,10 +119,11 @@ public override void VisitNamespace(INamespaceSymbol symbol)
 			private void ProcessType(INamedTypeSymbol typeSymbol)
 			{
 				var isiOSView = typeSymbol.Is(_iosViewSymbol);
+				var ismacOSView = typeSymbol.Is(_macosViewSymbol);
 				var isAndroidView = typeSymbol.Is(_androidViewSymbol);
 				var smallSymbolName = typeSymbol.ToString().Replace(typeSymbol.ContainingNamespace + ".", "");
 
-				if (isiOSView)
+				if (isiOSView || ismacOSView)
 				{
 					var nativeCtor = typeSymbol
 						.GetMethods()

diff --git a/...Uno.UI/DataBinding/BinderCollector.iOS.cs → ...I/DataBinding/BinderCollector.iOSmacOS.cs b/...Uno.UI/DataBinding/BinderCollector.iOS.cs → ...I/DataBinding/BinderCollector.iOSmacOS.cs
@@ -1,5 +1,4 @@
-#if XAMARIN_IOS
-using Windows.UI.Core;
+using Windows.UI.Core;
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -47,5 +46,4 @@ internal static void RequestCollect()
             }
         }
     }
-}
-#endif
+}