Feature: space between function and unit

docs/Documentation.md

@@ -1,6 +1,7 @@
 ## Fantomas: How to use
 
 ### Using the command line tool
+
 ---
 
 For the overview how to use the tool, you can type the command
@@ -131,12 +132,6 @@ add semicolons at the end of lines e.g.
 	    Mass = 0.0002858859807 * solarMass }
 	```
 
- ##### `--noSpaceBeforeArgument`
-
-if being set, no space is inserted before a function name and its first argument. 
-For example, `Seq.filter (fun x -> x > 2)` becomes `Seq.filter(fun x -> x > 2)`. 
-This doesn't affect methods and constructors, e.g. `Console.WriteLine("Hello World")`.
-
 ##### `--spaceBeforeColon`
 
 if being set, there is a space before `:` e.g.
@@ -292,11 +287,19 @@ Use a JSON configuration file based on a [schema](../src/Fantomas/schema.json) t
 
 A default configuration file would look like
 ```json
-{
+{  
   "IndentSpaceNum":4,
   "PageWidth":120,
   "SemicolonAtEndOfLine":false,
-  "SpaceBeforeArgument":true ,
+  "SpaceBeforeUnitArgumentInUppercaseInvocation":false,
+  "SpaceBeforeUnitArgumentInLowercaseInvocation":false,
+  "SpaceBeforeParenthesesInUppercaseInvocation":false,
+  "SpaceBeforeParenthesesInLowercaseInvocation":true ,
+  "SpaceBeforeUnitParameterInUppercaseFunctionDefinition":false,
+  "SpaceBeforeUnitParameterInLowercaseFunctionDefinition":false,
+  "SpaceBeforeParenthesesInUppercaseFunctionDefinition":false,
+  "SpaceBeforeParenthesesInLowercaseFunctionDefinition":true ,
+  "SpaceBeforeClassConstructor":false,
   "SpaceBeforeColon":false,
   "SpaceAfterComma":true ,
   "SpaceBeforeSemicolon": false,
@@ -306,7 +309,7 @@ A default configuration file would look like
   "SpaceAroundDelimiter":true ,
   "KeepNewlineAfter":false,
   "MaxIfThenElseShortWidth":40,
-  "StrictMode":false
+  "StrictMode":false 
 }
 ```
 

src/Fantomas.CoreGlobalTool/Program.fs

@@ -18,7 +18,6 @@ type Arguments =
     | [<Unique>] Check
     | [<Unique;AltCommandLine("--pageWidth")>] PageWidth of int
     | [<Unique;AltCommandLine("--semicolonEOL")>] SemicolonEOL
-    | [<Unique;AltCommandLine("--noSpaceBeforeArgument")>] NoSpaceBeforeArgument
     | [<Unique;AltCommandLine("--spaceBeforeColon")>] SpaceBeforeColon
     | [<Unique;AltCommandLine("--noSpaceAfterComma")>] NoSpaceAfterComma
     | [<Unique;AltCommandLine("--noSpaceAfterSemiColon")>] NoSpaceAfterSemiColon
@@ -46,7 +45,6 @@ with
             | Check -> "Don't format files, just check if they have changed. Exits with 0 if it's formatted correctly, with 1 if some files need formatting and 99 if there was an internal error"
             | PageWidth _ -> "Set the column where we break to new lines (default = 80). The value should be at least 60."
             | SemicolonEOL -> "Enable semicolons at the end of line (default = false)."
-            | NoSpaceBeforeArgument -> "Disable spaces before the first argument of functions when there are parenthesis (default = true). For methods and constructors, there are never spaces regardless of this option."
             | SpaceBeforeColon -> "Enable spaces before colons (default = false)."
             | NoSpaceAfterComma -> "Disable spaces after commas (default = true)."
             | NoSpaceAfterSemiColon -> "Disable spaces after semicolons (default = true)."
@@ -271,7 +269,6 @@ let main argv =
                 | Indent i -> { acc with IndentSpaceNum = i }
                 | PageWidth pw -> { acc with PageWidth = pw }
                 | SemicolonEOL -> { acc with SemicolonAtEndOfLine = true }
-                | NoSpaceBeforeArgument -> { acc with SpaceBeforeArgument = false }
                 | SpaceBeforeColon -> { acc with SpaceBeforeColon = true }
                 | NoSpaceAfterComma -> { acc with SpaceAfterComma = false }
                 | NoSpaceAfterSemiColon -> { acc with SpaceAfterSemicolon = false }

src/Fantomas.Tests/AttributeTests.fs

@@ -112,9 +112,9 @@ and [<Test>] b () = 10""" config
     |> prepend newline
     |> should equal """
 [<Test>]
-let rec a() = 10
+let rec a () = 10
 
-and [<Test>] b() = 10
+and [<Test>] b () = 10
 """
 
 [<Test>]
@@ -190,7 +190,7 @@ let printInStyle (style: string) (msg): unit = jsNative
 let printModel model: unit = jsNative
 
 [<Emit("console.trace()")>]
-let printStackTrace(): unit = jsNative
+let printStackTrace (): unit = jsNative
 #endif
 
 let e2e value = Props.Data("e2e", value)
@@ -292,7 +292,7 @@ let main argv =
             SpaceAfterComma = false
             SpaceAfterSemicolon = false
             SpaceAroundDelimiter = false
-            SpaceBeforeArgument = false })
+            SpaceBeforeLowercaseInvocation = false })
     |> prepend newline
     |> should equal """
 open System

src/Fantomas.Tests/CommentTests.fs

@@ -38,7 +38,7 @@ let print_30_permut() =
     """ config
     |> prepend newline
     |> should equal """
-let print_30_permut() =
+let print_30_permut () =
 
     /// declare and initialize
     let permutation: int array =
@@ -59,7 +59,7 @@ let print_30_permut() =
     """ config
     |> prepend newline
     |> should equal """
-let print_30_permut() =
+let print_30_permut () =
 
     /// declare and initialize
     let permutation: int array =
@@ -120,7 +120,7 @@ let f() =
 """  config
     |> prepend newline
     |> should equal """
-let f() =
+let f () =
     // COMMENT
     x + x
 """
@@ -134,7 +134,7 @@ let f() =
 """   config
     |> prepend newline
     |> should equal """
-let f() =
+let f () =
     let x = 1 // COMMENT
     x + x
 """ 
@@ -156,7 +156,7 @@ let f() =
     |> should equal """
 /// XML COMMENT
 // Other comment
-let f() =
+let f () =
     // COMMENT A
     let y = 1
     (* COMMENT B *)
@@ -182,7 +182,7 @@ let f() =
     |> should equal """
 /// XML COMMENT A
 // Other comment
-let f() =
+let f () =
     // COMMENT A
     let y = 1
     /// XML COMMENT B
@@ -380,7 +380,7 @@ let hello() = "hello world"
 """  config
     |> prepend newline
     |> should equal """
-let hello() = "hello world"
+let hello () = "hello world"
 
 (* This is a comment. *)
 """

src/Fantomas.Tests/CompilerDirectivesTests.fs

@@ -89,12 +89,12 @@ let ``line, file and path identifiers``() =
     """ config
     |> prepend newline
     |> should equal """
-let printSourceLocation() =
+let printSourceLocation () =
     printfn "Line: %s" __LINE__
     printfn "Source Directory: %s" __SOURCE_DIRECTORY__
     printfn "Source File: %s" __SOURCE_FILE__
 
-printSourceLocation()
+printSourceLocation ()
 """
 
 [<Test>]
@@ -170,7 +170,7 @@ let [<Literal>] private assemblyConfig() =
     |> prepend newline
     |> should equal """
 [<Literal>]
-let private assemblyConfig() =
+let private assemblyConfig () =
 #if TRACE
     let x = ""
 #else
@@ -1021,7 +1021,7 @@ let f () =
     |> prepend newline
     |> should equal """
 #if TEST
-let f() =
+let f () =
     async {
         let x = 2
         return x
@@ -1042,7 +1042,7 @@ let f () =
     |> prepend newline
     |> should equal """
 #if TEST
-let f() =
+let f () =
     async {
         let x = 2
         return x

src/Fantomas.Tests/ComputationExpressionTests.fs

@@ -78,7 +78,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
@@ -108,7 +108,7 @@ async {
     |> prepend newline
     |> should equal """
 async {
-    match! myAsyncFunction() with
+    match! myAsyncFunction () with
     | Some x -> printfn "%A" x
     | None -> printfn "Function returned None!"
 }
@@ -158,9 +158,9 @@ parallel {
    |> should equal """
 // Reads the values of x, y and z concurrently, then applies f to them
 ``parallel`` {
-    let! x = slowRequestX()
-    and! y = slowRequestY()
-    and! z = slowRequestZ()
+    let! x = slowRequestX ()
+    and! y = slowRequestY ()
+    and! z = slowRequestZ ()
     return f x y z }
 """