Merge branch 'master' into more-binary-operators

# Conflicts:
#	Tests/SwiftSyntaxTest/SyntaxFactory.swift

Author: kitasuke

Sources/SwiftSyntax/SyntaxFactory.swift.gyb

@@ -319,9 +319,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/SyntaxFactory.swift

@@ -37,6 +37,7 @@ public class SyntaxFactoryAPITestCase: XCTestCase {
     ("testFunctionCallSyntaxBuilder", testFunctionCallSyntaxBuilder),
     ("testWithOptionalChild", testWithOptionalChild),
     ("testUnknownSyntax", testUnknownSyntax),
+    ("testMakeStringLiteralExpr", testMakeStringLiteralExpr),
     ("testMakeNonEqualityOperator", testMakeNonEqualityOperator),
     ("testMakeAdditionOperator", testMakeAdditionOperator),
     ("testMakeSubtractionOperator", testMakeSubtractionOperator),
@@ -188,6 +189,18 @@ public class SyntaxFactoryAPITestCase: 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 testMakeNonEqualityOperator() {
     let exprList = infixOperationExprList(with: SyntaxFactory.makeNonEqualityOperator())