Put SynExpr.DotGet atCurrentColumn in if expression. Fixes fsprojects…

…#1329.
nojaf · Dec 23, 2020 · e2edb56 · e2edb56
1 parent 6695a60
commit e2edb56
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 0 deletions.
diff --git a/src/Fantomas.Tests/IfThenElseTests.fs b/src/Fantomas.Tests/IfThenElseTests.fs
@@ -1690,3 +1690,51 @@ module X =
 
     ()
 """
+
+[<Test>]
+let ``if expression with SynExpr.DotGet inside, 1329`` () =
+    formatSourceString
+        false
+        """
+let private tryGetUrlWithExactMatch (pathPattern: string<SourcelinkPattern>) (urlPattern: string<Url>) (document: Document) =
+    if (UMX.untag pathPattern).Equals(UMX.untag document.Name, System.StringComparison.Ordinal)
+    then Some (urlPattern, normalizeRepoPath (UMX.cast<SourcelinkPattern, RepoPathSegment> pathPattern), document) else None
+
+let private tryGetUrlWithExactMatch
+  (pathPattern: string<SourcelinkPattern>)
+  (urlPattern: string<Url>)
+  (document: Document)
+  =
+  if (UMX.untag pathPattern)
+       .Equals(UMX.untag document.Name, System.StringComparison.Ordinal) then
+    Some(urlPattern, normalizeRepoPath (UMX.cast<SourcelinkPattern, RepoPathSegment> pathPattern), document)
+  else
+    None
+"""
+        { config with IndentSize = 2 }
+    |> prepend newline
+    |> should
+        equal
+        """
+let private tryGetUrlWithExactMatch
+  (pathPattern: string<SourcelinkPattern>)
+  (urlPattern: string<Url>)
+  (document: Document)
+  =
+  if (UMX.untag pathPattern)
+       .Equals(UMX.untag document.Name, System.StringComparison.Ordinal) then
+    Some(urlPattern, normalizeRepoPath (UMX.cast<SourcelinkPattern, RepoPathSegment> pathPattern), document)
+  else
+    None
+
+let private tryGetUrlWithExactMatch
+  (pathPattern: string<SourcelinkPattern>)
+  (urlPattern: string<Url>)
+  (document: Document)
+  =
+  if (UMX.untag pathPattern)
+       .Equals(UMX.untag document.Name, System.StringComparison.Ordinal) then
+    Some(urlPattern, normalizeRepoPath (UMX.cast<SourcelinkPattern, RepoPathSegment> pathPattern), document)
+  else
+    None
+"""
diff --git a/src/Fantomas/CodePrinter.fs b/src/Fantomas/CodePrinter.fs
@@ -2419,6 +2419,7 @@ and genExpr astContext synExpr ctx =
                     +> (match e1 with
                         | SynExpr.TryWith _
                         | SynExpr.TryFinally _ -> sepOpenT +> genExpr astContext e1 +> sepCloseT
+                        | App (SynExpr.DotGet _, [ (Paren _) ]) -> atCurrentColumn (genExpr astContext e1)
                         | AppTuple _ when (isConditionMultiline) ->
                             sepOpenT
                             +> atCurrentColumn (genExpr astContext e1)

diff --git a/src/Fantomas/SourceParser.fs b/src/Fantomas/SourceParser.fs
@@ -799,6 +799,7 @@ let (|App|_|) e =
 // captures application with single tuple arg
 let (|AppTuple|_|) =
     function
+    | App (SynExpr.DotGet _, [ (Paren (_, Tuple _, _)) ]) -> None
     | App (e, [ (Paren (lpr, Tuple args, rpr)) ]) -> Some(e, lpr, args, rpr)
     | App (e, [ (Paren (lpr, singleExpr, rpr)) ]) ->
         match singleExpr with