swiftlang
diff --git a/‎.gitignore
Lines changed: 3 additions & 0 deletions b/‎.gitignore
Lines changed: 3 additions & 0 deletions
diff --git a/‎CONTRIBUTING.md
Lines changed: 18 additions & 3 deletions b/‎CONTRIBUTING.md
Lines changed: 18 additions & 3 deletions
diff --git a/‎CodeGeneration/Package.swift
Lines changed: 2 additions & 22 deletions b/‎CodeGeneration/Package.swift
Lines changed: 2 additions & 22 deletions
diff --git a/‎CodeGeneration/README.md
Lines changed: 0 additions & 11 deletions b/‎CodeGeneration/README.md
Lines changed: 0 additions & 11 deletions
diff --git a/‎CodeGeneration/Sources/SyntaxSupport/AttributeNodes.swift
Lines changed: 0 additions & 1 deletion b/‎CodeGeneration/Sources/SyntaxSupport/AttributeNodes.swift
Lines changed: 0 additions & 1 deletion
diff --git a/‎CodeGeneration/Sources/SyntaxSupport/CommonNodes.swift
Lines changed: 23 additions & 38 deletions b/‎CodeGeneration/Sources/SyntaxSupport/CommonNodes.swift
Lines changed: 23 additions & 38 deletions
diff --git a/‎CodeGeneration/Sources/SyntaxSupport/DeclNodes.swift
Lines changed: 12 additions & 1 deletion b/‎CodeGeneration/Sources/SyntaxSupport/DeclNodes.swift
Lines changed: 12 additions & 1 deletion
diff --git a/‎CodeGeneration/Sources/SyntaxSupport/ExperimentalFeatures.swift
Lines changed: 6 additions & 3 deletions b/‎CodeGeneration/Sources/SyntaxSupport/ExperimentalFeatures.swift
Lines changed: 6 additions & 3 deletions
diff --git a/‎CodeGeneration/Sources/SyntaxSupport/ExprNodes.swift
Lines changed: 3 additions & 0 deletions b/‎CodeGeneration/Sources/SyntaxSupport/ExprNodes.swift
Lines changed: 3 additions & 0 deletions
diff --git a/‎CodeGeneration/Sources/SyntaxSupport/GenericNodes.swift
Lines changed: 2 additions & 0 deletions b/‎CodeGeneration/Sources/SyntaxSupport/GenericNodes.swift
Lines changed: 2 additions & 0 deletions
@@ -26,3 +26,6 @@ Package.resolved
 *.pyc
 
 Tests/PerformanceTest/baselines.json
