Merge branch 'swiftlang:main' into trivia-piece-comment-value

Author: zyadtaha

.github/CODEOWNERS

@@ -8,7 +8,7 @@
 # Order is important. The last matching pattern has the most precedence.
 
 # Owner of anything in SwiftSyntax not owned by anyone else.
-* @ahoppen @bnbarham
+* @ahoppen @bnbarham @hamishknight @rintaro
 
 # Macros
 /Sources/SwiftSyntaxMacros @DougGregor

.github/workflows/automerge.yml

@@ -0,0 +1,17 @@
+name: Create PR to merge main into release branch
+# In the first period after branching the release branch, we typically want to include many changes from `main` in the release branch. This workflow automatically creates a PR every Monday to merge main into the release branch.
+# Later in the release cycle we should stop this practice to avoid landing risky changes by disabling this workflow. To do so, disable the workflow as described in https://docs.github.com/en/actions/managing-workflow-runs-and-deployments/managing-workflow-runs/disabling-and-enabling-a-workflow
+on:
+  schedule:
+    - cron: '0 9 * * MON'
+  workflow_dispatch:
+jobs:
+  create_merge_pr:
+    name: Create PR to merge main into release branch
+    uses: swiftlang/github-workflows/.github/workflows/create_automerge_pr.yml@main
+    with:
+      base_branch: release/6.2
+    permissions:
+      contents: write
+      pull-requests: write
+    if: (github.event_name == 'schedule' && github.repository == 'swiftlang/swift-syntax') || (github.event_name != 'schedule')  # Ensure that we don't run this on a schedule in a fork

.github/workflows/publish_release.yml

@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - run: |
-          if [[ "${{ github.triggering_actor }}" != "ahoppen" ]]; then
+          if [[ "${{ github.triggering_actor }}" != "bnbarham" ]]; then
             echo "${{ github.triggering_actor }} is not allowed to create a release"
             exit 1
           fi

.github/workflows/pull_request.yml

@@ -1,8 +1,10 @@
 name: Pull request
 
+# PRs created by GitHub Actions don't kick off further actions (https://github.com/peter-evans/create-pull-request/blob/d57e551ebc1a16dee0b8c9ea6d24dba7627a6e35/docs/concepts-guidelines.md#triggering-further-workflow-runs).
+# As a workaround, we mark automerge PRs that are created by GitHub actions as draft and trigger the GitHub actions by marking the PR as ready for review. We'd prefer not re-triggering testing on a normal user's PR in this case, but skipping them causes the checks to reset.
 on:
   pull_request:
-    types: [opened, reopened, synchronize]
+    types: [opened, reopened, synchronize, ready_for_review]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

CodeGeneration/Sources/SyntaxSupport/AttributeNodes.swift

@@ -74,6 +74,11 @@ public let ATTRIBUTE_NODES: [Node] = [
             // Special arguments for keyword decl name e.g. 'subscript(_:)', and availability arguments.
             kind: .node(kind: .specializeAttributeArgumentList)
           ),
