replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

clang-format: [JS] Support ES6 destructuring assignments. 

Before:
  var[a, b, c] = [1, 2, 3];

After:
  var [a, b, c] = [1, 2, 3];

llvm-svn: 209113
This commit is contained in:
Daniel Jasper 2014-05-19 07:37:07 +00:00
parent 78214397a3
commit 0dd5291e69
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1381,6 +1381,9 @@ bool TokenAnnotator::spaceRequiredBetween(const AnnotatedLine &Line,
if (Right.is(tok::l_paren) && if (Right.is(tok::l_paren) &&
(Left.TokenText == "returns" || Left.TokenText == "option")) (Left.TokenText == "returns" || Left.TokenText == "option"))
return true; return true;
} else if (Style.Language == FormatStyle::LK_JavaScript) {
if (Left.TokenText == "var")
return true;
} }
if (Left.is(tok::kw_return) && Right.isNot(tok::semi)) if (Left.is(tok::kw_return) && Right.isNot(tok::semi))
return true; return true;

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

@ -81,6 +81,11 @@ TEST_F(FormatTestJS, UnderstandsJavaScriptOperators) {
verifyFormat("var b = a.map((x) => x + 1);"); verifyFormat("var b = a.map((x) => x + 1);");
} }
TEST_F(FormatTestJS, ES6DestructuringAssignment) {
verifyFormat("var [a, b, c] = [1, 2, 3];");
verifyFormat("var {a, b} = {a: 1, b: 2};");
}
TEST_F(FormatTestJS, SpacesInContainerLiterals) { TEST_F(FormatTestJS, SpacesInContainerLiterals) {
verifyFormat("var arr = [1, 2, 3];"); verifyFormat("var arr = [1, 2, 3];");
verifyFormat("var obj = {a: 1, b: 2, c: 3};"); verifyFormat("var obj = {a: 1, b: 2, c: 3};");