Skip to content

[generator] Fix nested type visibility and findability. #102

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
Nov 17, 2016
Merged

[generator] Fix nested type visibility and findability. #102

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
2 changes: 1 addition & 1 deletion tools/generator/GenBaseSupport.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ public override GenericParameterDefinitionList TypeParameters {
}

public override string Visibility {
get { return t.IsPublic ? "public" : "protected internal"; }
get { return t.IsPublic || t.IsNestedPublic ? "public" : "protected internal"; }
}
}
#endif
Expand Down
4 changes: 3 additions & 1 deletion tools/generator/JavaApiDllLoaderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
#if GENERATOR
using System;
using System.Collections.Generic;
using System.Linq;
using MonoDroid.Generation;

namespace Xamarin.Android.Tools.ApiXmlAdjuster
{
public static class JavaApiDllLoaderExtensions
{
public static void LoadReferences (this JavaApi api, GenBase [] gens)
public static void LoadReferences (this JavaApi api, IEnumerable<GenBase> gens)
{
JavaPackage pkg = null;
foreach (var gen in gens.Where (_ => _.IsAcw)) {
Expand All @@ -27,6 +28,7 @@ public static void LoadReferences (this JavaApi api, GenBase [] gens)
}
else
throw new InvalidOperationException ();
api.LoadReferences (gen.NestedTypes);
}
}

Expand Down