[generator] Prevent generating duplicate EventArgs classes.

Author: jpobst

src/Xamarin.SourceWriter/Models/PropertyWriter.cs

@@ -35,6 +35,7 @@ public class PropertyWriter : ISourceWriter
 		public List<AttributeWriter> SetterAttributes { get; } = new List<AttributeWriter> ();
 		public int Priority { get; set; }
 		public string ExplicitInterfaceImplementation { get; set; }
+		public Visibility AutoSetterVisibility { get; set; }
 
 		public void SetVisibility (string visibility)
 		{
@@ -165,6 +166,8 @@ protected virtual void WriteAutomaticPropertyBody (CodeWriter writer)
 					writer.WriteLine ();
 					writer.Indent ();
 					need_unindent = true;
+				} else {
+					writer.Write (" ");
 				}
 
 				WriteGetterComments (writer);
@@ -187,6 +190,14 @@ protected virtual void WriteAutomaticPropertyBody (CodeWriter writer)
 
 				WriteSetterComments (writer);
 				WriteSetterAttributes (writer);
+
+				if (AutoSetterVisibility == Visibility.Private && !IsPrivate)
+					writer.Write ("private ");
+				else if (AutoSetterVisibility == Visibility.Protected && !IsProtected)
+					writer.Write ("protected ");
+				if (AutoSetterVisibility == Visibility.Internal && !IsInternal)
+					writer.Write ("internal ");
+
 				writer.Write ("set; ");
 
 				if (need_unindent) {

tests/generator-Tests/Unit-Tests/CodeGeneratorTests.cs

@@ -195,6 +195,26 @@ public void ManagedOverrideProperty_Override ()
 
 			Assert.True (writer.ToString ().Contains ("public override unsafe int Name {"));
 		}
+
+		[Test]
+		public void WriteDuplicateInterfaceEventArgs ()
+		{
+			// If we have 2 methods that would each create the same EventArgs class,
+			// make sure we combine them into 1 class with both members instead.
+			var iface = SupportTypeBuilder.CreateEmptyInterface ("java.code.AnimatorListener");
+
+			var method1 = SupportTypeBuilder.CreateMethod (iface, "OnAnimationEnd", options, "boolean", false, true, new Parameter ("param1", "int", "int", false));
+			var method2 = SupportTypeBuilder.CreateMethod (iface, "OnAnimationEnd", options, "boolean", false, true, new Parameter ("param1", "int", "int", false), new Parameter ("param2", "int", "int", false));
+
+			iface.Methods.Add (method1);
+			iface.Methods.Add (method2);
+
+			generator.Context.ContextTypes.Push (iface);
+			generator.WriteType (iface, string.Empty, new GenerationInfo ("", "", "MyAssembly"));
+			generator.Context.ContextTypes.Pop ();
+
+			Assert.AreEqual (GetExpected (nameof (WriteDuplicateInterfaceEventArgs)), writer.ToString ().NormalizeLineEndings ());
+		}
 	}
 
 	[TestFixture]

tests/generator-Tests/expected.ji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs

