Merge branch 'hotfix/attributevalues'

Author: CodeCasterNL

JsonTestClasses.cs

@@ -64,16 +64,17 @@ public class FooNumerics : FooBase
         public decimal? NullableDecimal { get; set; }
     }
 
+    public enum FooEnum
+    {
+        Foo = 0,
+        Bar = 1,
+    }
+
     /// <summary>
     /// Enums.
     /// </summary>
     public class FooWithEnum : FooBase
     {
-        public enum FooEnum
-        {
-            Foo = 0,
-            Bar = 1,
-        }
 
         public FooEnum EnumMember { get; set; }
     }
@@ -206,11 +207,18 @@ public class FooAttributes
         [System.Text.Json.JsonPropertyName(Name = "Last_Name")]
         public string Lastname { get; set; }
 
+        [Test(new int[1] { 42 }, FooEnum.Bar, typeof(string))]
         [DataMember(Name = "YesNo")]
         public bool BoolProperty { get; set; }
     }
+
+    public class TestAttribute : Attribute
+    {
+        public TestAttribute(int[] foos, FooEnum @enum, Type type) { }
+    }
 }
 
+
 // These are here so the attribute test works. This is a standalone file without references, so Roslyn won't know the attributes otherwise.
 namespace Newtonsoft.Json
 {

src/CodeCaster.SerializeThis.Serialization.Roslyn/AttributeDataExtensions.cs

@@ -14,10 +14,32 @@ public static AttributeInfo[] Map(this ImmutableArray<AttributeData> attributes)
                 : attributes.Select(a => new AttributeInfo
                 {
                     Name = a.AttributeClass.GetTypeName(withGenericParameterNames: true),
-                    ConstructorArguments = a.ConstructorArguments.Select(ca => ca.Value).ToArray(),
-                    Properties = a.NamedArguments.ToDictionary(na => na.Key, na => na.Value.Value),
+                    ConstructorArguments = a.ConstructorArguments.Select(GetValue).ToArray(),
+                    Properties = a.NamedArguments.ToDictionary(na => na.Key, na => GetValue(na.Value)),
                 })
                 .ToArray();
         }
+
+        private static object GetValue(TypedConstant typedConstant)
+        {
+            switch (typedConstant.Kind)
+            {
+                case TypedConstantKind.Array:
+                    return typedConstant.Values.Select(GetValue).ToArray();
+
+                case TypedConstantKind.Primitive:
+                case TypedConstantKind.Enum:
+                    return typedConstant.Value;
+
+                case TypedConstantKind.Type:
+                    return typedConstant.Value is ITypeSymbol typeSymbol
+                        ? $"typeof({typeSymbol.GetTypeName()})"
+                        : typedConstant.Value?.GetType().Name;
+
+                case TypedConstantKind.Error:
+                default:
+                    return null;
+            }
+        }
     }
 }

src/CodeCaster.SerializeThis.Serialization.Roslyn/TypeSymbolParser.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Immutable;
 using System.Linq;
 using Microsoft.CodeAnalysis;
 

src/CodeCaster.SerializeThis/Package/source.extension.vsixmanifest

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="SerializeThis.CodeCaster.ca0c8664-e98d-434b-b54e-cafb6f0b1279" Version="1.4.2" Language="en-US" Publisher="CodeCaster" />
+    <Identity Id="SerializeThis.CodeCaster.ca0c8664-e98d-434b-b54e-cafb6f0b1279" Version="1.4.3" Language="en-US" Publisher="CodeCaster" />
     <DisplayName>CodeCaster.SerializeThis</DisplayName>
     <Description xml:space="preserve">Serialize types directly from the IDE.</Description>
     <MoreInfo>https://github.com/CodeCasterNL/CodeCaster.SerializeThis/blob/master/README.md</MoreInfo>

src/SolutionInfo.cs

@@ -4,5 +4,5 @@
 [assembly: AssemblyCopyright("Copyright © CodeCaster 2016-2021")]
 [assembly: AssemblyTrademark("")]
 
-[assembly: AssemblyVersion("1.4.2.0")]
-[assembly: AssemblyFileVersion("1.4.2.0")]
+[assembly: AssemblyVersion("1.4.3.0")]
+[assembly: AssemblyFileVersion("1.4.3.0")]