Merge pull request #1444 from dsyme/fmt3

formatting: wider lists

.editorconfig

@@ -13,6 +13,7 @@ insert_final_newline = true
 trim_trailing_whitespace = false
 
 [*.fs]
+fsharp_max_array_or_list_width=80
 fsharp_max_array_or_list_number_of_items=5
 fsharp_max_if_then_else_short_width=60
 fsharp_max_dot_get_expression_width=80

README.md

@@ -13,6 +13,11 @@ You can see the version history [here](RELEASE_NOTES.md).
 - Install the .NET SDK specified in the `global.json` file
 - `build.sh -t Build` or `build.cmd -t Build`
 
+## Formatting
+
+    dotnet fake build -t Format
+    dotnet fake build -t CheckFormat
+
 ## Documentation
 
 This library comes with comprehensive documentation. The documentation is 

src/CommonRuntime/StructuralInference.fs

@@ -95,25 +95,10 @@ let typeTag =
 
 let private conversionTable =
     [ typeof<Bit>, [ typeof<Bit0>; typeof<Bit1> ]
-      typeof<bool>,
-      [ typeof<Bit0>
-        typeof<Bit1>
-        typeof<Bit> ]
-      typeof<int>,
-      [ typeof<Bit0>
-        typeof<Bit1>
-        typeof<Bit> ]
-      typeof<int64>,
-      [ typeof<Bit0>
-        typeof<Bit1>
-        typeof<Bit>
-        typeof<int> ]
-      typeof<decimal>,
-      [ typeof<Bit0>
-        typeof<Bit1>
-        typeof<Bit>
-        typeof<int>
-        typeof<int64> ]
+      typeof<bool>, [ typeof<Bit0>; typeof<Bit1>; typeof<Bit> ]
+      typeof<int>, [ typeof<Bit0>; typeof<Bit1>; typeof<Bit> ]
+      typeof<int64>, [ typeof<Bit0>; typeof<Bit1>; typeof<Bit>; typeof<int> ]
+      typeof<decimal>, [ typeof<Bit0>; typeof<Bit1>; typeof<Bit>; typeof<int>; typeof<int64> ]
       typeof<float>,
       [ typeof<Bit0>
         typeof<Bit1>

src/CommonRuntime/TextConversions.fs

@@ -51,15 +51,7 @@ module private Helpers =
 type TextConversions private () =
 
     /// `NaN` `NA` `N/A` `#N/A` `:` `-` `TBA` `TBD`
-    static member val DefaultMissingValues =
-        [| "NaN"
-           "NA"
-           "N/A"
-           "#N/A"
-           ":"
-           "-"
-           "TBA"
-           "TBD" |]
+    static member val DefaultMissingValues = [| "NaN"; "NA"; "N/A"; "#N/A"; ":"; "-"; "TBA"; "TBD" |]
 
     /// `%` `‰` `‱`
     static member val DefaultNonCurrencyAdorners = [| '%'; '‰'; '‱' |] |> Set.ofArray

src/Html/HtmlRuntime.fs

@@ -272,15 +272,7 @@ module HtmlRuntime =
                         let data =
                             let getContents contents =
                                 contents
-                                |> List.map (
-                                    innerTextExcluding
-                                        [ "table"
-                                          "ul"
-                                          "ol"
-                                          "dl"
-                                          "sup"
-                                          "sub" ]
-                                )
+                                |> List.map (innerTextExcluding [ "table"; "ul"; "ol"; "dl"; "sup"; "sub" ])
                                 |> String.Concat
                                 |> normalizeWs
 
@@ -362,13 +354,7 @@ module HtmlRuntime =
         let rows =
             list.Descendants("li", true)
             |> Seq.map (
-                innerTextExcluding
-                    [ "table"
-                      "ul"
-                      "ol"
-                      "dl"
-                      "sup"
-                      "sub" ]
+                innerTextExcluding [ "table"; "ul"; "ol"; "dl"; "sup"; "sub" ]
                 >> normalizeWs
             )
             |> Seq.toArray

src/Json/JsonGenerator.fs

@@ -400,8 +400,7 @@ module JsonTypeBuilder =
 
                     let tupleType =
                         Microsoft.FSharp.Reflection.FSharpType.MakeTupleType(
-                            [| keyResult.ConvertedType
-                               valueResult.ConvertedType |]
+                            [| keyResult.ConvertedType; valueResult.ConvertedType |]
                         )
 
                     let itemsSeqType = typedefof<_ seq>.MakeGenericType ([| tupleType |])
@@ -566,9 +565,7 @@ module JsonTypeBuilder =
                                     typeof<string * obj>,
                                     args
                                     |> List.mapi (fun i a ->
-                                        Expr.NewTuple
-                                            [ Expr.Value names.[i]
-                                              Expr.Coerce(a, typeof<obj>) ])
+                                        Expr.NewTuple [ Expr.Value names.[i]; Expr.Coerce(a, typeof<obj>) ])
                                 )
 
                             let cultureStr = ctx.CultureStr

src/WorldBank/WorldBankProvider.fs

@@ -340,8 +340,7 @@ type public WorldBankProvider(cfg: TypeProviderConfig) as this =
 
     // ASSUMPTION: Follow www.worldbank.org and only show these sources by default. The others are very sparsely populated.
     let defaultSources =
-        [ "World Development Indicators"
-          "Global Financial Development" ]
+        [ "World Development Indicators"; "Global Financial Development" ]
 
     let worldBankType =
         createTypesForSources (defaultSources, "WorldBankData", false, false)

src/WorldBank/WorldBankRuntime.fs

@@ -259,13 +259,7 @@ module Implementation =
         member internal __.GetDataAsync(countryOrRegionCode, indicatorCode) =
             async {
                 let! data =
-                    getData
-                        [ "countries"
-                          countryOrRegionCode
-                          "indicators"
-                          indicatorCode ]
-                        [ "date", "" ]
-                        "date"
+                    getData [ "countries"; countryOrRegionCode; "indicators"; indicatorCode ] [ "date", "" ] "date"
 
                 return
                     seq {

src/Xml/XmlGenerator.fs

@@ -572,9 +572,7 @@ module internal XmlTypeBuilder =
                             |> Seq.take attrParameters.Length
                             |> Seq.toList
                             |> List.mapi (fun i a ->
-                                Expr.NewTuple
-                                    [ Expr.Value attrNames.[i]
-                                      Expr.Coerce(a, typeof<obj>) ])
+                                Expr.NewTuple [ Expr.Value attrNames.[i]; Expr.Coerce(a, typeof<obj>) ])
                         )
 
                     let elements =
@@ -587,16 +585,12 @@ module internal XmlTypeBuilder =
                         )
                         |> Seq.toList
                         |> List.mapi (fun i a ->
-                            Expr.NewTuple
-                                [ Expr.Value childElemNames.[i]
-                                  Expr.Coerce(a, typeof<obj>) ])
+                            Expr.NewTuple [ Expr.Value childElemNames.[i]; Expr.Coerce(a, typeof<obj>) ])
 
                     let elements =
                         match primitiveParam with
                         | Some _ ->
-                            Expr.NewTuple
-                                [ Expr.Value ""
-                                  Expr.Coerce(args.[attrParameters.Length], typeof<obj>) ]
+                            Expr.NewTuple [ Expr.Value ""; Expr.Coerce(args.[attrParameters.Length], typeof<obj>) ]
                             :: elements
                         | None -> elements