Read editorconfig settings before overwriting settings with request c…

…onfiguration. (#2006)
fsprojects · Dec 29, 2021 · 0349c29 · 0349c29
1 parent 81ebd61
commit 0349c29
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 7 deletions.
diff --git a/src/Fantomas.CoreGlobalTool.Tests/DaemonTests.fs b/src/Fantomas.CoreGlobalTool.Tests/DaemonTests.fs
@@ -311,3 +311,37 @@ val    y     : string
                 | FormatSelectionResponse.Error _ -> Assert.Pass()
                 | otherResponse -> Assert.Fail $"Unexpected response %A{otherResponse}"
             })
+
+[<Test>]
+let ``format document with both .editorconfig file and custom config`` () =
+    runWithDaemon
+        (fun client ->
+            async {
+                let sourceCode =
+                    "module Foo\n\nlet add (a:int) (b:int) = //\n    a + b"
+
+                use codeFile = new TemporaryFileCodeSample(sourceCode)
+
+                use _config =
+                    new ConfigurationFile("[*.fs]\nindent_size=2")
+
+                let request =
+                    { SourceCode = sourceCode
+                      FilePath = codeFile.Filename
+                      Config = Some(readOnlyDict [ "fsharp_space_before_colon", "true" ]) }
+
+                let! response =
+                    client.InvokeAsync<FormatDocumentResponse>(Methods.FormatDocument, request)
+                    |> Async.AwaitTask
+
+                match response with
+                | FormatDocumentResponse.Formatted (_, formatted) ->
+                    assertFormatted
+                        formatted
+                        "module Foo
+
+let add (a : int) (b : int) = //
+  a + b
+"
+                | otherResponse -> Assert.Fail $"Unexpected response %A{otherResponse}"
+            })
diff --git a/src/Fantomas.CoreGlobalTool/Daemon.fs b/src/Fantomas.CoreGlobalTool/Daemon.fs
@@ -49,7 +49,9 @@ type FantomasDaemon(sender: Stream, reader: Stream) as this =
             else
                 let config =
                     match request.Config with
-                    | Some configProperties -> parseOptionsFromEditorConfig configProperties
+                    | Some configProperties ->
+                        let config = readConfiguration request.FilePath
+                        parseOptionsFromEditorConfig config configProperties
                     | None -> readConfiguration request.FilePath
 
                 try
@@ -76,7 +78,9 @@ type FantomasDaemon(sender: Stream, reader: Stream) as this =
         async {
             let config =
                 match request.Config with
-                | Some configProperties -> parseOptionsFromEditorConfig configProperties
+                | Some configProperties ->
+                    let config = readConfiguration request.FilePath
+                    parseOptionsFromEditorConfig config configProperties
                 | None -> readConfiguration request.FilePath
 
             let range =

diff --git a/src/Fantomas.Extras/EditorConfig.fs b/src/Fantomas.Extras/EditorConfig.fs
@@ -57,8 +57,8 @@ let toEditorConfigName value =
         else
             sprintf "fsharp_%s" name
 
-let private fantomasFields =
-    Reflection.getRecordFields FormatConfig.Default
+let private getFantomasFields (fallbackConfig: FormatConfig) =
+    Reflection.getRecordFields fallbackConfig
     |> Array.map
         (fun (recordField, defaultValue) ->
             let editorConfigName =
@@ -81,8 +81,11 @@ let private (|Boolean|_|) b =
     elif b = "false" then Some(box false)
     else None
 
-let parseOptionsFromEditorConfig (editorConfigProperties: IReadOnlyDictionary<string, string>) : FormatConfig =
-    fantomasFields
+let parseOptionsFromEditorConfig
+    (fallbackConfig: FormatConfig)
+    (editorConfigProperties: IReadOnlyDictionary<string, string>)
+    : FormatConfig =
+    getFantomasFields fallbackConfig
     |> Array.map
         (fun (ecn, dv) ->
             match editorConfigProperties.TryGetValue(ecn) with
@@ -124,7 +127,7 @@ let tryReadConfiguration (fsharpFile: string) : FormatConfig option =
     if editorConfigSettings.Properties.Count = 0 then
         None
     else
-        Some(parseOptionsFromEditorConfig editorConfigSettings.Properties)
+        Some(parseOptionsFromEditorConfig FormatConfig.Default editorConfigSettings.Properties)
 
 let readConfiguration (fsharpFile: string) : FormatConfig =
     tryReadConfiguration fsharpFile