[PackageManifest] Address NFC review feedback

Addresses minor comments like indentation, naming, and code style.

Author: xedin

Sources/SwiftRefactor/PackageManifest/AddPackageDependency.swift

@@ -66,7 +66,7 @@ public struct AddPackageDependency: ManifestEditRefactoringProvider {
   ) throws -> FunctionCallExprSyntax {
     try packageCall.appendingToArrayArgument(
       label: "dependencies",
-      trailingLabels: Self.argumentLabelsAfterDependencies,
+      labelsAfter: Self.argumentLabelsAfterDependencies,
       newElement: dependency.asSyntax()
     )
   }

Sources/SwiftRefactor/PackageManifest/AddPackageTarget.swift

@@ -97,12 +97,12 @@ public struct AddPackageTarget: ManifestEditRefactoringProvider {
       target.dependencies.append(contentsOf: macroTargetDependencies)
 
     default:
-      break;
+      break
     }
 
     var newPackageCall = try packageCall.appendingToArrayArgument(
       label: "targets",
-      trailingLabels: Self.argumentLabelsAfterTargets,
+      labelsAfter: Self.argumentLabelsAfterTargets,
       newElement: target.asSyntax()
     )
 

Sources/SwiftRefactor/PackageManifest/AddPluginUsage.swift

