Publish AOT artefacts for Fantomas

.devcontainer/Dockerfile

@@ -16,7 +16,7 @@ RUN apt-get update \
     && apt-get -y install --no-install-recommends apt-utils dialog 2>&1 \
     #
     # Verify git, process tools, lsb-release (common in install instructions for CLIs) installed
-    && apt-get -y install git iproute2 procps lsb-release \
+    && apt-get -y install git iproute2 procps lsb-release clang libz-dev \
     #
     # Create a non-root user to use if preferred - see https://aka.ms/vscode-remote/containers/non-root-user.
     && groupadd --gid $USER_GID $USERNAME \

.gitignore

@@ -199,4 +199,5 @@ tests/.repositories/**
 
 # Analyzer files
 .analyzerpackages
-*.sarif
+*.sarif
+.fake

Directory.Packages.props

@@ -3,7 +3,7 @@
         <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     </PropertyGroup>
     <ItemGroup>
-        <PackageVersion Include="FSharp.Core" Version="6.0.1"/>
+        <PackageVersion Include="FSharp.Core" Version="8.0.100"/>
         <PackageVersion Include="System.Collections.Immutable" Version="7.0.0" />
         <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="7.0.0" />
         <PackageVersion Include="System.Memory" Version="4.5.5" />
@@ -22,7 +22,7 @@
         <PackageVersion Include="Serilog" Version="3.1.1"/>
         <PackageVersion Include="Serilog.Sinks.Console" Version="5.0.1" />
         <PackageVersion Include="SerilogTraceListener" Version="3.2.1-dev-00011" />
-        <PackageVersion Include="Argu" Version="6.2.4" />
+        <PackageVersion Include="Fargo.Cmdline" Version="1.1.14" />
         <PackageVersion Include="Thoth.Json.Net" Version="8.0.0" />
         <PackageVersion Include="editorconfig" Version="0.15.0" />
         <PackageVersion Include="Ignore" Version="0.1.50" />

build.fsx

@@ -61,6 +61,10 @@ pipeline "Build" {
     stage "Build" { run "dotnet build -c Release --tl" }
     stage "UnitTests" { run "dotnet test -c Release --tl" }
     stage "Pack" { run "dotnet pack --no-restore -c Release --tl" }
+    stage "PublishAOT" {
+        run
+            "dotnet publish src/Fantomas/Fantomas.fsproj -r linux-x64 -c Release -p:DoPublishAot=yes -p:RestoreLockedMode=false --tl"
+    }
     stage "Docs" {
         whenNot { platformOSX }
         envVars
@@ -441,12 +445,17 @@ pipeline "Release" {
                         |> Seq.filter (fun nupkg -> not (nupkg.Contains("Fantomas.Client")))
                         |> Seq.toArray
 
+                    let aotCompiledExecutableFiles =
+                        [ "fantomas"; "fantomas.dbg" ]
+                        |> List.map (fun file -> $"artifacts/publish/Fantomas/release_linux-x64/%s{file}")
+
                     let! nugetExitCodes = nugetPackages |> Array.map pushPackage |> Async.Sequential
 
                     let notes = getReleaseNotes currentRelease lastRelease
                     let noteFile = Path.GetTempFileName()
                     File.WriteAllText(noteFile, notes)
-                    let files = nugetPackages |> String.concat " "
+                    let files =
+                        [ yield! nugetPackages; yield! aotCompiledExecutableFiles ] |> String.concat " "
 
                     // We create a draft release for minor and majors. Those that requires a manual publish.
                     // This is to allow us to add additional release notes when it makes sense.

fake-sample/script.fsx

@@ -11,33 +11,29 @@ open Fake.DotNet
 
 let sourceFiles = !! "*.fs"
 
-Target.create
-    "CheckFormat"
-    (fun _ ->
-        let result =
-            sourceFiles
-            |> Seq.map (sprintf "\"%s\"")
-            |> String.concat " "
-            |> sprintf "%s --check"
-            |> DotNet.exec id "fantomas"
+Target.create "CheckFormat" (fun _ ->
+    let result =
+        sourceFiles
+        |> Seq.map (sprintf "\"%s\"")
+        |> String.concat " "
+        |> sprintf "%s --check"
+        |> DotNet.exec id "fantomas"
 
-        if result.ExitCode = 0 then
-            Trace.log "No files need formatting"
-        elif result.ExitCode = 99 then
-            failwith "Some files need formatting, check output for more info"
-        else
-            Trace.logf "Errors while formatting: %A" result.Errors)
+    if result.ExitCode = 0 then
+        Trace.log "No files need formatting"
+    elif result.ExitCode = 99 then
+        failwith "Some files need formatting, check output for more info"
+    else
+        Trace.logf "Errors while formatting: %A" result.Errors)
 
-Target.create
-    "Format"
-    (fun _ ->
-        let result =
-            sourceFiles
-            |> Seq.map (sprintf "\"%s\"")
-            |> String.concat " "
-            |> DotNet.exec id "fantomas"
+Target.create "Format" (fun _ ->
+    let result =
+        sourceFiles
+        |> Seq.map (sprintf "\"%s\"")
+        |> String.concat " "
+        |> DotNet.exec id "fantomas"
 
-        if not result.OK then
-            printfn "Errors while formatting all files: %A" result.Messages)
+    if not result.OK then
+        printfn "Errors while formatting all files: %A" result.Messages)
 
 Target.runOrList ()

src/Fantomas.Benchmarks/packages.lock.json

@@ -28,9 +28,9 @@
       },
       "FSharp.Core": {
         "type": "Direct",
-        "requested": "[6.0.1, )",
-        "resolved": "6.0.1",
-        "contentHash": "VrFAiW8dEEekk+0aqlbvMNZzDvYXmgWZwAt68AUBqaWK8RnoEVUNglj66bZzhs4/U63q0EfXlhcEKnH1sTYLjw=="
+        "requested": "[8.0.100, )",
+        "resolved": "8.0.100",
+        "contentHash": "ZOVZ/o+jI3ormTZOa28Wh0tSRoyle1f7lKFcUN61sPiXI7eDZu8eSveFybgTeyIEyW0ujjp31cp7GOglDgsNEg=="
       },
       "G-Research.FSharp.Analyzers": {
         "type": "Direct",
@@ -274,14 +274,14 @@
       "fantomas.core": {
         "type": "Project",
         "dependencies": {
-          "FSharp.Core": "[6.0.1, )",
+          "FSharp.Core": "[8.0.100, )",
           "Fantomas.FCS": "[1.0.0, )"
         }
       },
       "fantomas.fcs": {
         "type": "Project",
         "dependencies": {
-          "FSharp.Core": "[6.0.1, )",
+          "FSharp.Core": "[8.0.100, )",
           "System.Collections.Immutable": "[7.0.0, )",
           "System.Diagnostics.DiagnosticSource": "[7.0.0, )",
           "System.Memory": "[4.5.5, )",

src/Fantomas.Client.Tests/packages.lock.json

@@ -16,9 +16,9 @@
       },
       "FSharp.Core": {
         "type": "Direct",
-        "requested": "[6.0.1, )",
-        "resolved": "6.0.1",
-        "contentHash": "VrFAiW8dEEekk+0aqlbvMNZzDvYXmgWZwAt68AUBqaWK8RnoEVUNglj66bZzhs4/U63q0EfXlhcEKnH1sTYLjw=="
+        "requested": "[8.0.100, )",
+        "resolved": "8.0.100",
+        "contentHash": "ZOVZ/o+jI3ormTZOa28Wh0tSRoyle1f7lKFcUN61sPiXI7eDZu8eSveFybgTeyIEyW0ujjp31cp7GOglDgsNEg=="
       },
       "G-Research.FSharp.Analyzers": {
         "type": "Direct",

src/Fantomas.Core.Tests/packages.lock.json

@@ -19,9 +19,9 @@
       },
       "FSharp.Core": {
         "type": "Direct",
-        "requested": "[6.0.1, )",
-        "resolved": "6.0.1",
-        "contentHash": "VrFAiW8dEEekk+0aqlbvMNZzDvYXmgWZwAt68AUBqaWK8RnoEVUNglj66bZzhs4/U63q0EfXlhcEKnH1sTYLjw=="
+        "requested": "[8.0.100, )",
+        "resolved": "8.0.100",
+        "contentHash": "ZOVZ/o+jI3ormTZOa28Wh0tSRoyle1f7lKFcUN61sPiXI7eDZu8eSveFybgTeyIEyW0ujjp31cp7GOglDgsNEg=="
       },
       "FsUnit": {
         "type": "Direct",
@@ -149,14 +149,14 @@
       "fantomas.core": {
         "type": "Project",
         "dependencies": {
-          "FSharp.Core": "[6.0.1, )",
+          "FSharp.Core": "[8.0.100, )",
           "Fantomas.FCS": "[1.0.0, )"
         }
       },
       "fantomas.fcs": {
         "type": "Project",
         "dependencies": {
-          "FSharp.Core": "[6.0.1, )",
+          "FSharp.Core": "[8.0.100, )",
           "System.Collections.Immutable": "[7.0.0, )",
           "System.Diagnostics.DiagnosticSource": "[7.0.0, )",
           "System.Memory": "[4.5.5, )",

src/Fantomas.Core/ASTTransformer.fs

@@ -117,20 +117,27 @@ let mkConstant (creationAide: CreationAide) c r : Constant =
     match c with
     | SynConst.Unit -> mkUnit r |> Constant.Unit
     | SynConst.Bool b -> stn (if b then "true" else "false") r |> Constant.FromText
-    | SynConst.Byte v -> orElse $"%A{v}"
-    | SynConst.SByte v -> orElse $"%A{v}"
-    | SynConst.Int16 v -> orElse $"%A{v}"
-    | SynConst.Int32 v -> orElse $"%A{v}"
-    | SynConst.Int64 v -> orElse $"%A{v}"
-    | SynConst.UInt16 v -> orElse $"%A{v}"
-    | SynConst.UInt16s v -> orElse $"%A{v}"
-    | SynConst.UInt32 v -> orElse $"%A{v}"
-    | SynConst.UInt64 v -> orElse $"%A{v}"
-    | SynConst.Double v -> orElse $"%A{v}"
-    | SynConst.Single v -> orElse $"%A{v}"
-    | SynConst.Decimal v -> orElse $"%A{v}"
-    | SynConst.IntPtr v -> orElse $"%A{v}"
-    | SynConst.UIntPtr v -> orElse $"%A{v}"
+    | SynConst.Byte v -> orElse (v.ToString() + "uy")
+    | SynConst.SByte v -> orElse (v.ToString() + "y")
+    | SynConst.Int16 v -> orElse (v.ToString() + "s")
+    | SynConst.Int32 v -> orElse (v.ToString())
+    | SynConst.Int64 v -> orElse (v.ToString() + "L")
+    | SynConst.UInt16 v -> orElse (v.ToString() + "us")
+    // This formatting is likely imperfect, but SynConst.UInt16s is only used internally to the F# compiler.
+    | SynConst.UInt16s v ->
+        orElse (
+            v
+            |> Array.map (fun uint16 -> (uint16.ToString() + "us"))
+            |> String.concat "; "
+            |> sprintf "[| %s |]"
+        )
+    | SynConst.UInt32 v -> orElse (v.ToString() + "u")
+    | SynConst.UInt64 v -> orElse (v.ToString() + "uL")
+    | SynConst.Double v -> orElse (v.ToString("r"))
+    | SynConst.Single v -> orElse (v.ToString("r") + "f")
+    | SynConst.Decimal v -> orElse (sprintf "%sM" (v.ToString()))
+    | SynConst.IntPtr v -> orElse (v.ToString() + "n")
+    | SynConst.UIntPtr v -> orElse (v.ToString() + "un")
     | SynConst.UserNum(v, s) ->
         let fallback () = $"%s{v}%s{s}"
         stn (creationAide.TextFromSource fallback r) r |> Constant.FromText

src/Fantomas.Core/Selection.fs

@@ -350,7 +350,7 @@ let mkTreeWithSingleNode (node: Node) : TreeForSelection =
 let printTriviaNode (node: Node) : unit =
     let rec visit (level: int) (node: Node) =
         let name = node.GetType().Name
-        printfn "%s%s: %A" ("".PadRight(level * 2)) name node.Range
+        printfn "%s%s: %O" ("".PadRight(level * 2)) name node.Range
         Array.iter (visit (level + 1)) node.Children
 
     visit 0 node

src/Fantomas.Core/packages.lock.json

@@ -22,9 +22,9 @@
       },
       "FSharp.Core": {
         "type": "Direct",
-        "requested": "[6.0.1, )",
-        "resolved": "6.0.1",
-        "contentHash": "VrFAiW8dEEekk+0aqlbvMNZzDvYXmgWZwAt68AUBqaWK8RnoEVUNglj66bZzhs4/U63q0EfXlhcEKnH1sTYLjw=="
+        "requested": "[8.0.100, )",
+        "resolved": "8.0.100",
+        "contentHash": "ZOVZ/o+jI3ormTZOa28Wh0tSRoyle1f7lKFcUN61sPiXI7eDZu8eSveFybgTeyIEyW0ujjp31cp7GOglDgsNEg=="
       },
       "G-Research.FSharp.Analyzers": {
         "type": "Direct",
@@ -127,7 +127,7 @@
       "fantomas.fcs": {
         "type": "Project",
         "dependencies": {
-          "FSharp.Core": "[6.0.1, )",
+          "FSharp.Core": "[8.0.100, )",
           "System.Collections.Immutable": "[7.0.0, )",
           "System.Diagnostics.DiagnosticSource": "[7.0.0, )",
           "System.Memory": "[4.5.5, )",

src/Fantomas.FCS/packages.lock.json

@@ -22,9 +22,9 @@
       },
       "FSharp.Core": {
         "type": "Direct",
-        "requested": "[6.0.1, )",
-        "resolved": "6.0.1",
-        "contentHash": "VrFAiW8dEEekk+0aqlbvMNZzDvYXmgWZwAt68AUBqaWK8RnoEVUNglj66bZzhs4/U63q0EfXlhcEKnH1sTYLjw=="
+        "requested": "[8.0.100, )",
+        "resolved": "8.0.100",
+        "contentHash": "ZOVZ/o+jI3ormTZOa28Wh0tSRoyle1f7lKFcUN61sPiXI7eDZu8eSveFybgTeyIEyW0ujjp31cp7GOglDgsNEg=="
       },
       "FsLexYacc": {
         "type": "Direct",

src/Fantomas.Tests/packages.lock.json

@@ -19,9 +19,9 @@
       },
       "FSharp.Core": {
         "type": "Direct",
-        "requested": "[6.0.1, )",
-        "resolved": "6.0.1",
-        "contentHash": "VrFAiW8dEEekk+0aqlbvMNZzDvYXmgWZwAt68AUBqaWK8RnoEVUNglj66bZzhs4/U63q0EfXlhcEKnH1sTYLjw=="
+        "requested": "[8.0.100, )",
+        "resolved": "8.0.100",
+        "contentHash": "ZOVZ/o+jI3ormTZOa28Wh0tSRoyle1f7lKFcUN61sPiXI7eDZu8eSveFybgTeyIEyW0ujjp31cp7GOglDgsNEg=="
       },
       "FsUnit": {
         "type": "Direct",
@@ -331,14 +331,6 @@
           "System.Threading.Tasks": "4.3.0"
         }
       },
-      "System.Configuration.ConfigurationManager": {
-        "type": "Transitive",
-        "resolved": "4.4.0",
-        "contentHash": "gWwQv/Ug1qWJmHCmN17nAbxJYmQBM/E94QxKLksvUiiKB1Ld3Sc/eK1lgmbSjDFxkQhVuayI/cGFZhpBSodLrg==",
-        "dependencies": {
-          "System.Security.Cryptography.ProtectedData": "4.4.0"
-        }
-      },
       "System.Diagnostics.Debug": {
         "type": "Transitive",
         "resolved": "4.3.0",
@@ -719,11 +711,6 @@
           "System.Threading.Tasks": "4.3.0"
         }
       },
-      "System.Security.Cryptography.ProtectedData": {
-        "type": "Transitive",
-        "resolved": "4.4.0",
-        "contentHash": "cJV7ScGW7EhatRsjehfvvYVBvtiSMKgN8bOVI0bQhnF5bU7vnHVIsH49Kva7i7GWaWYvmEzkYVk1TC+gZYBEog=="
-      },
       "System.Security.Cryptography.X509Certificates": {
         "type": "Transitive",
         "resolved": "4.3.0",
@@ -825,10 +812,10 @@
       "fantomas": {
         "type": "Project",
         "dependencies": {
-          "Argu": "[6.2.4, )",
-          "FSharp.Core": "[6.0.1, )",
+          "FSharp.Core": "[8.0.100, )",
           "Fantomas.Client": "[1.0.0, )",
           "Fantomas.Core": "[1.0.0, )",
+          "Fargo.Cmdline": "[1.1.14, )",
           "Ignore": "[0.1.50, )",
           "Serilog": "[3.1.1, )",
           "Serilog.Sinks.Console": "[5.0.1, )",
@@ -851,36 +838,35 @@
       "fantomas.core": {
         "type": "Project",
         "dependencies": {
-          "FSharp.Core": "[6.0.1, )",
+          "FSharp.Core": "[8.0.100, )",
           "Fantomas.FCS": "[1.0.0, )"
         }
       },
       "fantomas.fcs": {
         "type": "Project",
         "dependencies": {
-          "FSharp.Core": "[6.0.1, )",
+          "FSharp.Core": "[8.0.100, )",
           "System.Collections.Immutable": "[7.0.0, )",
           "System.Diagnostics.DiagnosticSource": "[7.0.0, )",
           "System.Memory": "[4.5.5, )",
           "System.Runtime": "[4.3.1, )"
         }
       },
-      "Argu": {
-        "type": "CentralTransitive",
-        "requested": "[6.2.4, )",
-        "resolved": "6.2.4",
-        "contentHash": "RuANu8+L1P2HWozmbRXkj6MQGYwP5DL2wdARfBPtRjsLS8TSgwYjOKxMnY5LtjmHLlMBD3u2+MfbAy8xMGg8Qg==",
-        "dependencies": {
-          "FSharp.Core": "6.0.7",
-          "System.Configuration.ConfigurationManager": "4.4.0"
-        }
-      },
       "editorconfig": {
         "type": "CentralTransitive",
         "requested": "[0.15.0, )",
         "resolved": "0.15.0",
         "contentHash": "NuUxFbycSCOhl0WzmNZ8ksSMrTHBFzTASkil+IOqXpqTXszokKjy6ihxMdjArGaC+AaLLq4nxfGVFLi6KWyFJg=="
       },
+      "Fargo.CmdLine": {
+        "type": "CentralTransitive",
+        "requested": "[1.1.14, )",
+        "resolved": "1.1.14",
+        "contentHash": "gzlReYsGi3CWO4GUKFtEjzB4C85+/kzVrUPXt0sB2kNCB/Cc/ih7RkXPR9yF6AhOdXQ2QcPc2yeBi4SAUMJLlg==",
+        "dependencies": {
+          "FSharp.Core": "7.0.400"
+        }
+      },
       "Ignore": {
         "type": "CentralTransitive",
         "requested": "[0.1.50, )",