+
+# The local build of swift-format to format swift-syntax
+.swift-format-build
@@ -21,12 +21,27 @@ swift-syntax is a SwiftPM package, so you can build and test it using anything t
 
 swift-syntax is formatted using [swift-format](http://github.com/apple/swift-format) to ensure a consistent style.
 
-To format your changes run `format.py` at the root of this repository. If you have a `swift-format` executable ready, you can pass it to `format.py`. If you do not, `format.py` will build its own copy of `swift-format` in `/tmp/swift-format`.
-
-If you are seeing surprising formatting results, you most likely have a `swift-format` installed on your system that’s not the most recent version built from the `main` branch. To fix this, clone [swift-format](http://github.com/apple/swift-format), build it using `swift build` and pass the freshly built executable to `format.py` as `--swift-format path/to/swift-format/.build/debug/swift-format`. Alternatively, you can uninstall `swift-format` on your system and `format.py` will build it from scratch.
+To format your changes run the formatter using the following command
+```bash
+./swift-syntax-dev-utils format
+```
+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.
 
 Generated source code is not formatted to make it easier to spot changes when re-running code generation.
 
+> [!NOTE]
+> You can add a git hook to ensure all commits to the swift-syntax repository are correctly formatted. 
+> 1. Save the following contents to `swift-syntax/.git/hooks/pre-commit`
+> ```bash
+> #!/usr/bin/env bash
+> set -e
+> SOURCE_DIR=$(realpath "$(dirname $0)/../..")
+> swift "$SOURCE_DIR/swift-syntax-dev-utils" format --lint
+> ```
+> 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 "$@"` 
+
+
 ## Generating Source Code
 
 If you want to modify the generated files, open the [CodeGeneration](CodeGeneration) package and run the `generate-swift-syntax` executable.
 
@@ -12,17 +12,8 @@ let package = Package(
     .executable(name: "generate-swift-syntax", targets: ["generate-swift-syntax"])
   ],
   dependencies: [
-    // This directory is a standalone package that uses swift-syntax from the
-    // outer directory.
-    // If you are making significant changs to `CodeGeneration` locally and want
-    // to avoid breaking the build of `CodeGeneration` itself by generating new
-    // files in the parent swift-syntax package, it is encouraged to change the
-    // dependency to the following. That way `CodeGeneration` has its own
-    // checkout of swift-syntax that is unaffected by the newly generated files.
-    // Be sure to revert the change before committing your changes.
-    //
-    // .package(url: "https://github.com/apple/swift-syntax", branch: "main")
-    .package(path: "..")
+    .package(url: "https://github.com/apple/swift-syntax", from: "509.0.0"),
+    .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.2.2"),
   ],
   targets: [
     .executableTarget(
@@ -63,14 +54,3 @@ let package = Package(
     ),
   ]
 )
-
-if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
-  // Building standalone.
-  package.dependencies += [
-    .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.2.2")
-  ]
-} else {
-  package.dependencies += [
-    .package(path: "../../swift-argument-parser")
-  ]
-}
@@ -4,17 +4,6 @@ This directory contains file to generate source code that is part of the SwiftSy
 
 Some source code inside SwiftSyntax is generated using [SwiftSyntaxBuilder](../Sources/SwiftSyntaxBuilder), a Swift library whose purpose is to generate Swift code using Swift itself. This kind of code generation is performed by the Swift package defined in this directory.
 
-This directory is a standalone package that uses swift-syntax from the outer directory. 
-If you are making significant changes to `CodeGeneration` locally and want to avoid breaking the build of `CodeGeneration` itself by generating new files in the parent swift-syntax package, it is encouraged to change the dependency from
-```swift
-.package(path: "..")
-```
-to 
-```swift
-.package(url: "https://github.com/apple/swift-syntax", branch: "main")
-```
-That way `CodeGeneration` has its own checkout of swift-syntax that is unaffected by the newly generated files. Be sure to revert the change before committing your changes.
-
 To re-generate the files after changing `CodeGeneration` run the `generate-swift-syntax` 
 target of `CodeGeneration` and pass `path/to/swift-syntax/Sources` as the argument.
 
 
@@ -629,7 +629,6 @@ public let ATTRIBUTE_NODES: [Node] = [
           .keyword(.kind),
           .keyword(.spi),
           .keyword(.spiModule),
-          .keyword(.available),
         ]),
         nameForDiagnostics: "label",
         documentation: "The label of the argument"
 
@@ -56,6 +56,7 @@ public let COMMON_NODES: [Node] = [
     kind: .codeBlock,
     base: .syntax,
     nameForDiagnostics: "code block",
+    parserFunction: "parseCodeBlock",
     traits: [
       "Braced",
       "WithStatements",
@@ -80,29 +81,33 @@ public let COMMON_NODES: [Node] = [
   ),
 
   Node(
-    kind: .thrownTypeClause,
+    kind: .throwsClause,
     base: .syntax,
-    nameForDiagnostics: "thrown type clause",
-    documentation: "The specific error type that a function can throw.",
-    traits: [
-      "Parenthesized"
-    ],
+    nameForDiagnostics: "throws clause",
     children: [
+      Child(
+        name: "throwsSpecifier",
+        kind: .token(choices: [.keyword(.throws), .keyword(.rethrows)]),
+        documentation: "The `throws` keyword."
+      ),
       Child(
         name: "leftParen",
         kind: .token(choices: [.token(.leftParen)]),
-        documentation: "The '(' to open the thrown type clause."
+        documentation: "The '(' to open the thrown error type specification.",
+        isOptional: true
       ),
       Child(
         name: "type",
         kind: .node(kind: .type),
         nameForDiagnostics: "thrown type",
-        documentation: "The thrown error type."
+        documentation: "The thrown error type.",
+        isOptional: true
       ),
       Child(
         name: "rightParen",
         kind: .token(choices: [.token(.rightParen)]),
-        documentation: "The ')' to closure the thrown type clause."
+        documentation: "The ')' to close the thrown error type specification.",
+        isOptional: true
       ),
     ]
   ),
@@ -122,16 +127,9 @@ public let COMMON_NODES: [Node] = [
         isOptional: true
       ),
       Child(
-        name: "throwsSpecifier",
-        kind: .token(choices: [.keyword(.throws)]),
-        documentation: "The `throws` keyword.",
-        isOptional: true
-      ),
-      Child(
-        name: "thrownError",
-        kind: .node(kind: .thrownTypeClause),
-        experimentalFeature: .typedThrows,
-        documentation: "The specific error type thrown by this accessor.",
+        name: "throwsClause",
+        kind: .node(kind: .throwsClause),
+        documentation: "The clause specifying thrown errors",
         isOptional: true
       ),
     ]
@@ -152,16 +150,9 @@ public let COMMON_NODES: [Node] = [
         isOptional: true
       ),
       Child(
-        name: "throwsSpecifier",
-        kind: .token(choices: [.keyword(.throws), .keyword(.rethrows)]),
-        documentation: "The `throws` or `rethrows` keyword.",
-        isOptional: true
-      ),
-      Child(
-        name: "thrownError",
-        kind: .node(kind: .thrownTypeClause),
-        experimentalFeature: .typedThrows,
-        documentation: "The specific error type thrown by this function.",
+        name: "throwsClause",
+        kind: .node(kind: .throwsClause),
+        documentation: "The clause specifying thrown errors",
         isOptional: true
       ),
     ]
@@ -362,15 +353,9 @@ public let COMMON_NODES: [Node] = [
         isOptional: true
       ),
       Child(
-        name: "throwsSpecifier",
-        kind: .token(choices: [.keyword(.throws)]),
-        isOptional: true
-      ),
-      Child(
-        name: "thrownError",
-        kind: .node(kind: .thrownTypeClause),
-        experimentalFeature: .typedThrows,
-        documentation: "The specific error type thrown by this function type.",
+        name: "throwsClause",
+        kind: .node(kind: .throwsClause),
+        documentation: "The clause specifying thrown errors",
         isOptional: true
       ),
     ]
 
@@ -82,7 +82,10 @@ public let DECL_NODES: [Node] = [
     base: .decl,
     nameForDiagnostics: "accessor",
     parserFunction: "parseAccessorDecl",
-    traits: ["WithAttributes"],
+    traits: [
+      "WithOptionalCodeBlock",
+      "WithAttributes",
+    ],
     children: [
       Child(
         name: "attributes",
@@ -461,8 +464,10 @@ public let DECL_NODES: [Node] = [
           .keyword(.private),
           .keyword(.public),
           .keyword(.reasync),
+          .keyword(._resultDependsOnSelf),
           .keyword(.required),
           .keyword(.static),
+          .keyword(.transferring),
           .keyword(.unowned),
           .keyword(.weak),
         ])
@@ -492,6 +497,7 @@ public let DECL_NODES: [Node] = [
     traits: [
       "WithAttributes",
       "WithModifiers",
+      "WithOptionalCodeBlock",
     ],
     children: [
       Child(
@@ -554,6 +560,8 @@ public let DECL_NODES: [Node] = [
     nameForDiagnostics: "editor placeholder",
     documentation: """
       An editor placeholder, e.g. `<#declaration#>` that is used in a position that expects a declaration.
+
+      - Warning: This ``EditorPlaceholderDeclSyntax`` node is not generated by the parser anymore. Placeholders are represented by a ``MissingDeclSyntax``.
       """,
     traits: [
       "WithAttributes",
@@ -876,6 +884,7 @@ public let DECL_NODES: [Node] = [
       "WithAttributes",
       "WithGenericParameters",
       "WithModifiers",
+      "WithOptionalCodeBlock",
     ],
     children: [
       Child(
@@ -1214,6 +1223,7 @@ public let DECL_NODES: [Node] = [
       "WithAttributes",
       "WithGenericParameters",
       "WithModifiers",
+      "WithOptionalCodeBlock",
     ],
     children: [
       Child(
@@ -1737,6 +1747,7 @@ public let DECL_NODES: [Node] = [
     nameForDiagnostics: "precedencegroup",
     documentation: "A Swift `precedencegroup` declaration.",
     traits: [
+      "Braced",
       "NamedDecl",
       "WithAttributes",
       "WithModifiers",
 
@@ -15,8 +15,9 @@ import SwiftSyntax
 public enum ExperimentalFeature: String, CaseIterable {
   case referenceBindings
   case thenStatements
-  case typedThrows
   case doExpressions
+  case nonescapableTypes
+  case transferringArgsAndResults
 
   /// The name of the feature, which is used in the doc comment.
   public var featureName: String {
@@ -25,10 +26,12 @@ public enum ExperimentalFeature: String, CaseIterable {
       return "reference bindings"
     case .thenStatements:
       return "'then' statements"
-    case .typedThrows:
-      return "typed throws"
     case .doExpressions:
       return "'do' expressions"
+    case .nonescapableTypes:
+      return "NonEscableTypes"
+    case .transferringArgsAndResults:
+      return "TransferringArgsAndResults"
     }
   }
 
 
@@ -792,6 +792,9 @@ public let EXPR_NODES: [Node] = [
     kind: .editorPlaceholderExpr,
     base: .expr,
     nameForDiagnostics: "editor placeholder",
+    documentation: """
+      - Warning: This ``EditorPlaceholderExprSyntax`` node is not generated by the parser anymore. Placeholders are represented by a ``DeclReferenceExprSyntax``.
+      """,
     children: [
       Child(
         name: "placeholder",
 
@@ -205,6 +205,8 @@ public let GENERIC_NODES: [Node] = [
           .keyword(._NativeRefCountedObject),
           .keyword(._Class),
           .keyword(._NativeClass),
+          .keyword(._BridgeObject),
+          .keyword(._TrivialStride),
         ])
       ),
       Child(