[5.8] Cherry-pick most changes from main to release/5.8

CODEOWNERS → .github/CODEOWNERS

@@ -8,6 +8,12 @@
 # Order is important. The last matching pattern has the most precedence.
 
 # Owner of anything in SwiftSyntax not owned by anyone else.
-# N: Alex Hoppen
-# E: [email protected]
 * @ahoppen
+
+# Macros
+/Sources/_SwiftSyntaxMacros @DougGregor
+/Tests/SwiftSyntaxMacrosTest @DougGregor
+
+# SwiftOperators
+/Sources/SwiftOperators @DougGregor
+/Tests/SwiftOperatorsTest @DougGregor

CONTRIBUTING.md

@@ -64,7 +64,7 @@ If you are seeing issues regarding a mismatched parser library, try the followin
 Tip: Running SwiftSyntax’s self-parse tests takes the majority of testing time. If you want to iterate quickly, you can skip these tests using the following steps:
 1. Product -> Scheme -> Edit Scheme…
 2. Select the Arguments tab in the Run section
-3. Add a `SKIP_SELF_PARSE` environment variable with value `1`
+3. Add a `SKIP_LONG_TESTS` environment variable with value `1`
 
 ### `lit`-based tests
 

CodeGeneration/Package.swift

@@ -8,47 +8,13 @@ let package = Package(
       .macOS(.v10_15),
     ],
   products: [
-    .executable(name: "generate-swiftbasicformat", targets: ["generate-swiftbasicformat"]),
-    .executable(name: "generate-swiftideutils", targets: ["generate-swiftideutils"]),
-    .executable(name: "generate-swiftparser", targets: ["generate-swiftparser"]),
     .executable(name: "generate-swiftsyntax", targets: ["generate-swiftsyntax"]),
-    .executable(name: "generate-swiftsyntaxbuilder", targets: ["generate-swiftsyntaxbuilder"]),
   ],
   dependencies: [
-    .package(url: "https://github.com/apple/swift-syntax.git", revision: "74b1286795d6a4e4f5a106638dc99eb482df609d"),
+    .package(url: "https://github.com/apple/swift-syntax.git", revision: "05916332d79994097ed7780f2fe34d33b16ddd31"),
     .package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMinor(from: "1.1.4")),
   ],
   targets: [
-    .executableTarget(
-      name: "generate-swiftbasicformat",
-      dependencies: [
-        .product(name: "SwiftSyntax", package: "swift-syntax"),
-        .product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
-        .product(name: "ArgumentParser", package: "swift-argument-parser"),
-        "SyntaxSupport",
-        "Utils"
-      ]
-    ),
-    .executableTarget(
-      name: "generate-swiftideutils",
-      dependencies: [
-        .product(name: "SwiftSyntax", package: "swift-syntax"),
-        .product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
-        .product(name: "ArgumentParser", package: "swift-argument-parser"),
-        "SyntaxSupport",
-        "Utils"
-      ]
-    ),
-    .executableTarget(
-      name: "generate-swiftparser",
-      dependencies: [
-        .product(name: "SwiftSyntax", package: "swift-syntax"),
-        .product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
-        .product(name: "ArgumentParser", package: "swift-argument-parser"),
-        "SyntaxSupport",
-        "Utils"
-      ]
-    ),
     .executableTarget(
       name: "generate-swiftsyntax",
       dependencies: [
@@ -58,16 +24,6 @@ let package = Package(
         "SyntaxSupport",
         "Utils"
       ]
-    ),
-      .executableTarget(
-      name: "generate-swiftsyntaxbuilder",
-      dependencies: [
-        .product(name: "SwiftSyntax", package: "swift-syntax"),
-        .product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
-        .product(name: "ArgumentParser", package: "swift-argument-parser"),
-        "SyntaxSupport",
-        "Utils"
-      ]
     ),
     .target(
       name: "SyntaxSupport",

CodeGeneration/Sources/SyntaxSupport/AttributeKinds.swift.gyb

@@ -86,37 +86,6 @@ public let TYPE_ATTR_KINDS = [
 % end
 ]
 
-/// Schema for `DeclAttribute`s:
-///
-/// - Attribute name.
-/// - C++ class name without the 'Attr' suffix
-/// - Options for the attribute, including:
-///    * the declarations the attribute can appear on
-///    * whether duplicates are allowed
-/// - Unique attribute identifier used for serialization. This
-///   can never be changed.
-///
-/// SimpleDeclAttribute is the same, but the class becomes
-/// SimpleDeclAttr<DAK_##NAME> on the C++ side.
-///
-/// Please help ease code review/audits:
-/// - Please place the "OnXYZ" flags together on the next line.
-/// - Please place the non-OnXYZ flags together on the next to last line.
-/// - Please place the unique code number on the last line.
-/// - Please sort attributes by serialization number.
-/// - Please create a "NOTE" comment if a unique number is skipped.
-///
-/// If you're adding a new kind of "attribute" that is spelled without a leading
-/// '@' symbol, add an entry to the `DECL_MODIFIER_KINDS` array instead.
-///
-/// If you're adding a new underscored attribute here, please document it in
-/// docs/ReferenceGuides/UnderscoredAttributes.md.
-public let DECL_ATTR_KINDS: [Attribute] = [
-% for attr in DECL_ATTR_KINDS:
-  ${make_swift_attribute(attr)},
-% end
-]
-
 /// Schema for declaration modifiers:
 ///
 /// - Modifier name.

CodeGeneration/Sources/SyntaxSupport/KeywordSpec.swift

@@ -0,0 +1,231 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2022 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+public struct KeywordSpec {
+  public var name: String
+  public var isLexerClassified: Bool
+  public var requiresLeadingSpace: Bool
+  public var requiresTrailingSpace: Bool
+
+  public var escapedName: String {
+    if isLexerClassified || name == "Type" || name == "Protocol" {
+      return "`\(name)`"
+    } else {
+      return name
+    }
+  }
+
+  /// `isLexerClassified` determines whether the token kind is switched from being an identifier to a keyword in the lexer.
+  /// This is true for keywords that used to be considered non-contextual.
+  init(_ name: String, isLexerClassified: Bool = false, requiresLeadingSpace: Bool = false, requiresTrailingSpace: Bool = false) {
+    self.name = name
+    self.isLexerClassified = isLexerClassified
+    self.requiresLeadingSpace = requiresLeadingSpace
+    self.requiresTrailingSpace = requiresTrailingSpace
+  }
+}
+
+public let KEYWORDS: [KeywordSpec] = [
+  // Please keep these sorted alphabetically
+
+  KeywordSpec("__consuming"),
+  KeywordSpec("__owned"),
+  KeywordSpec("__setter_access"),
+  KeywordSpec("__shared"),
+  KeywordSpec("_alignment"),
+  KeywordSpec("_backDeploy"),
+  KeywordSpec("_borrow"),
+  KeywordSpec("_cdecl"),
+  KeywordSpec("_Class"),
+  KeywordSpec("_compilerInitialized"),
+  KeywordSpec("_const"),
+  KeywordSpec("_documentation"),
+  KeywordSpec("_dynamicReplacement"),
+  KeywordSpec("_effects"),
+  KeywordSpec("_expose"),
+  KeywordSpec("_forward"),
+  KeywordSpec("_implements"),
+  KeywordSpec("_linear"),
+  KeywordSpec("_local"),
+  KeywordSpec("_modify"),
+  KeywordSpec("_move"),
+  KeywordSpec("_NativeClass"),
+  KeywordSpec("_NativeRefCountedObject"),
+  KeywordSpec("_noMetadata"),
+  KeywordSpec("_nonSendable"),
+  KeywordSpec("_objcImplementation"),
+  KeywordSpec("_objcRuntimeName"),
+  KeywordSpec("_opaqueReturnTypeOf"),
+  KeywordSpec("_optimize"),
+  KeywordSpec("_originallyDefinedIn"),
+  KeywordSpec("_PackageDescription"),
+  KeywordSpec("_private"),
+  KeywordSpec("_projectedValueProperty"),
+  KeywordSpec("_read"),
+  KeywordSpec("_RefCountedObject"),
+  KeywordSpec("_semantics"),
+  KeywordSpec("_silgen_name"),
+  KeywordSpec("_specialize"),
+  KeywordSpec("_spi"),
+  KeywordSpec("_spi_available"),
+  KeywordSpec("_swift_native_objc_runtime_base"),
+  KeywordSpec("_Trivial"),
+  KeywordSpec("_TrivialAtMost"),
+  KeywordSpec("_typeEraser"),
+  KeywordSpec("_unavailableFromAsync"),
+  KeywordSpec("_UnknownLayout"),
+  KeywordSpec("actor"),
+  KeywordSpec("addressWithNativeOwner"),
+  KeywordSpec("addressWithOwner"),
+  KeywordSpec("any"),
+  KeywordSpec("Any", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("as", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("assignment"),
+  KeywordSpec("associatedtype", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("associativity"),
+  KeywordSpec("async", requiresTrailingSpace: true),
+  KeywordSpec("autoclosure"),
+  KeywordSpec("availability"),
+  KeywordSpec("available"),
+  KeywordSpec("await"),
+  KeywordSpec("before"),
+  KeywordSpec("break", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("case", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("catch", isLexerClassified: true, requiresLeadingSpace: true),
+  KeywordSpec("class", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("continue", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("convenience"),
+  KeywordSpec("convention"),
+  KeywordSpec("default", isLexerClassified: true),
+  KeywordSpec("defer", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("deinit", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("deprecated"),
+  KeywordSpec("derivative"),
+  KeywordSpec("didSet"),
+  KeywordSpec("differentiable"),
+  KeywordSpec("distributed"),
+  KeywordSpec("do", isLexerClassified: true),
+  KeywordSpec("dynamic"),
+  KeywordSpec("each"),
+  KeywordSpec("else", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("enum", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("escaping"),
+  KeywordSpec("exclusivity"),
+  KeywordSpec("exported"),
+  KeywordSpec("extension", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("fallthrough", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("false", isLexerClassified: true),
+  KeywordSpec("fileprivate", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("final"),
+  KeywordSpec("for", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("func", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("get"),
+  KeywordSpec("guard", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("higherThan"),
+  KeywordSpec("if", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("import", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("in", isLexerClassified: true, requiresLeadingSpace: true, requiresTrailingSpace: true),
+  KeywordSpec("indirect"),
+  KeywordSpec("infix"),
+  KeywordSpec("init", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("inline"),
+  KeywordSpec("inout", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("internal", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("introduced"),
+  KeywordSpec("is", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("isolated"),
+  KeywordSpec("kind"),
+  KeywordSpec("lazy"),
+  KeywordSpec("let", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("lowerThan"),
+  KeywordSpec("macro"),
+  KeywordSpec("message"),
+  KeywordSpec("metadata"),
+  KeywordSpec("module"),
+  KeywordSpec("mutableAddressWithNativeOwner"),
+  KeywordSpec("mutableAddressWithOwner"),
+  KeywordSpec("mutating"),
+  KeywordSpec("nil", isLexerClassified: true),
+  KeywordSpec("noasync"),
+  KeywordSpec("noDerivative"),
+  KeywordSpec("noescape"),
+  KeywordSpec("nonisolated"),
+  KeywordSpec("nonmutating"),
+  KeywordSpec("objc"),
+  KeywordSpec("obsoleted"),
+  KeywordSpec("of"),
+  KeywordSpec("open"),
+  KeywordSpec("operator", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("optional"),
+  KeywordSpec("override"),
+  KeywordSpec("package"),
+  KeywordSpec("postfix"),
+  KeywordSpec("precedencegroup", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("prefix"),
+  KeywordSpec("private", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("Protocol"),
+  KeywordSpec("protocol", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("public", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("reasync"),
+  KeywordSpec("renamed"),
+  KeywordSpec("repeat", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("required"),
+  KeywordSpec("rethrows", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("return", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("reverse"),
+  KeywordSpec("safe"),
+  KeywordSpec("self", isLexerClassified: true),
+  KeywordSpec("Self", isLexerClassified: true),
+  KeywordSpec("Sendable"),
+  KeywordSpec("set"),
+  KeywordSpec("some"),
+  KeywordSpec("sourceFile"),
+  KeywordSpec("spi"),
+  KeywordSpec("spiModule"),
+  KeywordSpec("static", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("struct", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("subscript", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("super", isLexerClassified: true),
+  KeywordSpec("swift"),
+  KeywordSpec("switch", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("target"),
+  KeywordSpec("throw", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("throws", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("transpose"),
+  KeywordSpec("true", isLexerClassified: true),
+  KeywordSpec("try", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("Type"),
+  KeywordSpec("typealias", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("unavailable"),
+  KeywordSpec("unchecked"),
+  KeywordSpec("unowned"),
+  KeywordSpec("unsafe"),
+  KeywordSpec("unsafeAddress"),
+  KeywordSpec("unsafeMutableAddress"),
+  KeywordSpec("var", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("visibility"),
+  KeywordSpec("weak"),
+  KeywordSpec("where", isLexerClassified: true, requiresLeadingSpace: true, requiresTrailingSpace: true),
+  KeywordSpec("while", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("willSet"),
+  KeywordSpec("witness_method"),
+  KeywordSpec("wrt"),
+  KeywordSpec("yield"),
+]
+
+public func keywordsByLength() -> [(Int, [KeywordSpec])] {
+  var result: [Int: [KeywordSpec]] = [:]
+  for keyword in KEYWORDS {
+    result[keyword.name.count, default: []].append(keyword)
+  }
+  return result.sorted(by: { $0.key < $1.key })
+}