V7.0

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:8.0.300
+FROM mcr.microsoft.com/dotnet/sdk:8.0.400
 
 # Avoid warnings by switching to noninteractive
 ENV DEBIAN_FRONTEND=noninteractive

CHANGELOG.md

@@ -1,5 +1,38 @@
 # Changelog
 
+## 7.0.0 - 2025-01-10
+
+### Miscellaneous
+* Stable release.
+
+## 7.0.0-beta-001 - 2024-12-30
+
+### Miscellaneous
+* Stable API of v7, no more breaking changes going forward.
+
+## 7.0.0-alpha-004 - 2024-12-12
+
+### Fixed
+* (Empty/NoEmpty)-bodied named computation expression produces inconsistent formatting. [#3140](https://github.com/fsprojects/fantomas/issues/3140)
+
+## 7.0.0-alpha-003 - 2024-11-29
+
+### Removed
+* setting `MaxDotGetExpressionWidth`. [#3138](https://github.com/fsprojects/fantomas/pull/3138)
+
+## 7.0.0-alpha-002 - 2024-11-02
+
+### Changed
+* Unary operators: inconsistent formatting when arg is literal vs variable. [#3131](https://github.com/fsprojects/fantomas/issues/3131)
+
+## 7.0.0-alpha-001 - 2024-09-16
+
+### Added
+* Add initial support for Nullness syntax. [#3118](https://github.com/fsprojects/fantomas/pull/3118)
+
+### Changed
+* Update FCS to 'Add trivia to Nullness nodes in SyntaxTree', commit 836d4e0603442d6053c8d439993a022501cae494 [#3118](https://github.com/fsprojects/fantomas/pull/3118)
+
 ## 6.3.16 - 2024-10-29
 
 ### Fixed

Directory.Build.props

@@ -40,12 +40,12 @@ Some common use cases include:
         <!-- https://www.gresearch.co.uk/blog/article/improve-nuget-restores-with-static-graph-evaluation/ -->
         <RestoreUseStaticGraphEvaluation>true</RestoreUseStaticGraphEvaluation>
         <ServerGarbageCollection>true</ServerGarbageCollection>
-        <OtherFlags>$(OtherFlags) --test:GraphBasedChecking --test:ParallelOptimization --test:ParallelIlxGen --strict-indentation+</OtherFlags>
+        <OtherFlags>$(OtherFlags) --test:GraphBasedChecking --test:ParallelOptimization --test:ParallelIlxGen --strict-indentation+ --realsig+</OtherFlags>
     </PropertyGroup>
 
     <!-- Versions -->
     <PropertyGroup>
-        <FCSCommitHash>836d4e0603442d6053c8d439993a022501cae494</FCSCommitHash>
+        <FCSCommitHash>e668b90e3c087e5fba8a855e502af60bf35be45e</FCSCommitHash>
     </PropertyGroup>
 
     <PropertyGroup>

Directory.Packages.props

@@ -1,14 +1,15 @@
 <Project>
     <PropertyGroup>
         <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+        <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
     </PropertyGroup>
     <ItemGroup>
-        <PackageVersion Include="FSharp.Core" Version="6.0.1"/>
-        <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" />
+        <PackageVersion Include="FSharp.Core" Version="8.0.100"/>
+        <PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
+        <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
+        <PackageVersion Include="System.Memory" Version="4.6.0" />
         <PackageVersion Include="System.Runtime" Version="4.3.1" />
-        <PackageVersion Include="FsLexYacc" Version="11.2.0" />
+        <PackageVersion Include="FsLexYacc" Version="11.3.0" />
 
         <PackageVersion Include="Ionide.KeepAChangelog.Tasks" Version="0.1.8"/>
         <PackageVersion Include="DotNet.ReproducibleBuilds" Version="1.1.1"/>
@@ -17,25 +18,26 @@
         <PackageVersion Include="Ionide.Analyzers" Version="0.9.0" />
         <PackageVersion Include="FSharp.Analyzers.Build" Version="0.3.0" />
 
-        <PackageVersion Include="StreamJsonRpc" Version="2.8.28" />
+        <PackageVersion Include="StreamJsonRpc" Version="2.20.20" />
+        <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
         <PackageVersion Include="SemanticVersioning" Version="2.0.2" />
-        <PackageVersion Include="Serilog" Version="3.1.1"/>
-        <PackageVersion Include="Serilog.Sinks.Console" Version="5.0.1" />
+        <PackageVersion Include="Serilog" Version="4.1.0"/>
+        <PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
         <PackageVersion Include="SerilogTraceListener" Version="3.2.1-dev-00011" />
         <PackageVersion Include="Argu" Version="6.2.4" />
-        <PackageVersion Include="Thoth.Json.Net" Version="8.0.0" />
+        <PackageVersion Include="Thoth.Json.Net" Version="12.0.0" />
         <PackageVersion Include="editorconfig" Version="0.15.0" />
-        <PackageVersion Include="Ignore" Version="0.1.50" />
-        <PackageVersion Include="System.IO.Abstractions" Version="20.0.4" />
-        <PackageVersion Include="Spectre.Console" Version="0.48.0" />
-        <PackageVersion Include="BenchmarkDotNet" Version="0.13.13-nightly.20240213.132" />
+        <PackageVersion Include="Ignore" Version="0.2.1" />
+        <PackageVersion Include="System.IO.Abstractions" Version="21.1.3" />
+        <PackageVersion Include="Spectre.Console" Version="0.49.1" />
+        <PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
 
-        <PackageVersion Include="CliWrap" Version="3.6.4" />
-        <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
-        <PackageVersion Include="NUnit" Version="4.0.1"/>
-        <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0"/>
-        <PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="20.0.4" />
+        <PackageVersion Include="CliWrap" Version="3.6.7" />
+        <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0"/>
+        <PackageVersion Include="NUnit" Version="4.2.2"/>
+        <PackageVersion Include="NUnit3TestAdapter" Version="4.6.0"/>
+        <PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="21.1.3" />
         <PackageVersion Include="FsCheck" Version="2.16.5" />
-        <PackageVersion Include="FsUnit" Version="6.0.0" />
+        <PackageVersion Include="FsUnit" Version="6.0.1" />
     </ItemGroup>
 </Project>

NuGet.config

@@ -3,14 +3,9 @@
     <packageSources>
         <clear />
         <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
-        <add key="bdn-nightly" value="https://www.myget.org/F/benchmarkdotnet/api/v3/index.json" />
     </packageSources>
     <packageSourceMapping>
         <!-- key value for <packageSource> should match key values from <packageSources> element -->
-        <packageSource key="bdn-nightly">
-            <package pattern="BenchmarkDotNet" />
-            <package pattern="BenchmarkDotNet.*" />
-        </packageSource>
         <packageSource key="nuget.org">
             <package pattern="*" />
         </packageSource>

build.fsx

@@ -194,6 +194,8 @@ let updateFileRaw (file: FileInfo) =
         |> Array.map (fun line ->
             if line.Contains("FSharp.Compiler") then
                 line.Replace("FSharp.Compiler", "Fantomas.FCS")
+            elif line.Contains("[<TailCall>]") then
+                line.Replace("[<TailCall>]", "[<Microsoft.FSharp.Core.TailCall>]")
             else
                 line)
     File.WriteAllLines(file.FullName, updatedLines)
@@ -228,6 +230,7 @@ pipeline "Init" {
         run (fun _ ->
             [| "src/Compiler/FSComp.txt"
                "src/Compiler/FSStrings.resx"
+               "src/Compiler/Utilities/NullnessShims.fs"
                "src/Compiler/Utilities/Activity.fsi"
                "src/Compiler/Utilities/Activity.fs"
                "src/Compiler/Utilities/sformat.fsi"
@@ -475,4 +478,25 @@ pipeline "Release" {
     runIfOnlySpecified true
 }
 
+pipeline "PublishAlpha" {
+    workingDir __SOURCE_DIRECTORY__
+    stage "Clean" { run (cleanFolders [| analysisReportsDir; "artifacts" |]) }
+    stage "Build" { run "dotnet build -c Release --tl" }
+    stage "Pack" { run "dotnet pack --no-restore -c Release --tl" }
+    stage "Publish" {
+        run (fun ctx ->
+            async {
+                let nugetPackages =
+                    Directory.EnumerateFiles("artifacts/package/release", "*.nupkg", SearchOption.TopDirectoryOnly)
+                    |> Seq.filter (fun nupkg -> not (nupkg.Contains("Fantomas.Client")))
+                    |> Seq.toArray
+
+                let! nugetExitCodes = nugetPackages |> Array.map pushPackage |> Async.Sequential
+
+                return Seq.sum nugetExitCodes
+            })
+    }
+    runIfOnlySpecified true
+}
+
 tryPrintPipelineCommandHelp ()

docs/docs/end-users/Configuration.fsx

@@ -729,28 +729,6 @@ fsharp_max_function_binding_width = 10
     """
 (*** include-output ***)
 
-(**
-<fantomas-setting green></fantomas-setting>
-### fsharp_max_dot_get_expression_width
-<copy-to-clipboard text="fsharp_max_dot_get_expression_width = 100"></copy-to-clipboard>
-
-Control the maximum width for which (nested) [SynExpr.DotGet](https://fsharp.github.io/fsharp-compiler-docs/reference/fsharp-compiler-syntax-synexpr.html#DotGet) expressions should be in one line.
-*)
-
-(*** hide ***)
-printfn
-    $"# Default\n{toEditorConfigName (nameof FormatConfig.Default.MaxDotGetExpressionWidth)} = {FormatConfig.Default.MaxDotGetExpressionWidth}"
-(*** include-output ***)
-
-formatCode
-    """ 
-   let job = JobBuilder.UsingJobData(jobDataMap).Create<WrapperJob>().Build()
-    """
-    """
-fsharp_max_dot_get_expression_width = 60
-    """
-(*** include-output ***)
-
 (**
 <fantomas-setting green gr></fantomas-setting>
 ### fsharp_multiline_bracket_style

docs/docs/end-users/UpgradeGuide.md

@@ -82,4 +82,12 @@ fsharp_experimental_stroustrup_style = true
 ### Miscellaneous
 - The namespace in [Fantomas.FCS](https://www.nuget.org/packages/Fantomas.FCS) changed from `FSharp.Compiler` to `Fantomas.FCS`.
 
+## v7 alpha
+
+### console application
+- Target framework is now `net8.0`.
+
+### .editorconfig
+- `fsharp_max_dot_get_expression_width` was removed.
+
 <fantomas-nav previous="{{fsdocs-previous-page-link}}" next="{{fsdocs-next-page-link}}"></fantomas-nav>

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.300",
-    "rollForward": "latestMinor"
+    "version": "8.0.400",
+    "rollForward": "latestPatch"
   }
 }

src/Fantomas.Benchmarks/packages.lock.json

@@ -4,19 +4,19 @@
     "net8.0": {
       "BenchmarkDotNet": {
         "type": "Direct",
-        "requested": "[0.13.13-nightly.20240213.132, )",
-        "resolved": "0.13.13-nightly.20240213.132",
-        "contentHash": "2dGQPEr47nGnsgipskl3rWS+dVWm+xkVzS/1jAF49VdDdGh6JLQkaVv5k59UewMF6ofGV1EvF5HeO55wwTRaww==",
+        "requested": "[0.14.0, )",
+        "resolved": "0.14.0",
+        "contentHash": "eIPSDKi3oni734M1rt/XJAwGQQOIf9gLjRRKKJ0HuVy3vYd7gnmAIX1bTjzI9ZbAY/nPddgqqgM/TeBYitMCIg==",
         "dependencies": {
-          "BenchmarkDotNet.Annotations": "0.13.13-nightly.20240213.132",
+          "BenchmarkDotNet.Annotations": "0.14.0",
           "CommandLineParser": "2.9.1",
           "Gee.External.Capstone": "2.3.0",
           "Iced": "1.17.0",
           "Microsoft.CodeAnalysis.CSharp": "4.1.0",
           "Microsoft.Diagnostics.Runtime": "2.2.332302",
-          "Microsoft.Diagnostics.Tracing.TraceEvent": "3.0.2",
+          "Microsoft.Diagnostics.Tracing.TraceEvent": "3.1.8",
           "Microsoft.DotNet.PlatformAbstractions": "3.1.6",
-          "Perfolizer": "[0.2.1]",
+          "Perfolizer": "[0.3.17]",
           "System.Management": "5.0.0"
         }
       },
@@ -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",
@@ -46,8 +46,8 @@
       },
       "BenchmarkDotNet.Annotations": {
         "type": "Transitive",
-        "resolved": "0.13.13-nightly.20240213.132",
-        "contentHash": "G40jV79QmtgQbqaIPUmQ2CCswnfO7j/tdL0ENbAevVsuBW5rGoxj2V3NlMiSUQO9MogRk3rWMnXytFYcRFmP4w=="
+        "resolved": "0.14.0",
+        "contentHash": "CUDCg6bgHrDzhjnA+IOBl5gAo8Y5hZ2YSs7MBXrYMlMKpBZqrD5ez0537uDveOkcf+YWAoK+S4sMcuWPbIz8bw=="
       },
       "CommandLineParser": {
         "type": "Transitive",
@@ -117,10 +117,11 @@
       },
       "Microsoft.Diagnostics.Tracing.TraceEvent": {
         "type": "Transitive",
-        "resolved": "3.0.2",
-        "contentHash": "Pr7t+Z/qBe6DxCow4BmYmDycHe2MrGESaflWXRcSUI4XNGyznx1ttS+9JNOxLuBZSoBSPTKw9Dyheo01Yi6anQ==",
+        "resolved": "3.1.8",
+        "contentHash": "kl3UMrZKSeSEYZ8rt/GjLUQToREjgQABqfg6PzQBmSlYHTZOKE9ePEOS2xptROQ9SVvngg3QGX51TIT11iZ0wA==",
         "dependencies": {
-          "System.Runtime.CompilerServices.Unsafe": "4.5.3"
+          "Microsoft.Win32.Registry": "4.4.0",
+          "System.Runtime.CompilerServices.Unsafe": "5.0.0"
         }
       },
       "Microsoft.DotNet.PlatformAbstractions": {
@@ -212,11 +213,8 @@
       },
       "Perfolizer": {
         "type": "Transitive",
-        "resolved": "0.2.1",
-        "contentHash": "Dt4aCxCT8NPtWBKA8k+FsN/RezOQ2C6omNGm5o/qmYRiIwlQYF93UgFmeF1ezVNsztTnkg7P5P63AE+uNkLfrw==",
-        "dependencies": {
-          "System.Memory": "4.5.3"
-        }
+        "resolved": "0.3.17",
+        "contentHash": "FQgtCoF2HFwvzKWulAwBS5BGLlh8pgbrJtOp47jyBwh2CW16juVtacN1azOA2BqdrJXkXTNLNRMo7ZlHHiuAnA=="
       },
       "System.CodeDom": {
         "type": "Transitive",
@@ -274,37 +272,37 @@
       "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, )",
-          "System.Collections.Immutable": "[7.0.0, )",
-          "System.Diagnostics.DiagnosticSource": "[7.0.0, )",
-          "System.Memory": "[4.5.5, )",
+          "FSharp.Core": "[8.0.100, )",
+          "System.Collections.Immutable": "[8.0.0, )",
+          "System.Diagnostics.DiagnosticSource": "[8.0.1, )",
+          "System.Memory": "[4.6.0, )",
           "System.Runtime": "[4.3.1, )"
         }
       },
       "System.Collections.Immutable": {
         "type": "CentralTransitive",
-        "requested": "[7.0.0, )",
-        "resolved": "7.0.0",
-        "contentHash": "dQPcs0U1IKnBdRDBkrCTi1FoajSTBzLcVTpjO4MBCMC7f4pDOIPzgBoX8JjG7X6uZRJ8EBxsi8+DR1JuwjnzOQ=="
+        "requested": "[8.0.0, )",
+        "resolved": "8.0.0",
+        "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg=="
       },
       "System.Diagnostics.DiagnosticSource": {
         "type": "CentralTransitive",
-        "requested": "[7.0.0, )",
-        "resolved": "7.0.0",
-        "contentHash": "9W0ewWDuAyDqS2PigdTxk6jDKonfgscY/hP8hm7VpxYhNHZHKvZTdRckberlFk3VnCmr3xBUyMBut12Q+T2aOw=="
+        "requested": "[8.0.1, )",
+        "resolved": "8.0.1",
+        "contentHash": "vaoWjvkG1aenR2XdjaVivlCV9fADfgyhW5bZtXT23qaEea0lWiUljdQuze4E31vKM7ZWJaSUsbYIKE3rnzfZUg=="
       },
       "System.Memory": {
         "type": "CentralTransitive",
-        "requested": "[4.5.5, )",
-        "resolved": "4.5.5",
-        "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw=="
+        "requested": "[4.6.0, )",
+        "resolved": "4.6.0",
+        "contentHash": "OEkbBQoklHngJ8UD8ez2AERSk2g+/qpAaSWWCBFbpH727HxDq5ydVkuncBaKcKfwRqXGWx64dS6G1SUScMsitg=="
       },
       "System.Runtime": {
         "type": "CentralTransitive",

src/Fantomas.Client.Tests/EndToEndTests.fs

@@ -76,7 +76,7 @@ type EndToEndTests() =
     [<TestCase("5.0.6")>]
     [<TestCase("5.1.5")>]
     [<TestCase("5.2.2")>]
-    [<TestCase("6.0.0-alpha-004")>]
+    [<TestCase("6.0.0")>]
     member _.Version(version: string) =
         withVersion version (fun fsharpFile ->
             backgroundTask {
@@ -87,7 +87,7 @@ type EndToEndTests() =
     [<TestCase("5.0.6")>]
     [<TestCase("5.1.5")>]
     [<TestCase("5.2.2")>]
-    [<TestCase("6.0.0-alpha-004")>]
+    [<TestCase("6.0.0")>]
     member _.FormatDocument(version: string) =
         withVersion version (fun fsharpFile ->
             backgroundTask {