Merge pull request #2611 from Matejkob/6.0-no-public-attribute-on-extension-decl

[6.0] Remove `public` from the extension declaration and add it to each declaration in the extension

Author: ahoppen

CodeGeneration/Sources/SyntaxSupport/String+Extensions.swift

@@ -10,20 +10,20 @@
 //
 //===----------------------------------------------------------------------===//
 
-public extension StringProtocol {
-  var withFirstCharacterLowercased: String {
+extension StringProtocol {
+  public var withFirstCharacterLowercased: String {
     guard first?.isLetter ?? false else {
       return String(first!) + dropFirst().withFirstCharacterLowercased
     }
     return prefix(1).lowercased() + dropFirst()
   }
-  var withFirstCharacterUppercased: String {
+  public var withFirstCharacterUppercased: String {
     guard first?.isLetter ?? false else {
       return String(first!) + dropFirst().withFirstCharacterUppercased
     }
     return prefix(1).uppercased() + dropFirst()
   }
-  var backtickedIfNeeded: String {
+  public var backtickedIfNeeded: String {
     if Keyword.allCases.map(\.spec).contains(where: {
       $0.name == self && ($0.isLexerClassified || $0.name == "Type" || $0.name == "Protocol")
     }) {

CodeGeneration/Sources/SyntaxSupport/Utils.swift

@@ -58,9 +58,9 @@ extension SwiftSyntax.Trivia {
   }
 }
 
-public extension Collection {
+extension Collection {
   /// If the collection contains a single element, return it, otherwise `nil`.
-  var only: Element? {
+  public var only: Element? {
     if !isEmpty && index(after: startIndex) == endIndex {
       return self.first!
     } else {
@@ -69,8 +69,8 @@ public extension Collection {
   }
 }
 
-public extension TokenSyntax {
-  var backtickedIfNeeded: TokenSyntax {
+extension TokenSyntax {
+  public var backtickedIfNeeded: TokenSyntax {
     if Keyword.allCases.map(\.spec).contains(where: {
       $0.name == self.description && ($0.isLexerClassified || $0.name == "Type" || $0.name == "Protocol")
     }) {

CodeGeneration/Sources/Utils/SyntaxBuildableChild.swift

@@ -23,10 +23,10 @@ public enum SyntaxOrTokenNodeKind: Hashable {
 
 /// Extension to the ``Child`` type to provide functionality specific to
 /// SwiftSyntaxBuilder.
-public extension Child {
+extension Child {
   /// The type of this child, represented by a ``SyntaxBuildableType``, which can
   /// be used to create the corresponding `Buildable` and `ExpressibleAs` types.
-  var buildableType: SyntaxBuildableType {
+  public var buildableType: SyntaxBuildableType {
     let buildableKind: SyntaxOrTokenNodeKind
     switch kind {
     case .node(kind: let kind):
@@ -44,7 +44,7 @@ public extension Child {
     )
   }
 
-  var parameterBaseType: TypeSyntax {
+  public var parameterBaseType: TypeSyntax {
     switch kind {
     case .nodeChoices:
       return self.syntaxChoicesType
@@ -53,11 +53,11 @@ public extension Child {
     }
   }
 
-  var parameterType: TypeSyntax {
+  public var parameterType: TypeSyntax {
     return self.buildableType.optionalWrapped(type: parameterBaseType)
   }
 
-  var defaultValue: ExprSyntax? {
+  public var defaultValue: ExprSyntax? {
     if isOptional || isUnexpectedNodes {
       if buildableType.isBaseType && kind.isNodeChoicesEmpty {
         return ExprSyntax("\(buildableType.buildable).none")
@@ -85,7 +85,7 @@ public extension Child {
   /// If the child node has a default value, return an expression of the form
   /// ` = default_value` that can be used as the default value to for a
   /// function parameter. Otherwise, return `nil`.
-  var defaultInitialization: InitializerClauseSyntax? {
+  public var defaultInitialization: InitializerClauseSyntax? {
     if let defaultValue {
       return InitializerClauseSyntax(
         equal: .equalToken(leadingTrivia: .space, trailingTrivia: .space),
@@ -99,7 +99,7 @@ public extension Child {
   /// If this node is a token that can't contain arbitrary text, generate a Swift
   /// `precondition` statement that verifies the variable with name var_name and of type
   /// ``TokenSyntax`` contains one of the supported text options. Otherwise return `nil`.
-  func generateAssertStmtTextChoices(varName: String) -> FunctionCallExprSyntax? {
+  public func generateAssertStmtTextChoices(varName: String) -> FunctionCallExprSyntax? {
     guard case .token(choices: let choices, requiresLeadingSpace: _, requiresTrailingSpace: _) = kind else {
       return nil
     }

CodeGeneration/Sources/Utils/SyntaxBuildableNode.swift

@@ -14,41 +14,41 @@ import SyntaxSupport
 
 /// Extension to the ``Node`` type to provide functionality specific to
 /// SwiftSyntaxBuilder.
-public extension Node {
+extension Node {
   /// The node's syntax kind as ``SyntaxBuildableType``.
-  var type: SyntaxBuildableType {
+  public var type: SyntaxBuildableType {
     SyntaxBuildableType(kind: .node(kind: kind))
   }
 
   /// The node's syntax kind as ``SyntaxBuildableType``.
-  var baseType: SyntaxBuildableType {
+  public var baseType: SyntaxBuildableType {
     if base == .syntaxCollection {
       return SyntaxBuildableType(kind: .node(kind: .syntax))
     } else {
       return SyntaxBuildableType(kind: .node(kind: base))
     }
   }
 
-  static func from(type: SyntaxBuildableType) -> Node {
+  public static func from(type: SyntaxBuildableType) -> Node {
     guard case .node(kind: let kind) = type.kind, let node = SYNTAX_NODE_MAP[kind] else {
       fatalError("Base name \(type) does not have a syntax node")
     }
     return node
   }
 }
 
-public extension LayoutNode {
+extension LayoutNode {
   /// Assuming this node has a single child without a default value, that child.
-  var singleNonDefaultedChild: Child {
+  public var singleNonDefaultedChild: Child {
     let nonDefaultedParams = children.filter { $0.defaultInitialization == nil }
     precondition(nonDefaultedParams.count == 1)
     return nonDefaultedParams[0]
   }
 }
 
-public extension CollectionNode {
+extension CollectionNode {
   /// Assuming this node is a syntax collection, the type of its elements.
-  var collectionElementType: SyntaxBuildableType {
+  public var collectionElementType: SyntaxBuildableType {
     if elementChoices.count > 1 {
       return SyntaxBuildableType(kind: .node(kind: .syntax))
     } else {

Sources/SwiftBasicFormat/SyntaxProtocol+Formatted.swift

@@ -16,9 +16,9 @@ public import SwiftSyntax
 import SwiftSyntax
 #endif
 
-public extension SyntaxProtocol {
+extension SyntaxProtocol {
   /// Build a syntax node from this `Buildable` and format it with the given format.
-  func formatted(using format: BasicFormat = BasicFormat()) -> Syntax {
+  public func formatted(using format: BasicFormat = BasicFormat()) -> Syntax {
     format.reset()
     return format.rewrite(self)
   }

Sources/SwiftCompilerPluginMessageHandling/CompilerPluginMessageHandler.swift

@@ -186,13 +186,13 @@ struct UnimplementedError: Error, CustomStringConvertible {
 }
 
 /// Default implementation of 'PluginProvider' requirements.
-public extension PluginProvider {
-  var features: [PluginFeature] {
+extension PluginProvider {
+  public var features: [PluginFeature] {
     // No optional features by default.
     return []
   }
 
-  func loadPluginLibrary(libraryPath: String, moduleName: String) throws {
+  public func loadPluginLibrary(libraryPath: String, moduleName: String) throws {
     // This should be unreachable. The host should not call 'loadPluginLibrary'
     // unless the feature is not declared.
     throw UnimplementedError()

Sources/SwiftCompilerPluginMessageHandling/PluginMessageCompatibility.swift

@@ -11,9 +11,8 @@
 //===----------------------------------------------------------------------===//
 
 /// Old compiler might send '.declaration' as "freeStandingDeclaration".
-@_spi(PluginMessage)
-public extension PluginMessage.MacroRole {
-  init(from decoder: Decoder) throws {
+extension PluginMessage.MacroRole {
+  @_spi(PluginMessage) public init(from decoder: Decoder) throws {
     let stringValue = try decoder.singleValueContainer().decode(String.self)
     if let role = Self(rawValue: stringValue) {
       self = role

Sources/SwiftIDEUtils/SwiftIDEUtilsCompatibility.swift

@@ -13,35 +13,35 @@
 // This file provides compatiblity aliases to keep dependents of SwiftSyntax building.
 // All users of the declarations in this file should transition away from them ASAP.
 
-public extension SyntaxClassification {
+extension SyntaxClassification {
   /// A `#` keyword like `#warning`.
   @available(*, deprecated, renamed: "ifConfigDirective")
-  static var poundDirective: SyntaxClassification {
+  public static var poundDirective: SyntaxClassification {
     return .ifConfigDirective
   }
 
   @available(*, deprecated, renamed: "ifConfigDirective")
-  static var buildConfigId: SyntaxClassification {
+  public static var buildConfigId: SyntaxClassification {
     return .ifConfigDirective
   }
 
   @available(*, deprecated, message: "String interpolation anchors are now classified as .none")
-  static var stringInterpolationAnchor: SyntaxClassification {
+  public static var stringInterpolationAnchor: SyntaxClassification {
     return .none
   }
 
   @available(*, deprecated, renamed: "type")
-  static var typeIdentifier: SyntaxClassification {
+  public static var typeIdentifier: SyntaxClassification {
     return .type
   }
 
   @available(*, deprecated, renamed: "operator")
-  static var operatorIdentifier: SyntaxClassification {
+  public static var operatorIdentifier: SyntaxClassification {
     return .operator
   }
 
   @available(*, deprecated, renamed: "floatLiteral")
-  static var floatingLiteral: SyntaxClassification {
+  public static var floatingLiteral: SyntaxClassification {
     return .floatLiteral
   }
 }

Sources/SwiftIDEUtils/Syntax+Classifications.swift

@@ -16,15 +16,15 @@ public import SwiftSyntax
 import SwiftSyntax
 #endif
 
-public extension SyntaxProtocol {
+extension SyntaxProtocol {
 
   /// Sequence of ``SyntaxClassifiedRange``s for this syntax node.
   ///
   /// The provided classified ranges are consecutive and cover the full source
   /// text of the node. The ranges may also span multiple tokens, if multiple
   /// consecutive tokens would have the same classification then a single classified
   /// range is provided for all of them.
-  var classifications: SyntaxClassifications {
+  public var classifications: SyntaxClassifications {
     let fullRange = ByteSourceRange(offset: 0, length: totalLength.utf8Length)
     return SyntaxClassifications(_syntaxNode, in: fullRange)
   }
@@ -43,7 +43,7 @@ public extension SyntaxProtocol {
   /// - Parameters:
   ///   - in: The relative byte range to pull ``SyntaxClassifiedRange``s from.
   /// - Returns: Sequence of ``SyntaxClassifiedRange``s.
-  func classifications(in range: ByteSourceRange) -> SyntaxClassifications {
+  public func classifications(in range: ByteSourceRange) -> SyntaxClassifications {
     return SyntaxClassifications(_syntaxNode, in: range)
   }
 
@@ -52,7 +52,7 @@ public extension SyntaxProtocol {
   ///   - at: The relative to the node byte offset.
   /// - Returns: The ``SyntaxClassifiedRange`` for the offset or nil if the source text
   ///   at the given offset is unclassified.
-  func classification(at offset: Int) -> SyntaxClassifiedRange? {
+  public func classification(at offset: Int) -> SyntaxClassifiedRange? {
     let classifications = SyntaxClassifications(_syntaxNode, in: ByteSourceRange(offset: offset, length: 1))
     var iterator = classifications.makeIterator()
     return iterator.next()
@@ -63,7 +63,7 @@ public extension SyntaxProtocol {
   ///   - at: The absolute position.
   /// - Returns: The ``SyntaxClassifiedRange`` for the position or nil if the source text
   ///   at the given position is unclassified.
-  func classification(at position: AbsolutePosition) -> SyntaxClassifiedRange? {
+  public func classification(at position: AbsolutePosition) -> SyntaxClassifiedRange? {
     let relativeOffset = position.utf8Offset - self.position.utf8Offset
     return self.classification(at: relativeOffset)
   }

Sources/SwiftParser/SwiftParserCompatibility.swift

@@ -15,14 +15,14 @@ import SwiftSyntax
 // This file provides compatibility aliases to keep dependents of SwiftSyntax building.
 // All users of the declarations in this file should transition away from them ASAP.
 
-public extension TokenSpec {
+extension TokenSpec {
   @available(*, deprecated, renamed: "leftSquare")
-  static var leftSquareBracket: TokenSpec {
+  public static var leftSquareBracket: TokenSpec {
     return .leftSquare
   }
 
   @available(*, deprecated, renamed: "rightSquare")
-  static var rightSquareBracket: TokenSpec {
+  public static var rightSquareBracket: TokenSpec {
     return .rightSquare
   }
 }

Sources/SwiftParserDiagnostics/LexerDiagnosticMessages.swift

@@ -27,16 +27,16 @@ public protocol TokenError: DiagnosticMessage {
   var diagnosticID: MessageID { get }
 }
 
-public extension TokenError {
-  static var diagnosticID: MessageID {
+extension TokenError {
+  public static var diagnosticID: MessageID {
     return MessageID(domain: diagnosticDomain, id: "\(self)")
   }
 
-  var diagnosticID: MessageID {
+  public var diagnosticID: MessageID {
     return Self.diagnosticID
   }
 
-  var severity: DiagnosticSeverity {
+  public var severity: DiagnosticSeverity {
     return .error
   }
 }
@@ -46,16 +46,16 @@ public protocol TokenWarning: DiagnosticMessage {
   var diagnosticID: MessageID { get }
 }
 
-public extension TokenWarning {
-  static var diagnosticID: MessageID {
+extension TokenWarning {
+  public static var diagnosticID: MessageID {
     return MessageID(domain: diagnosticDomain, id: "\(self)")
   }
 
-  var diagnosticID: MessageID {
+  public var diagnosticID: MessageID {
     return Self.diagnosticID
   }
 
-  var severity: DiagnosticSeverity {
+  public var severity: DiagnosticSeverity {
     return .warning
   }
 }
@@ -180,11 +180,11 @@ public struct ErrorToWarningDowngrade: TokenWarning {
 
 // MARK: - Convert TokenDiagnostic from SwiftSyntax to error messages
 
-public extension SwiftSyntax.TokenDiagnostic {
+extension SwiftSyntax.TokenDiagnostic {
   /// `tokenText` is the entire text of the token in which the ``TokenDiagnostic``
   /// occurred, including trivia.
   @_spi(RawSyntax)
-  func diagnosticMessage(in token: TokenSyntax) -> DiagnosticMessage {
+  public func diagnosticMessage(in token: TokenSyntax) -> DiagnosticMessage {
     var scalarAtErrorOffset: UnicodeScalar {
       // Fall back to the Unicode replacement character U+FFFD in case we can't
       // lex the unicode character at `byteOffset`. It's the best we can do
@@ -241,7 +241,7 @@ public extension SwiftSyntax.TokenDiagnostic {
     }
   }
 
-  func position(in token: TokenSyntax) -> AbsolutePosition {
+  public func position(in token: TokenSyntax) -> AbsolutePosition {
     switch kind {
     case .extraneousLeadingWhitespaceError, .extraneousLeadingWhitespaceWarning:
       if let previousToken = token.previousToken(viewMode: .all) {
@@ -253,7 +253,7 @@ public extension SwiftSyntax.TokenDiagnostic {
     return token.position.advanced(by: Int(byteOffset))
   }
 
-  func fixIts(in token: TokenSyntax) -> [FixIt] {
+  public func fixIts(in token: TokenSyntax) -> [FixIt] {
     switch self.kind {
     case .nonBreakingSpace:
       let replaceNonBreakingSpace = { (piece: TriviaPiece) -> TriviaPiece in