Parse parameters.

Author: jpobst

src/Xamarin.SourceWriter/Models/MethodParameterWriter.cs

@@ -9,6 +9,7 @@ public class MethodParameterWriter
 		public TypeReferenceWriter Type { get; set; }
 		public List<AttributeWriter> Attributes { get; } = new List<AttributeWriter> ();
 		public string Name { get; set; }
+		public bool IsExtension { get; set; }
 
 		public MethodParameterWriter (string name, TypeReferenceWriter type)
 		{
@@ -20,6 +21,9 @@ public virtual void WriteParameter (CodeWriter writer)
 		{
 			WriteAttributes (writer);
 
+			if (IsExtension)
+				writer.Write ("this ");
+
 			Type.WriteTypeReference (writer);
 			writer.Write (Name);
 		}

src/Xamarin.SourceWriter/Models/MethodWriter.cs

@@ -6,7 +6,7 @@ namespace Xamarin.SourceWriter
 {
 	public class MethodWriter : ISourceWriter
 	{
-		private Visibility visibility;
+		Visibility visibility;
 
 		public string Name { get; set; }
 		public List<MethodParameterWriter> Parameters { get; } = new List<MethodParameterWriter> ();

src/Xamarin.SourceWriter/Models/TypeReferenceWriter.cs

@@ -9,7 +9,7 @@ public class TypeReferenceWriter
 		public string Namespace { get; set; }
 		public string Name { get; set; }
 		public bool Nullable { get; set; }
-
+		
 		// These purposely create new instances, as they are not immutable.
 		// For example you may intend to make an instance null, but if there
 		// was only one, you would make them all null.

tools/generator/SourceWriters/BoundClass.cs

@@ -321,7 +321,6 @@ void AddProperties (ClassGen klass, CodeGenerationOptions opt)
 				if (prop.Setter != null)
 					prop.Setter.IsVirtual = set_virt;
 			}
-
 		}
 
 		void AddProperty (ClassGen klass, Property property, CodeGenerationOptions opt)

tools/generator/SourceWriters/BoundConstructor.cs

@@ -42,6 +42,8 @@ public BoundConstructor (ClassGen klass, Ctor constructor, bool useBase, CodeGen
 
 			BaseCall = $"{(useBase ? "base" : "this")} (IntPtr.Zero, JniHandleOwnership.DoNotTransfer)";
 			context_this = context.ContextType.GetObjectHandleProperty ("this");
+
+			this.AddMethodParameters (constructor.Parameters, opt);
 		}
 
 		protected override void WriteBody (CodeWriter writer)
@@ -100,11 +102,6 @@ void WriteParamterListCallArgs (CodeWriter writer, ParameterList parameters, boo
 				writer.WriteLine ("__args [{0}] = new {1} ({2});", i, JValue, p.GetCall (opt));
 			}
 		}
-
-		protected override void WriteParameters (CodeWriter writer)
-		{
-			writer.Write (constructor.GetSignature (opt));
-		}
 	}
 
 	public class StringOverloadConstructor : BoundConstructor
@@ -113,11 +110,9 @@ public StringOverloadConstructor (ClassGen klass, Ctor constructor, bool useBase
 			base (klass, constructor, useBase, opt, context)
 		{
 			Comments.Clear ();
-		}
+			Parameters.Clear ();
 
-		protected override void WriteParameters (CodeWriter writer)
-		{
-			writer.Write (constructor.GetSignature (opt).Replace ("Java.Lang.ICharSequence", "string").Replace ("global::string", "string"));
+			this.AddMethodParametersStringOverloads (constructor.Parameters, opt);
 		}
 	}
 }

tools/generator/SourceWriters/BoundInterfaceMethodDeclaration.cs

@@ -34,11 +34,7 @@ public BoundInterfaceMethodDeclaration (Method method, string adapter, CodeGener
 			Attributes.Add (new RegisterAttr (method.JavaName, method.JniSignature, method.ConnectorName + ":" + method.GetAdapterName (opt, adapter), additionalProperties: method.AdditionalAttributeString ()));
 
 			SourceWriterExtensions.AddMethodCustomAttributes (Attributes, method);
-		}
-
-		protected override void WriteParameters (CodeWriter writer)
-		{
-			writer.Write (method.GetSignature (opt));
+			this.AddMethodParameters (method.Parameters, opt);
 		}
 	}
 }

