Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion src/Fantomas.Tests/Integration/DaemonTests.fs
Original file line number Diff line number Diff line change
Expand Up @@ -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>]
Expand Down
14 changes: 13 additions & 1 deletion src/Fantomas/Daemon.fs
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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
3 changes: 3 additions & 0 deletions src/Fantomas/EditorConfig.fs
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
Loading