[clang-format] Use configured IndentWidth instead of 2

[thatguystone]

Summary

For JS projects that use a IdentWidth other than 2, this was causing the indent to be 2 when creating new objects in arrays.

[djasper]

looks good

[thatguystone]

A similar fix was accepted in https://reviews.llvm.org/D33857

lib/Format/ContinuationIndenter.cpp

   if (Current.isOneOf(tok::l_brace, TT_ArrayInitializerLSquare)) {
     if (Current.opensBlockOrBlockTypeList(Style)) {
       NewIndent = State.Stack.back().NestedBlockIndent + Style.IndentWidth;
-      NewIndent = std::min(State.Column + 2, NewIndent);
+      NewIndent = std::min(State.Column + Style.IndentWidth, NewIndent);
     } else {
       NewIndent = State.Stack.back().LastSpace + Style.ContinuationIndentWidth;
     }

unittests/Format/FormatTestJS.cpp

                "};");
 }
 
+TEST_F(FormatTestJS, ContainerLiteralsIndentWidth) {
+  FormatStyle Style = getGoogleStyle(FormatStyle::LK_JavaScript);
+  Style.IndentWidth = 4;
+
+  verifyFormat("return [\n"
+               "    {\n"
+               "        a: 1,\n"
+               "    },\n"
+               "    {\n"
+               "        b: 2,\n"
+               "    },\n"
+               "];",
+               Style);
+  verifyFormat("return {\n"
+               "    nested: {\n"
+               "        values: {\n"
+               "            indent: [\n"
+               "                right,\n"
+               "            ],\n"
+               "        },\n"
+               "    },\n"
+               "};",
+               Style);
+}
+
 TEST_F(FormatTestJS, MethodsInObjectLiterals) {
   verifyFormat("var o = {\n"
                "  value: 'test',\n"