Merge branch 'main' into adamcarter93/separate-backtick-tokens

Author: plemarquand

.bazelrc

@@ -1,4 +1,5 @@
 common --enable_bzlmod
+common --incompatible_disallow_empty_glob
 common --incompatible_use_host_features
 common --lockfile_mode=off
 

.github/PULL_REQUEST_TEMPLATE/release_branch.md

@@ -0,0 +1,7 @@
+* **Explanation**: <!-- A description of the issue being fixed or enhancement being made. This can be brief, but it should be clear. -->
+* **Scope**: <!-- An assessment of the impact/importance of the change. For example, is the change a source-breaking language change, etc. -->
+* **Issue**: <!-- The GitHub Issue link if the change fixes/implements an issue/enhancement -->
+* **Original PR**: <!-- Pull Request link from main branch -->
+* **Risk**: <!-- What is the (specific) risk to the release for taking this change? -->
+* **Testing**: <!-- What specific testing has been done or needs to be done to further validate any impact of this change? -->
+* **Reviewer**: <!-- One or more code owners for the impacted components should review the change. Technical review can be delegated by a code owner or otherwise requested as deemed appropriate or useful. -->

BUILD.bazel

@@ -36,6 +36,7 @@ swift_syntax_library(
         ":SwiftSyntax",
         ":SwiftSyntaxMacroExpansion",
         ":SwiftSyntaxMacros",
+        ":_SwiftSyntaxCShims",
     ],
 )
 
@@ -82,6 +83,14 @@ swift_syntax_test(
     ],
 )
 
+swift_syntax_library(
+    name = "SwiftLibraryPluginProvider",
+    deps = [
+        ":SwiftCompilerPluginMessageHandling",
+        ":SwiftSyntaxMacros",
+    ],
+)
+
 swift_syntax_library(
     name = "SwiftOperators",
     deps = [
@@ -161,7 +170,7 @@ swift_syntax_library(
         ":SwiftSyntax509",
         ":SwiftSyntax510",
         ":SwiftSyntax600",
-        ":_AtomicBool",
+        ":_SwiftSyntaxCShims",
     ],
 )
 
@@ -281,15 +290,6 @@ swift_syntax_test(
     ],
 )
 
