From 9ad93aecb596979839d4561cff37df672cae8017 Mon Sep 17 00:00:00 2001 From: dawe Date: Mon, 3 Apr 2023 15:15:07 +0200 Subject: [PATCH 1/2] remove AsParallel() when mapping over the results in mergeMultipleFormatResults() --- src/Fantomas.Core/MultipleDefineCombinations.fs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/Fantomas.Core/MultipleDefineCombinations.fs b/src/Fantomas.Core/MultipleDefineCombinations.fs index 9f3133ca07..22bb175a85 100644 --- a/src/Fantomas.Core/MultipleDefineCombinations.fs +++ b/src/Fantomas.Core/MultipleDefineCombinations.fs @@ -188,14 +188,12 @@ let splitWhenHash (defines: DefineCombination) (newline: string) (source: string let mergeMultipleFormatResults config (results: (DefineCombination * FormatResult) list) : FormatResult = let allInFragments: FormatResultForDefines list = results - .AsParallel() - .Select(fun (dc, result) -> - let fragments = splitWhenHash dc config.EndOfLine.NewLineString result.Code - - { Result = result - Defines = dc - Fragments = fragments }) - |> Seq.toList + |> List.map (fun (dc, result) -> + let fragments = splitWhenHash dc config.EndOfLine.NewLineString result.Code + + { Result = result + Defines = dc + Fragments = fragments }) let allHaveSameFragmentCount = let allWithCount = List.map (fun { Fragments = f } -> f.Length) allInFragments From 77daf5015b0d93aa0c45e14b658f042f0e25156f Mon Sep 17 00:00:00 2001 From: dawe Date: Mon, 3 Apr 2023 15:19:32 +0200 Subject: [PATCH 2/2] add CHANGELOG.md entry --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd11e9c666..8a0088d870 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## [6.0.0-alpha-010] - 2023-04-03 + +### Fixed +* Fix a performance regression. [#2820](https://github.com/fsprojects/fantomas/pull/2820) + ## [6.0.0-alpha-009] - 2023-03-31 ### Fixed