Merge pull request #2998 from ahoppen/enable-formatting

Enable format GitHub Action check

Author: ahoppen

.github/workflows/pull_request.yml

@@ -15,5 +15,3 @@ jobs:
       api_breakage_check_allowlist_path: "Release Notes/api-breakages.txt"
       # https://github.com/swiftlang/swift-syntax/issues/2987
       docs_check_enabled: false
-      # https://github.com/swiftlang/swift-syntax/issues/2988
-      format_check_enabled: false

CONTRIBUTING.md

@@ -25,7 +25,9 @@ swift-syntax is formatted using [swift-format](http://github.com/swiftlang/swift
 
 To format your changes run the formatter using the following command
 ```bash
-./swift-syntax-dev-utils format
+swift format --in-place --parallel --recursive .
+# Or alternatively
+swift format -ipr .
 ```
 It will build a local copy of swift-format from the `main` branch and format the repository. Since it is building a release version of `swift-format`, the first run will take few minutes. Subsequent runs take less than 2 seconds.
 
@@ -38,7 +40,7 @@ Generated source code is not formatted to make it easier to spot changes when re
 > #!/usr/bin/env bash
 > set -e
 > SOURCE_DIR=$(realpath "$(dirname $0)/../..")
-> swift "$SOURCE_DIR/swift-syntax-dev-utils" format --lint
+> swift format lint --strict --parallel --recursive $SOURCE_DIR
 > ```
 > 2. Mark the file as executable: `chmod a+x swift-syntax/.git/hooks/pre-commit`
 > 3. If you have global git hooks installed, be sure to call them at the end of the script with `path/to/global/hooks/pre-commit "$@"`

CodeGeneration/Sources/Utils/CopyrightHeader.swift

@@ -25,6 +25,7 @@ public var copyrightHeader: Trivia =
   // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
   //
   //===----------------------------------------------------------------------===//
-  //// Automatically generated by generate-swift-syntax
-  //// Do not edit directly!
+  // Automatically generated by generate-swift-syntax
+  // Do not edit directly!
+  // swift-format-ignore-file
   """ + .newlines(2)

Sources/SwiftParser/generated/ExperimentalFeatures.swift

@@ -9,8 +9,9 @@
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
-//// Automatically generated by generate-swift-syntax
-//// Do not edit directly!
+// Automatically generated by generate-swift-syntax
+// Do not edit directly!
+// swift-format-ignore-file
 
 extension Parser {
   @_spi(ExperimentalLanguageFeatures)

Sources/SwiftParser/generated/IsLexerClassified.swift

@@ -9,8 +9,9 @@
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
-//// Automatically generated by generate-swift-syntax
-//// Do not edit directly!
+// Automatically generated by generate-swift-syntax
+// Do not edit directly!
+// swift-format-ignore-file
 
 #if compiler(>=6)
 @_spi(RawSyntax) @_spi(ExperimentalLanguageFeatures) @_spi(Compiler) public import SwiftSyntax

Sources/SwiftParser/generated/LayoutNodes+Parsable.swift

@@ -9,8 +9,9 @@
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
-//// Automatically generated by generate-swift-syntax
-//// Do not edit directly!
+// Automatically generated by generate-swift-syntax
+// Do not edit directly!
+// swift-format-ignore-file
 
 #if compiler(>=6)
 @_spi(RawSyntax) @_spi(ExperimentalLanguageFeatures) @_spi(Compiler) public import SwiftSyntax

Sources/SwiftParser/generated/Parser+TokenSpecSet.swift

@@ -9,8 +9,9 @@
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
-//// Automatically generated by generate-swift-syntax
-//// Do not edit directly!
+// Automatically generated by generate-swift-syntax
+// Do not edit directly!
+// swift-format-ignore-file
 
 #if compiler(>=6)
 @_spi(RawSyntax) @_spi(ExperimentalLanguageFeatures) @_spi(Compiler) public import SwiftSyntax

Sources/SwiftParser/generated/TokenSpecStaticMembers.swift

@@ -9,8 +9,9 @@
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
-//// Automatically generated by generate-swift-syntax
-//// Do not edit directly!
+// Automatically generated by generate-swift-syntax
+// Do not edit directly!
+// swift-format-ignore-file
 
 #if compiler(>=6)
 @_spi(RawSyntax) @_spi(ExperimentalLanguageFeatures) @_spi(Compiler) internal import SwiftSyntax

Sources/SwiftParserDiagnostics/generated/ChildNameForDiagnostics.swift

@@ -9,8 +9,9 @@
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
-//// Automatically generated by generate-swift-syntax
-//// Do not edit directly!
+// Automatically generated by generate-swift-syntax
+// Do not edit directly!
+// swift-format-ignore-file
 
 #if compiler(>=6)
 @_spi(RawSyntax) @_spi(ExperimentalLanguageFeatures) @_spi(Compiler) internal import SwiftSyntax

Sources/SwiftParserDiagnostics/generated/SyntaxKindNameForDiagnostics.swift

@@ -9,8 +9,9 @@
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
-//// Automatically generated by generate-swift-syntax
-//// Do not edit directly!
+// Automatically generated by generate-swift-syntax
+// Do not edit directly!
+// swift-format-ignore-file
 
 #if compiler(>=6)
 @_spi(RawSyntax) @_spi(ExperimentalLanguageFeatures) @_spi(Compiler) internal import SwiftSyntax