<div dir="ltr">This apparently caused <a href="https://llvm.org/bugs/show_bug.cgi?id=30527">https://llvm.org/bugs/show_bug.cgi?id=30527</a></div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Jun 14, 2016 at 9:54 AM, Daniel Jasper via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: djasper<br>
Date: Tue Jun 14 08:54:38 2016<br>
New Revision: 272668<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=272668&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=272668&view=rev</a><br>
Log:<br>
clang-format: [JS] Fix failing format with TypeScript casts.<br>
<br>
Before, this could be formatted at all (with BracketAlignmentStyle<br>
AlwaysBreak):<br>
<br>
  foo = <Bar[]>[<br>
    1, /* */<br>
    2<br>
  ];<br>
<br>
Modified:<br>
    cfe/trunk/lib/Format/<wbr>TokenAnnotator.cpp<br>
    cfe/trunk/unittests/Format/<wbr>FormatTestJS.cpp<br>
<br>
Modified: cfe/trunk/lib/Format/<wbr>TokenAnnotator.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/TokenAnnotator.cpp?rev=272668&r1=272667&r2=272668&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/lib/Format/<wbr>TokenAnnotator.cpp?rev=272668&<wbr>r1=272667&r2=272668&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/lib/Format/<wbr>TokenAnnotator.cpp (original)<br>
+++ cfe/trunk/lib/Format/<wbr>TokenAnnotator.cpp Tue Jun 14 08:54:38 2016<br>
@@ -319,9 +319,9 @@ private:<br>
         Left->Type = TT_JsComputedPropertyName;<br>
       } else if (Style.Language == FormatStyle::LK_Proto ||<br>
                  (Parent &&<br>
-                  Parent->isOneOf(TT_<wbr>BinaryOperator, tok::at, tok::comma,<br>
-                                  tok::l_paren, tok::l_square, tok::question,<br>
-                                  tok::colon, tok::kw_return,<br>
+                  Parent->isOneOf(TT_<wbr>BinaryOperator, TT_TemplateCloser, tok::at,<br>
+                                  tok::comma, tok::l_paren, tok::l_square,<br>
+                                  tok::question, tok::colon, tok::kw_return,<br>
                                   // Should only be relevant to JavaScript:<br>
                                   tok::kw_default))) {<br>
         Left->Type = TT_ArrayInitializerLSquare;<br>
<br>
Modified: cfe/trunk/unittests/Format/<wbr>FormatTestJS.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTestJS.cpp?rev=272668&r1=272667&r2=272668&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/unittests/<wbr>Format/FormatTestJS.cpp?rev=<wbr>272668&r1=272667&r2=272668&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/unittests/Format/<wbr>FormatTestJS.cpp (original)<br>
+++ cfe/trunk/unittests/Format/<wbr>FormatTestJS.cpp Tue Jun 14 08:54:38 2016<br>
@@ -1205,6 +1205,10 @@ TEST_F(FormatTestJS, TemplateStrings) {<br>
 TEST_F(FormatTestJS, CastSyntax) {<br>
   verifyFormat("var x = <type>foo;");<br>
   verifyFormat("var x = foo as type;");<br>
+  verifyFormat("foo = <Bar[]>[\n"<br>
+               "  1,  //\n"<br>
+               "  2\n"<br>
+               "];");<br>
 }<br>
<br>
 TEST_F(FormatTestJS, TypeArguments) {<br>
<br>
<br>
______________________________<wbr>_________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>