[generator] Extend skipInvokerMethods support to interfaces. (#1202) (#1203)

Context: 73ebad2
Context: dotnet/android-libraries#779
Commit 73ebad2 added support for the metadata attribute
`//class[@skipInvokerMethods]`, which allowed us to suppress generation
of invoker methods for a class.
The AndroidX Media3 binding in dotnet/android-libraries#779 hits a similar
issue wherein we generate incorrect generics on an invoker type.
However, this is an invoker type for an *`interface`*, not a `class`.
Extend our `skipInvokerMethods` support so that it can be used as
`//interface[@skipInvokerMethods]` as well.
Co-authored-by: Jonathan Pobst <jonathan.pobst@microsoft.com>

Author: jonpryor

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

@@ -352,6 +352,32 @@ public void SkipInvokerMethodsMetadata ()
 Assert.False(writer.ToString().Contains("public abstract Com.Xamarin.Android.MyBaseClass DoStuff ();"),$"was: `{writer}`");
 }
 
+[Test]
+publicvoidSkipInterfaceInvokerMethodsMetadata()
+{
+varxml=@"<api>
+ <package name='java.lang' jni-name='java/lang'>
+ <class abstract='false' deprecated='not deprecated' final='false' name='Object' static='false' visibility='public' jni-signature='Ljava/lang/Object;' />
+ </package>
+ <package name='com.xamarin.android' jni-name='com/xamarin/android'>
+ <interface abstract='true' deprecated='not deprecated' extends='java.lang.Object' extends-generic-aware='java.lang.Object' jni-extends='Ljava/lang/Object;' final='false' name='MyInterface' static='false' visibility='public' jni-signature='Lcom/xamarin/android/MyInterface;' skipInvokerMethods='com/xamarin/android/MyInterface.countAffectedRows()I'>
+ <method abstract='true' deprecated='not deprecated' final='false' name='countAffectedRows' jni-signature='()I' bridge='false' native='false' return='int' jni-return='I' static='false' synchronized='false' synthetic='false' visibility='public'></method>
+ </interface>
+ </package>
+ </api>";
+
+vargens=ParseApiDefinition(xml);
+variface=gens.Single(g =>g.Name=="IMyInterface");
+
+generator.Context.ContextTypes.Push(iface);
+generator.WriteType(iface,string.Empty,newGenerationInfo("","","MyAssembly"));
+generator.Context.ContextTypes.Pop();
+
+// Ensure the invoker for 'countAffectedRows' isn't generated
+Assert.False(writer.ToString().Contains("static Delegate cb_countAffectedRows;"),$"was: `{writer}`");
+Assert.False(writer.ToString().Contains("InvokeAbstractInt32Method"),$"was: `{writer}`");
+}
+
 [Test]
 publicvoidCompatVirtualMethod_Class()
 {

tools/generator/Java.Interop.Tools.Generator.Importers/XmlApiImporter.cs

@@ -117,10 +117,6 @@ public static ClassGen CreateClass (XElement pkg, XElement elem, CodeGenerationO
 !options.SupportNestedInterfaceTypes
 };
 
-if(elem.Attribute("skipInvokerMethods")?.Valueisstringskip)
-foreach(varminskip.Split(newchar[]{',',' ','\n','\r'},StringSplitOptions.RemoveEmptyEntries))
-klass.SkippedInvokerMethods.Add(m);
-
 FillApiSince(klass,pkg,elem);
 SetLineInfo(klass,elem,options);
 
@@ -264,6 +260,10 @@ public static GenBaseSupport CreateGenBaseSupport (XElement pkg, XElement elem,
 Visibility=elem.XGetAttribute("visibility")
 };
 
+if(elem.Attribute("skipInvokerMethods")?.Valueisstringskip)
+foreach(varminskip.Split(newchar[]{',',' ','\n','\r'},StringSplitOptions.RemoveEmptyEntries))
+support.SkippedInvokerMethods.Add(m);
+
 if(support.IsDeprecated){
 support.DeprecatedComment=elem.XGetAttribute("deprecated");
 

tools/generator/Java.Interop.Tools.Generator.ObjectModel/ClassGen.cs

@@ -11,7 +11,6 @@ namespace MonoDroid.Generation
 publicclassClassGen:GenBase
 {
 boolfill_explicit_implementation_started;
-HashSet<string>skipped_invoker_methods;
 
 publicList<Ctor>Ctors{get;privateset;}=newList<Ctor>();
 
@@ -356,8 +355,6 @@ public override void ResetValidation ()
 base.ResetValidation();
 }
 
-publicHashSet<string>SkippedInvokerMethods=>skipped_invoker_methods??=newHashSet<string>();
-
 publicoverridestringToNative(CodeGenerationOptionsopt,stringvarname,Dictionary<string,string>mappings=null)
 {
 if(opt.CodeGenerationTarget==CodeGenerationTarget.JavaInterop1){

tools/generator/Java.Interop.Tools.Generator.ObjectModel/GenBase.cs

@@ -833,6 +833,8 @@ bool ReturnTypeMatches (Method m, Method mm)
 
 publicboolShouldGenerateAnnotationAttribute=>IsAnnotation;
 
+publicHashSet<string>SkippedInvokerMethods=>support.SkippedInvokerMethods;
+
 publicvoidStripNonBindables(CodeGenerationOptionsopt)
 {
 // Strip out default interface methods if not desired

tools/generator/Java.Interop.Tools.Generator.ObjectModel/GenBaseSupport.cs

@@ -1,9 +1,12 @@
 usingSystem;
+usingSystem.Collections.Generic;
 
 namespaceMonoDroid.Generation
 {
 publicclassGenBaseSupport
 {
+HashSet<string>skipped_invoker_methods;
+
 publicstringAnnotatedVisibility{get;set;}
 publicboolIsAcw{get;set;}
 publicboolIsDeprecated{get;set;}
@@ -21,6 +24,8 @@ public class GenBaseSupport
 publicstringVisibility{get;set;}
 publicGenericParameterDefinitionListTypeParameters{get;set;}
 
+publicHashSet<string>SkippedInvokerMethods=>skipped_invoker_methods??=newHashSet<string>();
+
 publicvirtualboolOnValidate(CodeGenerationOptionsopt)
 {
 // See com.google.inject.internal.util package for this case.

tools/generator/Java.Interop.Tools.Generator.ObjectModel/Method.cs

@@ -193,6 +193,8 @@ public string GetMetadataXPathReference (GenBase declaringType) =>
 
 publicstringGetSignature()=>$"n_{JavaName}:{JniSignature}:{ConnectorName}";
 
+publicstringGetSkipInvokerSignature()=>$"{DeclaringType.RawJniName}.{JavaName}{JniSignature}";
+
 publicboolIsEventHandlerWithHandledProperty=>RetVal.JavaName=="boolean"&&EventName!="";
 
 publicoverrideboolIsGeneric=>base.IsGeneric||RetVal.IsGeneric;

tools/generator/SourceWriters/ClassInvokerClass.cs

@@ -103,7 +103,7 @@ void AddPropertyInvokers (ClassGen klass, IEnumerable<Property> properties, Hash
 voidAddMethodInvokers(ClassGenklass,IEnumerable<Method>methods,HashSet<string>members,HashSet<string>skipInvokers,InterfaceGengen,CodeGenerationOptionsopt)
 {
 foreach(varminmethods){
-if(skipInvokers.Contains($"{m.DeclaringType.RawJniName}.{m.JavaName}{m.JniSignature}"))
+if(skipInvokers.Contains(m.GetSkipInvokerSignature()))
 continue;
 
 varsig=m.GetSignature();

tools/generator/SourceWriters/InterfaceInvokerClass.cs

@@ -55,18 +55,18 @@ public InterfaceInvokerClass (InterfaceGen iface, CodeGenerationOptions opt, Cod
 
 Constructors.Add(newInterfaceInvokerConstructor(opt,iface,context));
 
-AddMemberInvokers(iface,newHashSet<string>(),opt,context);
+AddMemberInvokers(iface,newHashSet<string>(),iface.SkippedInvokerMethods,opt,context);
 }
 
-voidAddMemberInvokers(InterfaceGeniface,HashSet<string>members,CodeGenerationOptionsopt,CodeGeneratorContextcontext)
+voidAddMemberInvokers(InterfaceGeniface,HashSet<string>members,HashSet<string>skipInvokers,CodeGenerationOptionsopt,CodeGeneratorContextcontext)
 {
 AddPropertyInvokers(iface,iface.Properties.Where(p =>!p.Getter.IsStatic&&!p.Getter.IsInterfaceDefaultMethod),members,opt,context);
-AddMethodInvokers(iface,iface.Methods.Where(m =>!m.IsStatic&&!m.IsInterfaceDefaultMethod),members,opt,context);
+AddMethodInvokers(iface,iface.Methods.Where(m =>!m.IsStatic&&!m.IsInterfaceDefaultMethod),members,skipInvokers,opt,context);
 AddCharSequenceEnumerators(iface);
 
 foreach(variiniface.GetAllDerivedInterfaces()){
 AddPropertyInvokers(iface,i.Properties.Where(p =>!p.Getter.IsStatic&&!p.Getter.IsInterfaceDefaultMethod),members,opt,context);
-AddMethodInvokers(iface,i.Methods.Where(m =>!m.IsStatic&&!m.IsInterfaceDefaultMethod&&!iface.IsCovariantMethod(m)&&!(i.FullName.StartsWith("Java.Lang.ICharSequence",StringComparison.Ordinal)&&m.Name.EndsWith("Formatted",StringComparison.Ordinal))),members,opt,context);
+AddMethodInvokers(iface,i.Methods.Where(m =>!m.IsStatic&&!m.IsInterfaceDefaultMethod&&!iface.IsCovariantMethod(m)&&!(i.FullName.StartsWith("Java.Lang.ICharSequence",StringComparison.Ordinal)&&m.Name.EndsWith("Formatted",StringComparison.Ordinal))),members,skipInvokers,opt,context);
 AddCharSequenceEnumerators(i);
 }
 }
@@ -90,10 +90,13 @@ void AddPropertyInvokers (InterfaceGen iface, IEnumerable<Property> properties,
 Properties.Add(newInterfaceInvokerProperty(iface,prop,opt,context));
 }
 }
-
-voidAddMethodInvokers(InterfaceGeniface,IEnumerable<Method>methods,HashSet<string>members,CodeGenerationOptionsopt,CodeGeneratorContextcontext)
+
+voidAddMethodInvokers(InterfaceGeniface,IEnumerable<Method>methods,HashSet<string>members,HashSet<string>skipInvokers,CodeGenerationOptionsopt,CodeGeneratorContextcontext)
 {
 foreach(varminmethods){
+if(skipInvokers.Contains(m.GetSkipInvokerSignature()))
+continue;
+
 varsig=m.GetSignature();
 
 if(members.Contains(sig))