Change formatting rules

Author: MangelMaxime

.config/dotnet-tools.json

@@ -9,7 +9,7 @@
       ]
     },
     "fantomas": {
-      "version": "6.3.0-alpha-005",
+      "version": "6.3.0-alpha-007",
       "commands": [
         "fantomas"
       ]

.editorconfig

@@ -11,9 +11,8 @@ trim_trailing_whitespace = true
 max_line_length = 80
 fsharp_alternative_long_member_definitions = true
 fsharp_multi_line_lambda_closing_newline = true
-fsharp_bar_before_discriminated_union_declaration = true
 fsharp_multiline_bracket_style = aligned
-fsharp_keep_max_number_of_blank_lines = 2
+fsharp_keep_max_number_of_blank_lines = 1
 fsharp_record_multiline_formatter = number_of_items
 fsharp_max_record_number_of_items = 1
 fsharp_array_or_list_multiline_formatter = number_of_items

.husky/task-runner.json

@@ -11,7 +11,10 @@
             "include": [
                 "src/**/*.fs",
                 "src/**/*.fsx",
-                "src/**/*.fsi"
+                "src/**/*.fsi",
+                "test/**/*.fs",
+                "test/**/*.fsx",
+                "test/**/*.fsi"
             ]
         },
         {

src/Glutinum.Build/Main.fs

@@ -60,8 +60,8 @@ let main argv =
     match argv with
     | "test" :: args -> Test.Specs.handle args
     | "publish" :: args -> Publish.handle args
-    | "lint" :: _ -> Command.Run("dotnet", "fantomas --check src")
-    | "format" :: _ -> Command.Run("dotnet", "fantomas src")
+    | "lint" :: _ -> Command.Run("dotnet", "fantomas --check src tests")
+    | "format" :: _ -> Command.Run("dotnet", "fantomas src tests")
     | "cli" :: args -> Cli.handle args
     | "help" :: _
     | "--help" :: _

src/Glutinum.Build/Publish.fs

@@ -7,7 +7,6 @@ open BlackFox.CommandLine
 open Build.Utils
 open Build.Utils.Pnpm
 
-
 let private publishNpm (projectDir: string) =
     let packageJsonPath = Path.Combine(projectDir, "package.json")
     let packageJsonContent = File.ReadAllText(packageJsonPath)

src/Glutinum.Build/Utils/ChangelogParser.fs

@@ -67,7 +67,6 @@ module Types =
         | SubSubSection of tag: string
         | ListItem of content: string
 
-
 [<RequireQualifiedAccess>]
 module Lexer =
 

src/Glutinum.Build/Utils/Nuget.fs

@@ -7,11 +7,7 @@ open BlackFox.CommandLine
 type Nuget =
 
     static member push
-        (
-            nupkgPath: string,
-            nugetKey: string,
-            ?skipDuplicate: bool
-        )
+        (nupkgPath: string, nugetKey: string, ?skipDuplicate: bool)
         =
         let skipDuplicate = defaultArg skipDuplicate false
 

src/Glutinum.Build/Utils/Pnpm.fs

@@ -21,11 +21,7 @@ type Pnpm =
     static member install() = Command.Run("pnpm", "install")
 
     static member publish
-        (
-            ?projectDir: string,
-            ?noGitChecks: bool,
-            ?access: Publish.Access
-        )
+        (?projectDir: string, ?noGitChecks: bool, ?access: Publish.Access)
         =
         let noGitChecks = defaultArg noGitChecks false
 

src/Glutinum.Converter/GlueAST.fs

@@ -150,7 +150,7 @@ type GlueModuleDeclaration =
         Types: GlueType list
     }
 
-type GlueConstructor = | GlueConstructor of GlueParameter list
+type GlueConstructor = GlueConstructor of GlueParameter list
 
 type GlueClassDeclaration =
     {
@@ -167,10 +167,10 @@ type GlueTypeReference =
         TypeArguments: GlueType list
     }
 
-type GlueTypeUnion = | GlueTypeUnion of GlueType list
+type GlueTypeUnion = GlueTypeUnion of GlueType list
 
 [<RequireQualifiedAccess>]
-type ExcludedMember = | Literal of GlueLiteral
+type ExcludedMember = Literal of GlueLiteral
 // | Function
 
 type GlueFunctionType =

src/Glutinum.Converter/Reader/TypeAliasDeclaration.fs

@@ -25,10 +25,8 @@ let readTypeAliasDeclaration
             let declaration = declaration.``type`` :?> Ts.IndexedAccessType
             reader.ReadIndexedAccessType declaration
 
-
         | _ -> reader.ReadTypeNode declaration.``type``
 
-
     {
         Name = declaration.name.getText ()
         Type = typ

src/Glutinum.Converter/Reader/UnionTypeNode.fs

@@ -114,7 +114,6 @@ let rec private readUnionTypeCases
                             typeReferenceNode
                     )
 
-
         // else
         //     symbol.declarations
         //     |> Seq.toList

src/Glutinum.Converter/Transform.fs

@@ -472,7 +472,6 @@ let private transformTypeParameters
         }
     )
 
-
 let private transformTypeAliasDeclaration
     (glueTypeAliasDeclaration: GlueTypeAliasDeclaration)
     : FSharpType

tests/Specs.fs

@@ -30,21 +30,24 @@ let macroTestSpec (t: ExecutionContext<obj>) (specPath: string) =
     promise {
         let filepath = $"{__SOURCE_DIRECTORY__}/specs/{specPath}.d.ts"
         let res = generateBindingFile filepath
-        let res = res + """
+
+        let res =
+            res
+            + """
 (***)
 #r "nuget: Fable.Core"
 (***)
 """
 
         let expectedFile = $"{__SOURCE_DIRECTORY__}/specs/{specPath}.fsx"
 
-        if fs.existsSync(!!expectedFile) then
+        if fs.existsSync (!!expectedFile) then
             let! expectedContent = Fs.readFile expectedFile
-            let expected =  expectedContent
+            let expected = expectedContent
             t.deepEqual.Invoke(res, expected) |> ignore
         else
             let tmpFile = $"{__SOURCE_DIRECTORY__}/specs/{specPath}.tmp.fsx"
-            fs.writeFileSync(tmpFile, res)
+            fs.writeFileSync (tmpFile, res)
     }
 
 [<ImportDefault("ava")>]

tests/glues/Ava.fs

@@ -3,7 +3,6 @@ module Glutinum.Ava
 open Fable.Core
 open System
 
-
 [<AllowNullLiteral>]
 type LogFn =
     /// Log one or more values.
@@ -25,7 +24,6 @@ type PlanFn =
     /// Don't plan assertions.
     abstract skip: count: float -> unit
 
-
 [<AllowNullLiteral>]
 type AssertAssertion =
     /// <summary>
@@ -38,7 +36,6 @@ type AssertAssertion =
     /// Skip this assertion.
     abstract skip: actual: obj option * ?message: string -> unit
 
-
 [<AllowNullLiteral>]
 type DeepEqualAssertion =
     /// <summary>
@@ -80,7 +77,6 @@ type ExecutionContext<'Context> =
     abstract log: LogFn
     abstract plan: PlanFn
 
-
 [<Erase>]
 type test<'Context> =
 
@@ -90,9 +86,6 @@ type test<'Context> =
 
     [<ImportDefault("ava")>]
     static member test
-        (
-            title: string,
-            t: ExecutionContext<'Context> -> JS.Promise<unit>
-        )
+        (title: string, t: ExecutionContext<'Context> -> JS.Promise<unit>)
         =
         nativeOnly