From fe8d18d66d5b444100239cd1d437db7fddff6c00 Mon Sep 17 00:00:00 2001 From: Maxime Mangel Date: Fri, 21 Feb 2025 10:00:36 +0100 Subject: [PATCH 1/2] Add missing 'MultilineBracketStyle' in the returned configuration JSON --- CHANGELOG.md | 6 ++++++ src/Fantomas.Tests/Integration/DaemonTests.fs | 3 ++- src/Fantomas/Daemon.fs | 14 +++++++++++++- src/Fantomas/EditorConfig.fs | 3 +++ 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f7120554a..33bd100304 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## [Unreleased] + +### Fixed + +* Add missing 'MultilineBracketStyle' in the returned configuration JSON [#3151](https://github.com/fsprojects/fantomas/issues/3151) + ## 7.0.0 - 2025-01-10 ### Miscellaneous diff --git a/src/Fantomas.Tests/Integration/DaemonTests.fs b/src/Fantomas.Tests/Integration/DaemonTests.fs index 559e0be7da..c30be4c1d6 100644 --- a/src/Fantomas.Tests/Integration/DaemonTests.fs +++ b/src/Fantomas.Tests/Integration/DaemonTests.fs @@ -46,7 +46,8 @@ let ``config request`` () = |> Fantomas.EditorConfig.configToEditorConfig |> fun s -> s.Split('\n') |> Seq.map (fun line -> line.Split('=').[0]) - |> Seq.iter (fun setting -> Assert.That(config.Contains(setting), Is.True)) + |> Seq.iter (fun setting -> + Assert.That(config.Contains(setting), Is.True, $"Setting %s{setting} not found")) }) [] diff --git a/src/Fantomas/Daemon.fs b/src/Fantomas/Daemon.fs index 7f2e760de8..7e69655c08 100644 --- a/src/Fantomas/Daemon.fs +++ b/src/Fantomas/Daemon.fs @@ -167,6 +167,13 @@ type FantomasDaemon(sender: Stream, reader: Stream) as this = yield "defaultValue", Encode.string (EndOfLineStyle.ToConfigString e) yield! meta ] ) + | :? MultilineBracketStyle as m -> + Some( + Encode.object + [ yield "type", Encode.string "multilineBracketStyle" + yield "defaultValue", Encode.string (MultilineBracketStyle.ToConfigString m) + yield! meta ] + ) | _ -> None type' |> Option.map (fun t -> toEditorConfigName recordField.PropertyName, t)) @@ -183,7 +190,12 @@ type FantomasDaemon(sender: Stream, reader: Stream) as this = "endOfLineStyle", Encode.list [ (EndOfLineStyle.ToConfigString EndOfLineStyle.LF |> Encode.string) - (EndOfLineStyle.ToConfigString EndOfLineStyle.CRLF |> Encode.string) ] ] + (EndOfLineStyle.ToConfigString EndOfLineStyle.CRLF |> Encode.string) ] + "multilineBracketStyle", + Encode.list + [ (MultilineBracketStyle.ToConfigString Aligned |> Encode.string) + (MultilineBracketStyle.ToConfigString Cramped |> Encode.string) + (MultilineBracketStyle.ToConfigString Stroustrup |> Encode.string) ] ] Encode.object [ "settings", settings; "enumOptions", enumOptions ] |> Encode.toString 4 diff --git a/src/Fantomas/EditorConfig.fs b/src/Fantomas/EditorConfig.fs index 87af71998f..dc107f2962 100644 --- a/src/Fantomas/EditorConfig.fs +++ b/src/Fantomas/EditorConfig.fs @@ -108,6 +108,9 @@ let configToEditorConfig (config: FormatConfig) : string = | :? EndOfLineStyle as eols -> $"%s{toEditorConfigName recordField.PropertyName}=%s{EndOfLineStyle.ToConfigString eols}" |> Some + | :? MultilineBracketStyle as mbs -> + $"%s{toEditorConfigName recordField.PropertyName}=%s{MultilineBracketStyle.ToConfigString mbs}" + |> Some | _ -> None) |> String.concat "\n" From 8270abd46098d5186c8957e9b52ded22bcf9769c Mon Sep 17 00:00:00 2001 From: Florian Verdonck Date: Fri, 21 Feb 2025 16:14:40 +0100 Subject: [PATCH 2/2] Apply suggestions from code review --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 33bd100304..7056fcec33 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,10 @@ # Changelog -## [Unreleased] +## 7.0.1 - 2025-02-21 ### Fixed -* Add missing 'MultilineBracketStyle' in the returned configuration JSON [#3151](https://github.com/fsprojects/fantomas/issues/3151) +* Add missing 'MultilineBracketStyle' in the returned configuration JSON. [#3151](https://github.com/fsprojects/fantomas/issues/3151) ## 7.0.0 - 2025-01-10