Skip to content

Commit 8b06c32

Browse files
committed
style: Minor refactorings
1 parent bdaad4a commit 8b06c32

File tree

3 files changed

+24
-26
lines changed

3 files changed

+24
-26
lines changed

Editor/Drawers/TypeReferencePropertyDrawer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ private static Rect GetPositionWithoutLabel(Rect position, GUIContent label)
3535

3636
private void DrawTypeReferenceField(Rect position, SerializedProperty property)
3737
{
38-
var typeOptionsAttribute = attribute as TypeOptionsAttribute ?? TypeOptionsAttribute.Default;
38+
var typeOptionsAttribute = attribute as TypeOptionsAttribute ?? new TypeOptionsAttribute();
3939
var serializedTypeRef = new SerializedTypeReference(property);
4040

4141
var selectedType = TypeCache.GetType(serializedTypeRef.TypeNameAndAssembly);

Editor/Util/TypeCollector.cs

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -27,39 +27,38 @@ internal static class TypeCollector
2727
/// </remarks>
2828
public static List<Assembly> GetAssembliesTypeHasAccessTo(Type type)
2929
{
30-
List<Assembly> assemblies;
30+
Assembly typeAssembly;
3131

3232
try
3333
{
34-
Assembly typeAssembly = type == null ? Assembly.Load("Assembly-CSharp") : type.Assembly;
35-
36-
var referencedAssemblies = typeAssembly.GetReferencedAssemblies();
37-
assemblies = new List<Assembly>(referencedAssemblies.Length + 1);
38-
39-
for (int i = 0; i < referencedAssemblies.Length; i++)
40-
{
41-
assemblies[i] = Assembly.Load(referencedAssemblies[i]);
42-
}
43-
44-
assemblies[referencedAssemblies.Length] = typeAssembly;
34+
typeAssembly = type == null ? Assembly.Load("Assembly-CSharp") : type.Assembly;
4535
}
4636
catch (FileNotFoundException)
4737
{
48-
assemblies = new List<Assembly>(AppDomain.CurrentDomain.GetAssemblies());
38+
return GetAllAssemblies();
39+
}
40+
41+
var referencedAssemblies = typeAssembly.GetReferencedAssemblies();
42+
var assemblies = new List<Assembly>(referencedAssemblies.Length + 1);
43+
44+
for (int i = 0; i < referencedAssemblies.Length; i++)
45+
{
46+
assemblies[i] = Assembly.Load(referencedAssemblies[i]);
4947
}
5048

49+
assemblies[referencedAssemblies.Length] = typeAssembly;
5150
return assemblies;
5251
}
5352

54-
public static List<Assembly> GetAssembliesTypeHasAccessTo(Type type, out bool containsMSCorLib)
53+
public static List<Assembly> GetAssembliesTypeHasAccessTo(Type type, out bool containsMscorlib)
5554
{
5655
if (type == null)
5756
{
58-
containsMSCorLib = true;
57+
containsMscorlib = true;
5958
return GetAllAssemblies();
6059
}
6160

62-
containsMSCorLib = false;
61+
containsMscorlib = false;
6362
Assembly typeAssembly = type.Assembly;
6463

6564
var referencedAssemblies = typeAssembly.GetReferencedAssemblies();
@@ -69,17 +68,17 @@ public static List<Assembly> GetAssembliesTypeHasAccessTo(Type type, out bool co
6968
{
7069
var assemblyName = referencedAssemblies[i];
7170

72-
if ( ! containsMSCorLib && assemblyName.Name == "mscorlib")
71+
if ( ! containsMscorlib && assemblyName.Name == "mscorlib")
7372
{
74-
containsMSCorLib = true;
73+
containsMscorlib = true;
7574
}
7675

7776
assemblies.Add(Assembly.Load(assemblyName));
7877
}
7978

80-
if ( ! containsMSCorLib && typeAssembly.FullName.Contains("mscorlib"))
79+
if ( ! containsMscorlib && typeAssembly.FullName.Contains("mscorlib"))
8180
{
82-
containsMSCorLib = true;
81+
containsMscorlib = true;
8382
}
8483

8584
assemblies.Add(typeAssembly);

Runtime/Attributes/TypeOptionsAttribute.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@
1313
[AttributeUsage(AttributeTargets.Field)]
1414
public class TypeOptionsAttribute : PropertyAttribute
1515
{
16-
private static readonly TypeOptionsAttribute _defaultInstance = new TypeOptionsAttribute();
17-
18-
public static TypeOptionsAttribute Default => _defaultInstance;
19-
2016
/// <summary>
2117
/// Gets or sets grouping of selectable types. Defaults to <see><cref>Grouping.ByNamespaceFlat</cref></see>
2218
/// unless explicitly specified.
@@ -42,7 +38,10 @@ public class TypeOptionsAttribute : PropertyAttribute
4238
/// </summary>
4339
[PublicAPI] public string[] IncludeAdditionalAssemblies;
4440

45-
/// <summary>Gets or sets the height of the dropdown. Default is zero.</summary>
41+
/// <summary>
42+
/// Gets or sets the height of the dropdown. If not set, the height is dynamic (min 100, max 600 pixels).
43+
/// If set outside the height limits, the height will be clamped.
44+
/// </summary>
4645
[PublicAPI] public int DropdownHeight;
4746

4847
/// <summary>

0 commit comments

Comments
 (0)