+          Child(
+            name: "specializedArguments",
+            // Special arguments for generic where clause.
+            kind: .node(kind: .specializedAttributeArgument)
+          ),
           Child(
             name: "objCName",
             // Special arguments for Objective-C names. e.g. 'methodNameWithArg1:Arg2:'
@@ -122,8 +127,7 @@ public let ATTRIBUTE_NODES: [Node] = [
           Child(
             name: "abiArguments",
             // Special arguments for declaration syntax. e.g. @abi(func abiName() -> Int)
-            kind: .node(kind: .abiAttributeArguments),
-            experimentalFeature: .abiAttribute
+            kind: .node(kind: .abiAttributeArguments)
           ),
         ]),
         documentation: """
@@ -256,7 +260,6 @@ public let ATTRIBUTE_NODES: [Node] = [
   Node(
     kind: .abiAttributeArguments,
     base: .syntax,
-    experimentalFeature: .abiAttribute,
     nameForDiagnostics: "ABI-providing declaration",
     documentation: "The arguments of the '@abi' attribute",
     children: [
@@ -719,6 +722,19 @@ public let ATTRIBUTE_NODES: [Node] = [
     ]
   ),
 
+  Node(
+    kind: .specializedAttributeArgument,
+    base: .syntax,
+    nameForDiagnostics: "argument to '@specialized",
+    documentation: "The generic where clause for the `@specialized` attribute",
+    children: [
+      Child(
+        name: "genericWhereClause",
+        kind: .node(kind: .genericWhereClause)
+      )
+    ]
+  ),
+
   Node(
     kind: .specializeTargetFunctionArgument,
     base: .syntax,

CodeGeneration/Sources/SyntaxSupport/DeclNodes.swift

@@ -1307,6 +1307,37 @@ public let DECL_NODES: [Node] = [
     ]
   ),
 
+  Node(
+    kind: .usingDecl,
+    base: .decl,
+    experimentalFeature: .defaultIsolationPerFile,
+    nameForDiagnostics: "using",
+    documentation: """
+      A `using` declaration, currently used to control actor isolation within the current file.
+
+      An example of a `using` declaration is
+
+      ```swift
+      using @MainActor
+      ```
+      """,
+    children: [
+      Child(
+        name: "usingKeyword",
+        kind: .token(choices: [.keyword(.using)]),
+        documentation: "The `using` keyword for this declaration."
+      ),
+      Child(
+        name: "specifier",
+        kind: .nodeChoices(choices: [
+          Child(name: "attribute", kind: .node(kind: .attribute)),
+          Child(name: "modifier", kind: .token(choices: [.token(.identifier)])),
+        ]),
+        documentation: "The specifier that could be either an attribute or a modifier."
+      ),
+    ]
+  ),
+
   Node(
     kind: .inheritedTypeList,
     base: .syntaxCollection,

CodeGeneration/Sources/SyntaxSupport/ExperimentalFeatures.swift

@@ -19,10 +19,10 @@ public enum ExperimentalFeature: String, CaseIterable {
   case nonescapableTypes
   case trailingComma
   case coroutineAccessors
-  case abiAttribute
   case keypathWithMethodMembers
   case oldOwnershipOperatorSpellings
   case inlineArrayTypeSugar
+  case defaultIsolationPerFile
 
   /// The name of the feature as it is written in the compiler's `Features.def` file.
   public var featureName: String {
@@ -39,14 +39,14 @@ public enum ExperimentalFeature: String, CaseIterable {
       return "TrailingComma"
     case .coroutineAccessors:
       return "CoroutineAccessors"
-    case .abiAttribute:
-      return "ABIAttribute"
     case .keypathWithMethodMembers:
       return "KeypathWithMethodMembers"
     case .oldOwnershipOperatorSpellings:
       return "OldOwnershipOperatorSpellings"
     case .inlineArrayTypeSugar:
       return "InlineArrayTypeSugar"
+    case .defaultIsolationPerFile:
+      return "DefaultIsolationPerFile"
     }
   }
 
@@ -65,14 +65,14 @@ public enum ExperimentalFeature: String, CaseIterable {
       return "trailing commas"
     case .coroutineAccessors:
       return "coroutine accessors"
-    case .abiAttribute:
-      return "@abi attribute"
     case .keypathWithMethodMembers:
       return "keypaths with method members"
     case .oldOwnershipOperatorSpellings:
       return "`_move` and `_borrow` as ownership operators"
     case .inlineArrayTypeSugar:
       return "sugar type for InlineArray"
+    case .defaultIsolationPerFile:
+      return "set default actor isolation for a file"
     }
   }
 

CodeGeneration/Sources/SyntaxSupport/KeywordSpec.swift

@@ -104,6 +104,7 @@ public enum Keyword: CaseIterable {
   case _PackageDescription
   case _read
   case _RefCountedObject
+  case specialized
   case _specialize
   case _spi_available
   case _Trivial
@@ -210,6 +211,7 @@ public enum Keyword: CaseIterable {
   case none
   case nonisolated
   case nonmutating
+  case nonsending
   case objc
   case obsoleted
   case of
@@ -267,14 +269,14 @@ public enum Keyword: CaseIterable {
   case unsafe
   case unsafeAddress
   case unsafeMutableAddress
+  case using
   case `var`
   case visibility
   case weak
   case `where`
   case `while`
   case willSet
   case wrt
-  case x
   case yield
 
   public var spec: KeywordSpec {
@@ -339,6 +341,8 @@ public enum Keyword: CaseIterable {
       return KeywordSpec("_read")
     case ._RefCountedObject:
       return KeywordSpec("_RefCountedObject")
+    case .specialized:
+      return KeywordSpec("specialized")
     case ._specialize:
       return KeywordSpec("_specialize")
     case ._spi_available:
@@ -356,7 +360,7 @@ public enum Keyword: CaseIterable {
     case ._version:
       return KeywordSpec("_version")
     case .abi:
-      return KeywordSpec("abi", experimentalFeature: .abiAttribute)
+      return KeywordSpec("abi")
     case .accesses:
       return KeywordSpec("accesses")
     case .actor:
@@ -551,6 +555,8 @@ public enum Keyword: CaseIterable {
       return KeywordSpec("nonisolated")
     case .nonmutating:
       return KeywordSpec("nonmutating")
+    case .nonsending:
+      return KeywordSpec("nonsending")
     case .objc:
       return KeywordSpec("objc")
     case .obsoleted:
@@ -665,6 +671,8 @@ public enum Keyword: CaseIterable {
       return KeywordSpec("unsafeAddress")
     case .unsafeMutableAddress:
       return KeywordSpec("unsafeMutableAddress")
+    case .using:
+      return KeywordSpec("using")
     case .var:
       return KeywordSpec("var", isLexerClassified: true)
     case .visibility:
@@ -679,8 +687,6 @@ public enum Keyword: CaseIterable {
       return KeywordSpec("willSet")
     case .wrt:
       return KeywordSpec("wrt")
-    case .x:
-      return KeywordSpec("x", experimentalFeature: .inlineArrayTypeSugar)
     case .yield:
       return KeywordSpec("yield")
     }

CodeGeneration/Sources/SyntaxSupport/SyntaxNodeKind.swift

@@ -210,6 +210,9 @@ public enum SyntaxNodeKind: String, CaseIterable, IdentifierConvertible, TypeCon
   case multipleTrailingClosureElementList
   case namedOpaqueReturnType
   case nilLiteralExpr
+  case nonisolatedSpecifierArgument
+  case nonisolatedSpecifierArgumentList
+  case nonisolatedTypeSpecifier
   case objCSelectorPiece
   case objCSelectorPieceList
   case operatorDecl
@@ -256,6 +259,7 @@ public enum SyntaxNodeKind: String, CaseIterable, IdentifierConvertible, TypeCon
   case simpleStringLiteralSegmentList
   case someOrAnyType
   case sourceFile
+  case specializedAttributeArgument
   case specializeAttributeArgumentList
   case specializeAvailabilityArgument
   case specializeTargetFunctionArgument
@@ -301,6 +305,7 @@ public enum SyntaxNodeKind: String, CaseIterable, IdentifierConvertible, TypeCon
   case unresolvedIsExpr
   case unresolvedTernaryExpr
   case unsafeExpr
+  case usingDecl
   case valueBindingPattern
   case variableDecl
   case versionComponent
@@ -451,6 +456,7 @@ public enum SyntaxNodeKind: String, CaseIterable, IdentifierConvertible, TypeCon
     case .someOrAnyType: return "constrainedSugarType"
     case .simpleTypeSpecifier: return "typeSpecifier"
     case .specializeAttributeArgumentList: return "specializeAttributeSpecList"
+    case .specializedAttributeArgument: return "specializedAttribute"
     case .specializeAvailabilityArgument: return "availabilityEntry"
     case .specializeTargetFunctionArgument: return "targetFunctionEntry"
     case .stringLiteralSegmentList: return "stringLiteralSegments"

CodeGeneration/Sources/SyntaxSupport/TypeNodes.swift

@@ -304,7 +304,7 @@ public let TYPE_NODES: [Node] = [
     base: .type,
     experimentalFeature: .inlineArrayTypeSugar,
     nameForDiagnostics: "inline array type",
-    documentation: "An inline array type `[3 x Int]`, sugar for `InlineArray<3, Int>`.",
+    documentation: "An inline array type `[3 of Int]`, sugar for `InlineArray<3, Int>`.",
     children: [
       Child(
         name: "leftSquare",
@@ -317,12 +317,12 @@ public let TYPE_NODES: [Node] = [
         documentation: """
           The `count` argument for the inline array type.
 
