diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 6beedf44..1220863a 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -44,8 +44,21 @@ jobs:
           swift /tmp/cross-pr-checkout.swift "${{ github.repository }}" "${{ github.event.number }}"
       - name: Build
         run: swift build --configuration release
+      - name: Write check script
+        run: |
+          cat > /tmp/check-formatting.sh <<EOL
+          #!/usr/bin/env sh
+          set -ex
+          cd "\$1"
+          # Format and run 'git diff' first because this yields more insightful results than 'swift-format lint'
+          .build/release/swift-format --in-place --parallel --recursive .
+          git diff
+          # Linting may discover issues that weren't changed during formatting (such as diagnosing lowercase classes). Check that we didn't introduce any new lint errors.
+          .build/release/swift-format lint --parallel --recursive --strict .
+          EOL
+          chmod a+x /tmp/check-formatting.sh
       - name: Format swift-format
-        run: .build/release/swift-format lint --parallel --recursive --strict .
+        run: /tmp/check-formatting.sh .
       - name: Checkout swift-syntax
         uses: actions/checkout@v4
         with:
@@ -53,7 +66,7 @@ jobs:
           persist-credentials: false
           path: swift-syntax
       - name: Format swift-syntax
-        run: .build/release/swift-format lint --parallel --recursive --strict swift-syntax
+        run: /tmp/check-formatting.sh swift-syntax
       - name: Checkout sourcekit-lsp
         uses: actions/checkout@v4
         with:
@@ -61,4 +74,4 @@ jobs:
           persist-credentials: false
           path: sourcekit-lsp
       - name: Format sourcekit-lsp
-        run: .build/release/swift-format lint --parallel --recursive --strict sourcekit-lsp
+        run: /tmp/check-formatting.sh sourcekit-lsp
diff --git a/Sources/SwiftFormat/PrettyPrint/TokenStreamCreator.swift b/Sources/SwiftFormat/PrettyPrint/TokenStreamCreator.swift
index f56f50e6..46a805a2 100644
--- a/Sources/SwiftFormat/PrettyPrint/TokenStreamCreator.swift
+++ b/Sources/SwiftFormat/PrettyPrint/TokenStreamCreator.swift
@@ -2411,6 +2411,9 @@ private final class TokenStreamCreator: SyntaxVisitor {
       )
     }
 
+    before(node.baseType.firstToken(viewMode: .sourceAccurate), tokens: .open)
+    after(node.baseType.lastToken(viewMode: .sourceAccurate), tokens: .close)
+
     after(node.lastToken(viewMode: .sourceAccurate), tokens: .close)
     return .visitChildren
   }
diff --git a/Tests/SwiftFormatTests/PrettyPrint/FunctionTypeTests.swift b/Tests/SwiftFormatTests/PrettyPrint/FunctionTypeTests.swift
index d7b7f30c..2bb5b326 100644
--- a/Tests/SwiftFormatTests/PrettyPrint/FunctionTypeTests.swift
+++ b/Tests/SwiftFormatTests/PrettyPrint/FunctionTypeTests.swift
@@ -316,15 +316,15 @@ final class FunctionTypeTests: PrettyPrintTestCase {
       expected: """
         func f(
           _ body:
-            nonisolated(nonsending) ()
-            async -> Void
+            nonisolated(nonsending)
+            () async -> Void
         ) {}
 
         func f(
           _ body:
             @Foo @Bar
-            nonisolated(nonsending) ()
-            async -> Void
+            nonisolated(nonsending)
+            () async -> Void
         ) {}
 
         func f(
@@ -336,8 +336,8 @@ final class FunctionTypeTests: PrettyPrintTestCase {
         func f(
           _ body:
             inout @Foo @Bar
-            nonisolated(nonsending) ()
-            async -> Void
+            nonisolated(nonsending)
+            () async -> Void
         ) {}
 
         """,