@@ -52,7 +52,7 @@ public struct AddPluginUsage: ManifestEditRefactoringProvider {
 
     let newTargetCall = try targetCall.appendingToArrayArgument(
       label: "plugins",
-      trailingLabels: Self.argumentLabelsAfterPluginUsages,
+      labelsAfter: Self.argumentLabelsAfterPluginUsages,
       newElement: pluginUsage.asSyntax()
     )
 

Sources/SwiftRefactor/PackageManifest/AddProduct.swift

@@ -50,7 +50,7 @@ public struct AddProduct: ManifestEditRefactoringProvider {
 
     let newPackageCall = try packageCall.appendingToArrayArgument(
       label: "products",
-      trailingLabels: argumentLabelsAfterProducts,
+      labelsAfter: argumentLabelsAfterProducts,
       newElement: product.asSyntax()
     )
 

Sources/SwiftRefactor/PackageManifest/AddTargetDependency.swift

@@ -83,7 +83,7 @@ public struct AddTargetDependency: ManifestEditRefactoringProvider {
   ) throws -> FunctionCallExprSyntax {
     try targetCall.appendingToArrayArgument(
       label: "dependencies",
-      trailingLabels: Self.argumentLabelsAfterDependencies,
+      labelsAfter: Self.argumentLabelsAfterDependencies,
       newElement: dependency.asSyntax()
     )
   }

Sources/SwiftRefactor/PackageManifest/SyntaxEditUtils.swift

@@ -26,7 +26,7 @@ extension Trivia {
 
   /// Produce trivia from the last newline to the end, dropping anything
   /// prior to that.
-  func onlyLastLine() -> Trivia {
+  var onlyLastLine: Trivia {
     guard let lastNewline = pieces.lastIndex(where: { $0.isNewline }) else {
       return self
     }
@@ -122,15 +122,13 @@ extension LabeledExprListSyntax {
   /// context.
   func insertingArgument(
     at position: SyntaxChildrenIndex,
-    generator: (Trivia, TokenSyntax?) -> LabeledExprSyntax
+    generator: (_ leadingTrivia: Trivia, _ trailingComma: TokenSyntax?) -> LabeledExprSyntax
   ) -> LabeledExprListSyntax {
     // Turn the arguments into an array so we can manipulate them.
     var arguments = Array(self)
 
     let positionIdx = distance(from: startIndex, to: position)
 
-    let commaToken = TokenSyntax.commaToken()
-
     // Figure out leading trivia and adjust the prior argument (if there is
     // one) by adding a comma, if necessary.
     let leadingTrivia: Trivia
@@ -143,7 +141,7 @@ extension LabeledExprListSyntax {
 
       // If the prior argument is missing a trailing comma, add one.
       if priorArgument.trailingComma == nil {
-        arguments[positionIdx - 1].trailingComma = commaToken
+        arguments[positionIdx - 1].trailingComma = .commaToken()
       }
     } else if positionIdx + 1 < count {
       leadingTrivia = arguments[positionIdx + 1].leadingTrivia
@@ -154,7 +152,7 @@ extension LabeledExprListSyntax {
     // Determine whether we need a trailing comma on this argument.
     let trailingComma: TokenSyntax?
     if position < endIndex {
-      trailingComma = commaToken
+      trailingComma = .commaToken()
     } else {
       trailingComma = nil
     }
@@ -194,9 +192,7 @@ extension FunctionCallExprSyntax {
         return false
       }
 
-      guard let stringLiteral = nameArgument.expression.as(StringLiteralExprSyntax.self),
-        let literalValue = stringLiteral.representedLiteralValue
-      else {
+      guard let literalValue = nameArgument.expression.as(StringLiteralExprSyntax.self)?.representedLiteralValue else {
         return false
       }
 
@@ -220,24 +216,21 @@ extension ArrayExprSyntax {
   ) -> ArrayExprSyntax {
     var elements = self.elements
 
-    let commaToken = TokenSyntax.commaToken()
-
     // If there are already elements, tack it on.
     let leadingTrivia: Trivia
     let trailingTrivia: Trivia
     let leftSquareTrailingTrivia: Trivia
     if let last = elements.last {
       // The leading trivia of the new element should match that of the
       // last element.
-      leadingTrivia = last.leadingTrivia.onlyLastLine()
+      leadingTrivia = last.leadingTrivia.onlyLastLine
 
       // Add a trailing comma to the last element if it isn't already
       // there.
       if last.trailingComma == nil {
         var newElements = Array(elements)
-        newElements[newElements.count - 1].trailingComma = commaToken
-        newElements[newElements.count - 1].expression.trailingTrivia =
-          Trivia()
+        newElements[newElements.count - 1].trailingComma = .commaToken()
+        newElements[newElements.count - 1].expression.trailingTrivia = Trivia()
         newElements[newElements.count - 1].trailingTrivia = last.trailingTrivia
         elements = ArrayElementListSyntax(newElements)
       }
@@ -257,7 +250,7 @@ extension ArrayExprSyntax {
     elements.append(
       ArrayElementSyntax(
         expression: element.with(\.leadingTrivia, leadingTrivia),
-        trailingComma: commaToken.with(\.trailingTrivia, trailingTrivia)
+        trailingComma: .commaToken().with(\.trailingTrivia, trailingTrivia)
       )
     )
 
@@ -358,10 +351,10 @@ extension Array<LabeledExprSyntax> {
 
   /// Append an array literal containing elements that can be rendered
   /// into expression syntax nodes.
-  mutating func append<T>(
+  mutating func append<T: ManifestSyntaxRepresentable>(
     label: String?,
     arrayLiteral: [T]
-  ) where T: ManifestSyntaxRepresentable, T.PreferredSyntax == ExprSyntax {
+  ) where T.PreferredSyntax == ExprSyntax {
     var elements: [ArrayElementSyntax] = []
     for element in arrayLiteral {
       elements.append(expression: element.asSyntax())
@@ -402,20 +395,20 @@ extension Array<LabeledExprSyntax> {
 
   /// Append an array literal containing elements that can be rendered
   /// into expression syntax nodes.
-  mutating func appendIf<T>(
+  mutating func appendIf<T: ManifestSyntaxRepresentable>(
     label: String?,
     arrayLiteral: [T]?
-  ) where T: ManifestSyntaxRepresentable, T.PreferredSyntax == ExprSyntax {
+  ) where T.PreferredSyntax == ExprSyntax {
     guard let arrayLiteral else { return }
     append(label: label, arrayLiteral: arrayLiteral)
   }
 
   /// Append an array literal containing elements that can be rendered
   /// into expression syntax nodes, but only if it's not empty.
-  mutating func appendIfNonEmpty<T>(
+  mutating func appendIfNonEmpty<T: ManifestSyntaxRepresentable>(
     label: String?,
     arrayLiteral: [T]
-  ) where T: ManifestSyntaxRepresentable, T.PreferredSyntax == ExprSyntax {
+  ) where T.PreferredSyntax == ExprSyntax {
     if arrayLiteral.isEmpty { return }
 
     append(label: label, arrayLiteral: arrayLiteral)
@@ -468,7 +461,7 @@ extension FunctionCallExprSyntax {
   /// - Returns: the function call after making this change.
   func appendingToArrayArgument(
     label: String,
-    trailingLabels: Set<String>,
+    labelsAfter: Set<String>,
     newElement: ExprSyntax
   ) throws -> FunctionCallExprSyntax {
     // If there is already an argument with this name, append to the array
@@ -483,7 +476,7 @@ extension FunctionCallExprSyntax {
 
       // Format the element appropriately for the context.
       let indentation = Trivia(
-        pieces: arg.leadingTrivia.filter { $0.isSpaceOrTab }
+        pieces: arg.leadingTrivia.filter(\.isSpaceOrTab)
       )
       let format = BasicFormat(
         indentationWidth: [defaultIndent],
@@ -504,13 +497,13 @@ extension FunctionCallExprSyntax {
 
     // Insert the new argument at the appropriate place in the call.
     let insertionPos = arguments.findArgumentInsertionPosition(
-      labelsAfter: trailingLabels
+      labelsAfter: labelsAfter
     )
     let newArguments = arguments.insertingArgument(
       at: insertionPos
     ) { (leadingTrivia, trailingComma) in
       // Format the element appropriately for the context.
-      let indentation = Trivia(pieces: leadingTrivia.filter { $0.isSpaceOrTab })
+      let indentation = Trivia(pieces: leadingTrivia.filter(\.isSpaceOrTab))
       let format = BasicFormat(
         indentationWidth: [defaultIndent],
         initialIndentation: indentation.appending(defaultIndent)
@@ -521,9 +514,7 @@ extension FunctionCallExprSyntax {
       // Form the array.
       let newArgument = ArrayExprSyntax(
         leadingTrivia: .space,
-        leftSquare: .leftSquareToken(
-          trailingTrivia: .newline
-        ),
+        leftSquare: .leftSquareToken(trailingTrivia: .newline),
         elements: ArrayElementListSyntax(
           [
             ArrayElementSyntax(
@@ -532,9 +523,7 @@ extension FunctionCallExprSyntax {
             )
           ]
         ),
-        rightSquare: .rightSquareToken(
-          leadingTrivia: leadingTrivia
-        )
+        rightSquare: .rightSquareToken(leadingTrivia: leadingTrivia)
       )
 
       // Create the labeled argument for the array.