[generator] Generate more [SupportedOSPlatform] attributes to fix warnings.

jpobst · jpobst · commit b0eb8485baed · 2021-08-20T10:16:56.000-05:00
diff --git a/tools/generator/SourceWriters/BoundMethodExtensionStringOverload.cs b/tools/generator/SourceWriters/BoundMethodExtensionStringOverload.cs
@@ -29,6 +29,8 @@ public BoundMethodExtensionStringOverload (Method method, CodeGenerationOptions
 			if (method.Deprecated != null)
 				Attributes.Add (new ObsoleteAttr (method.Deprecated.Replace ("\"", "\"\"").Trim ()));
 
+			SourceWriterExtensions.AddSupportedOSPlatform (Attributes, method, opt);
+
 			Parameters.Add (new MethodParameterWriter ("self", new TypeReferenceWriter (selfType)) { IsExtension = true });
 			this.AddMethodParametersStringOverloads (method.Parameters, opt);
 		}
diff --git a/tools/generator/SourceWriters/BoundMethodStringOverload.cs b/tools/generator/SourceWriters/BoundMethodStringOverload.cs
@@ -27,6 +27,8 @@ public BoundMethodStringOverload (Method method, CodeGenerationOptions opt)
 			if (method.Deprecated != null)
 				Attributes.Add (new ObsoleteAttr (method.Deprecated.Replace ("\"", "\"\"").Trim ()));
 
+			SourceWriterExtensions.AddSupportedOSPlatform (Attributes, method, opt);
+
 			method.JavadocInfo?.AddJavadocs (Comments);
 
 			this.AddMethodParametersStringOverloads (method.Parameters, opt);
diff --git a/tools/generator/SourceWriters/BoundProperty.cs b/tools/generator/SourceWriters/BoundProperty.cs
@@ -69,13 +69,13 @@ public BoundProperty (GenBase gen, Property property, CodeGenerationOptions opt,
 			if (property.Getter.Deprecated != null && (property.Setter == null || property.Setter.Deprecated != null))
 				Attributes.Add (new ObsoleteAttr (property.Getter.Deprecated.Replace ("\"", "\"\"").Trim () + (property.Setter != null && property.Setter.Deprecated != property.Getter.Deprecated ? " " + property.Setter.Deprecated.Replace ("\"", "\"\"").Trim () : null)));
 
+			SourceWriterExtensions.AddSupportedOSPlatform (Attributes, property.Getter, opt);
+
 			SourceWriterExtensions.AddMethodCustomAttributes (GetterAttributes, property.Getter);
 
 			if (gen.IsGeneratable)
 				GetterComments.Add ($"// Metadata.xml XPath method reference: path=\"{gen.MetadataXPathReference}/method[@name='{property.Getter.JavaName}'{property.Getter.Parameters.GetMethodXPathPredicate ()}]\"");
 
-			SourceWriterExtensions.AddSupportedOSPlatform (GetterAttributes, property.Getter, opt);
-
 			GetterAttributes.Add (new RegisterAttr (property.Getter.JavaName, property.Getter.JniSignature, property.Getter.IsVirtual ? property.Getter.GetConnectorNameFull (opt) : string.Empty, additionalProperties: property.Getter.AdditionalAttributeString ()));
 
 			SourceWriterExtensions.AddMethodBody (GetBody, property.Getter, opt);
diff --git a/tools/generator/SourceWriters/BoundPropertyStringVariant.cs b/tools/generator/SourceWriters/BoundPropertyStringVariant.cs
@@ -24,6 +24,8 @@ public BoundPropertyStringVariant (Property property, CodeGenerationOptions opt)
 
 			SetVisibility ((property.Setter ?? property.Getter).Visibility);
 
+			SourceWriterExtensions.AddSupportedOSPlatform (Attributes, property.Getter, opt);
+
 			HasGet = true;
 
 			if (is_array)
diff --git a/tools/generator/SourceWriters/ClassInvokerClass.cs b/tools/generator/SourceWriters/ClassInvokerClass.cs
@@ -26,6 +26,8 @@ public ClassInvokerClass (ClassGen klass, CodeGenerationOptions opt)
 
 			Attributes.Add (new RegisterAttr (klass.RawJniName, noAcw: true, additionalProperties: klass.AdditionalAttributeString ()) { UseGlobal = true });
 
+			SourceWriterExtensions.AddSupportedOSPlatform (Attributes, klass, opt);
+
 			var ctor = new ConstructorWriter {
 				Name = Name,
 				IsPublic = true,
diff --git a/tools/generator/SourceWriters/Extensions/SourceWriterExtensions.cs b/tools/generator/SourceWriters/Extensions/SourceWriterExtensions.cs
@@ -85,7 +85,7 @@ public static void AddInterfaceListenerEventsAndProperties (TypeWriter tw, Inter
 
 					AddInterfaceListenerEventsAndProperties (tw, iface, target, name, setter,
 						string.Format ("__v => {0} = __v", prop.Name),
-						string.Format ("__v => {0} = null", prop.Name), opt);
+						string.Format ("__v => {0} = null", prop.Name), opt, prop.Getter);
 				} else {
 					refs.Add (method.Name);
 					string rm = null;
@@ -103,7 +103,7 @@ public static void AddInterfaceListenerEventsAndProperties (TypeWriter tw, Inter
 
 					AddInterfaceListenerEventsAndProperties (tw, iface, target, name, method.Name,
 						method.Name,
-						remove, opt);
+						remove, opt, method);
 				}
 			}
 