-          - Note: In semantically valid Swift code, this is always an integer or a wildcard type, e.g `_` in `[_ x Int]`.
+          - Note: In semantically valid Swift code, this is always an integer or a wildcard type, e.g `_` in `[_ of Int]`.
           """
       ),
       Child(
         name: "separator",
-        kind: .token(choices: [.keyword(.x)])
+        kind: .token(choices: [.keyword(.of)])
       ),
       Child(
         name: "element",
@@ -676,6 +676,52 @@ public let TYPE_NODES: [Node] = [
     ]
   ),
 
+  Node(
+    kind: .nonisolatedSpecifierArgument,
+    base: .syntax,
+    nameForDiagnostics: nil,
+    documentation: """
+      A single argument that can be added to a nonisolated specifier: 'nonsending'.
+
+      ### Example
+      `data` in `func foo(data: nonisolated(nonsending) () async -> Void) -> X`
+      """,
+    traits: [
+      "Parenthesized"
+    ],
+    children: [
+      Child(
+        name: "leftParen",
+        kind: .token(choices: [.token(.leftParen)])
+      ),
+      Child(
+        name: "nonsendingKeyword",
+        kind: .token(choices: [.keyword(.nonsending)])
+      ),
+      Child(
+        name: "rightParen",
+        kind: .token(choices: [.token(.rightParen)])
+      ),
+    ]
+  ),
+
+  Node(
+    kind: .nonisolatedTypeSpecifier,
+    base: .syntax,
+    nameForDiagnostics: "'nonisolated' specifier",
+    children: [
+      Child(
+        name: "nonisolatedKeyword",
+        kind: .token(choices: [.keyword(.nonisolated)])
+      ),
+      Child(
+        name: "argument",
+        kind: .node(kind: .nonisolatedSpecifierArgument),
+        isOptional: true
+      ),
+    ]
+  ),
+
   Node(
     kind: .simpleTypeSpecifier,
     base: .syntax,
@@ -689,7 +735,6 @@ public let TYPE_NODES: [Node] = [
           .keyword(.__shared),
           .keyword(.__owned),
           .keyword(.isolated),
-          .keyword(.nonisolated),
           .keyword(._const),
           .keyword(.borrowing),
           .keyword(.consuming),
@@ -704,6 +749,6 @@ public let TYPE_NODES: [Node] = [
     kind: .typeSpecifierList,
     base: .syntaxCollection,
     nameForDiagnostics: nil,
-    elementChoices: [.simpleTypeSpecifier, .lifetimeTypeSpecifier]
+    elementChoices: [.simpleTypeSpecifier, .lifetimeTypeSpecifier, .nonisolatedTypeSpecifier]
   ),
 ]

CodeGeneration/Tests/ValidateSyntaxNodes/ValidateSyntaxNodes.swift

@@ -372,10 +372,11 @@ class ValidateSyntaxNodes: XCTestCase {
           message:
             "child 'defaultKeyword' has a single keyword as its only token choice and is followed by a colon. It should thus be named 'defaultLabel'"
         ),
-        // 'separator' is more descriptive than 'xKeyword'
+        // 'separator' is more descriptive than 'ofKeyword'
         ValidationFailure(
           node: .inlineArrayType,
-          message: "child 'separator' has a single keyword as its only token choice and should thus be named 'xKeyword'"
+          message:
+            "child 'separator' has a single keyword as its only token choice and should thus be named 'ofKeyword'"
         ),
       ]
     )