Merge pull request #478 from evnik/TupleExprElement

Convenience initializer for TupleExprElement

Author: ahoppen

Sources/SwiftSyntaxBuilder/TupleExprElementConvenienceInitializers.swift

@@ -0,0 +1,22 @@
+//===----------------------------------------------------------------------===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+import SwiftSyntax
+
+public extension TupleExprElement {
+  /// A convenience initializer that allows passing in label as an optional string.
+  /// The presence of the colon will be inferred based on the presence of the label.
+  init(label: String? = nil, expression: ExpressibleAsExprBuildable) {
+    self.init(
+      label: label.map(TokenSyntax.identifier), colon: label == nil ? nil : .colon, expression: expression)
+  }
+}

Sources/SwiftSyntaxBuilderGeneration/Templates/TokensFile.swift

@@ -88,7 +88,7 @@ let tokensFile = SourceFile {
       let body = CodeBlock {
         FunctionCallExpr(MemberAccessExpr(base: "SyntaxFactory", name: "makeToken")) {
           TupleExprElement(expression: MemberAccessExpr(name: "eof"))
-          TupleExprElement(label: TokenSyntax.identifier("presence"), colon: .colon, expression: MemberAccessExpr(name: "present"))
+          TupleExprElement(label: "presence", expression: MemberAccessExpr(name: "present"))
         }
       }
 

Tests/SwiftSyntaxBuilderTest/FunctionTests.swift

@@ -56,11 +56,7 @@ final class FunctionTests: XCTestCase {
   func testArguments() {
     let buildable = FunctionCallExpr("test") {
       for param in (1...5) {
-        if param.isMultiple(of: 2) {
-          TupleExprElement(label: .identifier("p\(param)"), colon: .colon, expression: "value\(param)")
-        } else {
-          TupleExprElement(expression: "value\(param)")
-        }
+        TupleExprElement(label: param.isMultiple(of: 2) ? "p\(param)" : nil, expression: "value\(param)")
       }
     }
     let syntax = buildable.buildSyntax(format: Format())