Indent multiline if condition for KeepIndentInBranch. Fixes #1729. (#…

…1730)
fsprojects · May 18, 2021 · 8507701 · 8507701
1 parent 76ffe36
commit 8507701
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 3 deletions.
diff --git a/src/Fantomas.Tests/KeepIndentInBranchTests.fs b/src/Fantomas.Tests/KeepIndentInBranchTests.fs
@@ -1493,3 +1493,50 @@ module Foo =
 
         0
 """
+
+[<Test>]
+let ``multiline if condition is indented, 1729`` () =
+    formatSourceString
+        false
+        """
+let x y =
+            if not (
+                result.HasResultsFor(
+                    [ "label"
+                      "ipv4"
+                      "macAddress"
+                      "medium"
+                      "manufacturer" ]
+                )
+            ) then
+                None
+            else
+
+            let label = string result.["label"]
+            let ipv4 = string result.["ipv4"]
+            None
+"""
+        config
+    |> prepend newline
+    |> should
+        equal
+        """
+let x y =
+    if
+        not (
+            result.HasResultsFor(
+                [ "label"
+                  "ipv4"
+                  "macAddress"
+                  "medium"
+                  "manufacturer" ]
+            )
+        )
+    then
+        None
+    else
+
+    let label = string result.["label"]
+    let ipv4 = string result.["ipv4"]
+    None
+"""
diff --git a/src/Fantomas/CodePrinter.fs b/src/Fantomas/CodePrinter.fs
@@ -5401,9 +5401,24 @@ and genKeepIdentIf
         sepNln
         branches
         (fun idx (ifExpr, thenExpr, _r, _fullRange, _node) ->
-            ifElse (idx = 0) (!- "if ") (!- "elif ")
-            +> genExpr astContext ifExpr
-            +> !- " then"
+            let genIf =
+                let short =
+                    ifElse (idx = 0) (!- "if ") (!- "elif ")
+                    +> genExpr astContext ifExpr
+                    +> !- " then"
+
+                let long =
+                    ifElse (idx = 0) (!- "if ") (!- "elif ")
+                    +> indent
+                    +> sepNln
+                    +> genExpr astContext ifExpr
+                    +> unindent
+                    +> sepNln
+                    +> !- "then"
+
+                expressionFitsOnRestOfLine short long
+
+            genIf
             +> indent
             +> sepNln
             +> genExpr astContext thenExpr