@@ -123,42 +123,22 @@ public unsafe void OnEvent (global::Com.Google.Android.Exoplayer.Drm.IExoMediaDr
 	public partial class ExoMediaDrmOnEventEventArgs : global::System.EventArgs {
 		public ExoMediaDrmOnEventEventArgs (global::Com.Google.Android.Exoplayer.Drm.IExoMediaDrm p0, byte[] p1, int p2, int p3, byte[] p4)
 		{
-			this.p0 = p0;
-			this.p1 = p1;
-			this.p2 = p2;
-			this.p3 = p3;
-			this.p4 = p4;
+			this.P0 = p0;
+			this.P1 = p1;
+			this.P2 = p2;
+			this.P3 = p3;
+			this.P4 = p4;
 		}
 
-		global::Com.Google.Android.Exoplayer.Drm.IExoMediaDrm p0;
+		public global::Com.Google.Android.Exoplayer.Drm.IExoMediaDrm P0 { get; private set; }
 
-		public global::Com.Google.Android.Exoplayer.Drm.IExoMediaDrm P0 {
-			get { return p0; }
-		}
-
-		byte[] p1;
-
-		public byte[] P1 {
-			get { return p1; }
-		}
-
-		int p2;
+		public byte[] P1 { get; private set; }
 
-		public int P2 {
-			get { return p2; }
-		}
-
-		int p3;
+		public int P2 { get; private set; }
 
-		public int P3 {
-			get { return p3; }
-		}
+		public int P3 { get; private set; }
 
-		byte[] p4;
-
-		public byte[] P4 {
-			get { return p4; }
-		}
+		public byte[] P4 { get; private set; }
 
 	}
 

tools/generator/SourceWriters/BoundInterface.cs

@@ -104,8 +104,17 @@ void AddInterfaceEventHandler (InterfaceGen iface, CodeGenerationOptions opt, Co
 
 			foreach (var method in iface.Methods.Where (m => m.EventName != string.Empty)) {
 				if (method.RetVal.IsVoid || method.IsEventHandlerWithHandledProperty) {
-					if (!method.IsSimpleEventHandler || method.IsEventHandlerWithHandledProperty)
-						post_sibling_types.Add (new InterfaceEventArgsClass (iface, method, opt, context));
+					if (!method.IsSimpleEventHandler || method.IsEventHandlerWithHandledProperty) {
+						var event_args_class = post_sibling_types.OfType<InterfaceEventArgsClass> ().SingleOrDefault (c => c.Name == iface.GetArgsName (method));
+
+						// Check if there's an existing EventArgs class to add to
+						if (event_args_class is null) {
+							event_args_class = new InterfaceEventArgsClass (iface, method);
+							post_sibling_types.Add (event_args_class);
+						}
+
+						event_args_class.AddMembersFromMethod (iface, method, opt);
+					}
 				} else {
 					var del = new DelegateWriter {
 						Name = iface.GetEventDelegateName (method),

tools/generator/SourceWriters/BoundMethod.cs

@@ -12,8 +12,12 @@ public class BoundMethod : MethodWriter
 	{
 		readonly MethodCallback callback;
 
+		public Method JavaMethod { get; }
+
 		public BoundMethod (GenBase type, Method method, CodeGenerationOptions opt, bool generateCallbacks)
 		{
+			JavaMethod = method;
+
 			if (generateCallbacks && method.IsVirtual)
 				callback = new MethodCallback (type, method, opt, null, method.IsReturnCharSequence);
 

tools/generator/SourceWriters/InterfaceEventArgsClass.cs

@@ -10,23 +10,31 @@ namespace generator.SourceWriters
 {
 	public class InterfaceEventArgsClass : ClassWriter
 	{
-		public InterfaceEventArgsClass (InterfaceGen iface, Method method, CodeGenerationOptions opt, CodeGeneratorContext context)
+		public InterfaceEventArgsClass (InterfaceGen iface, Method method)
 		{
 			Name = iface.GetArgsName (method);
 			Inherits = "global::System.EventArgs";
 
 			IsPublic = true;
 			IsPartial = true;
 
-			UsePriorityOrder = true;
-
 			Comments.Add ($"// event args for {iface.JavaName}.{method.JavaName}");
 
-			AddConstructor (iface, method, opt);
-
+			// Add: public bool Handled { get; set; }
 			if (method.IsEventHandlerWithHandledProperty)
-				Properties.Add (new HandledProperty ());
+				Properties.Add (new PropertyWriter {
+					Name = "Handled",
+					PropertyType = TypeReferenceWriter.Bool,
+					IsPublic = true,
+					HasGet = true,
+					HasSet = true,
+					IsAutoProperty = true
+				});
+		}
 
+		public void AddMembersFromMethod (InterfaceGen iface, Method method, CodeGenerationOptions opt)
+		{
+			AddConstructor (iface, method, opt);
 			AddProperties (method, opt);
 		}
 
@@ -39,15 +47,15 @@ void AddConstructor (InterfaceGen iface, Method method, CodeGenerationOptions op
 
 			if (method.IsEventHandlerWithHandledProperty) {
 				ctor.Parameters.Add (new MethodParameterWriter ("handled", TypeReferenceWriter.Bool));
-				ctor.Body.Add ("this.handled = handled;");
+				ctor.Body.Add ("this.Handled = handled;");
 			}
 
 			foreach (var p in method.Parameters) {
 				if (p.IsSender)
 					continue;
 
 				ctor.Parameters.Add (new MethodParameterWriter (p.Name, new TypeReferenceWriter (opt.GetTypeReferenceName (p))));
-				ctor.Body.Add ($"this.{opt.GetSafeIdentifier (p.Name)} = {opt.GetSafeIdentifier (p.Name)};");
+				ctor.Body.Add ($"this.{p.PropertyName} = {opt.GetSafeIdentifier (p.Name)};");
 			}
 
 			Constructors.Add (ctor);
@@ -59,46 +67,22 @@ void AddProperties (Method method, CodeGenerationOptions opt)
 				if (p.IsSender)
 					continue;
 
-				Fields.Add (new FieldWriter {
-					Name = opt.GetSafeIdentifier (p.Name),
-					Type = new TypeReferenceWriter (opt.GetTypeReferenceName (p))
-				});
+				// We've already added this property from a different overload
+				if (Properties.Any (prop => prop.Name == p.PropertyName))
+					continue;
 
 				var prop = new PropertyWriter {
 					Name = p.PropertyName,
 					PropertyType = new TypeReferenceWriter (opt.GetTypeReferenceName (p)),
 					IsPublic = true,
-					HasGet = true
+					HasGet = true,
+					HasSet = true,
+					IsAutoProperty = true,
+					AutoSetterVisibility = Visibility.Private
 				};
 
-				prop.GetBody.Add ($"return {opt.GetSafeIdentifier (p.Name)};");
-
 				Properties.Add (prop);
 			}
 		}
 	}
-
-	public class HandledProperty : PropertyWriter
-	{
-		public HandledProperty ()
-		{
-			Name = "Handled";
-			PropertyType = TypeReferenceWriter.Bool;
-
-			IsPublic = true;
-
-			HasGet = true;
-			GetBody.Add ("return handled;");
-
-			HasSet = true;
-			SetBody.Add ("handled = value;");
-		}
-
-		public override void Write (CodeWriter writer)
-		{
-			writer.Write ("bool handled;");
-
-			base.Write (writer);
-		}
-	}
 }