@@ -113,7 +113,9 @@ public static void AddInterfaceListenerEventsAndProperties (TypeWriter tw, Inter
 			tw.Methods.Add (new CreateImplementorMethod (iface, opt));
 		}
 
-		public static void AddInterfaceListenerEventsAndProperties (TypeWriter tw, InterfaceGen iface, ClassGen target, string name, string connector_fmt, string add, string remove, CodeGenerationOptions opt)
+		// Parameter 'setListenerMethod' refers to the method used to set the listener, like 'addOnRoutingChangedListener'/'setOnRoutingChangedListener'.
+		// This is used to determine what API level the listener setter is available on.
+		public static void AddInterfaceListenerEventsAndProperties (TypeWriter tw, InterfaceGen iface, ClassGen target, string name, string connector_fmt, string add, string remove, CodeGenerationOptions opt, Method setListenerMethod)
 		{
 			if (!iface.IsValid)
 				return;
@@ -128,11 +130,11 @@ public static void AddInterfaceListenerEventsAndProperties (TypeWriter tw, Inter
 				if (target.ContainsName (nameUnique))
 					nameUnique += "Event";
 
-				AddInterfaceListenerEventOrProperty (tw, iface, method, target, nameUnique, connector_fmt, add, remove, opt);
+				AddInterfaceListenerEventOrProperty (tw, iface, method, target, nameUnique, connector_fmt, add, remove, opt, setListenerMethod);
 			}
 		}
 
