Control space in pattern by fsharp_space_before_lowercase_invocation …

…and fsharp_space_before_uppercase_invocation. (#2551)

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [Unreleased]
+
+### Changed
+* Control space in pattern by `fsharp_space_before_lowercase_invocation` and `fsharp_space_before_uppercase_invocation`. [fslang-design/issues/712](https://github.com/fsharp/fslang-design/issues/712)
+
+### Fixed
+* Comments in SynArgPats.NamePatPairs are lost. [#2541](https://github.com/fsprojects/fantomas/issues/2541)
+
 ## [5.1.0-alpha-004] - 2022-10-07
 
 ### Changed

docs/docs/end-users/Configuration.fsx

@@ -151,15 +151,18 @@ formatCode
 <fantomas-setting name="fsharp_space_before_lowercase_invocation" orange></fantomas-setting>
 
 Add a space after the name of a lowercased function and before the opening parenthesis of the first argument.  
-This setting influences function invocation.
+This setting influences function invocation in expressions and patterns.
 
 Default = true.
 *)
 
 formatCode
     """ 
-    value (a, b)
-    startTimer ()
+value (a, b)
+startTimer ()
+
+match x with
+| value (a, b) -> ()
     """
     { FormatConfig.Default with SpaceBeforeLowercaseInvocation = false }
 (*** include-it ***)
@@ -168,15 +171,18 @@ formatCode
 <fantomas-setting name="fsharp_space_before_uppercase_invocation" green gr></fantomas-setting>
 
 Add a space after the name of a uppercase function and before the opening parenthesis of the first argument.  
-This setting influences function invocation.
+This setting influences function invocation in expressions and patterns.
 
 Default = false.
 *)
 
 formatCode
     """ 
-    Value(a, b)
-    person.ToString()
+Value(a, b)
+person.ToString()
+
+match x with
+| Value(a, b) -> ()
     """
     { FormatConfig.Default with SpaceBeforeUppercaseInvocation = true }
 (*** include-it ***)

src/Fantomas.Core.Tests/AppTests.fs

@@ -131,7 +131,7 @@ module Caching =
             lock cacheFiles.CachedNetworkData (fun _ ->
                 match balance with
                 | NotAvailable -> NotAvailable
-                | Cached (balance, time) ->
+                | Cached(balance, time) ->
                     if compoundBalance < 0.0m then
                         ReportProblem
                             compoundBalance
@@ -176,7 +176,7 @@ module Caching =
             lock cacheFiles.CachedNetworkData (fun _ ->
                 match balance with
                 | NotAvailable -> NotAvailable
-                | Cached (balance, time) ->
+                | Cached(balance, time) ->
                     if compoundBalance < 0.0m then
                         ReportProblem
                             looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong
@@ -214,7 +214,7 @@ module Caching =
             lock cacheFiles.CachedNetworkData (fun _ ->
                 match balance with
                 | NotAvailable -> NotAvailable
-                | Cached (balance, time) ->
+                | Cached(balance, time) ->
                     if compoundBalance < 0.0m then
                         ReportProblem compoundBalance None currency address sessionCachedNetworkData
 
@@ -251,7 +251,7 @@ module Caching =
             lock cacheFiles.CachedNetworkData (fun _ ->
                 match balance with
                 | NotAvailable -> NotAvailable
-                | Cached (balance, time) ->
+                | Cached(balance, time) ->
                     if compoundBalance < 0.0m then
                         ReportProblem compoundBalance
 
@@ -726,7 +726,7 @@ module Foo =
             thing
             |> Map.iter (fun key value ->
                 match value with
-                | Ok (TestResult.Failure f) -> failwith ""
+                | Ok(TestResult.Failure f) -> failwith ""
                 | Error e -> failwith ""
                 | _ -> () // hi!
             ))

src/Fantomas.Core.Tests/CommentTests.fs

@@ -1940,7 +1940,7 @@ let compilerOptionUsage (CompilerOption (s, tag, spec, _, _)) =
     |> should
         equal
         """
-let compilerOptionUsage (CompilerOption (s, tag, spec, _, _)) =
+let compilerOptionUsage (CompilerOption(s, tag, spec, _, _)) =
     let s =
         if s = "--" then
             ""
@@ -2012,7 +2012,7 @@ let compilerOptionUsage (CompilerOption (s, tag, spec, _, _)) =
     |> should
         equal
         """
-let compilerOptionUsage (CompilerOption (s, tag, spec, _, _)) =
+let compilerOptionUsage (CompilerOption(s, tag, spec, _, _)) =
     let s =
         if s = "--" then
             ""
@@ -2357,7 +2357,7 @@ node {
             match builderOpt with
             | Some builder ->
                 match! bc.GetCachedCheckFileResult(builder, fileName, sourceText, options) with
-                | Some (_, checkResults) ->
+                | Some(_, checkResults) ->
                     return Some(builder, creationDiags, Some(FSharpCheckFileAnswer.Succeeded checkResults))
                 | _ -> return Some(builder, creationDiags, None)
             | _ -> return None // the builder wasn't ready

src/Fantomas.Core.Tests/ComputationExpressionTests.fs

@@ -90,7 +90,7 @@ let s2 = seq { 0..10..100 }
 let rec inorder tree =
     seq {
         match tree with
-        | Tree (x, left, right) ->
+        | Tree(x, left, right) ->
             yield! inorder left
             yield x
             yield! inorder right
@@ -1512,10 +1512,10 @@ let private getAST log (req: HttpRequest) =
             | Result.Ok ast ->
                 let node =
                     match ast with
-                    | ParsedInput.ImplFile (ParsedImplFileInput.ParsedImplFileInput (_, _, _, _, hds, mns, _)) ->
+                    | ParsedInput.ImplFile(ParsedImplFileInput.ParsedImplFileInput(_, _, _, _, hds, mns, _)) ->
                         Fantomas.AstTransformer.astToNode hds mns
 
-                    | ParsedInput.SigFile (ParsedSigFileInput.ParsedSigFileInput (_, _, _, _, mns)) ->
+                    | ParsedInput.SigFile(ParsedSigFileInput.ParsedSigFileInput(_, _, _, _, mns)) ->
                         Fantomas.AstTransformer.sigAstToNode mns
                     |> Encoders.nodeEncoder
 
@@ -2306,7 +2306,7 @@ let generateUnionCases =
                 let! (tyRes, line, lines) = getParseResultsForFile fileName pos
 
                 match! generateCases tyRes pos lines line |> Async.map Ok with
-                | CoreResponse.Res (insertString: string, insertPosition) ->
+                | CoreResponse.Res(insertString: string, insertPosition) ->
                     return
                         [ { SourceDiagnostic = Some diagnostic
                             File = codeActionParams.TextDocument

src/Fantomas.Core.Tests/ControlStructureTests.fs

@@ -172,7 +172,7 @@ let function1 x y =
                 raise (OuterError("outer"))
         with
         | Failure _ -> ()
-        | InnerError (str) -> printfn "Error1 %s" str
+        | InnerError(str) -> printfn "Error1 %s" str
     finally
         printfn "Always print this."
 """
@@ -629,8 +629,8 @@ let genPropertyWithGetSet astContext (b1, b2) rangeOfMember =
         """
 let genPropertyWithGetSet astContext (b1, b2) rangeOfMember =
     match b1, b2 with
-    | PropertyBinding (ats, px, ao, isInline, mf1, PatLongIdent (ao1, s1, ps1, _), e1),
-      PropertyBinding (_, _, _, _, _, PatLongIdent (ao2, _, ps2, _), e2) ->
+    | PropertyBinding(ats, px, ao, isInline, mf1, PatLongIdent(ao1, s1, ps1, _), e1),
+      PropertyBinding(_, _, _, _, _, PatLongIdent(ao2, _, ps2, _), e2) ->
         let prefix =
             genPreXmlDoc px
             +> genAttributes astContext ats

src/Fantomas.Core.Tests/DotGetTests.fs

@@ -170,7 +170,7 @@ module Services =
                         initial
                     )
                     .Resolve
-            | Storage.EventStore (gateway, cache) ->
+            | Storage.EventStore(gateway, cache) ->
                 let accessStrategy = Equinox.EventStore.AccessStrategy.RollingSnapshots snapshot
 
                 let cacheStrategy =

src/Fantomas.Core.Tests/FunctionDefinitionTests.fs

@@ -323,7 +323,7 @@ type U = X of int
 let f =
     fun x ->
         match x with
-        | X (x) -> x
+        | X(x) -> x
 """
 
 [<Test>]

src/Fantomas.Core.Tests/KeepIndentInBranchTests.fs

@@ -525,7 +525,7 @@ let rec getEndCol (r: Range) (tokenizer: FSharpLineTokenizer) lexState =
 /// Find out the end token
 let rec getEndCol (r: Range) (tokenizer: FSharpLineTokenizer) lexState =
     match tokenizer.ScanToken(!lexState) with
-    | Some (tok), state ->
+    | Some(tok), state ->
         Debug.WriteLine("End token: {0}", sprintf "%A" tok |> box)
 
         if tok.RightColumn >= r.EndColumn && isSignificantToken tok then
@@ -785,7 +785,7 @@ module Foo =
         | Error e ->
             printfn ""
             2
-        | Ok (thing, instructions) ->
+        | Ok(thing, instructions) ->
 
         log.LogInformation("")
 

src/Fantomas.Core.Tests/LambdaTests.fs

@@ -582,7 +582,7 @@ let init =
 let init =
     addDateTimeConverter
         (fun dt -> Date(dt.Year, dt.Month, dt.Day))
-        (fun (Date (y, m, d)) -> System.DateTime(y, m, d))
+        (fun (Date(y, m, d)) -> System.DateTime(y, m, d))
 """
 
 [<Test>]
@@ -787,7 +787,7 @@ let ``desugared union case, 1631`` () =
     |> should
         equal
         """
-col (fun (ArgInfo (ats, so, isOpt), t) -> sepNone)
+col (fun (ArgInfo(ats, so, isOpt), t) -> sepNone)
 """
 
 [<Test>]

src/Fantomas.Core.Tests/LetBindingTests.fs

@@ -600,7 +600,7 @@ let genSigModuleDeclList astContext node =
     match node with
     | [ x ] -> genSigModuleDecl astContext x
 
-    | SigOpenL (xs, ys) ->
+    | SigOpenL(xs, ys) ->
         let sepXsAndYs =
             match List.tryHead ys with
             | Some hs ->
@@ -774,14 +774,14 @@ let useEntries month year =
     let income =
         events
         |> Seq.choose (function
-            | Event.AddIncome (ai) when (filter ai.Created && isNotCancelled ai.Id) -> Some ai
+            | Event.AddIncome(ai) when (filter ai.Created && isNotCancelled ai.Id) -> Some ai
             | _ -> None)
         |> sortMapAndToArray
 
     let expenses =
         events
         |> Seq.choose (function
-            | Event.AddExpense (ae) when (filter ae.Created && isNotCancelled ae.Id) -> Some ae
+            | Event.AddExpense(ae) when (filter ae.Created && isNotCancelled ae.Id) -> Some ae
             | _ -> None)
         |> sortMapAndToArray
 
@@ -812,14 +812,14 @@ let useEntries month year =
     let income =
         events
         |> Seq.choose (function
-            | Event.AddIncome (ai) when (filter ai.Created && isNotCancelled ai.Id) -> Some ai
+            | Event.AddIncome(ai) when (filter ai.Created && isNotCancelled ai.Id) -> Some ai
             | _ -> None)
         |> sortMapAndToArray
 
     let expenses =
         events
         |> Seq.choose (function
-            | Event.AddExpense (ae) when (filter ae.Created && isNotCancelled ae.Id) -> Some ae
+            | Event.AddExpense(ae) when (filter ae.Created && isNotCancelled ae.Id) -> Some ae
             | _ -> None)
         |> sortMapAndToArray
 
@@ -925,8 +925,8 @@ let useOverviewPerMonth () =
         events
         |> List.choose (fun msg ->
             match msg with
-            | Event.AddIncome ({ Created = created })
-            | Event.AddExpense ({ Created = created }) -> Some(created.Month, created.Year)
+            | Event.AddIncome({ Created = created })
+            | Event.AddExpense({ Created = created }) -> Some(created.Month, created.Year)
             | _ -> None)
         |> List.distinct
         |> List.sort
@@ -962,8 +962,8 @@ let useOverviewPerMonth () =
         events
         |> List.choose (fun msg ->
             match msg with
-            | Event.AddIncome ({ Created = created })
-            | Event.AddExpense ({ Created = created }) -> Some(created.Month, created.Year)
+            | Event.AddIncome({ Created = created })
+            | Event.AddExpense({ Created = created }) -> Some(created.Month, created.Year)
             | _ -> None)
         |> List.distinct
         |> List.sort

src/Fantomas.Core.Tests/MultiLineLambdaClosingNewlineTests.fs

@@ -271,7 +271,7 @@ let expr =
         es
         (fun e ->
             match e with
-            | Paren (_, Lambda _, _) -> !- "lambda"
+            | Paren(_, Lambda _, _) -> !- "lambda"
             | _ -> genExpr astContext e
         )
 """
@@ -859,7 +859,7 @@ module Foo =
             thing
             |> Map.iter (fun key value ->
                 match value with
-                | Ok (TestResult.Failure f) -> failwith ""
+                | Ok(TestResult.Failure f) -> failwith ""
                 | Error e -> failwith ""
                 | _ -> () // hi!
             )

src/Fantomas.Core.Tests/OperatorTests.fs

@@ -1002,8 +1002,8 @@ let MethInfosEquivByNameAndSig erasureFlag ignoreFinal g amap m minfo minfo2 =
 /// Used to hide/filter members from base classes based on signature
 let MethInfosEquivByNameAndSig erasureFlag ignoreFinal g amap m minfo minfo2 =
     MethInfosEquivByNameAndPartialSig erasureFlag ignoreFinal g amap m minfo minfo2
-    && let (CompiledSig (_, retTy, formalMethTypars, _)) = CompiledSigOfMeth g amap m minfo in
-       let (CompiledSig (_, retTy2, formalMethTypars2, _)) =
+    && let (CompiledSig(_, retTy, formalMethTypars, _)) = CompiledSigOfMeth g amap m minfo in
+       let (CompiledSig(_, retTy2, formalMethTypars2, _)) =
            CompiledSigOfMeth g amap m minfo2 in
 
        match retTy, retTy2 with