clang-format: [JS] Fix line breaks in computed property names.

Before:
  let foo = {
    [someLongKeyHere]: 1,
    someOtherLongKeyHere: 2, [keyLongEnoughToWrap]: 3,
    lastLongKey: 4
  };

After:
  let foo = {
    [someLongKeyHere]: 1,
    someOtherLongKeyHere: 2,
    [keyLongEnoughToWrap]: 3,
    lastLongKey: 4
  };

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@238671 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Format/TokenAnnotator.cpp b/lib/Format/TokenAnnotator.cpp
index 3b6628ecfbdd2ba22b85027b3de33e10e997ab51..ad40d99ad82c2df3391e8d8ddf8a49d1ff28f403 100644 (file)
--- a/lib/Format/TokenAnnotator.cpp
+++ b/lib/Format/TokenAnnotator.cpp
@@ -1321,7 +1321,7 @@ private:
       else if (Current->is(TT_LambdaArrow))
         return prec::Comma;
       else if (Current->isOneOf(tok::semi, TT_InlineASMColon,
-                                TT_SelectorName) ||
+                                TT_SelectorName, TT_JsComputedPropertyName) ||
                (Current->is(tok::comment) && NextNonComment &&
                 NextNonComment->is(TT_SelectorName)))
         return 0;

diff --git a/unittests/Format/FormatTestJS.cpp b/unittests/Format/FormatTestJS.cpp
index d95ff9ba8341a57fe99d7d7382f7401a9718f71e..29b8aa1ff13c7b59eca56ac3e09167c3a6becdbb 100644 (file)
--- a/unittests/Format/FormatTestJS.cpp
+++ b/unittests/Format/FormatTestJS.cpp
@@ -153,8 +153,11 @@ TEST_F(FormatTestJS, ContainerLiterals) {
   verifyFormat("var x = {y: (a) => a};");
 
   // Computed keys.
+  verifyFormat("var x = {[a]: 1, b: 2, [c]: 3};");
   verifyFormat("var x = {\n"
                "  [a]: 1,\n"
+               "  b: 2,\n"
+               "  [c]: 3,\n"
                "};");
 }