Skip to content

Commit fe8d18d

Browse files
committed
Add missing 'MultilineBracketStyle' in the returned configuration JSON
1 parent 7fca01d commit fe8d18d

File tree

4 files changed

+24
-2
lines changed

4 files changed

+24
-2
lines changed

CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## [Unreleased]
4+
5+
### Fixed
6+
7+
* Add missing 'MultilineBracketStyle' in the returned configuration JSON [#3151](https://github.com/fsprojects/fantomas/issues/3151)
8+
39
## 7.0.0 - 2025-01-10
410

511
### Miscellaneous

src/Fantomas.Tests/Integration/DaemonTests.fs

+2-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ let ``config request`` () =
4646
|> Fantomas.EditorConfig.configToEditorConfig
4747
|> fun s -> s.Split('\n')
4848
|> Seq.map (fun line -> line.Split('=').[0])
49-
|> Seq.iter (fun setting -> Assert.That(config.Contains(setting), Is.True))
49+
|> Seq.iter (fun setting ->
50+
Assert.That(config.Contains(setting), Is.True, $"Setting %s{setting} not found"))
5051
})
5152

5253
[<Test>]

src/Fantomas/Daemon.fs

+13-1
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,13 @@ type FantomasDaemon(sender: Stream, reader: Stream) as this =
167167
yield "defaultValue", Encode.string (EndOfLineStyle.ToConfigString e)
168168
yield! meta ]
169169
)
170+
| :? MultilineBracketStyle as m ->
171+
Some(
172+
Encode.object
173+
[ yield "type", Encode.string "multilineBracketStyle"
174+
yield "defaultValue", Encode.string (MultilineBracketStyle.ToConfigString m)
175+
yield! meta ]
176+
)
170177
| _ -> None
171178

172179
type' |> Option.map (fun t -> toEditorConfigName recordField.PropertyName, t))
@@ -183,7 +190,12 @@ type FantomasDaemon(sender: Stream, reader: Stream) as this =
183190
"endOfLineStyle",
184191
Encode.list
185192
[ (EndOfLineStyle.ToConfigString EndOfLineStyle.LF |> Encode.string)
186-
(EndOfLineStyle.ToConfigString EndOfLineStyle.CRLF |> Encode.string) ] ]
193+
(EndOfLineStyle.ToConfigString EndOfLineStyle.CRLF |> Encode.string) ]
194+
"multilineBracketStyle",
195+
Encode.list
196+
[ (MultilineBracketStyle.ToConfigString Aligned |> Encode.string)
197+
(MultilineBracketStyle.ToConfigString Cramped |> Encode.string)
198+
(MultilineBracketStyle.ToConfigString Stroustrup |> Encode.string) ] ]
187199

188200
Encode.object [ "settings", settings; "enumOptions", enumOptions ]
189201
|> Encode.toString 4

src/Fantomas/EditorConfig.fs

+3
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,9 @@ let configToEditorConfig (config: FormatConfig) : string =
108108
| :? EndOfLineStyle as eols ->
109109
$"%s{toEditorConfigName recordField.PropertyName}=%s{EndOfLineStyle.ToConfigString eols}"
110110
|> Some
111+
| :? MultilineBracketStyle as mbs ->
112+
$"%s{toEditorConfigName recordField.PropertyName}=%s{MultilineBracketStyle.ToConfigString mbs}"
113+
|> Some
111114
| _ -> None)
112115
|> String.concat "\n"
113116

0 commit comments

Comments
 (0)