Fix for #483

fsprojects · Sep 27, 2019 · d03768f · d03768f
1 parent 3df63ec
commit d03768f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/src/Fantomas.Tests/ControlStructureTests.fs b/src/Fantomas.Tests/ControlStructureTests.fs
@@ -384,4 +384,23 @@ elif bar then
     | None -> printfn "%s" "meh"
 else
     ()
+"""
+
+[<Test>]
+let ``else keyword should be on separate line, #483`` () =
+    formatSourceString false """  if i.OpCode = OpCodes.Switch then
+    AccumulateSwitchTargets i targets
+    c
+  else
+    let branch = i.Operand :?> Cil.Instruction
+    c + (Option.nullable branch.Previous)
+"""  config
+    |> prepend newline
+    |> should equal """
+if i.OpCode = OpCodes.Switch then
+    AccumulateSwitchTargets i targets
+    c
+else
+    let branch = i.Operand :?> Cil.Instruction
+    c + (Option.nullable branch.Previous)
 """
diff --git a/src/Fantomas/Context.fs b/src/Fantomas/Context.fs
@@ -219,7 +219,7 @@ let internal (+~) (ctx : Context -> Context) (str : string) x =
         dump ctx
         |> String.normalizeThenSplitNewLine
         |> Array.tryLast
-        |> Option.map (fun (line:string) -> line.Trim().Length > 1)
+        |> Option.map (fun (line:string) -> not(System.String.IsNullOrWhiteSpace(line)))
         |> Option.defaultValue false
     let c = ctx x
     if addNewline c then