switch to swift format (#71)

* switched to swift-format

* added swift-format-ignore for glitchy line

* added format check

Author: sliemeobn

.github/workflows/format.yaml

@@ -0,0 +1,27 @@
+name: Swift Format Lint
+
+on:
+  push:
+    branches: [main]
+    paths:
+      - "**.swift"
+  pull_request:
+    branches: [main]
+  workflow_dispatch:
+
+jobs:
+  linux:
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    strategy:
+      matrix:
+        image: ["swift:6.1"]
+
+    container:
+      image: ${{ matrix.image }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Check Format
+        run: swift format lint -prs .

.swift-format

@@ -0,0 +1,63 @@
+{
+  "version": 1,
+  "indentation": {
+    "spaces": 4
+  },
+  "tabWidth": 4,
+  "fileScopedDeclarationPrivacy": {
+    "accessLevel": "private"
+  },
+  "spacesAroundRangeFormationOperators": false,
+  "indentConditionalCompilationBlocks": false,
+  "indentSwitchCaseLabels": false,
+  "lineBreakAroundMultilineExpressionChainComponents": false,
+  "lineBreakBeforeControlFlowKeywords": false,
+  "lineBreakBeforeEachArgument": true,
+  "lineBreakBeforeEachGenericRequirement": true,
+  "lineLength": 140,
+  "maximumBlankLines": 1,
+  "respectsExistingLineBreaks": true,
+  "prioritizeKeepingFunctionOutputTogether": true,
+  "multiElementCollectionTrailingCommas": true,
+  "rules": {
+    "AllPublicDeclarationsHaveDocumentation": false,
+    "AlwaysUseLiteralForEmptyCollectionInit": false,
+    "AlwaysUseLowerCamelCase": false,
+    "AmbiguousTrailingClosureOverload": true,
+    "BeginDocumentationCommentWithOneLineSummary": false,
+    "DoNotUseSemicolons": false,
+    "DontRepeatTypeInStaticProperties": true,
+    "FileScopedDeclarationPrivacy": true,
+    "FullyIndirectEnum": true,
+    "GroupNumericLiterals": true,
+    "IdentifiersMustBeASCII": true,
+    "NeverForceUnwrap": false,
+    "NeverUseForceTry": false,
+    "NeverUseImplicitlyUnwrappedOptionals": false,
+    "NoAccessLevelOnExtensionDeclaration": false,
+    "NoAssignmentInExpressions": true,
+    "NoBlockComments": true,
+    "NoCasesWithOnlyFallthrough": true,
+    "NoEmptyTrailingClosureParentheses": true,
+    "NoLabelsInCasePatterns": true,
+    "NoLeadingUnderscores": false,
+    "NoParensAroundConditions": true,
+    "NoVoidReturnOnFunctionSignature": true,
+    "OmitExplicitReturns": true,
+    "OneCasePerLine": true,
+    "OneVariableDeclarationPerLine": true,
+    "OnlyOneTrailingClosureArgument": true,
+    "OrderedImports": true,
+    "ReplaceForEachWithForLoop": true,
+    "ReturnVoidInsteadOfEmptyTuple": true,
+    "UseEarlyExits": false,
+    "UseExplicitNilCheckInConditions": false,
+    "UseLetInEveryBoundCaseVariable": false,
+    "UseShorthandTypeNames": true,
+    "UseSingleLinePropertyGetter": false,
+    "UseSynthesizedInitializer": false,
+    "UseTripleSlashForDocumentationComments": true,
+    "UseWhereClausesInForLoops": false,
+    "ValidateDocumentationComments": false
+  }
+}

.swiftformat

@@ -69,64 +69,74 @@ let benchmarks = { @Sendable in
     Benchmark("render merged attributes") { benchmark in
         benchmark.startMeasurement()
         for _ in benchmark.scaledIterations {
-            try blackHole(await p {
-                img(.class("1"), .style("1"), .id("old"))
-                    .attributes(.class("2"), .style("2"))
-                    .attributes(.id("new"))
-            }.renderAsync())
+            try blackHole(
+                await p {
+                    img(.class("1"), .style("1"), .id("old"))
+                        .attributes(.class("2"), .style("2"))
+                        .attributes(.id("new"))
+                }.renderAsync()
+            )
         }
     }
 
     Benchmark("render tuples") { benchmark in
         for _ in benchmark.scaledIterations {
-            try blackHole(await div {
-                img()
-                img()
-                img()
-                img()
-                div {
+            try blackHole(
+                await div {
                     img()
                     img()
                     img()
                     img()
                     div {
                         img()
                         img()
+                        img()
+                        img()
+                        div {
+                            img()
+                            img()
+                        }
                     }
-                }
-            }.renderAsync())
+                }.renderAsync()
+            )
         }
     }
 
     Benchmark("render array") { benchmark in
         for _ in benchmark.scaledIterations {
-            try blackHole(await div {
-                for i in 0 ..< 1000 {
-                    img(.id("\(i)"))
-                }
-            }.renderAsync())
+            try blackHole(
+                await div {
+                    for i in 0..<1000 {
+                        img(.id("\(i)"))
+                    }
+                }.renderAsync()
+            )
         }
     }
 
     Benchmark("render sequence") { benchmark in
         for _ in benchmark.scaledIterations {
-            try blackHole(await div {
-                ForEach(0 ..< 1000) { i in
-                    img(.id("\(i)"))
-                }
-            }.renderAsync())
+            try blackHole(
+                await div {
+                    ForEach(0..<1000) { i in
+                        img(.id("\(i)"))
+                    }
+                }.renderAsync()
+            )
         }
     }
 
     Benchmark("render text") { benchmark in
         for _ in benchmark.scaledIterations {
-            try blackHole(await div {
-                "Hello, World!"
-                "This is a paragraph."
-                "Some interpolation \("maybe")"
-                i { "Italic" }
-                b { "Bold" }
-            }.renderAsync())
+            try blackHole(
+                await div {
+                    "Hello, World!"
+                    "This is a paragraph."
+                    "Some interpolation \("maybe")"
+                    i { "Italic" }
+                    b { "Bold" }
+                }.renderAsync()
+            )
         }
     }
 
@@ -146,15 +156,16 @@ let benchmarks = { @Sendable in
                             "Swift"
                         }
                         ul(.class("fancy-list")) {
-                            ForEach(0 ..< 1000) { i in
+                            ForEach(0..<1000) { i in
                                 MyCustomElement {
                                     MyListItem(number: i)
                                 }
                                 HTMLComment("This is a comment")
                             }
                         }
                     }
-                }.renderAsync())
+                }.renderAsync()
+            )
         }
     }
 
