Merge pull request #3151 from MangelMaxime/fix-daemon-configuration

Add missing 'MultilineBracketStyle' in the returned configuration JSON
fsprojects · Feb 21, 2025 · b3b3e62 · b3b3e62
2 parents 86b8deb + 8270abd
commit b3b3e62
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 7.0.1 - 2025-02-21
+
+### 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
@@ -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"))
         })
 
 [<Test>]

diff --git 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
@@ -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"