Index: unittests/Format/FormatTest.cpp
===================================================================
--- unittests/Format/FormatTest.cpp
+++ unittests/Format/FormatTest.cpp
@@ -1521,6 +1521,13 @@
                "    .eeeeeeeeeeeeeeeeeeeeeeeeeee = 5};");
 
   verifyGoogleFormat("const struct A a = {.a = 1, .b = 2};");
+
+  verifyFormat("const struct A a = {[0] = 1, [1] = 2};");
+  verifyFormat("const struct A a = {[1] = aaaaaaaaa,\n"
+               "                    [2] = bbbbbbbbb,\n"
+               "                    [3] = ccccccccc,\n"
+               "                    [4] = ddddddddd,\n"
+               "                    [5] = eeeeeeeee};");
 }
 
 TEST_F(FormatTest, NestedStaticInitializers) {
@@ -5758,6 +5765,8 @@
                "    aaaaaaa,\n"
                "    a};");
   verifyFormat("vector<int> foo = { ::SomeGlobalFunction() };", ExtraSpaces);
+  verifyFormat("const struct A a = { .a = 1, .b = 2 };");
+  verifyFormat("const struct A a = { [0] = 1, [1] = 2 };");
 }
 
 TEST_F(FormatTest, FormatsBracedListsInColumnLayout) {