feat: ItemTypeAttribute

AvaloniaUI · Oct 3, 2023 · 979ef4b · 979ef4b
1 parent 6f25178
commit 979ef4b
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 12 deletions.
diff --git a/CompletionEngine/Avalonia.Ide.CompletionEngine.DnlibMetadataProvider/Wrappers.cs b/CompletionEngine/Avalonia.Ide.CompletionEngine.DnlibMetadataProvider/Wrappers.cs
@@ -117,7 +117,6 @@ public IEnumerable<string> Pseudoclasses
                 foreach (var ret2 in ret)
                     if (ret2 is not null)
                         yield return ret2;
-
         }
     }
     public override string ToString() => Name;
@@ -149,6 +148,20 @@ public bool IsSubclassOf(ITypeInformation? type)
             }
         }
     }
+    IReadOnlyList<ICustomAttributeInformation>? _customAttributes;
+    public IReadOnlyList<ICustomAttributeInformation> CustomAttributes
+    {
+        get
+        {
+            if (_customAttributes is null)
+            {
+                _customAttributes = _type.CustomAttributes
+                    .Select(a => new CustomAttributeWrapper(a))
+                    .ToArray();
+            }
+            return _customAttributes!;
+        }
+    }
 }
 
 internal class CustomAttributeWrapper : ICustomAttributeInformation
@@ -171,10 +184,17 @@ internal class ConstructorArgumentWrapper : IAttributeConstructorArgumentInforma
 {
     public ConstructorArgumentWrapper(CAArgument ca)
     {
-        Value = ca.Value;
+        if (ca.Value is ClassSig cs)
+        {
+            Value = cs.AssemblyQualifiedName;
+        }
+        else
+        {
+            Value = ca.Value;
+        }
     }
 
-    public object Value { get; }
+    public object? Value { get; }
 }
 
 internal class PropertyWrapper : IPropertyInformation
@@ -376,6 +396,21 @@ public MethodWrapper(MethodDef method)
     public string ReturnTypeFullName { get; }
     public string QualifiedReturnTypeFullName { get; }
 
+    private IReadOnlyList<ICustomAttributeInformation>? _customAttributes;
+    public IReadOnlyList<ICustomAttributeInformation> CustomAttributes
+    {
+        get
+        {
+            if (_customAttributes == null)
+            {
+                _customAttributes = _method.CustomAttributes
+                    .Select(a => new CustomAttributeWrapper(a))
+                    .ToArray();
+            }
+            return _customAttributes;
+        }
+    }
+
     public override string ToString() => Name;
 }
 
@@ -385,7 +420,7 @@ internal class ParameterWrapper : IParameterInformation
 
     public ParameterWrapper(Parameter param)
     {
-        TypeFullName = param.Name;
+        TypeFullName = param.Type.FullName;
         QualifiedTypeFullName = param.Type.AssemblyQualifiedName;
         _type = new Lazy<ITypeInformation?>(() =>
         {

diff --git a/CompletionEngine/Avalonia.Ide.CompletionEngine/AssemblyMetadata/IAssemblyInformation.cs b/CompletionEngine/Avalonia.Ide.CompletionEngine/AssemblyMetadata/IAssemblyInformation.cs
@@ -51,6 +51,8 @@ public interface ITypeInformation
     bool IsInternal { get; }
     IEnumerable<string> EnumValues { get; }
     IEnumerable<ITypeInformation> NestedTypes { get; }
+    IReadOnlyList<ICustomAttributeInformation> CustomAttributes { get; }
+
     bool IsSubclassOf(ITypeInformation? parentType);
 }
 
@@ -62,6 +64,7 @@ public interface IMethodInformation
     IList<IParameterInformation> Parameters { get; }
     string ReturnTypeFullName { get; }
     string QualifiedReturnTypeFullName { get; }
+    IReadOnlyList<ICustomAttributeInformation> CustomAttributes { get; }
 }
 
 public interface IFieldInformation

diff --git a/CompletionEngine/Avalonia.Ide.CompletionEngine/AssemblyMetadata/MetadataConverter.cs b/CompletionEngine/Avalonia.Ide.CompletionEngine/AssemblyMetadata/MetadataConverter.cs
@@ -94,13 +94,11 @@ private static MetadataType GetOrCreateMetadataType(Dictionary<string, MetadataT
         {
             return mt;
         }
-        var itemsType = type is null
-             ? null
-             : type.Methods
-                        .Where(m => !m.IsStatic && m.IsPublic && m.Name == "Add" && m.Parameters.Count == 1 && m.Parameters[0].Type is not null)
-                        .Select(m => GetOrCreateMetadataType(types, m.Parameters[0].Type, m.Parameters[0].QualifiedTypeFullName, m.Parameters[0].TypeFullName))
-                        .FirstOrDefault();
-        mt = ConvertTypeInfomation(type!, itemsType);
+        mt = ConvertTypeInfomation(type!, null);
+        foreach (var key in keys)
+        {
+            types[key] = mt;
+        }
         return mt;
     }
 
@@ -976,5 +974,34 @@ IEnumerable<string> filterLocalRes(MetadataType type, string? currentAssemblyNam
 
             metadata.AddType(Utils.Xaml2006Namespace, typeArguments);
         }
+
+        // Valorizze items type
+
+        var metaTypes = types.Values.ToArray();
+
+        foreach (var mt in metaTypes)
+        {
+            if (mt.ItemsType is null && mt.Type is { } ti)
+            {
+                var attributes = ti.CustomAttributes;
+                if (attributes.Count > 0)
+                {
+                    if (attributes.FirstOrDefault(a => a.TypeFullName == "Avalonia.Metadata.ItemTypeAttribute") is { } attribute)
+                    {
+                        if (attribute.ConstructorArguments[0].Value is string name)
+                        {
+                            mt.ItemsType = GetOrCreateMetadataType(types, null, name);
+                        }
+                    }
+                }
+                if (mt.ItemsType is null)
+                {
+                    mt.ItemsType = ti.Methods
+                            .Where(m => !m.IsStatic && m.IsPublic && m.Name == "Add" && m.Parameters.Count == 1 && m.Parameters[0].Type is not null)
+                            .Select(m => GetOrCreateMetadataType(types, m.Parameters[0].Type, m.Parameters[0].QualifiedTypeFullName, m.Parameters[0].TypeFullName))
+                            .FirstOrDefault();
+                }
+            }
+        }
     }
 }
diff --git a/CompletionEngine/Avalonia.Ide.CompletionEngine/Completion/CompletionEngine.cs b/CompletionEngine/Avalonia.Ide.CompletionEngine/Completion/CompletionEngine.cs
@@ -275,7 +275,7 @@ public IEnumerable<string> FilterTypeNames(string? prefix, bool withAttachedProp
                         {
                             TriggerCompletionAfterInsert = true,
                         });
-                        if (parentType?.Properties?.FirstOrDefault(p => p.IsContent) is { } contentProperty)
+                        if (parentType?.ItemsType is null && parentType?.Properties?.FirstOrDefault(p => p.IsContent) is { } contentProperty)
                         {
                             parentType = contentProperty.Type;
                         }