Merge branch 'master' into auto-generate-linux-test

# Conflicts:
#	Tests/SwiftSyntaxTest/SyntaxFactoryTests.swift

Author: kitasuke

Sources/SwiftSyntax/SyntaxFactory.swift.gyb

@@ -188,9 +188,10 @@ public enum SyntaxFactory {
                           trailingTrivia: trailingTrivia)
   }
 
-  public static func makeEqualityOperator(leadingTrivia: Trivia = [],
+  public static func makeBinaryOperator(_ name: String,
+    leadingTrivia: Trivia = [],
     trailingTrivia: Trivia = []) -> TokenSyntax {
-    return makeToken(.spacedBinaryOperator("=="),
+    return makeToken(.spacedBinaryOperator(name),
                      presence: .present,
                      leadingTrivia: leadingTrivia,
                      trailingTrivia: trailingTrivia)
@@ -199,9 +200,7 @@ public enum SyntaxFactory {
   public static func makeStringLiteralExpr(_ text: String,
     leadingTrivia: Trivia = [],
     trailingTrivia: Trivia = []) -> StringLiteralExprSyntax {
-    let string = makeStringSegment(text,
-                                   leadingTrivia: leadingTrivia,
-                                   trailingTrivia: trailingTrivia)
+    let string = makeStringSegment(text)
     let segment = makeStringSegment(content: string)
     let segments = makeStringLiteralSegments([segment])
     let openQuote = makeStringQuoteToken(leadingTrivia: leadingTrivia)

Tests/SwiftSyntaxTest/SyntaxFactoryTests.swift

@@ -152,4 +152,35 @@ public class SyntaxFactoryTests: XCTestCase {
     XCTAssertNoThrow(try SyntaxVerifier.verify(expr))
     XCTAssertThrowsError(try SyntaxVerifier.verify(unknown))
   }
+
+  public func testMakeStringLiteralExpr() {
+    let expr = SyntaxFactory.makeStringLiteralExpr(
+      "Hello, world!",
+      leadingTrivia: .init(pieces: [.lineComment("// hello"), .newlines(1)])
+    )
+    let expected = """
+// hello
+"Hello, world!"
+"""
+    XCTAssertEqual(expr.description, expected)
+  }
+    
+  public func testMakeBinaryOperator() {
+    let first = IntegerLiteralExprSyntax {
+      $0.useDigits(SyntaxFactory.makeIntegerLiteral("1", trailingTrivia: .spaces(1)))
+    }
+    let second = IntegerLiteralExprSyntax {
+      $0.useDigits(SyntaxFactory.makeIntegerLiteral("1"))
+    }
+    let operatorNames = ["==", "!=", "+", "-", "*", "/", "<", ">", "<=", ">="]
+    operatorNames.forEach { operatorName in
+      let operatorToken = SyntaxFactory.makeBinaryOperator(operatorName, trailingTrivia: .spaces(1))
+      let operatorExpr = BinaryOperatorExprSyntax {
+        $0.useOperatorToken(operatorToken)
+      }
+      let exprList = SyntaxFactory.makeExprList([first, operatorExpr, second])
+
+      XCTAssertEqual("\(exprList)", "1 \(operatorName) 1")
+    }
+  }
 }