---

yaml
---
r: 341951
b: refs/heads/rxwei-patch-1
c: b839e07
h: refs/heads/master
i:
  341949: d433bf5
  341947: 1585e77
  341943: 2ee4523
  341935: 14a9d6c
  341919: 09a5670
  341887: 9491508

Author: theblixguy

[refs]

@@ -1015,7 +1015,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-08-18-a: b10b1fce14385faa6d44f6b933e95
 refs/heads/rdar-43033749-fix-batch-mode-no-diags-swift-5.0-branch: a14e64eaad30de89f0f5f0b2a782eed7ecdcb255
 refs/heads/revert-19006-error-bridging-integer-type: 8a9065a3696535305ea53fe9b71f91cbe6702019
 refs/heads/revert-19050-revert-19006-error-bridging-integer-type: ecf752d54b05dd0a20f510f0bfa54a3fec3bcaca
-refs/heads/rxwei-patch-1: 8092dd9ad747a35f8f1120d3dcf64506d154265c
+refs/heads/rxwei-patch-1: b839e07c1277a2e974da297b995d89efce0f0f60
 refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
 refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9

branches/rxwei-patch-1/include/swift/AST/DiagnosticsParse.def

@@ -763,7 +763,9 @@ ERROR(extra_rbracket,PointsToFirstBadToken,
 ERROR(extra_colon,PointsToFirstBadToken,
       "unexpected ':' in type; did you mean to write a dictionary type?", ())
 WARNING(subscript_collection_element_invalid_index, none,
-       "index '%0' in subscript expression is out of bounds", (StringRef))
+        "index '%0' in subscript expression is out of bounds", (StringRef))
+NOTE(subscript_collection_element_fix_it, none, "did you mean to write two "
+     "array literals instead?", ())
 
 // Tuple Types
 ERROR(expected_rparen_tuple_type_list,none,

branches/rxwei-patch-1/lib/Parse/ParseExpr.cpp

@@ -3509,6 +3509,12 @@ void Parser::validateCollectionElement(ParserResult<Expr> element) {
                          diag::subscript_collection_element_invalid_index,
                          indexExpr->getDigitsText());
     diag.highlight(subscriptExpr->getSourceRange());
+    diag.flush();
+
+    auto note = diagnose(subscriptExpr->getLoc(),
+                         diag::subscript_collection_element_fix_it);
+    note.fixItInsertAfter(baseExpr->getRBracketLoc(), ",");
+
     element.setIsParseError();
   }
 }

branches/rxwei-patch-1/test/type/array.swift

@@ -117,6 +117,6 @@ func passAssocType<T : HasAssocType>(_ t: T) {
 // SR-11134
 
 let sr_11134_1 = [["a"][0]] // Ok
-let sr_11134_2 = [["a"][1]] // expected-warning {{index '1' in subscript expression is out of bounds}}
+let sr_11134_2 = [["a"][1]] // expected-warning {{index '1' in subscript expression is out of bounds}} // expected-note {{did you mean to write two array literals instead?}}{{24-24=,}}
+let sr_11134_3 = [[1, 1, 1], [], [4, 5, 6, 7], [0], [], [] [42]] // expected-warning {{index '42' in subscript expression is out of bounds}} // expected-note {{did you mean to write two array literals instead?}}{{59-59=,}}
 
-let sr_11134_3 = [[1, 1, 1], [], [4, 5, 6, 7], [0], [], [] [42]] // expected-warning {{index '42' in subscript expression is out of bounds}}