Merge pull request #2804 from nojaf/bump-fantomas

Update to Fantomas v6.0
fsprojects · Mar 27, 2023 · a8725d9 · a8725d9
2 parents 7293a94 + 79c3c2b
commit a8725d9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -9,7 +9,7 @@
       ]
     },
     "fantomas": {
-      "version": "5.2.1",
+      "version": "6.0.0-alpha-007",
       "commands": [
         "fantomas"
       ]

diff --git a/.editorconfig b/.editorconfig
@@ -9,4 +9,4 @@ fsharp_blank_lines_around_nested_multiline_expressions=false
 fsharp_keep_max_number_of_blank_lines=1
 
 [tests/*.fsx]
-fsharp_multiline_block_brackets_on_same_column = true
+fsharp_multiline_bracket_style = aligned
diff --git a/.fantomasignore b/.fantomasignore
@@ -1,2 +1,5 @@
 obj/**/*.fs
-src/Fantomas.FCS/generated
+src/Fantomas.FCS/generated
+.deps
+fake-sample/source.fs
+tests/data
diff --git a/build.fsx b/build.fsx
@@ -1,4 +1,4 @@
-#r "nuget: Fun.Build, 0.3.1"
+#r "nuget: Fun.Build, 0.3.8"
 #r "nuget: CliWrap, 3.5.0"
 #r "nuget: FSharp.Data, 5.0.2"
 
@@ -67,7 +67,7 @@ pipeline "Build" {
                    "src/Fantomas.Client/obj/Release" |]
         )
     }
-    stage "CheckFormat" { run "dotnet fantomas src docs build.fsx --recurse --check" }
+    stage "CheckFormat" { run "dotnet fantomas src docs build.fsx --check" }
     stage "Build" { run "dotnet build -c Release" }
     stage "UnitTests" { run "dotnet test -c Release" }
     stage "Benchmark" { run $"dotnet {benchmarkAssembly}" }
@@ -176,7 +176,7 @@ pipeline "Docs" {
 
 pipeline "FormatAll" {
     workingDir __SOURCE_DIRECTORY__
-    stage "Fantomas" { run "dotnet fantomas src docs build.fsx --recurse" }
+    stage "Fantomas" { run "dotnet fantomas src docs build.fsx" }
     runIfOnlySpecified true
 }