fsprojects · tpetricek · Mar 10, 2014 · Mar 9, 2014 · Mar 9, 2014 · Mar 9, 2014
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -33,4 +33,6 @@
 * 2.3.7-beta - Add auto-formatting for links and output sample usage for DU cases
 * 2.3.8-beta - Update FSharp.Compiler.Service to v0.0.17
 * 2.3.9-beta - Update FSharp.Compiler.Service to v0.0.20, include inherited members when the base type was ommited from the documentation, fix properties displaying as methods, fix functions with unit input rendering incorrectly
-* 2.3.10-beta - Support output embedding in literate scripts
+* 2.3.10-beta - Support output embedding in literate scripts
+* 2.4.0 - Incrementing version and stop using the beta versioning
+* 2.4.1 - Support for generating docs for type providers
diff --git a/misc/templates/reference/type.cshtml b/misc/templates/reference/type.cshtml
@@ -77,6 +77,12 @@
     TableHeader = "Record Field",
     Members = g.Members.Where(m => m.Kind == MemberKind.RecordField)
   })
+
+  @RenderPart("part-members", new {
+    Header = "Static parameters",
+    TableHeader = "Static parameters",
+    Members = g.Members.Where(m => m.Kind == MemberKind.StaticParameter)
+  })
 
   @RenderPart("part-members", new {
     Header = "Constructors",

diff --git a/nuget/FSharp.Formatting.nuspec b/nuget/FSharp.Formatting.nuspec
@@ -17,7 +17,7 @@
     <dependencies>
       <dependency id="Microsoft.AspNet.Razor" version="2.0.30506.0" />
       <dependency id="RazorEngine" version="3.3.0" />
-      <dependency id="FSharp.Compiler.Service" version="0.0.20" />
+      <dependency id="FSharp.Compiler.Service" version="0.0.32" />
     </dependencies>
   </metadata>
   <files>

diff --git a/src/Common/AssemblyInfo.fs b/src/Common/AssemblyInfo.fs
@@ -4,10 +4,10 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("FSharp.Formatting")>]
 [<assembly: AssemblyProductAttribute("FSharp.Formatting")>]
 [<assembly: AssemblyDescriptionAttribute("A package of libraries for building great F# documentation, samples and blogs")>]
-[<assembly: AssemblyVersionAttribute("2.3.10")>]
-[<assembly: AssemblyFileVersionAttribute("2.3.10")>]
+[<assembly: AssemblyVersionAttribute("2.4.1")>]
+[<assembly: AssemblyFileVersionAttribute("2.4.1")>]
 [<assembly: AssemblyCopyrightAttribute("Apache 2.0 License")>]
 do ()
 
 module internal AssemblyVersionInformation =
-    let [<Literal>] Version = "2.3.10"
+    let [<Literal>] Version = "2.4.1"
diff --git a/src/FSharp.CodeFormat/FSharp.CodeFormat.fsproj b/src/FSharp.CodeFormat/FSharp.CodeFormat.fsproj
@@ -91,7 +91,7 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="FSharp.Compiler.Service">
-      <HintPath>..\..\packages\FSharp.Compiler.Service.0.0.20\lib\net40\FSharp.Compiler.Service.dll</HintPath>
+      <HintPath>..\..\packages\FSharp.Compiler.Service.0.0.32\lib\net40\FSharp.Compiler.Service.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="FSharp.Core, Version=4.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

diff --git a/src/FSharp.CodeFormat/packages.config b/src/FSharp.CodeFormat/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="FSharp.Compiler.Service" version="0.0.20" targetFramework="net40" />
+  <package id="FSharp.Compiler.Service" version="0.0.32" targetFramework="net40" />
 </packages>
diff --git a/src/FSharp.Formatting.CommandTool/Exec.fs b/src/FSharp.Formatting.CommandTool/Exec.fs
@@ -11,10 +11,6 @@ open CommandLine
 open CommandLine.Text
 
 open System.Collections.Generic
-open FSharp.Data
-open FSharp.Data.Json
-open FSharp.Data.Json.Extensions
-
 
 /// configuration of the supported FSharp.Formatting functions 
 let OptionsMapping = new Dictionary<string, IExecutable>(HashIdentity.Structural)

diff --git a/src/FSharp.Formatting.CommandTool/FSharp.Formatting.CommandTool.fsproj b/src/FSharp.Formatting.CommandTool/FSharp.Formatting.CommandTool.fsproj
@@ -47,14 +47,6 @@
       <HintPath>..\..\packages\CommandLineParser.1.9.71\lib\net45\CommandLine.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="FSharp.Data">
-      <HintPath>..\..\packages\FSharp.Data.1.1.10\lib\net40\FSharp.Data.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="FSharp.Data.DesignTime">
-      <HintPath>..\..\packages\FSharp.Data.1.1.10\lib\net40\FSharp.Data.DesignTime.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="mscorlib" />
     <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <Private>False</Private>
@@ -65,6 +57,7 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Numerics" />
+    <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />

diff --git a/src/FSharp.Formatting.CommandTool/packages.config b/src/FSharp.Formatting.CommandTool/packages.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="CommandLineParser" version="1.9.71" targetFramework="net451" />
-  <package id="FSharp.Data" version="1.1.10" targetFramework="net451" />
 </packages>
diff --git a/src/FSharp.Literate/FSharp.Literate.fsproj b/src/FSharp.Literate/FSharp.Literate.fsproj
@@ -73,7 +73,7 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="FSharp.Compiler.Service">
-      <HintPath>..\..\packages\FSharp.Compiler.Service.0.0.20\lib\net40\FSharp.Compiler.Service.dll</HintPath>
+      <HintPath>..\..\packages\FSharp.Compiler.Service.0.0.32\lib\net40\FSharp.Compiler.Service.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="FSharp.Core, Version=4.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

diff --git a/src/FSharp.Literate/packages.config b/src/FSharp.Literate/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="FSharp.Compiler.Service" version="0.0.20" targetFramework="net45" />
+  <package id="FSharp.Compiler.Service" version="0.0.32" targetFramework="net45" />
   <package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net40" />
   <package id="RazorEngine" version="3.3.0" targetFramework="net40" />
 </packages>
diff --git a/src/FSharp.MetadataFormat/FSharp.MetadataFormat.fsproj b/src/FSharp.MetadataFormat/FSharp.MetadataFormat.fsproj
@@ -38,7 +38,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="FSharp.Compiler.Service">
-      <HintPath>..\..\packages\FSharp.Compiler.Service.0.0.20\lib\net40\FSharp.Compiler.Service.dll</HintPath>
+      <HintPath>..\..\packages\FSharp.Compiler.Service.0.0.32\lib\net40\FSharp.Compiler.Service.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="FSharp.Core, Version=4.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

diff --git a/src/FSharp.MetadataFormat/Main.fs b/src/FSharp.MetadataFormat/Main.fs
@@ -47,6 +47,7 @@ type MemberKind =
   // In a class, F# special members
   | UnionCase = 100
   | RecordField = 101
+  | StaticParameter = 102
 
 type Member =
   { Name : string
@@ -65,16 +66,23 @@ type Type =
 
     UnionCases : Member list
     RecordFields : Member list
+    StaticParameters : Member list 
 
     AllMembers : Member list
     Constructors : Member list
     InstanceMembers : Member list
     StaticMembers : Member list }
-  static member Create(name, url, comment, cases, fields, ctors, inst, stat) = 
-    { Type.Name = name; UrlName = url; Comment = comment;
-      UnionCases = cases; RecordFields = fields
-      AllMembers = List.concat [ ctors; inst; stat; cases; fields ] ;
-      Constructors = ctors; InstanceMembers = inst; StaticMembers = stat }
+  static member Create(name, url, comment, cases, fields, statParams, ctors, inst, stat) = 
+    { Type.Name = name
+      UrlName = url
+      Comment = comment
+      UnionCases = cases
+      RecordFields = fields
+      StaticParameters = statParams
+      AllMembers = List.concat [ ctors; inst; stat; cases; fields; statParams ]
+      Constructors = ctors
+      InstanceMembers = inst
+      StaticMembers = stat }
 
 type Module = 
   { Name : string 
@@ -261,15 +269,15 @@ module ValueReader =
   let formatArgUsage generateTypes i (arg:FSharpParameter) = 
     let nm = 
       match arg.Name with 
-      | null -> 
+      | None -> 
           if arg.Type.IsNamedType && arg.Type.NamedEntity.XmlDocSig = "T:Microsoft.FSharp.Core.unit" then "()" 
           else "arg" + string i 
-      | nm -> nm
+      | Some nm -> nm
     // Detect an optional argument 
     let isOptionalArg = hasAttrib<OptionalArgumentAttribute> arg.Attributes
     let argName = if isOptionalArg then "?" + nm else nm
     if generateTypes then 
-      (if String.IsNullOrWhiteSpace(arg.Name) then "" else argName + ":") + 
+      (match arg.Name with None -> "" | Some argName -> argName + ":") + 
       formatTypeWithPrec 2 arg.Type
     else argName
 
@@ -341,12 +349,12 @@ module ValueReader =
     let signature =
       match argInfos with
       | [] -> retType
-      | [[x]] when v.IsGetterMethod && x.Name = null && x.Type.NamedEntity.XmlDocSig = "T:Microsoft.FSharp.Core.unit" -> retType
+      | [[x]] when v.IsGetterMethod && x.Name.IsNone && x.Type.NamedEntity.XmlDocSig = "T:Microsoft.FSharp.Core.unit" -> retType
       | _  -> (formatArgsUsage true v argInfos) + " -> " + retType
 
     let usage = 
       match argInfos with
-      | [[x]] when v.IsGetterMethod && x.Name = null && x.Type.NamedEntity.XmlDocSig = "T:Microsoft.FSharp.Core.unit" -> ""
+      | [[x]] when v.IsGetterMethod && x.Name.IsNone && x.Type.NamedEntity.XmlDocSig = "T:Microsoft.FSharp.Core.unit" -> ""
       | _  -> formatArgsUsage false v argInfos
 
     let buildShortUsage length = 
@@ -392,7 +400,7 @@ module ValueReader =
     *)
 
   let readUnionCase (ctx:ReadingContext) (case:FSharpUnionCase) =
-    let formatFieldUsage (field:FSharpRecordField) =
+    let formatFieldUsage (field:FSharpField) =
         if field.Name.StartsWith("Item") then
             formatType field.FieldType
         else
@@ -551,13 +559,49 @@ module Reader =
   // Reading modules types (mutually recursive, because of nesting)
   // ----------------------------------------------------------------------------------------------
 
+  // Create a xml documentation snippet and add it to the XmlMemberMap
+  let registerXmlDoc (ctx:ReadingContext) xmlDocSig (xmlDoc:string) =
+    let xmlDoc = if xmlDoc.Contains "<summary>" then xmlDoc else "<summary>" + xmlDoc + "</summary>"
+    let xmlDoc = "<member name=\"" + xmlDocSig + "\">" + xmlDoc + "</member>"
+    let xmlDoc = XElement.Parse xmlDoc
+    ctx.XmlMemberMap.Add(xmlDocSig, xmlDoc)
+    xmlDoc
+
+  // Type providers don't have their docs dumped into the xml file,
+  // so we need to add them to the XmlMemberMap separately
+  let processTypeProvider (ctx:ReadingContext) (typ:FSharpEntity) =
+    let xmlDocSig = "T:" + typ.AccessPath + "." + typ.LogicalName
+    let xmlDoc = registerXmlDoc ctx xmlDocSig (String.concat "" typ.XmlDoc)
+    let statParams = 
+        xmlDoc.Descendants(XName.Get "param")
+        |> Seq.choose (fun p -> let nameAttr = p.Attribute(XName.Get "name")
+                                if nameAttr = null
+                                then None
+                                else Some (nameAttr.Value, p.Value))
+        |> Seq.choose (fun (name, xmlDoc) -> 
+            let xmlDocSig = "P:" + typ.AccessPath + "." + typ.LogicalName + "." + name
+            registerXmlDoc ctx xmlDocSig (Security.SecurityElement.Escape xmlDoc) |> ignore                
+            readCommentsInto ctx xmlDocSig (fun cat cmds comment -> 
+                Member.Create(name,
+                              MemberKind.StaticParameter, 
+                              cat,
+                              MemberOrValue.Create((fun _ -> name), [], [], name, None), 
+                              comment)))
+        |> Seq.toList
+    xmlDocSig, statParams
+
   let rec readModulesAndTypes ctx (entities:seq<_>) = 
     let modules = readChildren ctx entities readModule (fun x -> x.IsFSharpModule) 
     let types = readChildren ctx entities readType (fun x -> not x.IsFSharpModule) 
     modules, types
 
   and readType (ctx:ReadingContext) (typ:FSharpEntity) =
-    readCommentsInto ctx typ.XmlDocSig (fun cat cmds comment ->
+    let xmlDocSig, statParams =
+        if typ.XmlDocSig <> "" then typ.XmlDocSig, []
+        elif typ.XmlDoc.Count = 0 then "", []
+        // assume is a type provider
+        else processTypeProvider ctx typ
+    readCommentsInto ctx xmlDocSig (fun cat cmds comment ->
       let urlName = ctx.UniqueUrlName (sprintf "%s.%s" typ.AccessPath typ.CompiledName)
 
       let rec getMembers (typ:FSharpEntity) = [
@@ -600,7 +644,7 @@ module Reader =
       let inst = readAllMembers ctx MemberKind.InstanceMember ivals 
       let stat = readAllMembers ctx MemberKind.StaticMember svals 
       Type.Create
-        ( name, urlName, comment, cases, fields, ctors, inst, stat ))
+        ( name, urlName, comment, cases, fields, statParams, ctors, inst, stat ))
 
   and readModule (ctx:ReadingContext) (modul:FSharpEntity) =
     readCommentsInto ctx modul.XmlDocSig (fun cat cmd comment ->
@@ -632,11 +676,14 @@ module Reader =
 
     // Read in the supplied XML file, map its name attributes to document text 
     let doc = XDocument.Load(xmlFile)
-    let xmlMemberMap =
+    // don't use 'dict' to allow the dictionary to be mutated later on
+    let xmlMemberMap = Dictionary()
+    for key, value in 
       [ for e in doc.Descendants(XName.Get "member") do
           let attr = e.Attribute(XName.Get "name") 
           if attr <> null && not (String.IsNullOrEmpty(attr.Value)) then 
-            yield attr.Value, e ] |> dict
+            yield attr.Value, e ] do
+        xmlMemberMap.Add(key, value)
     let ctx = ReadingContext.Create(publicOnly, xmlMemberMap, sourceFolderRepo)
 
     // 

diff --git a/src/FSharp.MetadataFormat/packages.config b/src/FSharp.MetadataFormat/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="FSharp.Compiler.Service" version="0.0.20" targetFramework="net40" />
+  <package id="FSharp.Compiler.Service" version="0.0.32" targetFramework="net40" />
   <package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net45" />
   <package id="RazorEngine" version="3.3.0" targetFramework="net45" />
 </packages>
diff --git a/tests/FSharp.MetadataFormat.Tests/FSharp.MetadataFormat.Tests.fsproj b/tests/FSharp.MetadataFormat.Tests/FSharp.MetadataFormat.Tests.fsproj
@@ -41,7 +41,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="FSharp.Compiler.Service">
-      <HintPath>..\..\packages\FSharp.Compiler.Service.0.0.20\lib\net40\FSharp.Compiler.Service.dll</HintPath>
+      <HintPath>..\..\packages\FSharp.Compiler.Service.0.0.32\lib\net40\FSharp.Compiler.Service.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

diff --git a/tests/FSharp.MetadataFormat.Tests/packages.config b/tests/FSharp.MetadataFormat.Tests/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="FSharp.Compiler.Service" version="0.0.20" targetFramework="net40" />
+  <package id="FSharp.Compiler.Service" version="0.0.32" targetFramework="net40" />
   <package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net40" />
   <package id="NUnit" version="2.6.3" targetFramework="net40" />
   <package id="RazorEngine" version="3.3.0" targetFramework="net40" />