Changed AttributeHelper

Author: SergeiPavlov

Orm/Xtensive.Orm/Orm/Building/Builders/IndexBuilder.FullText.cs

@@ -141,8 +141,8 @@ private Dictionary<TypeInfo, List<FullTextIndexDef>> GatherFullTextIndexDefinito
             typeHasIndexDef = true;
           }
         }
-        if (typeHasIndexDef)
-          foreach (var descendant in type.DirectDescendants)
+        if (typeHasIndexDef) {
+          foreach (var descendant in type.DirectDescendants) {
             processQueue.Enqueue(descendant);
           }
       }

Orm/Xtensive.Orm/Reflection/AttributeHelper.cs

@@ -23,8 +23,7 @@ public static class AttributeHelper
   {
     internal class AttributeExtractors<TAttribute> where TAttribute : Attribute
     {
-      internal static readonly Func<PerAttributeKey, TAttribute[]> AttributesExtractor = key =>
-      {
+      internal static readonly Func<PerAttributeKey, TAttribute[]> AttributesExtractor = key => {
         var uncasted = GetAttributes(key.Item1, typeof(TAttribute), key.Item2);
         return uncasted.Count > 0
           ? uncasted.Cast<TAttribute>().ToArray(uncasted.Count)
@@ -77,65 +76,60 @@ public static TAttribute GetAttribute<TAttribute>(this MemberInfo member, Attrib
     }
 
     private static IReadOnlyList<Attribute> GetAttributes(MemberInfo member, Type attributeType, AttributeSearchOptions options) =>
-      AttributesByMemberInfoAndSearchOptions.GetOrAdd(
-        new AttributesKey(member, attributeType, options),
-        t => ExtractAttributes(t, out var count).ToArray(count)
-      );
+         AttributesByMemberInfoAndSearchOptions.GetOrAdd(
+           new AttributesKey(member, attributeType, options),
+           ExtractAttributes
+         );
 
-    private static IEnumerable<Attribute> GetAttributes(this MemberInfo member, Type attributeType, out int count)
+    private static List<Attribute> GetAttributesAsNewList(this MemberInfo member, Type attributeType)
     {
       var attrObjects = member.GetCustomAttributes(attributeType, false);
-      count = attrObjects.Length;
-      return (count == 0)
-        ? Array.Empty<Attribute>()
-        : attrObjects.Cast<Attribute>();
+      var attrs = new List<Attribute>(attrObjects.Length);
+      for (int i = 0, count = attrObjects.Length; i < count; ++i) {
+        attrs.Add((Attribute) attrObjects[i]);
+      }
+      return attrs;
     }
 
-    private static IEnumerable<Attribute> ExtractAttributes((MemberInfo member, Type attributeType, AttributeSearchOptions options) t, out int count)
+    private static IReadOnlyList<Attribute> ExtractAttributes((MemberInfo member, Type attributeType, AttributeSearchOptions options) t)
     {
       (var member, var attributeType, var options) = t;
 
-      var customAttributesRaw = member.GetCustomAttributes(attributeType, false);
-      count = customAttributesRaw.Length;
+      var attributesAsObjects = member.GetCustomAttributes(attributeType, false);
+      var attributesCount = attributesAsObjects.Length;
 
-      if (options == AttributeSearchOptions.InheritNone) {
-        return (customAttributesRaw.Length == 0)
-          ? Array.Empty<Attribute>()
-          : customAttributesRaw.Cast<Attribute>();
-      }
+      var attributes = attributesCount > 0
+        ? attributesAsObjects.Cast<Attribute>().ToList(attributesCount)
+        : null;
 
-      IEnumerable<Attribute> attributes;
-      if (customAttributesRaw.Length == 0) {
-        attributes = Enumerable.Empty<Attribute>();
-        if ((options & AttributeSearchOptions.InheritFromPropertyOrEvent) != 0
-            && member is MethodInfo m
-            && ((MemberInfo) m.GetProperty() ?? m.GetEvent()) is MemberInfo poe) {
-          var poeAttributes = poe.GetAttributes(attributeType, out var count1);
-          count = count1;
-          attributes = poeAttributes;
-        }
-        if ((options & AttributeSearchOptions.InheritFromBase) != 0
-            && (options & AttributeSearchOptions.InheritRecursively) == 0
-            && member.GetBaseMember() is MemberInfo bm) {
-          var inheritedAttributes = GetAttributes(bm, attributeType, options);
-          count += inheritedAttributes.Count;
-          attributes = attributes.Concat(inheritedAttributes);
-          return attributes;
+      if (options != AttributeSearchOptions.InheritNone) {
+        if (attributesCount == 0) {
+          if ((options & AttributeSearchOptions.InheritFromPropertyOrEvent) != 0
+              && member is MethodInfo m
+              && ((MemberInfo) m.GetProperty() ?? m.GetEvent()) is MemberInfo poe) {
+            attributes = poe.GetAttributesAsNewList(attributeType);
+          }
+          if ((options & AttributeSearchOptions.InheritFromBase) != 0
+              && (options & AttributeSearchOptions.InheritFromAllBase) == 0
+              && member.GetBaseMember() is MemberInfo bm) {
+            var attrsToAdd = GetAttributes(bm, attributeType, options);
+            if (attrsToAdd.Count > 0) {
+              (attributes ??= new List<Attribute>(attrsToAdd.Count)).AddRange(attrsToAdd);
+            }
+          }
         }
-      }
-      else {
-        attributes = customAttributesRaw.Cast<Attribute>();
-      }
 
-      if ((options & AttributeSearchOptions.InheritFromAllBase) == AttributeSearchOptions.InheritFromAllBase
-          && member.DeclaringType != WellKnownTypes.Object
-          && member.GetBaseMember() is MemberInfo bm2) {
-        var inheritedAttributes = GetAttributes(bm2, attributeType, options);
-        count += inheritedAttributes.Count;
-        attributes = attributes.Concat(inheritedAttributes);
+        if ((options & AttributeSearchOptions.InheritFromAllBase) != 0
+            && member.DeclaringType != WellKnownTypes.Object
+            && member.GetBaseMember() is MemberInfo bm2) {
+          var attrsToAdd = GetAttributes(bm2, attributeType, options);
+          if (attrsToAdd.Count > 0) {
+            (attributes ??= new List<Attribute>(attrsToAdd.Count)).AddRange(attrsToAdd);
+          }
+        }
       }
 
-      return (IReadOnlyList<Attribute>)attributes ?? Array.Empty<Attribute>();
+      return (IReadOnlyList<Attribute>) attributes ?? Array.Empty<Attribute>();
     }
   }
 }