feat: fantomizing

veepee-oss · Nov 25, 2024 · 9ca6ed4 · 9ca6ed4
1 parent 6e8aebe
commit 9ca6ed4
Show file tree

Hide file tree

Showing 24 changed files with 2,123 additions and 1,802 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -2,10 +2,10 @@
   "version": 1,
   "isRoot": true,
   "tools": {
-    "dotnet-fsharplint": {
-      "version": "0.24.2",
+    "fantomas": {
+      "version": "6.2.3",
       "commands": [
-        "dotnet-fsharplint"
+        "fantomas"
       ]
     }
   }

diff --git a/.github/workflows/on-push.yml b/.github/workflows/on-push.yml
@@ -35,6 +35,6 @@ jobs:
       - name: Restore .NET Projects
         run: dotnet restore
       - name: Run F# Linter
-        run: dotnet fsharplint lint --lint-config fsharplint.json Vp.FSharp.Sql.sln
+        run: dotnet fantomas -r --check ./
       - name: Run Tests
         run: dotnet test
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,15 +1,15 @@
 <Project>
 
-  <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
-    <LangVersion>preview</LangVersion>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <MSBuildTreatWarningsAsErrors>true</MSBuildTreatWarningsAsErrors>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>net9.0</TargetFramework>
+        <LangVersion>preview</LangVersion>
+        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+        <MSBuildTreatWarningsAsErrors>true</MSBuildTreatWarningsAsErrors>
+    </PropertyGroup>
 
-  <PropertyGroup>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <NoWarn>$(NoWarn);1591;NU1903</NoWarn>
-  </PropertyGroup>
+    <PropertyGroup>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <NoWarn>$(NoWarn);1591;NU1903</NoWarn>
+    </PropertyGroup>
 
-</Project>
+</Project>
diff --git a/Vp.FSharp.Sql.Tests/Helpers.fs b/Vp.FSharp.Sql.Tests/Helpers.fs
@@ -40,8 +40,10 @@ module FullCallCounter =
         | ConnectionClosed _ -> incrConnectionClosed callCounter
         | CommandPrepared _ -> incrCommandPrepared callCounter
         | CommandExecuted _ -> incrCommandExecuted callCounter
-    let createOpenCallback (callCounter: FullCallCounter) = fun() -> incrOpenCall callCounter
-    let createCloseCallback (callCounter: FullCallCounter) = fun() -> incrCloseCall callCounter
+
+    let createOpenCallback (callCounter: FullCallCounter) = fun () -> incrOpenCall callCounter
+    let createCloseCallback (callCounter: FullCallCounter) = fun () -> incrCloseCall callCounter
+
     let createCallbacks (callCounter: FullCallCounter) =
         (createOpenCallback callCounter, createCloseCallback callCounter, createLoggerCallback callCounter)
 
@@ -53,7 +55,8 @@ module FullCallCounter =
           CommandPrepared = commandPrepared
           CommandExecuted = commandExecuted }
 
-    let initSame value = init value value value value value value
+    let initSame value =
+        init value value value value value value
 
     let assertEqual
         (actual: FullCallCounter)
@@ -62,7 +65,8 @@ module FullCallCounter =
         expectedConnectionOpened
         expectedConnectionClosed
         expectedCommandPrepared
-        expectedCommandExecuted =
+        expectedCommandExecuted
+        =
         actual.OpenCall =! expectedOpenCall
         actual.CloseCall =! expectedCloseCall
         actual.ConnectionOpened =! expectedConnectionOpened
@@ -82,8 +86,9 @@ module PartialCallCounter =
     let incrCloseCall (callCounter: PartialCallCounter) =
         callCounter.CloseCall <- callCounter.CloseCall + 1
 
-    let createOpenCallback (callCounter: PartialCallCounter) = fun() -> incrOpenCall callCounter
-    let createCloseCallback (callCounter: PartialCallCounter) = fun() -> incrCloseCall callCounter
+    let createOpenCallback (callCounter: PartialCallCounter) = fun () -> incrOpenCall callCounter
+    let createCloseCallback (callCounter: PartialCallCounter) = fun () -> incrCloseCall callCounter
+
     let createCallbacks (callCounter: PartialCallCounter) =
         (createOpenCallback callCounter, createCloseCallback callCounter)
 
@@ -93,9 +98,6 @@ module PartialCallCounter =
 
     let initSame value = init value value
 
-    let assertEqual
-        (actual: PartialCallCounter)
-        expectedOpenCall
-        expectedCloseCall =
+    let assertEqual (actual: PartialCallCounter) expectedOpenCall expectedCloseCall =
         actual.OpenCall =! expectedOpenCall
         actual.CloseCall =! expectedCloseCall