[generator] Make internal Invoker classes partial. (#438)

jpobst · jonpryor · commit 0eb3c066a398 · 2019-06-26T13:34:34.000-04:00
Sometimes people need to add some code to the invoker type...
diff --git a/tools/generator/Java.Interop.Tools.Generator.CodeGeneration/CodeGenerator.cs b/tools/generator/Java.Interop.Tools.Generator.CodeGeneration/CodeGenerator.cs
@@ -712,7 +712,7 @@ public void WriteInterfaceExtensionsDeclaration (InterfaceGen @interface, string
 		public void WriteInterfaceInvoker (InterfaceGen @interface, string indent)
 		{
 			writer.WriteLine ("{0}[global::Android.Runtime.Register (\"{1}\", DoNotGenerateAcw=true{2})]", indent, @interface.RawJniName, @interface.AdditionalAttributeString ());
-			writer.WriteLine ("{0}internal class {1}Invoker : global::Java.Lang.Object, {1} {{", indent, @interface.Name);
+			writer.WriteLine ("{0}internal partial class {1}Invoker : global::Java.Lang.Object, {1} {{", indent, @interface.Name);
 			writer.WriteLine ();
 			WriteInterfaceInvokerHandle (@interface, indent + "\t", @interface.Name + "Invoker");
 			writer.WriteLine ("{0}\t{1}IntPtr class_ref;", indent, opt.BuildingCoreAssembly ? "new " : "");
diff --git a/tools/generator/Tests-Core/expected.ji/Android.Text.ISpannable.cs b/tools/generator/Tests-Core/expected.ji/Android.Text.ISpannable.cs
@@ -12,7 +12,7 @@ public partial interface ISpannable : Android.Text.ISpanned {
 	}
 
 	[global::Android.Runtime.Register ("android/text/Spannable", DoNotGenerateAcw=true)]
-	internal class ISpannableInvoker : global::Java.Lang.Object, ISpannable {
+	internal partial class ISpannableInvoker : global::Java.Lang.Object, ISpannable {
 
 		internal    new     static  readonly    JniPeerMembers  _members    = new JniPeerMembers ("android/text/Spannable", typeof (ISpannableInvoker));
 
diff --git a/tools/generator/Tests-Core/expected.ji/Android.Text.ISpanned.cs b/tools/generator/Tests-Core/expected.ji/Android.Text.ISpanned.cs
@@ -17,7 +17,7 @@ public partial interface ISpanned : IJavaObject {
 	}
 
 	[global::Android.Runtime.Register ("android/text/Spanned", DoNotGenerateAcw=true)]
-	internal class ISpannedInvoker : global::Java.Lang.Object, ISpanned {
+	internal partial class ISpannedInvoker : global::Java.Lang.Object, ISpanned {
 
 		internal    new     static  readonly    JniPeerMembers  _members    = new JniPeerMembers ("android/text/Spanned", typeof (ISpannedInvoker));
 
diff --git a/tools/generator/Tests-Core/expected.ji/Android.Views.View.cs b/tools/generator/Tests-Core/expected.ji/Android.Views.View.cs
@@ -20,7 +20,7 @@ public partial interface IOnClickListener : IJavaObject {
 		}
 
 		[global::Android.Runtime.Register ("android/view/View$OnClickListener", DoNotGenerateAcw=true)]
-		internal class IOnClickListenerInvoker : global::Java.Lang.Object, IOnClickListener {
+		internal partial class IOnClickListenerInvoker : global::Java.Lang.Object, IOnClickListener {
 
 			internal    new     static  readonly    JniPeerMembers  _members    = new JniPeerMembers ("android/view/View$OnClickListener", typeof (IOnClickListenerInvoker));
 
diff --git a/tools/generator/Tests-Core/expected/Android.Text.ISpannable.cs b/tools/generator/Tests-Core/expected/Android.Text.ISpannable.cs
@@ -11,7 +11,7 @@ public partial interface ISpannable : Android.Text.ISpanned {
 	}
 
 	[global::Android.Runtime.Register ("android/text/Spannable", DoNotGenerateAcw=true)]
-	internal class ISpannableInvoker : global::Java.Lang.Object, ISpannable {
+	internal partial class ISpannableInvoker : global::Java.Lang.Object, ISpannable {
 
 		static IntPtr java_class_ref = JNIEnv.FindClass ("android/text/Spannable");
 
diff --git a/tools/generator/Tests-Core/expected/Android.Text.ISpanned.cs b/tools/generator/Tests-Core/expected/Android.Text.ISpanned.cs
@@ -16,7 +16,7 @@ public partial interface ISpanned : IJavaObject {
 	}
 
 	[global::Android.Runtime.Register ("android/text/Spanned", DoNotGenerateAcw=true)]
-	internal class ISpannedInvoker : global::Java.Lang.Object, ISpanned {
+	internal partial class ISpannedInvoker : global::Java.Lang.Object, ISpanned {
 
 		static IntPtr java_class_ref = JNIEnv.FindClass ("android/text/Spanned");
 
diff --git a/tools/generator/Tests-Core/expected/Android.Views.View.cs b/tools/generator/Tests-Core/expected/Android.Views.View.cs
@@ -19,7 +19,7 @@ public partial interface IOnClickListener : IJavaObject {
 		}
 
 		[global::Android.Runtime.Register ("android/view/View$OnClickListener", DoNotGenerateAcw=true)]
-		internal class IOnClickListenerInvoker : global::Java.Lang.Object, IOnClickListener {
+		internal partial class IOnClickListenerInvoker : global::Java.Lang.Object, IOnClickListener {
 
 			static IntPtr java_class_ref = JNIEnv.FindClass ("android/view/View$OnClickListener");
 
diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterface.txt b/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterface.txt
@@ -68,7 +68,7 @@ public partial interface IMyInterface : IJavaObject {
 }
 
 [global::Android.Runtime.Register ("java/code/IMyInterface", DoNotGenerateAcw=true)]
-internal class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterface {
+internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterface {
 
 	internal    new     static  readonly    JniPeerMembers  _members    = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker));
 
diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceInvoker.txt b/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceInvoker.txt
@@ -1,5 +1,5 @@
 [global::Android.Runtime.Register ("java/code/IMyInterface", DoNotGenerateAcw=true)]
-internal class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterface {
+internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterface {
 
 	internal    new     static  readonly    JniPeerMembers  _members    = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker));
 
diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteInterface.txt b/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteInterface.txt
@@ -70,7 +70,7 @@ public partial interface IMyInterface : IJavaObject {
 }
 
 [global::Android.Runtime.Register ("java/code/IMyInterface", DoNotGenerateAcw=true)]
-internal class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterface {
+internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterface {
 
 	static IntPtr java_class_ref = JNIEnv.FindClass ("java/code/IMyInterface");
 
diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteInterfaceInvoker.txt b/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteInterfaceInvoker.txt
@@ -1,5 +1,5 @@
 [global::Android.Runtime.Register ("java/code/IMyInterface", DoNotGenerateAcw=true)]
-internal class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterface {
+internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterface {
 
 	static IntPtr java_class_ref = JNIEnv.FindClass ("java/code/IMyInterface");
 
diff --git a/tools/generator/Tests/expected.ji/Adapters/Xamarin.Test.IAdapter.cs b/tools/generator/Tests/expected.ji/Adapters/Xamarin.Test.IAdapter.cs
@@ -12,7 +12,7 @@ public partial interface IAdapter : IJavaObject {
 	}
 
 	[global::Android.Runtime.Register ("xamarin/test/Adapter", DoNotGenerateAcw=true)]
-	internal class IAdapterInvoker : global::Java.Lang.Object, IAdapter {
+	internal partial class IAdapterInvoker : global::Java.Lang.Object, IAdapter {
 
 		internal    new     static  readonly    JniPeerMembers  _members    = new JniPeerMembers ("xamarin/test/Adapter", typeof (IAdapterInvoker));
 
diff --git a/tools/generator/Tests/expected.ji/Adapters/Xamarin.Test.ISpinnerAdapter.cs b/tools/generator/Tests/expected.ji/Adapters/Xamarin.Test.ISpinnerAdapter.cs
@@ -12,7 +12,7 @@ public partial interface ISpinnerAdapter : global::Xamarin.Test.IAdapter {
 	}
 
 	[global::Android.Runtime.Register ("xamarin/test/SpinnerAdapter", DoNotGenerateAcw=true)]
-	internal class ISpinnerAdapterInvoker : global::Java.Lang.Object, ISpinnerAdapter {
+	internal partial class ISpinnerAdapterInvoker : global::Java.Lang.Object, ISpinnerAdapter {
 
 		internal    new     static  readonly    JniPeerMembers  _members    = new JniPeerMembers ("xamarin/test/SpinnerAdapter", typeof (ISpinnerAdapterInvoker));
 
diff --git a/tools/generator/Tests/expected.ji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs b/tools/generator/Tests/expected.ji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs
@@ -17,7 +17,7 @@ public partial interface IExoMediaDrmOnEventListener : IJavaObject {
 	}
 
 	[global::Android.Runtime.Register ("com/google/android/exoplayer/drm/ExoMediaDrm$OnEventListener", DoNotGenerateAcw=true)]
-	internal class IExoMediaDrmOnEventListenerInvoker : global::Java.Lang.Object, IExoMediaDrmOnEventListener {
+	internal partial class IExoMediaDrmOnEventListenerInvoker : global::Java.Lang.Object, IExoMediaDrmOnEventListener {
 
 		internal    new     static  readonly    JniPeerMembers  _members    = new JniPeerMembers ("com/google/android/exoplayer/drm/ExoMediaDrm$OnEventListener", typeof (IExoMediaDrmOnEventListenerInvoker));
 
@@ -198,7 +198,7 @@ public partial interface IExoMediaDrm : IJavaObject {
 	}
 
 	[global::Android.Runtime.Register ("com/google/android/exoplayer/drm/ExoMediaDrm", DoNotGenerateAcw=true)]
-	internal class IExoMediaDrmInvoker : global::Java.Lang.Object, IExoMediaDrm {
+	internal partial class IExoMediaDrmInvoker : global::Java.Lang.Object, IExoMediaDrm {
 
 		internal    new     static  readonly    JniPeerMembers  _members    = new JniPeerMembers ("com/google/android/exoplayer/drm/ExoMediaDrm", typeof (IExoMediaDrmInvoker));
 
diff --git a/tools/generator/Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II1.cs b/tools/generator/Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II1.cs
@@ -16,7 +16,7 @@ public partial interface II1 : IJavaObject {
 	}
 
 	[global::Android.Runtime.Register ("xamarin/test/I1", DoNotGenerateAcw=true)]
-	internal class II1Invoker : global::Java.Lang.Object, II1 {
+	internal partial class II1Invoker : global::Java.Lang.Object, II1 {
 
 		internal    new     static  readonly    JniPeerMembers  _members    = new JniPeerMembers ("xamarin/test/I1", typeof (II1Invoker));
 
diff --git a/tools/generator/Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II2.cs b/tools/generator/Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II2.cs
@@ -16,7 +16,7 @@ public partial interface II2 : IJavaObject {
 	}
 
 	[global::Android.Runtime.Register ("xamarin/test/I2", DoNotGenerateAcw=true)]
-	internal class II2Invoker : global::Java.Lang.Object, II2 {
+	internal partial class II2Invoker : global::Java.Lang.Object, II2 {
 
 		internal    new     static  readonly    JniPeerMembers  _members    = new JniPeerMembers ("xamarin/test/I2", typeof (II2Invoker));
 
diff --git a/tools/generator/Tests/expected.ji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs b/tools/generator/Tests/expected.ji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs
@@ -24,7 +24,7 @@ public partial interface IFactory : IJavaObject {
 			}
 
 			[global::Android.Runtime.Register ("xamarin/test/NotificationCompatBase$Action$Factory", DoNotGenerateAcw=true)]
-			internal class IFactoryInvoker : global::Java.Lang.Object, IFactory {
+			internal partial class IFactoryInvoker : global::Java.Lang.Object, IFactory {
 
 				internal    new     static  readonly    JniPeerMembers  _members    = new JniPeerMembers ("xamarin/test/NotificationCompatBase$Action$Factory", typeof (IFactoryInvoker));
 
diff --git a/tools/generator/Tests/expected.ji/TestInterface/Test.ME.IGenericInterface.cs b/tools/generator/Tests/expected.ji/TestInterface/Test.ME.IGenericInterface.cs
@@ -17,7 +17,7 @@ public partial interface IGenericInterface : IJavaObject {
 	}
 
 	[global::Android.Runtime.Register ("test/me/GenericInterface", DoNotGenerateAcw=true)]
-	internal class IGenericInterfaceInvoker : global::Java.Lang.Object, IGenericInterface {
+	internal partial class IGenericInterfaceInvoker : global::Java.Lang.Object, IGenericInterface {
 
 		internal    new     static  readonly    JniPeerMembers  _members    = new JniPeerMembers ("test/me/GenericInterface", typeof (IGenericInterfaceInvoker));
 
diff --git a/tools/generator/Tests/expected.ji/TestInterface/Test.ME.IGenericPropertyInterface.cs b/tools/generator/Tests/expected.ji/TestInterface/Test.ME.IGenericPropertyInterface.cs
@@ -20,7 +20,7 @@ public partial interface IGenericPropertyInterface : IJavaObject {
 	}
 
 	[global::Android.Runtime.Register ("test/me/GenericPropertyInterface", DoNotGenerateAcw=true)]
-	internal class IGenericPropertyInterfaceInvoker : global::Java.Lang.Object, IGenericPropertyInterface {
+	internal partial class IGenericPropertyInterfaceInvoker : global::Java.Lang.Object, IGenericPropertyInterface {
 
 		internal    new     static  readonly    JniPeerMembers  _members    = new JniPeerMembers ("test/me/GenericPropertyInterface", typeof (IGenericPropertyInterfaceInvoker));
 
diff --git a/tools/generator/Tests/expected.ji/TestInterface/Test.ME.ITestInterface.cs b/tools/generator/Tests/expected.ji/TestInterface/Test.ME.ITestInterface.cs
@@ -78,7 +78,7 @@ public static string Identity (this Test.ME.ITestInterface self, string value)
 	}
 
 	[global::Android.Runtime.Register ("test/me/TestInterface", DoNotGenerateAcw=true)]
-	internal class ITestInterfaceInvoker : global::Java.Lang.Object, ITestInterface {
+	internal partial class ITestInterfaceInvoker : global::Java.Lang.Object, ITestInterface {
 
 		internal    new     static  readonly    JniPeerMembers  _members    = new JniPeerMembers ("test/me/TestInterface", typeof (ITestInterfaceInvoker));
 
diff --git a/tools/generator/Tests/expected.ji/java.lang.Enum/Java.Lang.IComparable.cs b/tools/generator/Tests/expected.ji/java.lang.Enum/Java.Lang.IComparable.cs
@@ -17,7 +17,7 @@ public partial interface IComparable : IJavaObject {
 	}
 
 	[global::Android.Runtime.Register ("java/lang/Comparable", DoNotGenerateAcw=true)]
-	internal class IComparableInvoker : global::Java.Lang.Object, IComparable {
+	internal partial class IComparableInvoker : global::Java.Lang.Object, IComparable {
 
 		internal    new     static  readonly    JniPeerMembers  _members    = new JniPeerMembers ("java/lang/Comparable", typeof (IComparableInvoker));
 
diff --git a/tools/generator/Tests/expected/Adapters/Xamarin.Test.IAdapter.cs b/tools/generator/Tests/expected/Adapters/Xamarin.Test.IAdapter.cs
@@ -11,7 +11,7 @@ public partial interface IAdapter : IJavaObject {
 	}
 
 	[global::Android.Runtime.Register ("xamarin/test/Adapter", DoNotGenerateAcw=true)]
-	internal class IAdapterInvoker : global::Java.Lang.Object, IAdapter {
+	internal partial class IAdapterInvoker : global::Java.Lang.Object, IAdapter {
 
 		static IntPtr java_class_ref = JNIEnv.FindClass ("xamarin/test/Adapter");
 
diff --git a/tools/generator/Tests/expected/Adapters/Xamarin.Test.ISpinnerAdapter.cs b/tools/generator/Tests/expected/Adapters/Xamarin.Test.ISpinnerAdapter.cs
@@ -11,7 +11,7 @@ public partial interface ISpinnerAdapter : global::Xamarin.Test.IAdapter {
 	}
 
 	[global::Android.Runtime.Register ("xamarin/test/SpinnerAdapter", DoNotGenerateAcw=true)]
-	internal class ISpinnerAdapterInvoker : global::Java.Lang.Object, ISpinnerAdapter {
+	internal partial class ISpinnerAdapterInvoker : global::Java.Lang.Object, ISpinnerAdapter {
 
 		static IntPtr java_class_ref = JNIEnv.FindClass ("xamarin/test/SpinnerAdapter");
 
diff --git a/tools/generator/Tests/expected/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs b/tools/generator/Tests/expected/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs
@@ -16,7 +16,7 @@ public partial interface IExoMediaDrmOnEventListener : IJavaObject {
 	}
 
 	[global::Android.Runtime.Register ("com/google/android/exoplayer/drm/ExoMediaDrm$OnEventListener", DoNotGenerateAcw=true)]
-	internal class IExoMediaDrmOnEventListenerInvoker : global::Java.Lang.Object, IExoMediaDrmOnEventListener {
+	internal partial class IExoMediaDrmOnEventListenerInvoker : global::Java.Lang.Object, IExoMediaDrmOnEventListener {
 
 		static IntPtr java_class_ref = JNIEnv.FindClass ("com/google/android/exoplayer/drm/ExoMediaDrm$OnEventListener");
 
@@ -189,7 +189,7 @@ public partial interface IExoMediaDrm : IJavaObject {
 	}
 
 	[global::Android.Runtime.Register ("com/google/android/exoplayer/drm/ExoMediaDrm", DoNotGenerateAcw=true)]
-	internal class IExoMediaDrmInvoker : global::Java.Lang.Object, IExoMediaDrm {
+	internal partial class IExoMediaDrmInvoker : global::Java.Lang.Object, IExoMediaDrm {
 
 		static IntPtr java_class_ref = JNIEnv.FindClass ("com/google/android/exoplayer/drm/ExoMediaDrm");
 
diff --git a/tools/generator/Tests/expected/InterfaceMethodsConflict/Xamarin.Test.II1.cs b/tools/generator/Tests/expected/InterfaceMethodsConflict/Xamarin.Test.II1.cs
@@ -15,7 +15,7 @@ public partial interface II1 : IJavaObject {
 	}
 
 	[global::Android.Runtime.Register ("xamarin/test/I1", DoNotGenerateAcw=true)]
-	internal class II1Invoker : global::Java.Lang.Object, II1 {
+	internal partial class II1Invoker : global::Java.Lang.Object, II1 {
 
 		static IntPtr java_class_ref = JNIEnv.FindClass ("xamarin/test/I1");
 
diff --git a/tools/generator/Tests/expected/InterfaceMethodsConflict/Xamarin.Test.II2.cs b/tools/generator/Tests/expected/InterfaceMethodsConflict/Xamarin.Test.II2.cs
@@ -15,7 +15,7 @@ public partial interface II2 : IJavaObject {
 	}
 
 	[global::Android.Runtime.Register ("xamarin/test/I2", DoNotGenerateAcw=true)]
-	internal class II2Invoker : global::Java.Lang.Object, II2 {
+	internal partial class II2Invoker : global::Java.Lang.Object, II2 {
 
 		static IntPtr java_class_ref = JNIEnv.FindClass ("xamarin/test/I2");
 
diff --git a/tools/generator/Tests/expected/NestedTypes/Xamarin.Test.NotificationCompatBase.cs b/tools/generator/Tests/expected/NestedTypes/Xamarin.Test.NotificationCompatBase.cs
@@ -23,7 +23,7 @@ public partial interface IFactory : IJavaObject {
 			}
 
 			[global::Android.Runtime.Register ("xamarin/test/NotificationCompatBase$Action$Factory", DoNotGenerateAcw=true)]
-			internal class IFactoryInvoker : global::Java.Lang.Object, IFactory {
+			internal partial class IFactoryInvoker : global::Java.Lang.Object, IFactory {
 
 				static IntPtr java_class_ref = JNIEnv.FindClass ("xamarin/test/NotificationCompatBase$Action$Factory");
 
diff --git a/tools/generator/Tests/expected/TestInterface/Test.ME.IGenericInterface.cs b/tools/generator/Tests/expected/TestInterface/Test.ME.IGenericInterface.cs
@@ -16,7 +16,7 @@ public partial interface IGenericInterface : IJavaObject {
 	}
 
 	[global::Android.Runtime.Register ("test/me/GenericInterface", DoNotGenerateAcw=true)]
-	internal class IGenericInterfaceInvoker : global::Java.Lang.Object, IGenericInterface {
+	internal partial class IGenericInterfaceInvoker : global::Java.Lang.Object, IGenericInterface {
 
 		static IntPtr java_class_ref = JNIEnv.FindClass ("test/me/GenericInterface");
 
diff --git a/tools/generator/Tests/expected/TestInterface/Test.ME.IGenericPropertyInterface.cs b/tools/generator/Tests/expected/TestInterface/Test.ME.IGenericPropertyInterface.cs
@@ -19,7 +19,7 @@ public partial interface IGenericPropertyInterface : IJavaObject {
 	}
 
 	[global::Android.Runtime.Register ("test/me/GenericPropertyInterface", DoNotGenerateAcw=true)]
-	internal class IGenericPropertyInterfaceInvoker : global::Java.Lang.Object, IGenericPropertyInterface {
+	internal partial class IGenericPropertyInterfaceInvoker : global::Java.Lang.Object, IGenericPropertyInterface {
 
 		static IntPtr java_class_ref = JNIEnv.FindClass ("test/me/GenericPropertyInterface");
 
diff --git a/tools/generator/Tests/expected/TestInterface/Test.ME.ITestInterface.cs b/tools/generator/Tests/expected/TestInterface/Test.ME.ITestInterface.cs
@@ -78,7 +78,7 @@ public static string Identity (this Test.ME.ITestInterface self, string value)
 	}
 
 	[global::Android.Runtime.Register ("test/me/TestInterface", DoNotGenerateAcw=true)]
-	internal class ITestInterfaceInvoker : global::Java.Lang.Object, ITestInterface {
+	internal partial class ITestInterfaceInvoker : global::Java.Lang.Object, ITestInterface {
 
 		static IntPtr java_class_ref = JNIEnv.FindClass ("test/me/TestInterface");
 
diff --git a/tools/generator/Tests/expected/java.lang.Enum/Java.Lang.IComparable.cs b/tools/generator/Tests/expected/java.lang.Enum/Java.Lang.IComparable.cs
@@ -16,7 +16,7 @@ public partial interface IComparable : IJavaObject {
 	}
 
 	[global::Android.Runtime.Register ("java/lang/Comparable", DoNotGenerateAcw=true)]
-	internal class IComparableInvoker : global::Java.Lang.Object, IComparable {
+	internal partial class IComparableInvoker : global::Java.Lang.Object, IComparable {
 
 		static IntPtr java_class_ref = JNIEnv.FindClass ("java/lang/Comparable");
 

Original file line number	Diff line number	Diff line change
`@@ -712,7 +712,7 @@ public void WriteInterfaceExtensionsDeclaration (InterfaceGen @interface, string`
`712`	`712`	`public void WriteInterfaceInvoker (InterfaceGen @interface, string indent)`
`713`	`713`	`{`
`714`	`714`	`writer.WriteLine ("{0}[global::Android.Runtime.Register (\"{1}\", DoNotGenerateAcw=true{2})]", indent, @interface.RawJniName, @interface.AdditionalAttributeString ());`
`715`		`- writer.WriteLine ("{0}internal class {1}Invoker : global::Java.Lang.Object, {1} {{", indent, @interface.Name);`
	`715`	`+ writer.WriteLine ("{0}internal partial class {1}Invoker : global::Java.Lang.Object, {1} {{", indent, @interface.Name);`
`716`	`716`	`writer.WriteLine ();`
`717`	`717`	`WriteInterfaceInvokerHandle (@interface, indent + "\t", @interface.Name + "Invoker");`
`718`	`718`	`writer.WriteLine ("{0}\t{1}IntPtr class_ref;", indent, opt.BuildingCoreAssembly ? "new " : "");`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public partial interface ISpannable : Android.Text.ISpanned {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`[global::Android.Runtime.Register ("android/text/Spannable", DoNotGenerateAcw=true)]`
`15`		`- internal class ISpannableInvoker : global::Java.Lang.Object, ISpannable {`
	`15`	`+ internal partial class ISpannableInvoker : global::Java.Lang.Object, ISpannable {`
`16`	`16`
`17`	`17`	`internal new static readonly JniPeerMembers _members = new JniPeerMembers ("android/text/Spannable", typeof (ISpannableInvoker));`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public partial interface ISpanned : IJavaObject {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`[global::Android.Runtime.Register ("android/text/Spanned", DoNotGenerateAcw=true)]`
`20`		`- internal class ISpannedInvoker : global::Java.Lang.Object, ISpanned {`
	`20`	`+ internal partial class ISpannedInvoker : global::Java.Lang.Object, ISpanned {`
`21`	`21`
`22`	`22`	`internal new static readonly JniPeerMembers _members = new JniPeerMembers ("android/text/Spanned", typeof (ISpannedInvoker));`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public partial interface IOnClickListener : IJavaObject {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`[global::Android.Runtime.Register ("android/view/View$OnClickListener", DoNotGenerateAcw=true)]`
`23`		`- internal class IOnClickListenerInvoker : global::Java.Lang.Object, IOnClickListener {`
	`23`	`+ internal partial class IOnClickListenerInvoker : global::Java.Lang.Object, IOnClickListener {`
`24`	`24`
`25`	`25`	`internal new static readonly JniPeerMembers _members = new JniPeerMembers ("android/view/View$OnClickListener", typeof (IOnClickListenerInvoker));`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public partial interface ISpannable : Android.Text.ISpanned {`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`[global::Android.Runtime.Register ("android/text/Spannable", DoNotGenerateAcw=true)]`
`14`		`- internal class ISpannableInvoker : global::Java.Lang.Object, ISpannable {`
	`14`	`+ internal partial class ISpannableInvoker : global::Java.Lang.Object, ISpannable {`
`15`	`15`
`16`	`16`	`static IntPtr java_class_ref = JNIEnv.FindClass ("android/text/Spannable");`
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public partial interface ISpanned : IJavaObject {`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`[global::Android.Runtime.Register ("android/text/Spanned", DoNotGenerateAcw=true)]`
`19`		`- internal class ISpannedInvoker : global::Java.Lang.Object, ISpanned {`
	`19`	`+ internal partial class ISpannedInvoker : global::Java.Lang.Object, ISpanned {`
`20`	`20`
`21`	`21`	`static IntPtr java_class_ref = JNIEnv.FindClass ("android/text/Spanned");`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public partial interface IOnClickListener : IJavaObject {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`[global::Android.Runtime.Register ("android/view/View$OnClickListener", DoNotGenerateAcw=true)]`
`22`		`- internal class IOnClickListenerInvoker : global::Java.Lang.Object, IOnClickListener {`
	`22`	`+ internal partial class IOnClickListenerInvoker : global::Java.Lang.Object, IOnClickListener {`
`23`	`23`
`24`	`24`	`static IntPtr java_class_ref = JNIEnv.FindClass ("android/view/View$OnClickListener");`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public partial interface IMyInterface : IJavaObject {`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`[global::Android.Runtime.Register ("java/code/IMyInterface", DoNotGenerateAcw=true)]`
`71`		`-internal class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterface {`
	`71`	`+internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterface {`
`72`	`72`
`73`	`73`	`internal new static readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker));`
`74`	`74`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public partial interface IMyInterface : IJavaObject {`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`[global::Android.Runtime.Register ("java/code/IMyInterface", DoNotGenerateAcw=true)]`
`73`		`-internal class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterface {`
	`73`	`+internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterface {`
`74`	`74`
`75`	`75`	`static IntPtr java_class_ref = JNIEnv.FindClass ("java/code/IMyInterface");`
`76`	`76`