Merge pull request #4229 from akyrtzi/misplaced-paren-fixit-swift3

[AST] Fix issue with fixits wrapping over an interpolated string

Author: tkremenek

include/swift/AST/Expr.h

@@ -989,6 +989,7 @@ class StringLiteralExpr : public LiteralExpr {
 /// "[\(min)..\(max)]"
 /// \endcode
 class InterpolatedStringLiteralExpr : public LiteralExpr {
+  /// Points at the beginning quote.
   SourceLoc Loc;
   MutableArrayRef<Expr *> Segments;
   Expr *SemanticExpr;
@@ -1007,10 +1008,12 @@ class InterpolatedStringLiteralExpr : public LiteralExpr {
   void setSemanticExpr(Expr *SE) { SemanticExpr = SE; }
 
   SourceLoc getStartLoc() const {
-    return Segments.front()->getStartLoc();
+    return Loc;
   }
   SourceLoc getEndLoc() const {
-    return Segments.back()->getEndLoc();
+    // SourceLocs are token based, and the interpolated string is one string
+    // token, so the range should be (Start == End).
+    return Loc;
   }
 
   static bool classof(const Expr *E) {

test/FixCode/fixits-apply.swift

@@ -78,6 +78,16 @@ func testMask13(a: MyEventMask2?) {
   testMask1(a: a) // no fix, nullability mismatch.
 }
 
+struct SomeName : RawRepresentable {
+  init(_ rawValue: String) {}
+  init(rawValue: String) {}
+  var rawValue: String { return "" }
+}
+func testPassSomeName(_: SomeName) {}
+func testConvertSomeName(s: String) {
+  testPassSomeName("\(s)}")
+}
+
 enum MyEnumType : UInt32 {
   case invalid
 }

test/FixCode/fixits-apply.swift.result

@@ -78,6 +78,16 @@ func testMask13(a: MyEventMask2?) {
   testMask1(a: a) // no fix, nullability mismatch.
 }
 
+struct SomeName : RawRepresentable {
+  init(_ rawValue: String) {}
+  init(rawValue: String) {}
+  var rawValue: String { return "" }
+}
+func testPassSomeName(_: SomeName) {}
+func testConvertSomeName(s: String) {
+  testPassSomeName(SomeName(rawValue: "\(s)}"))
+}
+
 enum MyEnumType : UInt32 {
   case invalid
 }