-cc_library(
-    name = "_AtomicBool",
-    srcs = glob(["Sources/_AtomicBool/src/*.c"]),
-    hdrs = glob(["Sources/_AtomicBool/include/*.h"]),
-    includes = ["Sources/_AtomicBool/include"],
-    tags = ["swift_module=_AtomicBool"],
-    visibility = ["//visibility:private"],
-)
-
 cc_library(
     name = "_InstructionCounter",
     srcs = glob(["Sources/_InstructionCounter/src/*.c"]),
@@ -299,6 +299,14 @@ cc_library(
     visibility = ["//visibility:private"],
 )
 
+cc_library(
+    name = "_SwiftSyntaxCShims",
+    hdrs = glob(["Sources/_SwiftSyntaxCShims/include/*.h"]),
+    includes = ["Sources/_SwiftSyntaxCShims/include"],
+    tags = ["swift_module=_SwiftSyntaxCShims"],
+    visibility = ["//visibility:private"],
+)
+
 swift_syntax_library(
     name = "_SwiftSyntaxTestSupport",
     testonly = True,

CONTRIBUTING.md

@@ -49,7 +49,7 @@ If you want to modify the generated files, open the [CodeGeneration](CodeGenerat
 Alternatively, you can generate the files from the command line by running the following command from the swift-syntax directory
 
 ```bash
-swift run --package-path CodeGeneration
+./swift-syntax-dev-utils generate-source-code
 ```
 
 ## Running Pre-PR Checks Script
@@ -71,6 +71,42 @@ We prefer to not squash commits when merging a PR because, especially for larger
 - During review, the commits can be reviewed individually, making each review chunk smaller
 - In case this PR introduced a bug that is identified later, it is possible to check if it resulted from the refactoring or the actual change, thereby making it easier find the lines that introduce the issue. 
 
+## Opening a PR
+
+To submit a PR you don't need permissions on this repo, instead you can fork the repo and create a PR through your forked version.
+
+For more information and instructions, read the GitHub docs on [forking a repo](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/fork-a-repo).
+
+Once you've pushed your branch, you should see an option on this repository's page to create a PR from a branch in your fork.
+
+## Opening a PR for Release Branch
+
+In order for a pull request to be considered for inclusion in a release branch (e.g. `release/6.0`) after it has been cut, it must meet the following requirements:
+
+1. The title of the PR should start with the tag `[{swift version number}]`. For example, `[6.0]` for the Swift 6.0 release branch.
+
+1. The PR description must include the following information:
+
+    ```md
+    * **Explanation**: A description of the issue being fixed or enhancement being made. This can be brief, but it should be clear.
+    * **Scope**: An assessment of the impact/importance of the change. For example, is the change a source-breaking language change, etc.
+    * **Issue**: The GitHub Issue link if the change fixes/implements an issue/enhancement.
+    * **Original PR**: Pull Request link from the `main` branch.
+    * **Risk**: What is the (specific) risk to the release for taking this change?
+    * **Testing**: What specific testing has been done or needs to be done to further validate any impact of this change?
+    * **Reviewer**: One or more code owners for the impacted components should review the change. Technical review can be delegated by a code owner or otherwise requested as deemed appropriate or useful.
+    ```
+
+> [!TIP]
+> The PR description can be generated using the [release_branch.md](https://github.com/apple/swift-syntax/blob/main/.github/PULL_REQUEST_TEMPLATE/release_branch.md) [pull request template](https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/about-issue-and-pull-request-templates). To use this template when creating a PR, you need to add the query parameter:
+> ```
+> ?expand=1&template=release_branch.md
+> ```
+> to the PR URL, as described in the [GitHub documentation on using query parameters to create a pull request](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/using-query-parameters-to-create-a-pull-request). 
+> This is necessary because GitHub does not currently provide a UI to choose a PR template.
+
+All changes going into a release branch must go through pull requests that are approved and merged by the corresponding release manager.
+
 ## Review and CI Testing
 
 After you opened your PR, a maintainer will review it and test your changes in CI (*Continuous Integration*) by adding a `@swift-ci Please test` comment on the pull request. Once your PR is approved and CI has passed, the maintainer will merge your pull request.

CodeGeneration/README.md

@@ -4,14 +4,8 @@ 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.
 
-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.
+To re-generate the files after changing `CodeGeneration` run the following command on the command line.
 
-On the command line, this would be
 ```bash
-swift run --package-path CodeGeneration generate-swift-syntax Sources
+path/to/swift-syntax/swift-syntax-dev-utils generate-source-code
 ```
-
-Or if you open the `CodeGeneration` package in Xcode, you can add the 
-`generate-swift syntax ../Sources` arguments using Product -> Scheme -> Edit Scheme…
-

CodeGeneration/Sources/SyntaxSupport/DeclNodes.swift

@@ -472,6 +472,7 @@ public let DECL_NODES: [Node] = [
           .keyword(.transferring),
           .keyword(.unowned),
           .keyword(.weak),
+          .keyword(.sending),
         ])
       ),
       Child(

CodeGeneration/Sources/SyntaxSupport/ExperimentalFeatures.swift

@@ -18,7 +18,8 @@ public enum ExperimentalFeature: String, CaseIterable {
   case doExpressions
   case nonescapableTypes
   case transferringArgsAndResults
-  case borrowingSwitch
+  case trailingComma
+  case sendingArgsAndResults
 
   /// The name of the feature, which is used in the doc comment.
   public var featureName: String {
@@ -33,8 +34,10 @@ public enum ExperimentalFeature: String, CaseIterable {
       return "NonEscableTypes"
     case .transferringArgsAndResults:
       return "TransferringArgsAndResults"
-    case .borrowingSwitch:
-      return "borrowing pattern matching"
+    case .trailingComma:
+      return "trailing comma"
+    case .sendingArgsAndResults:
+      return "SendingArgsAndResults"
     }
   }
 

CodeGeneration/Sources/SyntaxSupport/KeywordSpec.swift

@@ -19,7 +19,6 @@ public struct KeywordSpec {
   /// The experimental feature the keyword is part of, or `nil` if this isn't
   /// for an experimental feature.
   public let experimentalFeature: ExperimentalFeature?
-  public let experimentalFeature2: ExperimentalFeature?
 
   /// Indicates if the token kind is switched from being an identifier to a keyword in the lexer.
   public let isLexerClassified: Bool
@@ -69,26 +68,6 @@ public struct KeywordSpec {
   ) {
     self.name = name
     self.experimentalFeature = experimentalFeature
-    self.experimentalFeature2 = nil
-    self.isLexerClassified = isLexerClassified
-  }
-
-  /// Initializes a new `KeywordSpec` instance.
-  ///
-  /// - Parameters:
-  ///   - name: A name of the keyword.
-  ///   - experimentalFeature: The experimental feature the keyword is part of, or `nil` if this isn't for an experimental feature.
-  ///   - or: A second experimental feature the keyword is also part of, or `nil` if this isn't for an experimental feature.
-  ///   - isLexerClassified: Indicates if the token kind is switched from being an identifier to a keyword in the lexer.
-  init(
-    _ name: String,
-    experimentalFeature: ExperimentalFeature,
-    or experimentalFeature2: ExperimentalFeature,
-    isLexerClassified: Bool = false
-  ) {
-    self.name = name
-    self.experimentalFeature = experimentalFeature
-    self.experimentalFeature2 = experimentalFeature2
     self.isLexerClassified = isLexerClassified
   }
 }
@@ -284,6 +263,7 @@ public enum Keyword: CaseIterable {
   case safe
   case scoped
   case `self`
+  case sending
   case `Self`
   case Sendable
   case set
@@ -340,7 +320,7 @@ public enum Keyword: CaseIterable {
     case ._borrow:
       return KeywordSpec("_borrow")
     case ._borrowing:
-      return KeywordSpec("_borrowing", experimentalFeature: .referenceBindings, or: .borrowingSwitch)
+      return KeywordSpec("_borrowing")
     case ._BridgeObject:
       return KeywordSpec("_BridgeObject")
     case ._cdecl:
@@ -722,6 +702,11 @@ public enum Keyword: CaseIterable {
         "transferring",
         experimentalFeature: .transferringArgsAndResults
       )
+    case .sending:
+      return KeywordSpec(
+        "sending",
+        experimentalFeature: .sendingArgsAndResults
+      )
     case .transpose:
       return KeywordSpec("transpose")
     case .true:

CodeGeneration/Sources/SyntaxSupport/PatternNodes.swift

@@ -201,6 +201,7 @@ public let PATTERN_NODES: [Node] = [
         kind: .token(choices: [
           .keyword(.let), .keyword(.var), .keyword(.inout),
           .keyword(._mutating), .keyword(._borrowing), .keyword(._consuming),
+          .keyword(.borrowing),
         ])
       ),
       Child(

CodeGeneration/Sources/SyntaxSupport/String+Extensions.swift

@@ -10,20 +10,20 @@
 //
 //===----------------------------------------------------------------------===//
 
-public extension StringProtocol {
-  var withFirstCharacterLowercased: String {
+extension StringProtocol {
+  public var withFirstCharacterLowercased: String {
     guard first?.isLetter ?? false else {
       return String(first!) + dropFirst().withFirstCharacterLowercased
     }
     return prefix(1).lowercased() + dropFirst()
   }
-  var withFirstCharacterUppercased: String {
+  public var withFirstCharacterUppercased: String {
     guard first?.isLetter ?? false else {
       return String(first!) + dropFirst().withFirstCharacterUppercased
     }
     return prefix(1).uppercased() + dropFirst()
   }
-  var backtickedIfNeeded: String {
+  public var backtickedIfNeeded: String {
     if Keyword.allCases.map(\.spec).contains(where: {
       $0.name == self && ($0.isLexerClassified || $0.name == "Type" || $0.name == "Protocol")
     }) {