-		public static void AddInterfaceListenerEventOrProperty (TypeWriter tw, InterfaceGen iface, Method method, ClassGen target, string name, string connector_fmt, string add, string remove, CodeGenerationOptions opt)
+		public static void AddInterfaceListenerEventOrProperty (TypeWriter tw, InterfaceGen iface, Method method, ClassGen target, string name, string connector_fmt, string add, string remove, CodeGenerationOptions opt, Method setListenerMethod)
 		{
 			if (method.EventName == string.Empty)
 				return;
@@ -157,7 +159,7 @@ public static void AddInterfaceListenerEventOrProperty (TypeWriter tw, Interface
 					var mt = target.Methods.Where (method => string.Compare (method.Name, connector_fmt, StringComparison.OrdinalIgnoreCase) == 0 && method.IsListenerConnector).FirstOrDefault ();
 					var hasHandlerArgument = mt != null && mt.IsListenerConnector && mt.Parameters.Count == 2 && mt.Parameters [1].Type == "Android.OS.Handler";
 
-					tw.Events.Add (new InterfaceListenerEvent (iface, name, nameSpec, full_delegate_name, connector_fmt, add, remove, hasHandlerArgument, opt));
+					tw.Events.Add (new InterfaceListenerEvent (iface, setListenerMethod, name, nameSpec, full_delegate_name, connector_fmt, add, remove, hasHandlerArgument, opt));
 				}
 			} else {
 				if (opt.GetSafeIdentifier (name) != name) {
diff --git a/tools/generator/SourceWriters/InterfaceInvokerMethod.cs b/tools/generator/SourceWriters/InterfaceInvokerMethod.cs
@@ -30,6 +30,8 @@ public InterfaceInvokerMethod (InterfaceGen iface, Method method, CodeGeneration
 			method_callback = new MethodCallback (iface, method, opt, null, method.IsReturnCharSequence);
 			context_this = context.ContextType.GetObjectHandleProperty ("this");
 
+			SourceWriterExtensions.AddSupportedOSPlatform (Attributes, method, opt);
+
 			this.AddMethodParameters (method.Parameters, opt);
 		}
 
diff --git a/tools/generator/SourceWriters/InterfaceInvokerProperty.cs b/tools/generator/SourceWriters/InterfaceInvokerProperty.cs
@@ -27,6 +27,8 @@ public InterfaceInvokerProperty (InterfaceGen iface, Property property, CodeGene
 			IsPublic = true;
 			IsUnsafe = true;
 
+			SourceWriterExtensions.AddSupportedOSPlatform (Attributes, property.Getter, opt);
+
 			HasGet = property.Getter != null;
 
 			if (property.Getter != null) {
diff --git a/tools/generator/SourceWriters/InterfaceListenerEvent.cs b/tools/generator/SourceWriters/InterfaceListenerEvent.cs
@@ -12,13 +12,15 @@ public class InterfaceListenerEvent : EventWriter
 	{
 		readonly InterfaceListenerEventHandlerHelper helper_method;
 
-		public InterfaceListenerEvent (InterfaceGen iface, string name, string nameSpec, string fullDelegateName, string wrefSuffix, string add, string remove, bool hasHandlerArgument, CodeGenerationOptions opt)
+		public InterfaceListenerEvent (InterfaceGen iface, Method method, string name, string nameSpec, string fullDelegateName, string wrefSuffix, string add, string remove, bool hasHandlerArgument, CodeGenerationOptions opt)
 		{
 			Name = name;
 			EventType = new TypeReferenceWriter (opt.GetOutputName (fullDelegateName));
 
 			IsPublic = true;
 
+			SourceWriterExtensions.AddSupportedOSPlatform (Attributes, method, opt);
+
 			HasAdd = true;
 
 			AddBody.Add ($"global::Java.Interop.EventHelper.AddEventHandler<{opt.GetOutputName (iface.FullName)}, {opt.GetOutputName (iface.FullName)}Implementor>(");
@@ -36,7 +38,7 @@ public InterfaceListenerEvent (InterfaceGen iface, string name, string nameSpec,
 			RemoveBody.Add ($"__h => __h.{nameSpec}Handler -= value);");
 
 			if (hasHandlerArgument)
-				helper_method = new InterfaceListenerEventHandlerHelper (iface, add, opt);
+				helper_method = new InterfaceListenerEventHandlerHelper (iface, method, add, opt);
 		}
 
 		public override void Write (CodeWriter writer)
@@ -49,12 +51,14 @@ public override void Write (CodeWriter writer)
 
 	public class InterfaceListenerEventHandlerHelper : MethodWriter
 	{
-		public InterfaceListenerEventHandlerHelper (InterfaceGen iface, string add, CodeGenerationOptions opt)
+		public InterfaceListenerEventHandlerHelper (InterfaceGen iface, Method method, string add, CodeGenerationOptions opt)
 		{
 			Name = add + "_Event_With_Handler_Helper";
 			Parameters.Add (new MethodParameterWriter ("value", new TypeReferenceWriter (opt.GetOutputName (iface.FullName))));
 			ReturnType = TypeReferenceWriter.Void;
 
+			SourceWriterExtensions.AddSupportedOSPlatform (Attributes, method, opt);
+
 			Body.Add ($"{add} (value, null);");
 		}
 	}
diff --git a/tools/generator/SourceWriters/MethodAsyncWrapper.cs b/tools/generator/SourceWriters/MethodAsyncWrapper.cs
@@ -28,6 +28,8 @@ public MethodAsyncWrapper (Method method, CodeGenerationOptions opt)
 			if (!method.IsVoid)
 				ReturnType.Name += "<" + opt.GetTypeReferenceName (method.RetVal) + ">";
 
+			SourceWriterExtensions.AddSupportedOSPlatform (Attributes, method, opt);
+
 			Body.Add ($"return global::System.Threading.Tasks.Task.Run (() => {method.AdjustedName} ({method.Parameters.GetCall (opt)}));");
 
 			this.AddMethodParameters (method.Parameters, opt);
diff --git a/tools/generator/SourceWriters/MethodCallback.cs b/tools/generator/SourceWriters/MethodCallback.cs
@@ -46,6 +46,8 @@ public MethodCallback (GenBase type, Method method, CodeGenerationOptions option
 			if (!string.IsNullOrWhiteSpace (method.Deprecated))
 				Attributes.Add (new ObsoleteAttr ());
 
+			SourceWriterExtensions.AddSupportedOSPlatform (Attributes, method, opt);
+
 			Parameters.Add (new MethodParameterWriter ("jnienv", TypeReferenceWriter.IntPtr));
 			Parameters.Add (new MethodParameterWriter ("native__this", TypeReferenceWriter.IntPtr));
 
@@ -136,6 +138,8 @@ public GetDelegateHandlerMethod (Method method, CodeGenerationOptions opt)
 
 			if (!string.IsNullOrWhiteSpace (method.Deprecated))
 				Attributes.Add (new ObsoleteAttr ());
+
+			SourceWriterExtensions.AddSupportedOSPlatform (Attributes, method, opt);
 		}
 
 		protected override void WriteBody (CodeWriter writer)
diff --git a/tools/generator/SourceWriters/MethodExtensionAsyncWrapper.cs b/tools/generator/SourceWriters/MethodExtensionAsyncWrapper.cs
@@ -22,6 +22,8 @@ public MethodExtensionAsyncWrapper (Method method, CodeGenerationOptions opt, st
 			if (!method.IsVoid)
 				ReturnType.Name += "<" + opt.GetTypeReferenceName (method.RetVal) + ">";
 
+			SourceWriterExtensions.AddSupportedOSPlatform (Attributes, method, opt);
+
 			Body.Add ($"return global::System.Threading.Tasks.Task.Run (() => self.{method.AdjustedName} ({method.Parameters.GetCall (opt)}));");
 
 			Parameters.Add (new MethodParameterWriter ("self", new TypeReferenceWriter (selfType)) { IsExtension = true });

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@ public BoundMethodExtensionStringOverload (Method method, CodeGenerationOptions`
`29`	`29`	`if (method.Deprecated != null)`
`30`	`30`	`Attributes.Add (new ObsoleteAttr (method.Deprecated.Replace ("\"", "\"\"").Trim ()));`
`31`	`31`
	`32`	`+ SourceWriterExtensions.AddSupportedOSPlatform (Attributes, method, opt);`
	`33`	`+`
`32`	`34`	`Parameters.Add (new MethodParameterWriter ("self", new TypeReferenceWriter (selfType)) { IsExtension = true });`
`33`	`35`	`this.AddMethodParametersStringOverloads (method.Parameters, opt);`
`34`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public static void AddInterfaceListenerEventsAndProperties (TypeWriter tw, Inter`
`85`	`85`
`86`	`86`	`AddInterfaceListenerEventsAndProperties (tw, iface, target, name, setter,`
`87`	`87`	`string.Format ("__v => {0} = __v", prop.Name),`
`88`		`- string.Format ("__v => {0} = null", prop.Name), opt);`
	`88`	`+ string.Format ("__v => {0} = null", prop.Name), opt, prop.Getter);`
`89`	`89`	`} else {`
`90`	`90`	`refs.Add (method.Name);`
`91`	`91`	`string rm = null;`
`@@ -103,7 +103,7 @@ public static void AddInterfaceListenerEventsAndProperties (TypeWriter tw, Inter`
`103`	`103`
`104`	`104`	`AddInterfaceListenerEventsAndProperties (tw, iface, target, name, method.Name,`
`105`	`105`	`method.Name,`
`106`		`- remove, opt);`
	`106`	`+ remove, opt, method);`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`
`@@ -113,7 +113,9 @@ public static void AddInterfaceListenerEventsAndProperties (TypeWriter tw, Inter`
`113`	`113`	`tw.Methods.Add (new CreateImplementorMethod (iface, opt));`
`114`	`114`	`}`
`115`	`115`
`116`		`- public static void AddInterfaceListenerEventsAndProperties (TypeWriter tw, InterfaceGen iface, ClassGen target, string name, string connector_fmt, string add, string remove, CodeGenerationOptions opt)`
	`116`	`+ // Parameter 'setListenerMethod' refers to the method used to set the listener, like 'addOnRoutingChangedListener'/'setOnRoutingChangedListener'.`
	`117`	`+ // This is used to determine what API level the listener setter is available on.`
	`118`	`+ public static void AddInterfaceListenerEventsAndProperties (TypeWriter tw, InterfaceGen iface, ClassGen target, string name, string connector_fmt, string add, string remove, CodeGenerationOptions opt, Method setListenerMethod)`
`117`	`119`	`{`
`118`	`120`	`if (!iface.IsValid)`
`119`	`121`	`return;`
`@@ -128,11 +130,11 @@ public static void AddInterfaceListenerEventsAndProperties (TypeWriter tw, Inter`
`128`	`130`	`if (target.ContainsName (nameUnique))`
`129`	`131`	`nameUnique += "Event";`
`130`	`132`
`131`		`- AddInterfaceListenerEventOrProperty (tw, iface, method, target, nameUnique, connector_fmt, add, remove, opt);`
	`133`	`+ AddInterfaceListenerEventOrProperty (tw, iface, method, target, nameUnique, connector_fmt, add, remove, opt, setListenerMethod);`
`132`	`134`	`}`
`133`	`135`	`}`
`134`	`136`
`135`		`- public static void AddInterfaceListenerEventOrProperty (TypeWriter tw, InterfaceGen iface, Method method, ClassGen target, string name, string connector_fmt, string add, string remove, CodeGenerationOptions opt)`
	`137`	`+ public static void AddInterfaceListenerEventOrProperty (TypeWriter tw, InterfaceGen iface, Method method, ClassGen target, string name, string connector_fmt, string add, string remove, CodeGenerationOptions opt, Method setListenerMethod)`
`136`	`138`	`{`
`137`	`139`	`if (method.EventName == string.Empty)`
`138`	`140`	`return;`
`@@ -157,7 +159,7 @@ public static void AddInterfaceListenerEventOrProperty (TypeWriter tw, Interface`
`157`	`159`	`var mt = target.Methods.Where (method => string.Compare (method.Name, connector_fmt, StringComparison.OrdinalIgnoreCase) == 0 && method.IsListenerConnector).FirstOrDefault ();`
`158`	`160`	`var hasHandlerArgument = mt != null && mt.IsListenerConnector && mt.Parameters.Count == 2 && mt.Parameters [1].Type == "Android.OS.Handler";`
`159`	`161`
`160`		`- tw.Events.Add (new InterfaceListenerEvent (iface, name, nameSpec, full_delegate_name, connector_fmt, add, remove, hasHandlerArgument, opt));`
	`162`	`+ tw.Events.Add (new InterfaceListenerEvent (iface, setListenerMethod, name, nameSpec, full_delegate_name, connector_fmt, add, remove, hasHandlerArgument, opt));`
`161`	`163`	`}`
`162`	`164`	`} else {`
`163`	`165`	`if (opt.GetSafeIdentifier (name) != name) {`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,8 @@ public InterfaceInvokerMethod (InterfaceGen iface, Method method, CodeGeneration`
`30`	`30`	`method_callback = new MethodCallback (iface, method, opt, null, method.IsReturnCharSequence);`
`31`	`31`	`context_this = context.ContextType.GetObjectHandleProperty ("this");`
`32`	`32`
	`33`	`+ SourceWriterExtensions.AddSupportedOSPlatform (Attributes, method, opt);`
	`34`	`+`
`33`	`35`	`this.AddMethodParameters (method.Parameters, opt);`
`34`	`36`	`}`
`35`	`37`
Original file line number	Diff line number	Diff line change
`@@ -12,13 +12,15 @@ public class InterfaceListenerEvent : EventWriter`
`12`	`12`	`{`
`13`	`13`	`readonly InterfaceListenerEventHandlerHelper helper_method;`
`14`	`14`
`15`		`- public InterfaceListenerEvent (InterfaceGen iface, string name, string nameSpec, string fullDelegateName, string wrefSuffix, string add, string remove, bool hasHandlerArgument, CodeGenerationOptions opt)`
	`15`	`+ public InterfaceListenerEvent (InterfaceGen iface, Method method, string name, string nameSpec, string fullDelegateName, string wrefSuffix, string add, string remove, bool hasHandlerArgument, CodeGenerationOptions opt)`
`16`	`16`	`{`
`17`	`17`	`Name = name;`
`18`	`18`	`EventType = new TypeReferenceWriter (opt.GetOutputName (fullDelegateName));`
`19`	`19`
`20`	`20`	`IsPublic = true;`
`21`	`21`
	`22`	`+ SourceWriterExtensions.AddSupportedOSPlatform (Attributes, method, opt);`
	`23`	`+`
`22`	`24`	`HasAdd = true;`
`23`	`25`
`24`	`26`	`AddBody.Add ($"global::Java.Interop.EventHelper.AddEventHandler<{opt.GetOutputName (iface.FullName)}, {opt.GetOutputName (iface.FullName)}Implementor>(");`
`@@ -36,7 +38,7 @@ public InterfaceListenerEvent (InterfaceGen iface, string name, string nameSpec,`
`36`	`38`	`RemoveBody.Add ($"__h => __h.{nameSpec}Handler -= value);");`
`37`	`39`
`38`	`40`	`if (hasHandlerArgument)`
`39`		`- helper_method = new InterfaceListenerEventHandlerHelper (iface, add, opt);`
	`41`	`+ helper_method = new InterfaceListenerEventHandlerHelper (iface, method, add, opt);`
`40`	`42`	`}`
`41`	`43`
`42`	`44`	`public override void Write (CodeWriter writer)`
`@@ -49,12 +51,14 @@ public override void Write (CodeWriter writer)`
`49`	`51`
`50`	`52`	`public class InterfaceListenerEventHandlerHelper : MethodWriter`
`51`	`53`	`{`
`52`		`- public InterfaceListenerEventHandlerHelper (InterfaceGen iface, string add, CodeGenerationOptions opt)`
	`54`	`+ public InterfaceListenerEventHandlerHelper (InterfaceGen iface, Method method, string add, CodeGenerationOptions opt)`
`53`	`55`	`{`
`54`	`56`	`Name = add + "_Event_With_Handler_Helper";`
`55`	`57`	`Parameters.Add (new MethodParameterWriter ("value", new TypeReferenceWriter (opt.GetOutputName (iface.FullName))));`
`56`	`58`	`ReturnType = TypeReferenceWriter.Void;`
`57`	`59`
	`60`	`+ SourceWriterExtensions.AddSupportedOSPlatform (Attributes, method, opt);`
	`61`	`+`
`58`	`62`	`Body.Add ($"{add} (value, null);");`
`59`	`63`	`}`
`60`	`64`	`}`