Use GetExportedTypes where possible and filter nested types #723
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,6 +4,7 @@ | |
| using System.Collections.Generic; | ||
| using System.Diagnostics; | ||
| using System.IO; | ||
| using System.Linq; | ||
| using System.Reflection; | ||
| using System.Threading; | ||
|
|
||
|
|
@@ -351,9 +352,7 @@ internal static void ScanAssembly(Assembly assembly) | |
| // A couple of things we want to do here: first, we want to | ||
| // gather a list of all of the namespaces contributed to by | ||
| // the assembly. | ||
| foreach (Type t in GetTypes(assembly)) | ||
| { | ||
| string ns = t.Namespace ?? ""; | ||
| if (!namespaces.ContainsKey(ns)) | ||
|
|
@@ -427,10 +426,9 @@ public static List<string> GetNames(string nsname) | |
| { | ||
| foreach (Assembly a in namespaces[nsname].Keys) | ||
| { | ||
| foreach (Type t in GetTypes(a)) | ||
| { | ||
| if ((t.Namespace ?? "") == nsname && !t.IsNested) | ||
| { | ||
| names.Add(t.Name); | ||
| } | ||
|
|
@@ -469,5 +467,32 @@ public static Type LookupType(string qname) | |
| } | ||
| return null; | ||
| } | ||
|
|
||
| internal static Type[] GetTypes(Assembly a) | ||
| { | ||
| if (a.IsDynamic) | ||
| { | ||
| try | ||
| { | ||
| return a.GetTypes(); | ||
| } | ||
| catch (ReflectionTypeLoadException exc) | ||
| { | ||
| // Return all types that were successfully loaded | ||
| return exc.Types.Where(x => x != null).ToArray(); | ||
| } | ||
| } | ||
|
There was a problem hiding this comment. @denfromufa Is this what you had in mind? There was a problem hiding this comment. @filmor this is even more than what i asked for :) |
||
| else | ||
| { | ||
| try | ||
| { | ||
| return a.GetExportedTypes(); | ||
| } | ||
| catch (FileNotFoundException) | ||
| { | ||
| return new Type[0]; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
need a try-catch block here for transitive depedencies
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Isn't it an error, though, if we can't load transitive dependencies?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@filmor i think it is someone else's job to load transitive dependencies, e.g. the direct dependencies should find them on their own:
NuGet/Home#6614