Skip to content

Cherry-pick fixes from master to d15-3 #149

New issue

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

#

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

Already on GitHub? # to your account

Merged
merged 2 commits into from
Jun 5, 2017
Merged

Cherry-pick fixes from master to d15-3 #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ef1b0e
[api-xml-adjuster] constructors could reference generic type paramete…
atsushieno Jun 1, 2017
66a48d6
Bump to cecil/master/f64903c0 (#148)
jonpryor Jun 1, 2017
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
2 changes: 1 addition & 1 deletion external/cecil
Open in desktop
Submodule cecil updated from b77420 to f64903
12 changes: 6 additions & 6 deletions src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApiTypeResolverExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,23 +104,23 @@ public static void Resolve (this JavaField f)
f.ResolvedType = f.GetApi ().Parse (f.TypeGeneric, f.Parent.TypeParameters);
}

static void ResolveMethodBase (this JavaMethodBase m, JavaTypeParameters methodTypeParameters)
static void ResolveMethodBase (this JavaMethodBase m)
{
if (m.TypeParameters != null)
m.TypeParameters.Resolve (m.GetApi (), m.TypeParameters);
foreach (var p in m.Parameters)
p.ResolvedType = m.GetApi ().Parse (p.Type, m.Parent.TypeParameters, methodTypeParameters);
p.ResolvedType = m.GetApi ().Parse (p.Type, m.Parent.TypeParameters, m.TypeParameters);
}

public static void Resolve (this JavaMethod m)
{
if (m.TypeParameters != null)
m.TypeParameters.Resolve (m.GetApi (), m.TypeParameters);
m.ResolveMethodBase (m.TypeParameters);
m.ResolveMethodBase ();
m.ResolvedReturnType = m.GetApi ().Parse (m.Return, m.Parent.TypeParameters, m.TypeParameters);
}

public static void Resolve (this JavaConstructor c)
{
c.ResolveMethodBase (null);
c.ResolveMethodBase ();
}

static void Resolve (this JavaTypeParameters tp, JavaApi api, params JavaTypeParameters [] additionalTypeParameters)
Expand Down