Merge pull request #3659 from rintaro/args-order-diag

Author: swift-ci

include/swift/AST/DiagnosticsSema.def

@@ -763,11 +763,11 @@ ERROR(extra_named_single_element_tuple,none,
 ERROR(argument_out_of_order_named_named,none,
       "argument %0 must precede argument %1", (Identifier, Identifier))
 ERROR(argument_out_of_order_named_unnamed,none,
-      "argument %0 must precede unnamed parameter #%1", (Identifier, unsigned))
+      "argument %0 must precede unnamed argument #%1", (Identifier, unsigned))
 ERROR(argument_out_of_order_unnamed_named,none,
-      "unnamed parameter #%0 must precede argument %1", (unsigned, Identifier))
+      "unnamed argument #%0 must precede argument %1", (unsigned, Identifier))
 ERROR(argument_out_of_order_unnamed_unnamed,none,
-      "unnamed parameter #%0 must precede unnamed parameter #%1",
+      "unnamed argument #%0 must precede unnamed argument #%1",
       (unsigned, unsigned))
 
 ERROR(instance_member_use_on_type,none,

lib/Sema/CSDiag.cpp

@@ -4424,15 +4424,15 @@ static bool diagnoseSingleCandidateFailures(CalleeCandidateInfo &CCI,
 
     if (first.empty() && second.empty()) {
       TC.diagnose(diagLoc, diag::argument_out_of_order_unnamed_unnamed,
-                  OOOArgIdx, OOOPrevArgIdx)
+                  OOOArgIdx + 1, OOOPrevArgIdx + 1)
         .fixItExchange(firstRange, secondRange);
     } else if (first.empty() && !second.empty()) {
       TC.diagnose(diagLoc, diag::argument_out_of_order_unnamed_named,
-                  OOOArgIdx, second)
+                  OOOArgIdx + 1, second)
         .fixItExchange(firstRange, secondRange);
     } else if (!first.empty() && second.empty()) {
       TC.diagnose(diagLoc, diag::argument_out_of_order_named_unnamed,
-                  first, OOOPrevArgIdx)
+                  first, OOOPrevArgIdx + 1)
         .fixItExchange(firstRange, secondRange);
     } else {
       TC.diagnose(diagLoc, diag::argument_out_of_order_named_named,

test/Constraints/diagnostics.swift

@@ -805,7 +805,7 @@ func nilComparison(i: Int, o: AnyObject) {
 // FIXME: Bad diagnostic
 func secondArgumentNotLabeled(a:Int, _ b: Int) { }
 secondArgumentNotLabeled(10, 20)
-// expected-error@-1 {{unnamed parameter #1 must precede unnamed parameter #0}}
+// expected-error@-1 {{unnamed argument #2 must precede unnamed argument #1}}
 
 // <rdar://problem/23709100> QoI: incorrect ambiguity error due to implicit conversion
 func testImplConversion(a : Float?) -> Bool {}

test/Constraints/function.swift

@@ -36,7 +36,7 @@ var s: String = optFunc("hi")
 // <rdar://problem/17652759> Default arguments cause crash with tuple permutation
 func testArgumentShuffle(_ first: Int = 7, third: Int = 9) {
 }
-testArgumentShuffle(third: 1, 2) // expected-error {{unnamed parameter #1 must precede argument 'third'}} {{21-29=2}} {{31-32=third: 1}}
+testArgumentShuffle(third: 1, 2) // expected-error {{unnamed argument #2 must precede argument 'third'}} {{21-29=2}} {{31-32=third: 1}}
 
 
 

test/Constraints/keyword_arguments.swift

@@ -135,7 +135,7 @@ variadics1(x: 1, y: 2, 1, 2)
 variadics1(x: 1, y: 2, 1, 2, 3)
 
 // Using various (out-of-order)
-variadics1(1, 2, 3, 4, 5, x: 6, y: 7) // expected-error{{argument 'x' must precede unnamed parameter #0}} {{12-25=x: 6}} {{27-31=1, 2, 3, 4, 5}}
+variadics1(1, 2, 3, 4, 5, x: 6, y: 7) // expected-error{{argument 'x' must precede unnamed argument #1}} {{12-25=x: 6}} {{27-31=1, 2, 3, 4, 5}}
 
 func variadics2(x: Int, y: Int = 2, z: Int...) { }
 
@@ -173,8 +173,8 @@ variadics3(1)
 variadics3()
 
 // Using variadics (out-of-order)
-variadics3(y: 0, 1, 2, 3) // expected-error{{unnamed parameter #1 must precede argument 'y'}} {{12-16=1, 2, 3}} {{18-25=y: 0}}
-variadics3(z: 1, 1) // expected-error{{unnamed parameter #1 must precede argument 'z'}} {{12-16=1}} {{18-19=z: 1}}
+variadics3(y: 0, 1, 2, 3) // expected-error{{unnamed argument #2 must precede argument 'y'}} {{12-16=1, 2, 3}} {{18-25=y: 0}}
+variadics3(z: 1, 1) // expected-error{{unnamed argument #2 must precede argument 'z'}} {{12-16=1}} {{18-19=z: 1}}
 
 func variadics4(x: Int..., y: Int = 2, z: Int = 3) { }
 
@@ -209,7 +209,7 @@ variadics5(1, y: 2, 1, 2)
 variadics5(1, y: 2, 1, 2, 3)
 
 // Using various (out-of-order)
-variadics5(1, 2, 3, 4, 5, 6, y: 7) // expected-error{{argument 'y' must precede unnamed parameter #1}} {{15-28=y: 7}} {{30-34=2, 3, 4, 5, 6}}
+variadics5(1, 2, 3, 4, 5, 6, y: 7) // expected-error{{argument 'y' must precede unnamed argument #2}} {{15-28=y: 7}} {{30-34=2, 3, 4, 5, 6}}
 variadics5(y: 1, 2, 3, 4, 5, 6, 7) // expected-error{{missing argument for parameter #1 in call}}
 
 func variadics6(x: Int..., y: Int = 2, z: Int) { }
@@ -233,7 +233,7 @@ variadics6(x: 1) // expected-error{{missing argument for parameter 'z' in call}}
 variadics6() // expected-error{{missing argument for parameter 'z' in call}}
 
 func outOfOrder(_ a : Int, b: Int) {
-  outOfOrder(b: 42, 52)  // expected-error {{unnamed parameter #1 must precede argument 'b'}} {{14-19=52}} {{21-23=b: 42}}
+  outOfOrder(b: 42, 52)  // expected-error {{unnamed argument #2 must precede argument 'b'}} {{14-19=52}} {{21-23=b: 42}}
 }
 
 // -------------------------------------------