Merge pull request #4 from JosephDuffy/test-coverage

Test coverage
JosephDuffy · Feb 1, 2024 · 0e77401 · 0e77401
2 parents 4359efc + ef8e69c
commit 0e77401
Show file tree

Hide file tree

Showing 4 changed files with 649 additions and 4 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -41,6 +41,8 @@ jobs:
 
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v3
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         with:
           files: ${{ join(fromJSON(steps.convert-coverage.outputs.files), ',') }}
           fail_ci_if_error: true
@@ -102,11 +104,11 @@ jobs:
 
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v3
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         with:
           files: ${{ join(fromJSON(steps.convert-coverage.outputs.files), ',') }}
           fail_ci_if_error: true
-        env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
   linux_tests:
     name: Swift ${{ matrix.swift }} on ${{ matrix.os }}

diff --git a/Sources/HashableMacroMacros/HashableMacro.swift b/Sources/HashableMacroMacros/HashableMacro.swift
@@ -589,7 +589,7 @@ public struct HashableMacro: ExtensionMacro {
                 comparisons = InfixOperatorExprSyntax(
                     leftOperand: existingComparisons,
                     operator: BinaryOperatorExprSyntax(
-                        leadingTrivia: .newline.appending(Trivia.spaces(8)),
+                        leadingTrivia: .newline.appending(Trivia.spaces(4)),
                         operator: .binaryOperator("&&")
                     ),
                     rightOperand: comparison