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

clang-format: [JS] Contract fewer functions to a single line. 

Before:
  var someVariable =
      function(x) { return x.zIsTooLongForOneLineWithTheDeclarationLine(); };

After:
  var someVariable = function(x) {
    return x.zIsTooLongForOneLineWithTheDeclarationLine();
  };

llvm-svn: 222893
This commit is contained in:
Daniel Jasper 2014-11-27 15:37:42 +00:00
parent 4087432f8b
commit 41368e9e07
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1480,6 +1480,9 @@ unsigned TokenAnnotator::splitPenalty(const AnnotatedLine &Line,
return 2; return 2;
if (Left.is(tok::comma) && Left.NestingLevel == 0) if (Left.is(tok::comma) && Left.NestingLevel == 0)
return 3; return 3;
} else if (Style.Language == FormatStyle::LK_JavaScript) {
if (Right.is(Keywords.kw_function))
return 100;
} }
if (Left.is(tok::comma) || (Right.is(tok::identifier) && Right.Next && if (Left.is(tok::comma) || (Right.is(tok::identifier) && Right.Next &&
@ -1548,8 +1551,6 @@ unsigned TokenAnnotator::splitPenalty(const AnnotatedLine &Line,
return 0; return 0;
if (Left.is(tok::colon) && Left.is(TT_ObjCMethodExpr)) if (Left.is(tok::colon) && Left.is(TT_ObjCMethodExpr))
return Line.MightBeFunctionDecl ? 50 : 500; return Line.MightBeFunctionDecl ? 50 : 500;
if (Left.is(tok::colon) && Left.is(TT_DictLiteral))
return 100;
if (Left.is(tok::l_paren) && InFunctionDecl && Style.AlignAfterOpenBracket) if (Left.is(tok::l_paren) && InFunctionDecl && Style.AlignAfterOpenBracket)
return 100; return 100;

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

@ -232,6 +232,11 @@ TEST_F(FormatTestJS, FunctionLiterals) {
" };\n" " };\n"
" }\n" " }\n"
"};"); "};");
verifyFormat("{\n"
" var someVariable = function(x) {\n"
" return x.zIsTooLongForOneLineWithTheDeclarationLine();\n"
" };\n"
"}");
verifyFormat("var x = {a: function() { return 1; }};", verifyFormat("var x = {a: function() { return 1; }};",
getGoogleJSStyleWithColumns(38)); getGoogleJSStyleWithColumns(38));