Fixes for Mono.Android.dll.

Author: jpobst

src/Xamarin.SourceWriter/Models/DelegateWriter.cs

@@ -4,11 +4,12 @@
 
 namespace Xamarin.SourceWriter
 {
-	public class DelegateWriter : ISourceWriter
+	public class DelegateWriter : ISourceWriter, ITakeParameters
 	{
 		private Visibility visibility;
 
 		public string Name { get; set; }
+		public List<MethodParameterWriter> Parameters { get; } = new List<MethodParameterWriter> ();
 		public TypeReferenceWriter Type { get; set; }
 		public List<string> Comments { get; } = new List<string> ();
 		public List<AttributeWriter> Attributes { get; } = new List<AttributeWriter> ();
@@ -23,7 +24,6 @@ public class DelegateWriter : ISourceWriter
 		public bool IsProtected { get => visibility == Visibility.Protected; set => visibility = value ? Visibility.Protected : Visibility.Default; }
 		public int Priority { get; set; }
 		public bool IsShadow { get; set; }
-		public string Signature { get; set; }
 
 		public void SetVisibility (string visibility)
 		{
@@ -81,10 +81,29 @@ public virtual void WriteSignature (CodeWriter writer)
 			if (IsShadow)
 				writer.Write ("new ");
 
+			writer.Write ("delegate ");
+
 			WriteType (writer);
 
 			writer.Write (Name + " ");
-			writer.Write ($"({Signature})");
+			writer.Write ("(");
+
+			WriteParameters (writer);
+
+			writer.Write (")");
+
+			writer.Write (";");
+		}
+
+		protected virtual void WriteParameters (CodeWriter writer)
+		{
+			for (var i = 0; i < Parameters.Count; i++) {
+				var p = Parameters [i];
+				p.WriteParameter (writer);
+
+				if (i < Parameters.Count - 1)
+					writer.Write (", ");
+			}
 		}
 
 		protected virtual void WriteType (CodeWriter writer)

src/Xamarin.SourceWriter/Models/FieldWriter.cs

@@ -6,27 +6,27 @@ namespace Xamarin.SourceWriter
 {
 	public class FieldWriter : ISourceWriter
 	{
-		private Visibility visibility;
+		Visibility visibility;
 
 		public string Name { get; set; }
 		public TypeReferenceWriter Type { get; set; }
 		public List<string> Comments { get; } = new List<string> ();
 		public List<AttributeWriter> Attributes { get; } = new List<AttributeWriter> ();
-		public bool IsPublic { get => visibility == Visibility.Public; set => visibility = value ? Visibility.Public : Visibility.Default; }
+		public bool IsPublic { get => visibility.HasFlag (Visibility.Public); set => visibility = value ? Visibility.Public : Visibility.Default; }
 		public bool UseExplicitPrivateKeyword { get; set; }
-		public bool IsInternal { get => visibility == Visibility.Internal; set => visibility = value ? Visibility.Internal : Visibility.Default; }
+		public bool IsInternal { get => visibility.HasFlag (Visibility.Internal); set => visibility = value ? Visibility.Internal : Visibility.Default; }
 		public bool IsConst { get; set; }
 		public string Value { get; set; }
 		public bool IsStatic { get; set; }
 		public bool IsReadonly { get; set; }
-		public bool IsPrivate { get => visibility == Visibility.Private; set => visibility = value ? Visibility.Private : Visibility.Default; }
-		public bool IsProtected { get => visibility == Visibility.Protected; set => visibility = value ? Visibility.Protected : Visibility.Default; }
+		public bool IsPrivate { get => visibility.HasFlag (Visibility.Private); set => visibility = value ? Visibility.Private : Visibility.Default; }
+		public bool IsProtected { get => visibility.HasFlag (Visibility.Protected); set => visibility = value ? Visibility.Protected : Visibility.Default; }
 		public int Priority { get; set; }
 		public bool IsShadow { get; set; }
 
 		public void SetVisibility (string visibility)
 		{
-			switch (visibility?.ToLowerInvariant ()) {
+			switch (visibility?.ToLowerInvariant ().Trim ()) {
 				case "public":
 					IsPublic = true;
 					break;
@@ -39,6 +39,9 @@ public void SetVisibility (string visibility)
 				case "private":
 					IsPrivate = true;
 					break;
+				default:
+					Console.WriteLine ($"Unrecognized field visibility: `{visibility}`");
+					break;
 			}
 		}
 
@@ -65,6 +68,8 @@ public virtual void WriteSignature (CodeWriter writer)
 		{
 			if (IsPublic)
 				writer.Write ("public ");
+			else if (IsProtected)
+				writer.Write ("protected ");
 			else if (IsInternal)
 				writer.Write ("internal ");
 			else if (IsPrivate)

src/Xamarin.SourceWriter/Models/ITakeParameters.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Xamarin.SourceWriter
+{
+	public interface ITakeParameters
+	{
+		List<MethodParameterWriter> Parameters { get; }
+	}
+}

src/Xamarin.SourceWriter/Models/MethodWriter.cs

@@ -4,7 +4,7 @@
 
 namespace Xamarin.SourceWriter
 {
-	public class MethodWriter : ISourceWriter
+	public class MethodWriter : ISourceWriter, ITakeParameters
 	{
 		Visibility visibility;
 
@@ -30,6 +30,7 @@ public class MethodWriter : ISourceWriter
 		public bool IsDeclaration { get; set; }
 
 		public string ExplicitInterfaceImplementation { get; set; }
+		public bool NewFirst { get; set; }           // TODO: Temporary to match unit tests
 
 		public void SetVisibility (string visibility)
 		{
@@ -70,6 +71,9 @@ public virtual void WriteAttributes (CodeWriter writer)
 
 		public virtual void WriteSignature (CodeWriter writer)
 		{
+			if (IsShadow && NewFirst)
+				writer.Write ("new ");
+
 			if (IsPublic)
 				writer.Write ("public ");
 			if (IsInternal)
@@ -79,7 +83,7 @@ public virtual void WriteSignature (CodeWriter writer)
 			if (IsPrivate)
 				writer.Write ("private ");
 
-			if (IsShadow)
+			if (IsShadow && !NewFirst)
 				writer.Write ("new ");
 
 			if (IsOverride)

src/Xamarin.SourceWriter/Models/TypeWriter.cs

@@ -8,7 +8,7 @@ namespace Xamarin.SourceWriter
 	public abstract class TypeWriter : ISourceWriter
 	{
 		Visibility visibility;
-		int current_priority;
+		int current_priority = 1;
 
 		public string Name { get; set; }
 		public string Inherits { get; set; }
@@ -56,7 +56,7 @@ protected void MemberAdded (object sender, System.Collections.Specialized.Notify
 
 		public void SetVisibility (string visibility)
 		{
-			switch (visibility?.ToLowerInvariant ()) {
+			switch (visibility?.ToLowerInvariant ().Trim ()) {
 				case "public":
 					IsPublic = true;
 					break;

tests/generator-Tests/expected.ji/TestInterface/Test.ME.TestInterfaceImplementation.cs

@@ -12,6 +12,7 @@ public abstract partial class TestInterfaceImplementation : global::Java.Lang.Ob
 
 		public static class InterfaceConsts {
 
+			// The following are fields from: test.me.TestInterface
 
 			// Metadata.xml XPath field reference: path="/api/package[@name='test.me']/interface[@name='TestInterface']/field[@name='SPAN_COMPOSING']"
 			[Register ("SPAN_COMPOSING")]

tools/generator/Java.Interop.Tools.Generator.CodeGeneration/CodeGenerator.cs

@@ -1414,9 +1414,13 @@ public void WriteMethod (Method method, string indent, GenBase type, bool genera
 
 		public void WriteParameterListCallArgs (ParameterList parameters, string indent, bool invoker)
 		{
+			var lines = new List<string> ();
+			SourceWriterExtensions.AddParameterListCallArgs (lines, parameters, opt, invoker);
+
 			var cw = new CodeWriter (writer, indent);
 
-			SourceWriterExtensions.WriteParameterListCallArgs (cw, parameters, opt, invoker);
+			foreach (var l in lines)
+				cw.WriteLine (l);
 		}
 
 		public void WriteProperty (Property property, GenBase gen, string indent, bool with_callbacks = true, bool force_override = false)

tools/generator/Java.Interop.Tools.Generator.CodeGeneration/JavaInteropCodeGenerator.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using generator.SourceWriters;
 using Mono.Options;
@@ -189,8 +190,13 @@ internal override void WriteMethodIdField (Method method, string indent)
 
 		internal override void WriteMethodBody (Method method, string indent, GenBase type)
 		{
+			var body = new List<string> ();
+			SourceWriterExtensions.AddMethodBody (body, method, opt);
+
 			var cw = new CodeWriter (writer, indent);
-			SourceWriterExtensions.WriteMethodBody (cw, method, opt);
+
+			foreach (var s in body)
+				cw.WriteLine (s);
 
 			//writer.WriteLine ("{0}const string __id = \"{1}.{2}\";", indent, method.JavaName, method.JniSignature);
 			//foreach (string prep in method.Parameters.GetCallPrep (opt))

tools/generator/SourceWriters/Attributes/GeneratedEnumAttr.cs

@@ -15,7 +15,10 @@ public class GeneratedEnumAttr : AttributeWriter
 
 		public override void WriteAttribute (CodeWriter writer)
 		{
-			writer.WriteLine ($"[{(is_return ? "return:" : string.Empty)}global::Android.Runtime.GeneratedEnum]");
+			if (is_return)
+				writer.WriteLine ($"[return:global::Android.Runtime.GeneratedEnum]");
+			else
+				writer.Write ($"[global::Android.Runtime.GeneratedEnum] ");
 		}
 	}
 }

tools/generator/SourceWriters/Attributes/ObsoleteAttr.cs

@@ -30,7 +30,7 @@ public override void WriteAttribute (CodeWriter writer)
 				attr_name = "global::System." + attr_name;
 
 			if (Message is null && !WriteEmptyString && !IsError) {
-				writer.Write ($"[{attr_name}]");
+				writer.WriteLine ($"[{attr_name}]");
 				return;
 			}