Skip to content

Commit

Permalink
Merge pull request #747 from nojaf/format
Browse files Browse the repository at this point in the history
Format
  • Loading branch information
dsyme authored May 26, 2022
2 parents fe2df39 + 688cc5c commit f389c0d
Show file tree
Hide file tree
Showing 31 changed files with 957 additions and 1,080 deletions.
4 changes: 2 additions & 2 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"paket"
]
},
"fantomas-tool": {
"version": "5.0.0-alpha-002",
"fantomas": {
"version": "5.0.0-alpha-007",
"commands": [
"fantomas"
]
Expand Down
4 changes: 2 additions & 2 deletions docs/apidocs.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ index: 5
(*** condition: fsx ***)
#if FSX
#r "nuget: FSharp.Formatting,{{fsdocs-package-version}}"
#endif // FSX
#endif
(*** condition: ipynb ***)
#if IPYNB
#r "nuget: FSharp.Formatting,{{fsdocs-package-version}}"
#endif // IPYNB
#endif

(*** hide ***)
let root = "C:\\"
Expand Down
4 changes: 2 additions & 2 deletions docs/codeformat.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ index: 1
(*** condition: fsx ***)
#if FSX
#r "nuget: FSharp.Formatting,{{fsdocs-package-version}}"
#endif // FSX
#endif
(*** condition: ipynb ***)
#if IPYNB
#r "nuget: FSharp.Formatting,{{fsdocs-package-version}}"
#endif // IPYNB
#endif

(**
[![Binder](img/badge-binder.svg)](https://mybinder.org/v2/gh/fsprojects/fsharp.formatting/gh-pages?filepath={{fsdocs-source-basename}}.ipynb) 
Expand Down
4 changes: 2 additions & 2 deletions docs/content.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ index: 3
(*** condition: fsx ***)
#if FSX
#r "nuget: FSharp.Formatting,{{fsdocs-package-version}}"
#endif // FSX
#endif
(*** condition: ipynb ***)
#if IPYNB
#r "nuget: FSharp.Formatting,{{fsdocs-package-version}}"
#endif // IPYNB
#endif


(**
Expand Down
6 changes: 3 additions & 3 deletions docs/evaluation.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ index: 6
(*** condition: fsx ***)
#if FSX
#r "nuget: FSharp.Formatting,{{fsdocs-package-version}}"
#endif // FSX
#endif
(*** condition: ipynb ***)
#if IPYNB
#r "nuget: FSharp.Formatting,{{fsdocs-package-version}}"
#endif // IPYNB
#endif

(**
[![Binder](img/badge-binder.svg)](https://mybinder.org/v2/gh/fsprojects/fsharp.formatting/gh-pages?filepath={{fsdocs-source-basename}}.ipynb) 
Expand Down Expand Up @@ -153,7 +153,7 @@ This can be done by calling `cref:M:FSharp.Formatting.Literate.Evaluation.FsiEva
// Create evaluator & register simple formatter for lists
let fsiEvaluator = FsiEvaluator()

fsiEvaluator.RegisterTransformation (fun (o, ty, _executionCount) ->
fsiEvaluator.RegisterTransformation(fun (o, ty, _executionCount) ->
// If the type of value is an F# list, format it nicely
if ty.IsGenericType
&& ty.GetGenericTypeDefinition() = typedefof<list<_>> then
Expand Down
4 changes: 2 additions & 2 deletions docs/literate.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ index: 3
(*** condition: fsx ***)
#if FSX
#r "nuget: FSharp.Formatting,{{fsdocs-package-version}}"
#endif // FSX
#endif
(*** condition: ipynb ***)
#if IPYNB
#r "nuget: FSharp.Formatting,{{fsdocs-package-version}}"
#endif // IPYNB
#endif


(**
Expand Down
4 changes: 2 additions & 2 deletions docs/markdown.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ index: 2
(*** condition: fsx ***)
#if FSX
#r "nuget: FSharp.Formatting,{{fsdocs-package-version}}"
#endif // FSX
#endif
(*** condition: ipynb ***)
#if IPYNB
#r "nuget: FSharp.Formatting,{{fsdocs-package-version}}"
#endif // IPYNB
#endif


(**
Expand Down
933 changes: 436 additions & 497 deletions src/FSharp.Formatting.ApiDocs/GenerateHtml.fs

Large diffs are not rendered by default.

Loading

0 comments on commit f389c0d

Please sign in to comment.