Revert "Some fixes to nullability (#365 )" (#366 )

This reverts commit 8d275f0047.
Some fixes to nullability (#365 )
2025-10-10 22:48:40 +00:00 · 2025-04-20 17:02:40 +00:00 · 2025-04-20 16:26:45 +00:00 · 2025-04-20 01:31:43 +00:00 · 2025-04-14 22:05:23 +00:00
9 changed files with 13 additions and 20 deletions
--- a/WoofWare.Myriad.Plugins.Test/WoofWare.Myriad.Plugins.Test.fsproj
+++ b/WoofWare.Myriad.Plugins.Test/WoofWare.Myriad.Plugins.Test.fsproj
@@ -43,7 +43,7 @@

  <ItemGroup>
    <PackageReference Include="ApiSurface" Version="4.1.20"/>
-    <PackageReference Include="FsCheck" Version="3.1.0"/>
+    <PackageReference Include="FsCheck" Version="3.2.0"/>
    <PackageReference Include="FsUnit" Version="7.0.1"/>
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0"/>
    <PackageReference Include="NUnit" Version="4.3.2"/>
--- a/WoofWare.Myriad.Plugins/ArgParserGenerator.fs
+++ b/WoofWare.Myriad.Plugins/ArgParserGenerator.fs
@@ -673,7 +673,7 @@ module internal ArgParserGenerator =
                args
                |> Map.toList
                |> List.map (fun (ident, expr) -> SynLongIdent.create [ Ident.create ident ], expr)
-                |> AstHelper.instantiateRecord
+                |> SynExpr.createRecord None
            )

        tree, counter
--- a/WoofWare.Myriad.Plugins/AstHelper.fs
+++ b/WoofWare.Myriad.Plugins/AstHelper.fs
@@ -36,13 +36,6 @@ module internal AstHelper =
        | SynTypeDefnRepr.Simple (SynTypeDefnSimpleRepr.Enum _, _) -> true
        | _ -> false

-    let instantiateRecord (fields : (SynLongIdent * SynExpr) list) : SynExpr =
-        let fields =
-            fields
-            |> List.map (fun (rfn, synExpr) -> SynExprRecordField ((rfn, true), Some range0, Some synExpr, None))
-
-        SynExpr.Record (None, None, fields, range0)
-
    let defineRecordType (record : RecordType) : SynTypeDefn =
        let name =
            SynComponentInfo.create record.Name
--- a/WoofWare.Myriad.Plugins/InterfaceMockGenerator.fs
+++ b/WoofWare.Myriad.Plugins/InterfaceMockGenerator.fs
@@ -89,7 +89,7 @@ module internal InterfaceMockGenerator =
                     []
                 else
                     [ SynPat.unit ])
-                (AstHelper.instantiateRecord constructorFields)
+                (SynExpr.createRecord None constructorFields)
            |> SynBinding.withXmlDoc (PreXmlDoc.create "An implementation where every method throws.")
            |> SynBinding.withReturnAnnotation constructorReturnType
            |> SynMemberDefn.staticMember
--- a/WoofWare.Myriad.Plugins/JsonParseGenerator.fs
+++ b/WoofWare.Myriad.Plugins/JsonParseGenerator.fs
@@ -480,7 +480,7 @@ module internal JsonParseGenerator =
        let finalConstruction =
            fields
            |> List.mapi (fun i fieldData -> SynLongIdent.createI fieldData.Ident, SynExpr.createIdent $"arg_%i{i}")
-            |> AstHelper.instantiateRecord
+            |> SynExpr.createRecord None

        (finalConstruction, assignments)
        ||> List.fold (fun final assignment -> SynExpr.createLet [ assignment ] final)
--- a/WoofWare.Myriad.Plugins/RemoveOptionsGenerator.fs
+++ b/WoofWare.Myriad.Plugins/RemoveOptionsGenerator.fs
@@ -97,7 +97,7 @@ module internal RemoveOptionsGenerator =

                SynLongIdent.createI fieldData.Ident, body
            )
-            |> AstHelper.instantiateRecord
+            |> SynExpr.createRecord None

        SynBinding.basic
            [ functionName ]
--- a/WoofWare.Myriad.Plugins/WoofWare.Myriad.Plugins.fsproj
+++ b/WoofWare.Myriad.Plugins/WoofWare.Myriad.Plugins.fsproj
@@ -22,7 +22,7 @@
  <ItemGroup>
    <PackageReference Include="Myriad.Core" Version="0.8.3" />
    <PackageReference Include="TypeEquality" Version="0.3.0" />