@@ -174,15 +185,16 @@ let benchmarks = { @Sendable in
                             "Swift"
                         }
                         ul(.class("fancy-list")) {
-                            ForEach(0 ..< 1000) { i in
+                            ForEach(0..<1000) { i in
                                 MyCustomElement {
                                     MyListItem(number: i)
                                 }
                                 HTMLComment("This is a comment")
                             }
                         }
                     }
-                }.render())
+                }.render()
+            )
         }
     }
 }

Benchmarks/Benchmarks/ElementaryBenchmarks/Benchmarks.swift

@@ -18,8 +18,8 @@ let package = Package(
             ],
             path: "Benchmarks/ElementaryBenchmarks",
             plugins: [
-                .plugin(name: "BenchmarkPlugin", package: "package-benchmark"),
+                .plugin(name: "BenchmarkPlugin", package: "package-benchmark")
             ]
-        ),
+        )
     ]
 )

Benchmarks/Package.swift

@@ -4,10 +4,10 @@ import PackageDescription
 let package = Package(
     name: "HummingbirdDemo",
     platforms: [
-        .macOS(.v14),
+        .macOS(.v14)
     ],
     products: [
-        .executable(name: "App", targets: ["App"]),
+        .executable(name: "App", targets: ["App"])
     ],
     dependencies: [
         .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.0.0"),
@@ -21,6 +21,6 @@ let package = Package(
                 .product(name: "Elementary", package: "elementary"),
             ],
             swiftSettings: [.enableExperimentalFeature("StrictConcurrency=complete")]
-        ),
+        )
     ]
 )

Examples/HummingbirdDemo/Package.swift

@@ -59,7 +59,7 @@ struct GreetingPage: HTML {
             }
         } else {
             ul {
-                ForEach(0 ..< greetingCount) { i in
+                ForEach(0..<greetingCount) { i in
                     li {
                         "Hello there, \(name)!"
                         // demo of conditional styling (should be done with CSS in real life)

Examples/HummingbirdDemo/Sources/App/Pages.swift

@@ -21,7 +21,7 @@ let package = Package(
         .library(
             name: "Elementary",
             targets: ["Elementary"]
-        ),
+        )
     ],
     targets: [
         .target(

Package.swift

@@ -4,7 +4,7 @@ import PackageDescription
 let shouldBuildForEmbedded = Context.environment["JAVASCRIPTKIT_EXPERIMENTAL_EMBEDDED_WASM"].flatMap(Bool.init) ?? false
 
 var featureFlags: [SwiftSetting] = [
-    .enableUpcomingFeature("ExistentialAny"),
+    .enableUpcomingFeature("ExistentialAny")
 ]
 
 if shouldBuildForEmbedded {
@@ -31,7 +31,7 @@ let package = Package(
         .library(
             name: "Elementary",
             targets: ["Elementary"]
-        ),
+        )
     ],
     targets: [
         .target(

[email protected]

@@ -24,12 +24,20 @@ public struct AsyncContent<Content: HTML>: HTML, Sendable {
     }
 
     @inlinable @inline(__always)
-    public static func _render<Renderer: _HTMLRendering>(_ html: consuming Self, into renderer: inout Renderer, with context: consuming _RenderingContext) {
+    public static func _render<Renderer: _HTMLRendering>(
+        _ html: consuming Self,
+        into renderer: inout Renderer,
+        with context: consuming _RenderingContext
+    ) {
         context.assertionFailureNoAsyncContext(self)
     }
 
     @inlinable @inline(__always)
-    public static func _render<Renderer: _AsyncHTMLRendering>(_ html: consuming Self, into renderer: inout Renderer, with context: consuming _RenderingContext) async throws {
+    public static func _render<Renderer: _AsyncHTMLRendering>(
+        _ html: consuming Self,
+        into renderer: inout Renderer,
+        with context: consuming _RenderingContext
+    ) async throws {
         try await Content._render(await html.content(), into: &renderer, with: context)
     }
 }