[J.I, generator] Fix GetPeerMembers for interfaces.

jpobst · jpobst · commit a1d1b81e0450 · 2019-08-27T15:27:14.000-05:00
diff --git a/src/Java.Interop/Java.Interop/JniPeerMembers.cs b/src/Java.Interop/Java.Interop/JniPeerMembers.cs
@@ -7,8 +7,15 @@ namespace Java.Interop {
 
 	public partial class JniPeerMembers {
 
+		private bool isInterface;
+
+		public JniPeerMembers (string jniPeerTypeName, Type managedPeerType, bool isInterface)
+			: this (jniPeerTypeName, managedPeerType, checkManagedPeerType: true, isInterface: isInterface)
+		{
+		}
+
 		public JniPeerMembers (string jniPeerTypeName, Type managedPeerType)
-			: this (jniPeerTypeName, managedPeerType, checkManagedPeerType: true)
+			: this (jniPeerTypeName, managedPeerType, checkManagedPeerType: true, isInterface: false)
 		{
 			if (managedPeerType == null)
 				throw new ArgumentNullException ("managedPeerType");
@@ -27,7 +34,7 @@ public JniPeerMembers (string jniPeerTypeName, Type managedPeerType)
 			ManagedPeerType = managedPeerType;
 		}
 
-		JniPeerMembers (string jniPeerTypeName, Type managedPeerType, bool checkManagedPeerType)
+		JniPeerMembers (string jniPeerTypeName, Type managedPeerType, bool checkManagedPeerType, bool isInterface = false)
 		{
 			if (jniPeerTypeName == null)
 				throw new ArgumentNullException (nameof (jniPeerTypeName));
@@ -51,6 +58,8 @@ public JniPeerMembers (string jniPeerTypeName, Type managedPeerType)
 			JniPeerTypeName = jniPeerTypeName;
 			ManagedPeerType = managedPeerType;
 
+			this.isInterface = isInterface;
+
 			instanceMethods = new JniInstanceMethods (this);
 			instanceFields  = new JniInstanceFields (this);
 			staticMethods   = new JniStaticMethods (this);
@@ -140,7 +149,7 @@ protected virtual bool UsesVirtualDispatch (IJavaPeerable value, Type declaringT
 
 		protected virtual JniPeerMembers GetPeerMembers (IJavaPeerable value)
 		{
-			return value.JniPeerMembers;
+			return isInterface ? this : value.JniPeerMembers;
 		}
 
 		internal static void AssertSelf (IJavaPeerable self)
diff --git a/tools/generator/Java.Interop.Tools.Generator.CodeGeneration/JavaInteropCodeGenerator.cs b/tools/generator/Java.Interop.Tools.Generator.CodeGeneration/JavaInteropCodeGenerator.cs
@@ -29,7 +29,7 @@ static string GetInvokeType (string type)
 
 		internal override void WriteClassHandle (ClassGen type, string indent, bool requireNew)
 		{
-			WritePeerMembers (indent + '\t', true, requireNew, type.RawJniName, type.Name);
+			WritePeerMembers (indent + '\t', true, requireNew, type.RawJniName, type.Name, false);
 
 			writer.WriteLine ("{0}\tinternal static {1}IntPtr class_ref {{", indent, requireNew ? "new " : string.Empty);
 			writer.WriteLine ("{0}\t\tget {{", indent);
@@ -55,12 +55,12 @@ internal override void WriteClassHandle (ClassGen type, string indent, bool requ
 
 		internal override void WriteClassHandle (InterfaceGen type, string indent, string declaringType)
 		{
-			WritePeerMembers (indent, false, true, type.RawJniName, declaringType);
+			WritePeerMembers (indent, false, true, type.RawJniName, declaringType, type.Name == declaringType);
 		}
 
 		internal override void WriteClassInvokerHandle (ClassGen type, string indent, string declaringType)
 		{
-			WritePeerMembers (indent, true, true, type.RawJniName, declaringType);
+			WritePeerMembers (indent, true, true, type.RawJniName, declaringType, false);
 
 			writer.WriteLine ();
 			writer.WriteLine ("{0}public override global::Java.Interop.JniPeerMembers JniPeerMembers {{", indent);
@@ -75,7 +75,7 @@ internal override void WriteClassInvokerHandle (ClassGen type, string indent, st
 
 		internal override void WriteInterfaceInvokerHandle (InterfaceGen type, string indent, string declaringType)
 		{
-			WritePeerMembers (indent, true, true, type.RawJniName, declaringType);
+			WritePeerMembers (indent, true, true, type.RawJniName, declaringType, false);
 
 			writer.WriteLine ();
 			writer.WriteLine ("{0}static IntPtr java_class_ref {{", indent);
@@ -262,10 +262,10 @@ internal override void WriteFieldSetBody (Field field, string indent, GenBase ty
 			writer.WriteLine ("{0}}}", indent);
 		}
 
-		void WritePeerMembers (string indent, bool isInternal, bool isNew, string rawJniType, string declaringType)
+		void WritePeerMembers (string indent, bool isInternal, bool isNew, string rawJniType, string declaringType, bool isInterface)
 		{
 			var signature = $"{(isInternal ? "internal " : "")}static {(isNew ? "new " : "")}readonly JniPeerMembers _members = ";
-			var type = $"new {GetPeerMembersType ()} (\"{rawJniType}\", typeof ({declaringType}));";
+			var type = $"new {GetPeerMembersType ()} (\"{rawJniType}\", typeof ({declaringType}){(isInterface ? ", isInterface: true" : string.Empty)});";
 
 			writer.WriteLine ($"{indent}{signature}{type}");
 		}
diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultMethod.txt b/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultMethod.txt
@@ -1,7 +1,7 @@
 // Metadata.xml XPath interface reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']"
 [Register ("java/code/IMyInterface", "", "java.code.IMyInterfaceInvoker")]
 public partial interface IMyInterface : IJavaObject, IJavaPeerable {
-	static new readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterface));
+	static new readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true);
 
 	static Delegate cb_DoSomething;
 #pragma warning disable 0169
diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultProperty.txt b/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultProperty.txt
@@ -1,7 +1,7 @@
 // Metadata.xml XPath interface reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']"
 [Register ("java/code/IMyInterface", "", "java.code.IMyInterfaceInvoker")]
 public partial interface IMyInterface : IJavaObject, IJavaPeerable {
-	static new readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterface));
+	static new readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true);
 
 	static Delegate cb_get_Value;
 #pragma warning disable 0169
diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt b/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt
@@ -1,7 +1,7 @@
 // Metadata.xml XPath interface reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']"
 [Register ("java/code/IMyInterface", "", "java.code.IMyInterfaceInvoker")]
 public partial interface IMyInterface : IJavaObject, IJavaPeerable {
-	static new readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterface));
+	static new readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true);
 
 	static Delegate cb_get_Value;
 #pragma warning disable 0169
diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt b/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt
@@ -1,7 +1,7 @@
 // Metadata.xml XPath interface reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']"
 [Register ("java/code/IMyInterface", "", "java.code.IMyInterfaceInvoker")]
 public partial interface IMyInterface : IJavaObject, IJavaPeerable {
-	static new readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterface));
+	static new readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true);
 
 	static Delegate cb_DoSomething;
 #pragma warning disable 0169
diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt b/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt
@@ -1,7 +1,7 @@
 // Metadata.xml XPath interface reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']"
 [Register ("java/code/IMyInterface", "", "java.code.IMyInterfaceInvoker")]
 public partial interface IMyInterface : IJavaObject, IJavaPeerable {
-	static new readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterface));
+	static new readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true);
 
 	static Delegate cb_get_Value;
 #pragma warning disable 0169
diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt b/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt
@@ -1,7 +1,7 @@
 // Metadata.xml XPath interface reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']"
 [Register ("java/code/IMyInterface", "", "java.code.IMyInterfaceInvoker")]
 public partial interface IMyInterface : IJavaObject, IJavaPeerable {
-	static new readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterface));
+	static new readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true);
 
 	static Delegate cb_get_Value;
 #pragma warning disable 0169

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ static string GetInvokeType (string type)`
`29`	`29`
`30`	`30`	`internal override void WriteClassHandle (ClassGen type, string indent, bool requireNew)`
`31`	`31`	`{`
`32`		`- WritePeerMembers (indent + '\t', true, requireNew, type.RawJniName, type.Name);`
	`32`	`+ WritePeerMembers (indent + '\t', true, requireNew, type.RawJniName, type.Name, false);`
`33`	`33`
`34`	`34`	`writer.WriteLine ("{0}\tinternal static {1}IntPtr class_ref {{", indent, requireNew ? "new " : string.Empty);`
`35`	`35`	`writer.WriteLine ("{0}\t\tget {{", indent);`
`@@ -55,12 +55,12 @@ internal override void WriteClassHandle (ClassGen type, string indent, bool requ`
`55`	`55`
`56`	`56`	`internal override void WriteClassHandle (InterfaceGen type, string indent, string declaringType)`
`57`	`57`	`{`
`58`		`- WritePeerMembers (indent, false, true, type.RawJniName, declaringType);`
	`58`	`+ WritePeerMembers (indent, false, true, type.RawJniName, declaringType, type.Name == declaringType);`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`internal override void WriteClassInvokerHandle (ClassGen type, string indent, string declaringType)`
`62`	`62`	`{`
`63`		`- WritePeerMembers (indent, true, true, type.RawJniName, declaringType);`
	`63`	`+ WritePeerMembers (indent, true, true, type.RawJniName, declaringType, false);`
`64`	`64`
`65`	`65`	`writer.WriteLine ();`
`66`	`66`	`writer.WriteLine ("{0}public override global::Java.Interop.JniPeerMembers JniPeerMembers {{", indent);`
`@@ -75,7 +75,7 @@ internal override void WriteClassInvokerHandle (ClassGen type, string indent, st`
`75`	`75`
`76`	`76`	`internal override void WriteInterfaceInvokerHandle (InterfaceGen type, string indent, string declaringType)`
`77`	`77`	`{`
`78`		`- WritePeerMembers (indent, true, true, type.RawJniName, declaringType);`
	`78`	`+ WritePeerMembers (indent, true, true, type.RawJniName, declaringType, false);`
`79`	`79`
`80`	`80`	`writer.WriteLine ();`
`81`	`81`	`writer.WriteLine ("{0}static IntPtr java_class_ref {{", indent);`
`@@ -262,10 +262,10 @@ internal override void WriteFieldSetBody (Field field, string indent, GenBase ty`
`262`	`262`	`writer.WriteLine ("{0}}}", indent);`
`263`	`263`	`}`
`264`	`264`
`265`		`- void WritePeerMembers (string indent, bool isInternal, bool isNew, string rawJniType, string declaringType)`
	`265`	`+ void WritePeerMembers (string indent, bool isInternal, bool isNew, string rawJniType, string declaringType, bool isInterface)`
`266`	`266`	`{`
`267`	`267`	`var signature = $"{(isInternal ? "internal " : "")}static {(isNew ? "new " : "")}readonly JniPeerMembers _members = ";`
`268`		`- var type = $"new {GetPeerMembersType ()} (\"{rawJniType}\", typeof ({declaringType}));";`
	`268`	`+ var type = $"new {GetPeerMembersType ()} (\"{rawJniType}\", typeof ({declaringType}){(isInterface ? ", isInterface: true" : string.Empty)});";`
`269`	`269`
`270`	`270`	`writer.WriteLine ($"{indent}{signature}{type}");`
`271`	`271`	`}`