-    <PackageReference Include="WoofWare.Whippet.Fantomas" Version="0.3.2" />
+    <PackageReference Include="WoofWare.Whippet.Fantomas" Version="0.5.1" />
    <!-- the lowest version allowed by Myriad.Core -->
    <PackageReference Update="FSharp.Core" Version="6.0.1" PrivateAssets="all"/>
  </ItemGroup>
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1744502386,
-        "narHash": "sha256-QAd1L37eU7ktL2WeLLLTmI6P9moz9+a/ONO8qNBYJgM=",
+        "lastModified": 1744868846,
+        "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "f6db44a8daa59c40ae41ba6e5823ec77fe0d2124",
+        "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c",
        "type": "github"
      },
      "original": {
--- a/nix/deps.json
+++ b/nix/deps.json
@@ -21,8 +21,8 @@
  },
  {
    "pname": "FsCheck",
-    "version": "3.1.0",
-    "hash": "sha256-u0Ha94EjClJ8evNSHu8d6+Dx9qYM3kV3sl1PEq9gF8s="
+    "version": "3.2.0",
+    "hash": "sha256-ksZ4vLgWwyQOzFuK2BczdtDtWWYmedG7UBAg4pYuI8g="
  },
  {
    "pname": "fsharp-analyzers",
@@ -381,7 +381,7 @@
  },
  {
    "pname": "WoofWare.Whippet.Fantomas",
-    "version": "0.3.2",
-    "hash": "sha256-dhzp/ASz1dlROJAfLYRKOCRlmjLBoS00KYeWEkSVtMA="
+    "version": "0.5.1",
+    "hash": "sha256-59CwnOZQAq5ZJoUkd87OiP8KUwx8xYDLMimMMTlKeZA="
  }
 ]
Author	SHA1	Message	Date
Patrick Stevens	7930039ad1	Revert "Some fixes to nullability (#365 )" (#366 ) This reverts commit `8d275f0047`.	2025-04-20 17:02:40 +00:00
Patrick Stevens	8d275f0047	Some fixes to nullability (#365 )	2025-04-20 16:26:45 +00:00
patrick-conscriptus[bot]	682b12fdb2	Automated commit (#363 ) Co-authored-by: patrick-conscriptus[bot] <175414948+patrick-conscriptus[bot]@users.noreply.github.com>	2025-04-20 01:31:43 +00:00
dependabot[bot]	325f8634a4	Bump FSharp.Core and WoofWare.Whippet.Fantomas (#361 ) * Bump FsCheck and FSharp.Core Bumps [FsCheck](https://github.com/Fscheck/fscheck) and [FSharp.Core](https://github.com/dotnet/fsharp). These dependencies needed to be updated together. Updates `FsCheck` from 3.1.0 to 3.2.0 - [Release notes](https://github.com/Fscheck/fscheck/releases) - [Changelog](https://github.com/fscheck/FsCheck/blob/master/FsCheck%20Release%20Notes.md) - [Commits](https://github.com/Fscheck/fscheck/compare/3.1.0...3.2.0) Updates `FSharp.Core` from 4.3.4 to 5.0.2 - [Release notes](https://github.com/dotnet/fsharp/releases) - [Changelog](https://github.com/dotnet/fsharp/blob/main/release-notes.md) - [Commits](https://github.com/dotnet/fsharp/commits) --- updated-dependencies: - dependency-name: FsCheck dependency-version: 3.2.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: FSharp.Core dependency-version: 5.0.2 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * Bump FSharp.Core and WoofWare.Whippet.Fantomas Bumps [FSharp.Core](https://github.com/dotnet/fsharp) and [WoofWare.Whippet.Fantomas](https://github.com/Smaug123/WoofWare.Whippet). These dependencies needed to be updated together. Updates `FSharp.Core` from 4.3.4 to 6.0.1 - [Release notes](https://github.com/dotnet/fsharp/releases) - [Changelog](https://github.com/dotnet/fsharp/blob/main/release-notes.md) - [Commits](https://github.com/dotnet/fsharp/commits) Updates `WoofWare.Whippet.Fantomas` from 0.3.2 to 0.5.1 - [Commits](https://github.com/Smaug123/WoofWare.Whippet/commits) --- updated-dependencies: - dependency-name: FSharp.Core dependency-version: 6.0.1 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: WoofWare.Whippet.Fantomas dependency-version: 0.5.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Smaug123 <3138005+Smaug123@users.noreply.github.com>	2025-04-14 22:05:23 +00:00