From 79c3c2b03edc6233a84380260a730ba292aa9c27 Mon Sep 17 00:00:00 2001 From: nojaf Date: Mon, 27 Mar 2023 19:08:41 +0200 Subject: [PATCH] Update to Fantomas v6.0 --- .config/dotnet-tools.json | 2 +- .editorconfig | 2 +- .fantomasignore | 5 ++++- build.fsx | 6 +++--- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index a192a52a65..a1ce0e5ace 100644 --- 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 index a4531de38b..6e9e7984a3 100644 --- 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 \ No newline at end of file +fsharp_multiline_bracket_style = aligned \ No newline at end of file diff --git a/.fantomasignore b/.fantomasignore index 49d6bcb58d..3372298728 100644 --- a/.fantomasignore +++ b/.fantomasignore @@ -1,2 +1,5 @@ obj/**/*.fs -src/Fantomas.FCS/generated \ No newline at end of file +src/Fantomas.FCS/generated +.deps +fake-sample/source.fs +tests/data \ No newline at end of file diff --git a/build.fsx b/build.fsx index 4726a68d60..f17b1d7a57 100644 --- 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 }