Merge pull request #3129 from swiftlang/jepa-6.2

[6.2] Parse @unsafe nonisolated conformance

Author: AnthonyLatsis

CodeGeneration/Sources/SyntaxSupport/Child.swift

@@ -47,7 +47,8 @@ public enum ChildKind {
  kind: SyntaxNodeKind,
  collectionElementName: String? = nil,
  defaultsToEmpty: Bool = false,
- deprecatedCollectionElementName: String? = nil
+ deprecatedCollectionElementName: String? = nil,
+ generateDeprecatedAddFunction: Bool = true
  )
  /// The child is a token that matches one of the given `choices`.
  /// If `requiresLeadingSpace` or `requiresTrailingSpace` is not `nil`, it
@@ -132,7 +133,7 @@ public class Child: NodeChoiceConvertible {
  return kind
  case .nodeChoices:
  return .syntax
- case .collection(kind: let kind, _, _, _):
+ case .collection(kind: let kind, _, _, _, _):
  return kind
  case .token:
  return .token
@@ -268,7 +269,7 @@ public class Child: NodeChoiceConvertible {
  /// Whether this child has syntax kind `UnexpectedNodes`.
  public var isUnexpectedNodes: Bool {
  switch kind {
- case .collection(kind: .unexpectedNodes, _, _, _):
+ case .collection(kind: .unexpectedNodes, _, _, _, _):
  return true
  default:
  return false
@@ -283,7 +284,7 @@ public class Child: NodeChoiceConvertible {
  return choices.isEmpty
  case .node(let kind):
  return kind.isBase
- case .collection(kind: let kind, _, _, _):
+ case .collection(kind: let kind, _, _, _, _):
  return kind.isBase
  case .token:
  return false

CodeGeneration/Sources/SyntaxSupport/GrammarGenerator.swift

@@ -41,7 +41,7 @@ struct GrammarGenerator {
  case .nodeChoices(let choices, _):
  let choicesDescriptions = choices.map { grammar(for: $0) }
  return "(\(choicesDescriptions.joined(separator: " | ")))\(optionality)"
- case .collection(kind: let kind, _, _, _):
+ case .collection(kind: let kind, _, _, _, _):
  return "\(kind.doccLink)\(optionality)"
  case .token(let choices, _, _):
  if choices.count == 1 {

CodeGeneration/Sources/SyntaxSupport/Node.swift

@@ -391,7 +391,7 @@ fileprivate extension Child {
  return [kind]
  case .nodeChoices(let choices, _):
  return choices.flatMap(\.kinds)
- case .collection(kind: let kind, _, _, _):
+ case .collection(kind: let kind, _, _, _, _):
  return [kind]
  case .token:
  return [.token]

CodeGeneration/Sources/SyntaxSupport/TypeNodes.swift

@@ -57,6 +57,17 @@ public let TYPE_NODES: [Node] = [
  kind: .collection(kind: .attributeList, collectionElementName: "Attribute", defaultsToEmpty: true),
  documentation: "A list of attributes that can be attached to the type, such as `@escaping`."
  ),
+ Child(
+ name: "lateSpecifiers",
+ kind: .collection(
+ kind: .typeSpecifierList,
+ collectionElementName: "Specifier",
+ defaultsToEmpty: true,
+ generateDeprecatedAddFunction: false
+ ),
+ documentation:
+ "A list of specifiers that can be attached to the type after the attributes, such as 'nonisolated'."
+ ),
  Child(
  name: "baseType",
  kind: .node(kind: .type),

CodeGeneration/Sources/Utils/SyntaxBuildableChild.swift

@@ -33,7 +33,7 @@ extension Child {
  buildableKind = .node(kind: kind)
  case .nodeChoices:
  buildableKind = .node(kind: .syntax)
- case .collection(kind: let kind, _, _, _):
+ case .collection(kind: let kind, _, _, _, _):
  buildableKind = .node(kind: kind)
  case .token:
  buildableKind = .token(self.tokenKind!)
@@ -65,7 +65,7 @@ extension Child {
  return ExprSyntax("nil")
  }
  }
- if case .collection(_, _, defaultsToEmpty: true, _) = kind {
+ if case .collection(_, _, defaultsToEmpty: true, _, _) = kind {
  return ExprSyntax("[]")
  }
  guard let token = token, isToken else {

CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/RenamedChildrenCompatibilityFile.swift

@@ -85,7 +85,8 @@ func makeCompatibilityAddMethod(for child: Child) -> DeclSyntax? {
  kind: _,
  collectionElementName: let collectionElementName?,
  defaultsToEmpty: _,
- deprecatedCollectionElementName: let deprecatedCollectionElementName?
+ deprecatedCollectionElementName: let deprecatedCollectionElementName?,
+ generateDeprecatedAddFunction: _
  ) = child.kind
  {
  let childEltType = childNode.collectionElementType.syntaxBaseName

CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/SyntaxNodesFile.swift

@@ -176,7 +176,8 @@ func syntaxNode(nodesStartingWith: [Character]) -> SourceFileSyntax {
  // If needed, this could be added in the future, but for now withUnexpected should be sufficient.
  if let childNode = SYNTAX_NODE_MAP[child.syntaxNodeKind]?.collectionNode,
  !child.isUnexpectedNodes,
- case .collection(_, collectionElementName: let childElt?, _, _) = child.kind
+ case .collection(_, collectionElementName: let childElt?, _, _, generateDeprecatedAddFunction: true) =
+ child.kind
  {
  let childEltType = childNode.collectionElementType.syntaxBaseName
 

CodeGeneration/Tests/ValidateSyntaxNodes/ValidateSyntaxNodes.swift

@@ -55,13 +55,13 @@ fileprivate extension ChildKind {
  return kind == otherKind
  case (.nodeChoices(let choices, _), .nodeChoices(let otherChoices, _)):
  return choices.count == otherChoices.count && zip(choices, otherChoices).allSatisfy { $0.hasSameType(as: $1) }
- case (.collection(kind: let kind, _, _, _), .collection(kind: let otherKind, _, _, _)):
+ case (.collection(kind: let kind, _, _, _, _), .collection(kind: let otherKind, _, _, _, _)):
  return kind == otherKind
  case (.token(let choices, _, _), .token(let otherChoices, _, _)):
  return choices == otherChoices
- case (.node(let kind), .collection(kind: let otherKind, _, _, _)):
+ case (.node(let kind), .collection(kind: let otherKind, _, _, _, _)):
  return kind == otherKind
- case (.collection(kind: let kind, _, _, _), .node(let otherKind)):
+ case (.collection(kind: let kind, _, _, _, _), .node(let otherKind)):
  return kind == otherKind
  default:
  return false

Sources/SwiftParser/Types.swift

@@ -100,6 +100,7 @@ extension Parser {
  RawAttributedTypeSyntax(
  specifiers: specifiersAndAttributes.specifiers,
  attributes: specifiersAndAttributes.attributes,
+ lateSpecifiers: specifiersAndAttributes.lateSpecifiers,
  baseType: base,
  arena: self.arena
  )
@@ -1215,7 +1216,8 @@ extension Parser {
  misplacedSpecifiers: [RawTokenSyntax] = []
  ) -> (
  specifiers: RawTypeSpecifierListSyntax,
- attributes: RawAttributeListSyntax
+ attributes: RawAttributeListSyntax,
+ lateSpecifiers: RawTypeSpecifierListSyntax
  )? {
  var specifiers: [RawTypeSpecifierListSyntax.Element] = []
  SPECIFIER_PARSING: while canHaveParameterSpecifier {
@@ -1254,7 +1256,15 @@ extension Parser {
  attributes = nil
  }
 
- guard !specifiers.isEmpty || attributes != nil else {
+ // Only handle `nonisolated` as a late specifier.
+ var lateSpecifiers: [RawTypeSpecifierListSyntax.Element] = []
+ if self.at(.keyword(.nonisolated)) && !(self.peek(isAt: .leftParen) && self.peek().isAtStartOfLine)
+ && canHaveParameterSpecifier
+ {
+ lateSpecifiers.append(parseNonisolatedTypeSpecifier())
+ }
+
+ guard !specifiers.isEmpty || attributes != nil || !lateSpecifiers.isEmpty else {
  // No specifiers or attributes on this type
  return nil
  }
@@ -1265,9 +1275,17 @@ extension Parser {
  specifierList = RawTypeSpecifierListSyntax(elements: specifiers, arena: arena)
  }
 
+ let lateSpecifierList: RawTypeSpecifierListSyntax
+ if lateSpecifiers.isEmpty {
+ lateSpecifierList = self.emptyCollection(RawTypeSpecifierListSyntax.self)
+ } else {
+ lateSpecifierList = RawTypeSpecifierListSyntax(elements: lateSpecifiers, arena: arena)
+ }
+
  return (
  specifierList,
- attributes ?? self.emptyCollection(RawAttributeListSyntax.self)
+ attributes ?? self.emptyCollection(RawAttributeListSyntax.self),
+ lateSpecifierList
  )
  }