tools/generator/SourceWriters/BoundMethod.cs

@@ -60,6 +60,7 @@ public BoundMethod (GenBase type, Method method, CodeGenerationOptions opt, bool
 			Attributes.Add (new RegisterAttr (method.JavaName, method.JniSignature, method.IsVirtual ? method.GetConnectorNameFull (opt) : string.Empty, additionalProperties: method.AdditionalAttributeString ()));
 
 			SourceWriterExtensions.AddMethodCustomAttributes (Attributes, method);
+			this.AddMethodParameters (method.Parameters, opt);
 		}
 
 		public override void Write (CodeWriter writer)
@@ -76,10 +77,5 @@ protected override void WriteBody (CodeWriter writer)
 			SourceWriterExtensions.WriteMethodBody (writer, method, opt);
 			method.IsVirtual = old_virtual;
 		}
-
-		protected override void WriteParameters (CodeWriter writer)
-		{
-			writer.Write (method.GetSignature (opt));
-		}
 	}
 }

tools/generator/SourceWriters/BoundMethodAbstractDeclaration.cs

@@ -45,6 +45,7 @@ public BoundMethodAbstractDeclaration (GenBase gen, Method method, CodeGeneratio
 			Attributes.Add (new RegisterAttr (method.JavaName, method.JniSignature, method.ConnectorName, additionalProperties: method.AdditionalAttributeString ()));
 
 			SourceWriterExtensions.AddMethodCustomAttributes (Attributes, method);
+			this.AddMethodParameters (method.Parameters, opt);
 		}
 
 		public override void Write (CodeWriter writer)
@@ -54,10 +55,5 @@ public override void Write (CodeWriter writer)
 
 			base.Write (writer);
 		}
-
-		protected override void WriteParameters (CodeWriter writer)
-		{
-			writer.Write (method.GetSignature (opt));
-		}
 	}
 }

tools/generator/SourceWriters/BoundMethodExtensionStringOverload.cs

@@ -28,17 +28,14 @@ public BoundMethodExtensionStringOverload (Method method, CodeGenerationOptions
 
 			if (method.Deprecated != null)
 				Attributes.Add (new ObsoleteAttr (method.Deprecated.Replace ("\"", "\"\"").Trim ()));
+
+			Parameters.Add (new MethodParameterWriter ("self", new TypeReferenceWriter (selfType)) { IsExtension = true });
+			this.AddMethodParametersStringOverloads (method.Parameters, opt);
 		}
 
 		protected override void WriteBody (CodeWriter writer)
 		{
 			SourceWriterExtensions.WriteMethodStringOverloadBody (writer, method, opt, true);
 		}
-
-		protected override void WriteParameters (CodeWriter writer)
-		{
-			writer.Write ($"this {self_type} self{(method.Parameters.Count > 0 ? ", " : "")}");
-			writer.Write (method.GetSignature (opt).Replace ("Java.Lang.ICharSequence", "string").Replace ("global::string", "string"));
-		}
 	}
 }

tools/generator/SourceWriters/BoundMethodStringOverload.cs

@@ -26,16 +26,13 @@ public BoundMethodStringOverload (Method method, CodeGenerationOptions opt)
 
 			if (method.Deprecated != null)
 				Attributes.Add (new ObsoleteAttr (method.Deprecated.Replace ("\"", "\"\"").Trim ()));
+
+			this.AddMethodParametersStringOverloads (method.Parameters, opt);
 		}
 
 		protected override void WriteBody (CodeWriter writer)
 		{
 			SourceWriterExtensions.WriteMethodStringOverloadBody (writer, method, opt, false);
 		}
-
-		protected override void WriteParameters (CodeWriter writer)
-		{
-			writer.Write (method.GetSignature (opt).Replace ("Java.Lang.ICharSequence", "string").Replace ("global::string", "string"));
-		}
 	}
 }