recognize types and arrays in F# attribute contructor arguments

Author: Jand42

src/fsharp/infos.fs

@@ -2541,7 +2541,7 @@ let rec evalILAttribElem e =
     | ILAttribElem.TypeRef (Some _t) -> fail()
     | ILAttribElem.TypeRef None     -> null
 
-let evalFSharpAttribArg e = 
+let rec evalFSharpAttribArg g e = 
     match e with
     | Expr.Const(c,_,_) -> 
         match c with 
@@ -2560,8 +2560,9 @@ let evalFSharpAttribArg e =
         | Const.Zero -> null
         | Const.String s ->  box s
         | _ -> fail()
-    // TODO: typeof<..> in attribute values
-    // TODO: arrays in attribute values
+    | Expr.Op (TOp.Array,_,a,_) -> box [| for i in a -> evalFSharpAttribArg g i |]
+    | TypeOfExpr g ty -> box ty
+    // TODO: | TypeDefOfExpr g ty
     | _ -> fail()
 
 type AttribInfo = 
@@ -2590,7 +2591,7 @@ type AttribInfo =
              unnamedArgs
              |> List.map (fun (AttribExpr(origExpr,evaluatedExpr)) -> 
                     let ty = tyOfExpr g origExpr
-                    let obj = evalFSharpAttribArg evaluatedExpr
+                    let obj = evalFSharpAttribArg g evaluatedExpr
                     ty,obj) 
          | ILAttribInfo (g, amap, scoref, cattr, m) -> 
               let parms, _args = decodeILAttribData g.ilg cattr (Some scoref) 
@@ -2605,7 +2606,7 @@ type AttribInfo =
              namedArgs
              |> List.map (fun (AttribNamedArg(nm,_,isField,AttribExpr(origExpr,evaluatedExpr))) -> 
                     let ty = tyOfExpr g origExpr
-                    let obj = evalFSharpAttribArg evaluatedExpr
+                    let obj = evalFSharpAttribArg g evaluatedExpr
                     ty, nm, isField, obj) 
          | ILAttribInfo (g, amap, scoref, cattr, m) -> 
               let _parms, namedArgs = decodeILAttribData g.ilg cattr (Some scoref) 

src/fsharp/vs/Symbols.fs

@@ -1711,19 +1711,25 @@ and FSharpType(cenv, typ:TType) =
 
 and FSharpAttribute(cenv: cenv, attrib: AttribInfo) = 
 
+    let rec resolveArgObj (arg: obj) =
+        match arg with
+        | :? TType as t -> box (FSharpType(cenv, t)) 
+        | :? (obj[]) as a -> a |> Array.map resolveArgObj |> box
+        | _ -> arg
+
     member __.AttributeType =  
         FSharpEntity(cenv,  attrib.TyconRef)
 
     member __.IsUnresolved = entityIsUnresolved(attrib.TyconRef)
 
     member __.ConstructorArguments = 
         attrib.ConstructorArguments 
-        |> List.map (fun (ty, obj) -> FSharpType(cenv, ty), obj)
+        |> List.map (fun (ty, obj) -> FSharpType(cenv, ty), resolveArgObj obj)
         |> makeReadOnlyCollection
 
     member __.NamedArguments = 
         attrib.NamedArguments 
-        |> List.map (fun (ty, nm, isField, obj) -> FSharpType(cenv, ty), nm, isField, obj)
+        |> List.map (fun (ty, nm, isField, obj) -> FSharpType(cenv, ty), nm, isField, resolveArgObj obj)
         |> makeReadOnlyCollection
 
     member __.Format(denv: FSharpDisplayContext) =