Fix missing spaces inside parentheses of function applications

Close fsprojects-archive/zzarchive-VisualFSharpPowerTools#1050.
fsprojects · Aug 10, 2015 · 3e99d64 · 3e99d64
1 parent 9aef8cf
commit 3e99d64
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 3 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+#### 1.9.0 - 19-08-2015
+* Fix https://github.com/fsprojects/VisualFSharpPowerTools/issues/1050 ([#172](https://github.com/dungpa/fantomas/pull/172))
+
 #### 1.8.0-beta - 19-07-2015
 * Migrate to F# 4.0 ([#170](https://github.com/dungpa/fantomas/pull/170))
 

diff --git a/paket.lock b/paket.lock
@@ -7,7 +7,7 @@ NUGET
       FsCheck (>= 1.0.0)
       NUnit (>= 2.6.3)
       NUnit.Runners (>= 2.6.3)
-    FSharp.Compiler.Service (1.4.0-beta) - framework: >= net45
+    FSharp.Compiler.Service (1.4.0.1) - framework: >= net45
     FsUnit (1.3.0.1) - framework: >= net45
       NUnit (>= 2.6.3)
     NuGet.CommandLine (2.8.5)

diff --git a/src/Fantomas.Tests/FunctionDefinitionTests.fs b/src/Fantomas.Tests/FunctionDefinitionTests.fs
@@ -278,4 +278,14 @@ f(42).Length
 let f x = "foo"
 
 f(42).Length
+"""
+
+[<Test>]
+let ``do add spaces for function application inside parentheses inside dot access``() =
+    formatSourceString false """let inputBlah = "So, I was like, Visual Studio did wat!?"
+let someBlahing = (Blah.TryCreate inputBlah).Value"""  config
+    |> prepend newline
+    |> should equal """
+let inputBlah = "So, I was like, Visual Studio did wat!?"
+let someBlahing = (Blah.TryCreate inputBlah).Value
 """
diff --git a/src/Fantomas/CodeFormatter.fsx b/src/Fantomas/CodeFormatter.fsx
@@ -23,7 +23,8 @@ let test (s : string) =
 fsi.AddPrinter (fun (p : pos) -> p.ToString())
 fsi.AddPrinter (fun (r : range) -> r.ToString())
 
-let input = """[<Measure>] type X = cm^(1/2)/W"""
+let input = """let inputBlah = "So, I was like, Visual Studio did wat!?"
+let someBlahing = (Blah.TryCreate inputBlah).Value"""
 
 test input;;
 

diff --git a/src/Fantomas/CodePrinter.fs b/src/Fantomas/CodePrinter.fs
@@ -489,7 +489,9 @@ and genExpr astContext = function
     | MatchLambda(sp, _) -> !- "function " +> colPre sepNln sepNln sp (genClause astContext true)
     | Match(e, cs) -> 
         atCurrentColumn (!- "match " +> genExpr astContext e -- " with" +> colPre sepNln sepNln cs (genClause astContext true))
-    | Paren e -> sepOpenT +> genExpr astContext e +> sepCloseT
+    | Paren e -> 
+        // Parentheses nullify effects of no space inside DotGet
+        sepOpenT +> genExpr { astContext with IsInsideDotGet = false } e +> sepCloseT
     | CompApp(s, e) ->
         !- s +> sepSpace +> sepOpenS +> genExpr { astContext with IsNakedRange = true } e 
         +> ifElse (checkBreakForExpr e) (sepNln +> sepCloseSFixed) sepCloseS