Cleanup (#2540)

* Remove unused code in Fantomas.Core.

* Remove unused code in Fantomas.Core.Tests.

Author: nojaf

src/Fantomas.Core.Tests/ClassTests.fs

@@ -594,7 +594,20 @@ type A() =
 
 [<Test>]
 let ``no extra new line before nested module with attribute, 586`` () =
-    shouldNotChangeAfterFormat
+    formatSourceString
+        false
+        """
+module A =
+    let x = 0
+
+    [<RequireQualifiedAccess>]
+    module B =
+        let y = 1
+"""
+        config
+    |> prepend newline
+    |> should
+        equal
         """
 module A =
     let x = 0
@@ -606,7 +619,20 @@ module A =
 
 [<Test>]
 let ``no extra new line before abstract member with attribute, 586`` () =
-    shouldNotChangeAfterFormat
+    formatSourceString
+        false
+        """
+type A =
+
+    [<EmitConstructor>]
+    abstract Create: Unit -> A
+
+    abstract b: Unit -> Unit
+"""
+        config
+    |> prepend newline
+    |> should
+        equal
         """
 type A =
 
@@ -618,7 +644,21 @@ type A =
 
 [<Test>]
 let ``no extra new line between abstract members with attribute, 586`` () =
-    shouldNotChangeAfterFormat
+    formatSourceString
+        false
+        """
+type A =
+
+    [<Emit("a")>]
+    abstract a: Unit -> string
+
+    [<Emit("b")>]
+    abstract b: Unit -> string
+"""
+        config
+    |> prepend newline
+    |> should
+        equal
         """
 type A =
 

src/Fantomas.Core.Tests/RecordTests.fs

@@ -269,7 +269,19 @@ let newDocument = //somecomment
 
 [<Test>]
 let ``|> should be on the next line if preceding expression is multiline`` () =
-    shouldNotChangeAfterFormat
+    formatSourceString
+        false
+        """
+let newDocument = //somecomment
+    { program = "Loooooooooooooooooooooooooong"
+      content = "striiiiiiiiiiiiiiiiiiinnnnnnnnnnng"
+      created = document.Created.ToLocalTime() }
+    |> JsonConvert.SerializeObject
+"""
+        config
+    |> prepend newline
+    |> should
+        equal
         """
 let newDocument = //somecomment
     { program = "Loooooooooooooooooooooooooong"

src/Fantomas.Core.Tests/SignatureTests.fs

@@ -32,15 +32,33 @@ let ``should keep the (string * string) list type signature in records`` () =
 
 [<Test>]
 let ``should keep the (string * string) list type signature in functions`` () =
-    shouldNotChangeAfterFormat
+    formatSourceString
+        false
+        """
+let MSBuildWithProjectProperties outputPath (targets: string) (properties: string -> (string * string) list) projects =
+    doingsomstuff
+"""
+        config
+    |> prepend newline
+    |> should
+        equal
         """
 let MSBuildWithProjectProperties outputPath (targets: string) (properties: string -> (string * string) list) projects =
     doingsomstuff
 """
 
 [<Test>]
 let ``should keep the string * string list type signature in functions`` () =
-    shouldNotChangeAfterFormat
+    formatSourceString
+        false
+        """
+let MSBuildWithProjectProperties outputPath (targets: string) (properties: (string -> string) * string list) projects =
+    doingsomstuff
+"""
+        config
+    |> prepend newline
+    |> should
+        equal
         """
 let MSBuildWithProjectProperties outputPath (targets: string) (properties: (string -> string) * string list) projects =
     doingsomstuff

src/Fantomas.Core.Tests/TestHelpers.fs

@@ -1,12 +1,9 @@
 module Fantomas.Core.Tests.TestHelper
 
 open System
-open System.IO
 open Fantomas.Core.TriviaTypes
 open NUnit.Framework
-open FsCheck
 open FsUnit
-open FSharp.Compiler.Text
 open Fantomas.Core.FormatConfig
 open Fantomas.Core
 
@@ -64,9 +61,6 @@ let formatSourceStringWithDefines defines (s: string) config =
 let isValidFSharpCode isFsiFile s =
     CodeFormatter.IsValidFSharpCodeAsync(isFsiFile, s) |> Async.RunSynchronously
 
-let formatAST a s c =
-    CodeFormatter.FormatASTAsync(a, s, c) |> Async.RunSynchronously
-
 let equal x =
     let x =
         match box x with
@@ -76,72 +70,7 @@ let equal x =
     equal x
 
 let inline prepend s content = s + content
-let inline append s content = content + s
-let zero = range.Zero
-
-let tryFormatAST ast sourceCode config =
-    try
-        formatAST ast sourceCode config
-    with _ ->
-        ""
-
 let formatConfig = { FormatConfig.Default with StrictMode = true }
-
-let shouldNotChangeAfterFormat source =
-    formatSourceString false source config |> prepend newline |> should equal source
-
 let (==) actual expected = Assert.AreEqual(expected, actual)
 let fail () = Assert.Fail()
 let pass () = Assert.Pass()
-
-/// An FsCheck runner which reports FsCheck test results to NUnit.
-type NUnitRunner() =
-    interface IRunner with
-        member __.OnStartFixture _ = ()
-
-        member __.OnArguments(_ntest, _args, _every) =
-            //stdout.Write(every ntest args)
-            ()
-
-        member __.OnShrink(_args, _everyShrink) =
-            //stdout.Write(everyShrink args)
-            ()
-
-        member __.OnFinished(name, result) =
-            match result with
-            | TestResult.True (_data, _) ->
-                // TODO : Log the result data.
-                Runner.onFinishedToString name result |> stdout.WriteLine
-
-            | TestResult.Exhausted _data ->
-                // TODO : Log the result data.
-                Runner.onFinishedToString name result |> Assert.Inconclusive
-
-            | TestResult.False _ ->
-                // TODO : Log more information about the test failure.
-                Runner.onFinishedToString name result |> Assert.Fail
-
-let private getTempFolder () = Path.GetTempPath()
-
-let private mkConfigPath fileName folder =
-    match folder with
-    | Some folder ->
-        let folderPath = Path.Combine(getTempFolder (), folder)
-        Directory.CreateDirectory(folderPath) |> ignore
-        Path.Combine(folderPath, fileName)
-    | None -> Path.Combine(getTempFolder (), fileName)
-
-let mkConfigFromContent fileName folder content =
-    let file = mkConfigPath fileName folder
-    File.WriteAllText(file, content)
-    file
-
-type TemporaryFileCodeSample internal (codeSnippet: string) =
-    let filename = Path.Join(Path.GetTempPath(), Guid.NewGuid().ToString() + ".fs")
-
-    do File.WriteAllText(filename, codeSnippet)
-
-    member __.Filename: string = filename
-
-    interface IDisposable with
-        member this.Dispose() : unit = File.Delete(filename)

src/Fantomas.Core.Tests/UnionTests.fs

@@ -35,7 +35,20 @@ type X =
 
 [<Test>]
 let ``enums conversion`` () =
-    shouldNotChangeAfterFormat
+    formatSourceString
+        false
+        """
+type uColor =
+    | Red = 0u
+    | Green = 1u
+    | Blue = 2u
+
+let col3 = Microsoft.FSharp.Core.LanguagePrimitives.EnumOfValue<uint32, uColor>(2u)
+"""
+        config
+    |> prepend newline
+    |> should
+        equal
         """
 type uColor =
     | Red = 0u