Merge pull request #1667 from ahoppen/ahoppen/parser-not-public

Reduce SwiftParser’s public surface area

Author: ahoppen

CodeGeneration/Sources/generate-swiftsyntax/templates/swiftparser/IsLexerClassifiedFile.swift

@@ -53,6 +53,7 @@ let isLexerClassifiedFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
       /// Keywords are reserved unconditionally for use by Swift and may not
       /// appear as identifiers in any position without being escaped. For example,
       /// `class`, `func`, or `import`.
+      @_spi(Diagnostics) @_spi(Testing)
       public var isLexerClassifiedKeyword: Bool
       """
     ) {

Sources/SwiftParser/Declarations.swift

@@ -150,12 +150,11 @@ extension TokenConsumer {
 }
 
 extension Parser {
-  @_spi(RawSyntax)
-  public struct DeclAttributes {
-    public var attributes: RawAttributeListSyntax?
-    public var modifiers: RawModifierListSyntax?
+  struct DeclAttributes {
+    var attributes: RawAttributeListSyntax?
+    var modifiers: RawModifierListSyntax?
 
-    public init(attributes: RawAttributeListSyntax?, modifiers: RawModifierListSyntax?) {
+    init(attributes: RawAttributeListSyntax?, modifiers: RawModifierListSyntax?) {
       self.attributes = attributes
       self.modifiers = modifiers
     }
@@ -188,8 +187,7 @@ extension Parser {
   ///
   /// If `inMemberDeclList` is `true`, we know that the next item must be a
   /// declaration and thus start with a keyword. This allows futher recovery.
-  @_spi(RawSyntax)
-  public mutating func parseDeclaration(inMemberDeclList: Bool = false) -> RawDeclSyntax {
+  mutating func parseDeclaration(inMemberDeclList: Bool = false) -> RawDeclSyntax {
     switch self.at(anyIn: PoundDeclarationStart.self) {
     case (.poundIfKeyword, _)?:
       if self.withLookahead({ $0.consumeIfConfigOfAttributes() }) {
@@ -320,8 +318,7 @@ extension Parser {
   ///     import-declaration → attributes? 'import' import-kind? import-path
   ///     import-kind → 'typealias' | 'struct' | 'class' | 'enum' | 'protocol' | 'let' | 'var' | 'func'
   ///     import-path → identifier | identifier '.' import-path
-  @_spi(RawSyntax)
-  public mutating func parseImportDeclaration(
+  mutating func parseImportDeclaration(
     _ attrs: DeclAttributes,
     _ handle: RecoveryConsumptionHandle
   ) -> RawImportDeclSyntax {
@@ -339,8 +336,7 @@ extension Parser {
     )
   }
 
-  @_spi(RawSyntax)
-  public mutating func parseImportKind() -> RawTokenSyntax? {
+  mutating func parseImportKind() -> RawTokenSyntax? {
     enum ImportKind: TokenSpecSet {
       case `typealias`
       case `struct`
@@ -385,8 +381,7 @@ extension Parser {
     return self.consume(ifAnyIn: ImportKind.self)
   }
 
-  @_spi(RawSyntax)
-  public mutating func parseImportPath() -> RawImportPathSyntax {
+  mutating func parseImportPath() -> RawImportPathSyntax {
     var elements = [RawImportPathComponentSyntax]()
     var keepGoing: RawTokenSyntax? = nil
     var loopProgress = LoopProgressCondition()
@@ -415,8 +410,7 @@ extension Parser {
   ///     extension-body → '{' extension-members? '}'
   ///     extension-members → extension-member extension-members?
   ///     extension-member → declaration | compiler-control-statement
-  @_spi(RawSyntax)
-  public mutating func parseExtensionDeclaration(
+  mutating func parseExtensionDeclaration(
     _ attrs: DeclAttributes,
     _ handle: RecoveryConsumptionHandle
   ) -> RawExtensionDeclSyntax {
@@ -468,8 +462,7 @@ extension Parser {
     )
   }
 
-  @_spi(RawSyntax)
-  public mutating func parseGenericParameters() -> RawGenericParameterClauseSyntax {
+  mutating func parseGenericParameters() -> RawGenericParameterClauseSyntax {
     if let remainingTokens = remainingTokensIfMaximumNestingLevelReached() {
       return RawGenericParameterClauseSyntax(
         remainingTokens,
@@ -631,8 +624,7 @@ extension Parser {
     }
   }
 
-  @_spi(RawSyntax)
-  public mutating func parseGenericWhereClause() -> RawGenericWhereClauseSyntax {
+  mutating func parseGenericWhereClause() -> RawGenericWhereClauseSyntax {
     let (unexpectedBeforeWhereKeyword, whereKeyword) = self.expect(.keyword(.where))
 
     var elements = [RawGenericRequirementSyntax]()
@@ -808,8 +800,7 @@ extension Parser {
 }
 
 extension Parser {
-  @_spi(RawSyntax)
-  public mutating func parseMemberDeclListItem() -> RawMemberDeclListItemSyntax? {
+  mutating func parseMemberDeclListItem() -> RawMemberDeclListItemSyntax? {
     if let remainingTokens = remainingTokensIfMaximumNestingLevelReached() {
       let item = RawMemberDeclListItemSyntax(
         remainingTokens,
@@ -848,8 +839,7 @@ extension Parser {
   /// `introducer` is the `struct`, `class`, ... keyword that is the cause that the member decl block is being parsed.
   /// If the left brace is missing, its indentation will be used to judge whether a following `}` was
   /// indented to close this code block or a surrounding context. See `expectRightBrace`.
-  @_spi(RawSyntax)
-  public mutating func parseMemberDeclList(introducer: RawTokenSyntax? = nil) -> RawMemberDeclBlockSyntax {
+  mutating func parseMemberDeclList(introducer: RawTokenSyntax? = nil) -> RawMemberDeclBlockSyntax {
     var elements = [RawMemberDeclListItemSyntax]()
     let (unexpectedBeforeLBrace, lbrace) = self.expect(.leftBrace)
     do {
@@ -907,8 +897,7 @@ extension Parser {
   ///     raw-value-style-enum-case → enum-case-name raw-value-assignment?
   ///     raw-value-assignment → = raw-value-literal
   ///     raw-value-literal → numeric-literal | static-string-literal | boolean-literal
-  @_spi(RawSyntax)
-  public mutating func parseEnumCaseDeclaration(
+  mutating func parseEnumCaseDeclaration(
     _ attrs: DeclAttributes,
     _ handle: RecoveryConsumptionHandle
   ) -> RawEnumCaseDeclSyntax {
@@ -974,8 +963,7 @@ extension Parser {
   /// =======
   ///
   ///     protocol-associated-type-declaration → attributes? access-level-modifier? 'associatedtype' typealias-name type-inheritance-clause? typealias-assignment? generic-where-clause?
-  @_spi(RawSyntax)
-  public mutating func parseAssociatedTypeDeclaration(
+  mutating func parseAssociatedTypeDeclaration(
     _ attrs: DeclAttributes,
     _ handle: RecoveryConsumptionHandle
   ) -> RawAssociatedtypeDeclSyntax {
@@ -1065,8 +1053,7 @@ extension Parser {
   ///     initializer-head → attributes? declaration-modifiers? 'init' '?'
   ///     initializer-head → attributes? declaration-modifiers? 'init' '!'
   ///     initializer-body → code-block
-  @_spi(RawSyntax)
-  public mutating func parseInitializerDeclaration(
+  mutating func parseInitializerDeclaration(
     _ attrs: DeclAttributes,
     _ handle: RecoveryConsumptionHandle
   ) -> RawInitializerDeclSyntax {
@@ -1121,8 +1108,7 @@ extension Parser {
   /// =======
   ///
   /// deinitializer-declaration → attributes? 'deinit' code-block
-  @_spi(RawSyntax)
-  public mutating func parseDeinitializerDeclaration(
+  mutating func parseDeinitializerDeclaration(
     _ attrs: DeclAttributes,
     _ handle: RecoveryConsumptionHandle
   ) -> RawDeinitializerDeclSyntax {
@@ -1170,8 +1156,7 @@ extension Parser {
 }
 
 extension Parser {
-  @_spi(RawSyntax)
-  public mutating func parseFuncDeclaration(
+  mutating func parseFuncDeclaration(
     _ attrs: DeclAttributes,
     _ handle: RecoveryConsumptionHandle
   ) -> RawFunctionDeclSyntax {
@@ -1221,8 +1206,7 @@ extension Parser {
     )
   }
 
-  @_spi(RawSyntax)
-  public mutating func parseFunctionSignature(allowOutput: Bool = true) -> RawFunctionSignatureSyntax {
+  mutating func parseFunctionSignature(allowOutput: Bool = true) -> RawFunctionSignatureSyntax {
     let input = self.parseParameterClause(RawParameterClauseSyntax.self) { parser in
       parser.parseFunctionParameter()
     }
@@ -1268,8 +1252,7 @@ extension Parser {
   ///     subscript-declaration → subscript-head subscript-result generic-where-clause? getter-setter-keyword-block
   ///     subscript-head → attributes? declaration-modifiers? 'subscript' generic-parameter-clause? parameter-clause
   ///     subscript-result → '->' attributes? type
-  @_spi(RawSyntax)
-  public mutating func parseSubscriptDeclaration(
+  mutating func parseSubscriptDeclaration(
     _ attrs: DeclAttributes,
     _ handle: RecoveryConsumptionHandle
   ) -> RawSubscriptDeclSyntax {
@@ -1349,8 +1332,7 @@ extension Parser {
   ///   }
   /// }
   /// ```
-  @_spi(RawSyntax)
-  public mutating func parseBindingDeclaration(
+  mutating func parseBindingDeclaration(
     _ attrs: DeclAttributes,
     _ handle: RecoveryConsumptionHandle,
     inMemberDeclList: Bool = false
@@ -1572,8 +1554,7 @@ extension Parser {
   ///     getter-setter-block → code-block
   ///     getter-setter-block → { getter-clause setter-clause opt }
   ///     getter-setter-block → { setter-clause getter-clause }
-  @_spi(RawSyntax)
-  public mutating func parseGetSet() -> RawSubscriptDeclSyntax.Accessor {
+  mutating func parseGetSet() -> RawSubscriptDeclSyntax.Accessor {
     // Parse getter and setter.
     let unexpectedBeforeLBrace: RawUnexpectedNodesSyntax?
     let lbrace: RawTokenSyntax
@@ -1647,8 +1628,7 @@ extension Parser {
   ///     typealias-declaration → attributes? access-level-modifier? 'typealias' typealias-name generic-parameter-clause? typealias-assignment
   ///     typealias-name → identifier
   ///     typealias-assignment → '=' type
-  @_spi(RawSyntax)
-  public mutating func parseTypealiasDeclaration(
+  mutating func parseTypealiasDeclaration(
     _ attrs: DeclAttributes,
     _ handle: RecoveryConsumptionHandle
   ) -> RawTypealiasDeclSyntax {
@@ -1714,8 +1694,7 @@ extension Parser {
   ///     postfix-operator-declaration → 'postfix' 'operator' operator
   ///     infix-operator-declaration → 'infix' 'operator' operator infix-operator-group?
   ///     infix-operator-group → ':' precedence-group-name
-  @_spi(RawSyntax)
-  public mutating func parseOperatorDeclaration(
+  mutating func parseOperatorDeclaration(
     _ attrs: DeclAttributes,
     _ handle: RecoveryConsumptionHandle
   ) -> RawOperatorDeclSyntax {
@@ -1832,8 +1811,7 @@ extension Parser {
   ///
   ///     precedence-group-names → precedence-group-name | precedence-group-name ',' precedence-group-names
   ///     precedence-group-name → identifier
-  @_spi(RawSyntax)
-  public mutating func parsePrecedenceGroupDeclaration(
+  mutating func parsePrecedenceGroupDeclaration(
     _ attrs: DeclAttributes,
     _ handle: RecoveryConsumptionHandle
   ) -> RawPrecedenceGroupDeclSyntax {
@@ -1860,8 +1838,7 @@ extension Parser {
     )
   }
 
-  @_spi(RawSyntax)
-  public mutating func parsePrecedenceGroupAttributeListSyntax() -> RawPrecedenceGroupAttributeListSyntax {
+  mutating func parsePrecedenceGroupAttributeListSyntax() -> RawPrecedenceGroupAttributeListSyntax {
     enum LabelText: TokenSpecSet {
       case associativity
       case assignment

Sources/SwiftParser/Directives.swift

@@ -87,8 +87,7 @@ extension Parser {
   ///                   previous element.
   ///   - syntax: A function that aggregates the parsed conditional elements
   ///             into a syntax collection.
-  @_spi(RawSyntax)
-  public mutating func parsePoundIfDirective<Element: RawSyntaxNodeProtocol>(
+  mutating func parsePoundIfDirective<Element: RawSyntaxNodeProtocol>(
     _ parseElement: (_ parser: inout Parser, _ isFirstElement: Bool) -> Element?,
     addSemicolonIfNeeded: (_ lastElement: Element, _ newItemAtStartOfLine: Bool, _ parser: inout Parser) -> Element? = { _, _, _ in nil },
     syntax: (inout Parser, [Element]) -> RawIfConfigClauseSyntax.Elements?
@@ -217,8 +216,7 @@ extension Parser {
   ///     line-control-statement → '#sourceLocation' '(' ')'
   ///     line-number → `A decimal integer greater than zero`
   ///     file-path → static-string-literal
-  @_spi(RawSyntax)
-  public mutating func parsePoundSourceLocationDirective() -> RawPoundSourceLocationSyntax {
+  mutating func parsePoundSourceLocationDirective() -> RawPoundSourceLocationSyntax {
     let line = self.consumeAnyToken()
     let (unexpectedBeforeLParen, lparen) = self.expect(.leftParen)
     let args: RawPoundSourceLocationArgsSyntax?