maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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
  };

llvm-svn: 238671
This commit is contained in:
Daniel Jasper 2015-05-31 08:40:37 +00:00
parent aa47cf9dae
commit cd8d4ff985
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/lib/Format/TokenAnnotator.cpp
View File

@ -1321,7 +1321,7 @@ private:
else if (Current->is(TT_LambdaArrow)) else if (Current->is(TT_LambdaArrow))
return prec::Comma; return prec::Comma;
else if (Current->isOneOf(tok::semi, TT_InlineASMColon, else if (Current->isOneOf(tok::semi, TT_InlineASMColon,
TT_SelectorName) || TT_SelectorName, TT_JsComputedPropertyName) ||
(Current->is(tok::comment) && NextNonComment && (Current->is(tok::comment) && NextNonComment &&
NextNonComment->is(TT_SelectorName))) NextNonComment->is(TT_SelectorName)))
return 0; return 0;

3
clang/unittests/Format/FormatTestJS.cpp
View File

@ -153,8 +153,11 @@ TEST_F(FormatTestJS, ContainerLiterals) {
verifyFormat("var x = {y: (a) => a};"); verifyFormat("var x = {y: (a) => a};");
// Computed keys. // Computed keys.
verifyFormat("var x = {[a]: 1, b: 2, [c]: 3};");
verifyFormat("var x = {\n" verifyFormat("var x = {\n"
" [a]: 1,\n" " [a]: 1,\n"
" b: 2,\n"
" [c]: 3,\n"
"};"); "};");
} }