Merge pull request #2613 from Matejkob/6.0-no-public-extensions-in-generated-code

[6.0] Move `public` from extension decl to each decl in the extension in generated files

Author: ahoppen

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

@@ -34,14 +34,14 @@ let renamedSyntaxNodesFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
     }
   }
 
-  try! ExtensionDeclSyntax("public extension SyntaxKind") {
+  try! ExtensionDeclSyntax("extension SyntaxKind") {
     let syntaxKinds = SyntaxNodeKind.allCases.sorted(by: { $0.deprecatedRawValue ?? "" < $1.deprecatedRawValue ?? "" })
     for syntaxKind in syntaxKinds {
       if let deprecatedName = syntaxKind.deprecatedRawValue {
         DeclSyntax(
           """
           \(deprecationAttribute(for: syntaxKind))
-          static var \(raw: deprecatedName): Self {
+          public static var \(raw: deprecatedName): Self {
             return .\(syntaxKind.varOrCaseName)
           }
           """

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

@@ -145,14 +145,14 @@ let syntaxBaseNodesFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
       """#
     )
 
-    try! ExtensionDeclSyntax("public extension Syntax") {
+    try! ExtensionDeclSyntax("extension Syntax") {
       DeclSyntax(
         """
         /// Check whether the non-type erased version of this syntax node conforms to
         /// \(node.kind.protocolType).
         ///
         ///  - Note:  This will incur an existential conversion.
-        func isProtocol(_: \(node.kind.protocolType).Protocol) -> Bool {
+        public func isProtocol(_: \(node.kind.protocolType).Protocol) -> Bool {
           return self.asProtocol(\(node.kind.protocolType).self) != nil
         }
         """
@@ -164,7 +164,7 @@ let syntaxBaseNodesFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
         /// \(node.kind.protocolType). Otherwise return nil.
         ///
         ///  - Note:  This will incur an existential conversion.
-        func asProtocol(_: \(node.kind.protocolType).Protocol) -> \(node.kind.protocolType)? {
+        public func asProtocol(_: \(node.kind.protocolType).Protocol) -> \(node.kind.protocolType)? {
           return self.asProtocol(SyntaxProtocol.self) as? \(node.kind.protocolType)
         }
         """
@@ -337,15 +337,15 @@ private func leafProtocolDecl(type: TypeSyntax, inheritedType: TypeSyntax) -> De
 private func leafProtocolExtension(type: TypeSyntax, inheritedType: TypeSyntax) -> DeclSyntax {
   DeclSyntax(
     #"""
-    public extension \#(type) {
+    extension \#(type) {
       /// Checks if the current leaf syntax node can be cast to a different specified type.
       ///
       /// - Returns: `false` since the leaf node cannot be cast to a different specified type.
       ///
       /// - Note: This method overloads the general `is` method and is marked as deprecated to produce a warning,
       ///         informing the user that the cast will always fail.
       @available(*, deprecated, message: "This cast will always fail")
-      func `is`<S: \#(inheritedType)>(_ syntaxType: S.Type) -> Bool {
+      public func `is`<S: \#(inheritedType)>(_ syntaxType: S.Type) -> Bool {
         return false
       }
 
@@ -356,7 +356,7 @@ private func leafProtocolExtension(type: TypeSyntax, inheritedType: TypeSyntax)
       /// - Note: This method overloads the general `as` method and is marked as deprecated to produce a warning,
       ///         informing the user that the cast will always fail.
       @available(*, deprecated, message: "This cast will always fail")
-      func `as`<S: \#(inheritedType)>(_ syntaxType: S.Type) -> S? {
+      public func `as`<S: \#(inheritedType)>(_ syntaxType: S.Type) -> S? {
         return nil
       }
 
@@ -368,7 +368,7 @@ private func leafProtocolExtension(type: TypeSyntax, inheritedType: TypeSyntax)
       ///         informing the user that the cast will always fail.
       /// - Warning: Invoking this method will lead to a fatal error.
       @available(*, deprecated, message: "This cast will always fail")
-      func cast<S: \#(inheritedType)>(_ syntaxType: S.Type) -> S {
+      public func cast<S: \#(inheritedType)>(_ syntaxType: S.Type) -> S {
         fatalError("\(Self.self) cannot be cast to \(S.self)")
       }
     }

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

@@ -35,13 +35,13 @@ let syntaxEnumFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
 
   try! ExtensionDeclSyntax(
     """
-    public extension Syntax
+    extension Syntax
     """
   ) {
     try FunctionDeclSyntax(
       """
       /// Get an enum that can be used to exhaustively switch over all syntax nodes.
-      func `as`(_: SyntaxEnum.Type) -> SyntaxEnum
+      public func `as`(_: SyntaxEnum.Type) -> SyntaxEnum
       """
     ) {
       try SwitchExprSyntax("switch raw.kind") {
@@ -81,13 +81,13 @@ let syntaxEnumFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
 
     try! ExtensionDeclSyntax(
       """
-      public extension \(baseKind.syntaxType)
+      extension \(baseKind.syntaxType)
       """
     ) {
       try FunctionDeclSyntax(
         """
         /// Get an enum that can be used to exhaustively switch over all \(raw: baseName) syntax nodes.
-        func `as`(_: \(enumType).Type) -> \(enumType)
+        public func `as`(_: \(enumType).Type) -> \(enumType)
         """
       ) {
         try SwitchExprSyntax("switch raw.kind") {

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

@@ -39,13 +39,13 @@ let syntaxTraitsFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
       }
     }
 
-    try! ExtensionDeclSyntax("public extension \(trait.protocolName)") {
+    try! ExtensionDeclSyntax("extension \(trait.protocolName)") {
       DeclSyntax(
         """
         /// Without this function, the `with` function defined on `SyntaxProtocol`
         /// does not work on existentials of this protocol type.
         @_disfavoredOverload
-        func with<T>(_ keyPath: WritableKeyPath<\(trait.protocolName), T>, _ newChild: T) -> \(trait.protocolName) {
+        public func with<T>(_ keyPath: WritableKeyPath<\(trait.protocolName), T>, _ newChild: T) -> \(trait.protocolName) {
           var copy: \(trait.protocolName) = self
           copy[keyPath: keyPath] = newChild
           return copy
@@ -54,13 +54,13 @@ let syntaxTraitsFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
       )
     }
 
-    try! ExtensionDeclSyntax("public extension SyntaxProtocol") {
+    try! ExtensionDeclSyntax("extension SyntaxProtocol") {
       DeclSyntax(
         """
         /// Check whether the non-type erased version of this syntax node conforms to
         /// `\(trait.protocolName)`.
         /// Note that this will incur an existential conversion.
-        func isProtocol(_: \(trait.protocolName).Protocol) -> Bool {
+        public func isProtocol(_: \(trait.protocolName).Protocol) -> Bool {
           return self.asProtocol(\(trait.protocolName).self) != nil
         }
         """
@@ -71,7 +71,7 @@ let syntaxTraitsFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
         /// Return the non-type erased version of this syntax node if it conforms to
         /// `\(trait.protocolName)`. Otherwise return `nil`.
         /// Note that this will incur an existential conversion.
-        func asProtocol(_: \(trait.protocolName).Protocol) -> \(trait.protocolName)? {
+        public func asProtocol(_: \(trait.protocolName).Protocol) -> \(trait.protocolName)? {
           return Syntax(self).asProtocol(SyntaxProtocol.self) as? \(trait.protocolName)
         }
         """

CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntaxbuilder/ResultBuildersFile.swift

@@ -60,8 +60,8 @@ let resultBuildersFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
 
     DeclSyntax(
       """
-      public extension \(type.syntaxBaseName) {
-        init(@\(type.resultBuilderType) itemsBuilder: () throws -> \(type.syntaxBaseName)) rethrows {
+      extension \(type.syntaxBaseName) {
+        public init(@\(type.resultBuilderType) itemsBuilder: () throws -> \(type.syntaxBaseName)) rethrows {
           self = try itemsBuilder()
         }
       }