Skip to content

[generator] Fix DIM error when subclassing a class that inherits an interface with a DIM method #489

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 30, 2019
Merged

[generator] Fix DIM error when subclassing a class that inherits an interface with a DIM method #489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions tools/generator/Java.Interop.Tools.Generator.CodeGeneration/CodeGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1470,8 +1470,13 @@ public void WriteProperty (Property property, GenBase gen, string indent, bool w
if ((property.Getter ?? property.Setter).IsStatic)
virtual_override = " static";
// It should be using AdjustedName instead of Name, but ICharSequence ("Formatted") properties are not caught by this...
else if (gen.BaseSymbol != null && gen.BaseSymbol.GetPropertyByName (property.Name, true) != null)
virtual_override = " override";
else if (gen.BaseSymbol != null) {
var base_prop = gen.BaseSymbol.GetPropertyByName (property.Name, true);

// If the matching base getter we found is a DIM, we do not override it, it should stay virtual
if (base_prop != null && !base_prop.Getter.IsInterfaceDefaultMethod)
virtual_override = " override";
}

WriteMethodIdField (property.Getter, indent);
if (property.Setter != null)
Expand Down
23 changes: 23 additions & 0 deletions tools/generator/Tests/Unit-Tests/CodeGeneratorTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Xml.Linq;
using MonoDroid.Generation;
using NUnit.Framework;

Expand Down Expand Up @@ -55,5 +58,25 @@ protected string GetTargetedExpected (string testName)

return File.ReadAllText (Path.Combine (root, "Unit-Tests", "CodeGeneratorExpectedResults", target, $"{testName}.txt")).NormalizeLineEndings ();
}

protected List<GenBase> ParseApiDefinition (string xml)
{
var doc = XDocument.Parse (xml);
var gens = new Parser (options).Parse (doc, Enumerable.Empty<string> (), "29", 7);

foreach (var gen in gens)
options.SymbolTable.AddType (gen);

foreach (var gen in gens)
gen.Validate (options, new GenericParameterDefinitionList (), generator.Context);

foreach (var gen in gens)
gen.FillProperties ();

foreach (var gen in gens)
gen.FixupMethodOverrides (options);

return gens;
}
}
}
43 changes: 43 additions & 0 deletions tools/generator/Tests/Unit-Tests/DefaultInterfaceMethodsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using System.Linq;
using MonoDroid.Generation;
using NUnit.Framework;
using Xamarin.Android.Binder;
Expand Down Expand Up @@ -149,6 +150,48 @@ public void WriteSealedOverriddenDefaultMethod ()
Assert.False (writer.ToString ().Contains ("virtual sealed"));
}

[Test]
public void WriteInterfaceRedeclaredChainDefaultMethod ()
{
// Fix a case where a property declared in this hierarchy was generated as "override" instead of "virtual"
// public interface MyInterface { default int getValue () { return 0; } }
// public class MyClass implements MyInterface { }
// public class MySecondClass extends MyClass { @Override public int getValue () { return 1; } }
var gens = ParseApiDefinition (@"<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/EmptyOverrideClass;' />
</package>
<package name='com.xamarin.android' jni-name='com/xamarin/android'>
<interface abstract='true' deprecated='not deprecated' final='false' name='DefaultMethodsInterface' static='false' visibility='public' jni-signature='Lcom/xamarin/android/DefaultMethodsInterface;'>
<method abstract='false' deprecated='not deprecated' final='false' name='foo' jni-signature='()I' bridge='false' native='false' return='int' jni-return='I' static='false' synchronized='false' synthetic='false' visibility='public'></method>
<method abstract='false' deprecated='not deprecated' final='false' name='getBar' jni-signature='()I' bridge='false' native='false' return='int' jni-return='I' static='false' synchronized='false' synthetic='false' visibility='public'></method>
<method abstract='false' deprecated='not deprecated' final='false' name='setBar' jni-signature='(I)V' bridge='false' native='false' return='void' jni-return='V' static='false' synchronized='false' synthetic='false' visibility='public'>
<parameter name='p0' type='int' jni-type='I'></parameter>
</method>
</interface>
<class abstract='false' deprecated='not deprecated' extends='java.lang.Object' extends-generic-aware='java.lang.Object' jni-extends='Ljava/lang/Object;' final='false' name='EmptyOverrideClass' static='false' visibility='public' jni-signature='Lcom/xamarin/android/EmptyOverrideClass;'>
<implements name='com.xamarin.android.DefaultMethodsInterface' name-generic-aware='com.xamarin.android.DefaultMethodsInterface' jni-type='Lcom/xamarin/android/DefaultMethodsInterface;'></implements>
<constructor deprecated='not deprecated' final='false' name='EmptyOverrideClass' jni-signature='()V' bridge='false' static='false' type='com.xamarin.android.EmptyOverrideClass' synthetic='false' visibility='public'></constructor>
</class>
<class abstract='false' deprecated='not deprecated' extends='com.xamarin.android.EmptyOverrideClass' extends-generic-aware='com.xamarin.android.EmptyOverrideClass' jni-extends='Lcom/xamarin/android/EmptyOverrideClass;' final='false' name='ImplementedChainOverrideClass' static='false' visibility='public' jni-signature='Lcom/xamarin/android/ImplementedChainOverrideClass;'>
<constructor deprecated='not deprecated' final='false' name='ImplementedChainOverrideClass' jni-signature='()V' bridge='false' static='false' type='com.xamarin.android.ImplementedChainOverrideClass' synthetic='false' visibility='public'></constructor>
<method abstract='false' deprecated='not deprecated' final='false' name='getBar' jni-signature='()I' bridge='false' native='false' return='int' jni-return='I' static='false' synchronized='false' synthetic='false' visibility='public'></method>
<method abstract='false' deprecated='not deprecated' final='false' name='setBar' jni-signature='(I)V' bridge='false' native='false' return='void' jni-return='V' static='false' synchronized='false' synthetic='false' visibility='public'>
<parameter name='p0' type='int' jni-type='I'></parameter>
</method>
</class>
</package>
</api>");

var klass = (ClassGen)gens.First (g => g.Name == "ImplementedChainOverrideClass");

generator.Context.ContextTypes.Push (klass);
generator.WriteClass (klass, string.Empty, new GenerationInfo (string.Empty, string.Empty, "MyAssembly"));
generator.Context.ContextTypes.Pop ();

Assert.True (writer.ToString ().Contains ("public virtual unsafe int Bar"));
}

[Test]
public void WriteStaticInterfaceMethod ()
{
Expand Down