Add atCurrentColumnIndent to match expression. Fixes fsprojects#1352.

nojaf · Jan 8, 2021 · 158f118 · 158f118
1 parent d5f4d9f
commit 158f118
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/Fantomas.Tests/PatternMatchingTests.fs b/src/Fantomas.Tests/PatternMatchingTests.fs
@@ -1128,3 +1128,23 @@ match foo with
 
     getTriviaFromTokensThemSelves allTokens rest info
 """
+
+[<Test>]
+let ``multiline application call in match expression, 1352`` () =
+    formatSourceString
+        false
+        """
+match x (Map.tryFind somelongidentifier a + Option.defaultValue longidentifier) with
+| _ -> ()
+"""
+        config
+    |> prepend newline
+    |> should
+        equal
+        """
+match x (
+          Map.tryFind somelongidentifier a
+          + Option.defaultValue longidentifier
+      ) with
+| _ -> ()
+"""
diff --git a/src/Fantomas/CodePrinter.fs b/src/Fantomas/CodePrinter.fs
@@ -1604,7 +1604,7 @@ and genExpr astContext synExpr ctx =
         | Match (e, cs) ->
             atCurrentColumn (
                 !- "match "
-                +> genExpr astContext e
+                +> atCurrentColumnIndent (genExpr astContext e)
                 +> enterNodeTokenByName synExpr.Range WITH
                 // indent 'with' further if trivia was printed so that is appear after the match keyword.
                 +> ifElseCtx lastWriteEventIsNewline (rep 5 !- " ") sepNone