clang-format: [JS] Fix function formatting

[ono]

Summary

We should consume function identifier only when we are in braced list.

This fixes bug introduced in r210887 that breaks function formatting with inner
functions.

Before:

function testa(a, b) { function innera(a, b) { return a; } } function
testb(a, b) { return b; }

After:

function testa(a, b) {
  function innera(a, b) { return a; }
}
function testb(a, b) { return b; }

[djasper]

What is 71bd6fc3? Can you use subversion revisions?

What is the actual bug? We definitely need a test case as well..

[ono]

Added sample and proper SVN revision reference.

[ono]

Remove spaces after Before/After headers, sample is in the commit log.

[djasper]

All your diffs are identical and I still don't see a subversion revision number.

[ono]

Sorry somehow updating commit msg and uploading it here doesn't affect Summary at very top. So I had to edit it manually.

[ono]

Added tests.

[djasper]

Based on the tests, I think this is (or at least might be) the wrong fix. For example, there can be function literals with names in other expression contexts, not just in braced lists, e.g.:

var variablename = function FunctionName(Argument List) { 
  // Function Body 
};

I'll ponder this some more and get back to you.

[ono]

Assume it is regular function declaration if previous token for function keyword is right brace, semicolon or none.

[djasper]

That patch still seems like the wrong approach to me. Submitted alternative solution in r212038. Let me know if you have further problems with this.

[ono]

Your change works great, thanks!

lib/Format/UnwrappedLineParser.h

private:
   void parseEnum();
   void parseRecord();
   void parseObjCProtocolList();
   void parseObjCUntilAtEnd();
   void parseObjCInterfaceOrImplementation();
   void parseObjCProtocol();
   bool tryToParseLambda();
   bool tryToParseLambdaIntroducer();
-  void tryToParseJSFunction();
+  void tryToParseJSFunction(bool BracedList = false);
   void addUnwrappedLine();
   bool eof() const;
   void nextToken();
   void readToken();
   void flushComments(bool NewlineBeforeNext);
   void pushToken(FormatToken *Tok);
   void calculateBraceTypes();
 

lib/Format/UnwrappedLineParser.cpp

if (FormatTok->is(tok::comma)) {
       return true;
     } else {
       return false;
     }
   } while (!eof());
   return false;
 }
 
-void UnwrappedLineParser::tryToParseJSFunction() {
+void UnwrappedLineParser::tryToParseJSFunction(bool BracedList) {
   nextToken();
 
-  // Consume function name.
-  if (FormatTok->is(tok::identifier))
+  // Consume function name if in braced list.
+  if (BracedList && FormatTok->is(tok::identifier))
       nextToken();
 
   if (FormatTok->isNot(tok::l_paren))
     return;
   nextToken();
   while (FormatTok->isNot(tok::l_brace)) {
     // Err on the side of caution in order to avoid consuming the full file in
     // case of incomplete code.
bool UnwrappedLineParser::parseBracedList(bool ContinueOnSemicolons) {
   bool HasError = false;
   nextToken();
 
   // FIXME: Once we have an expression parser in the UnwrappedLineParser,
   // replace this by using parseAssigmentExpression() inside.
   do {
     if (Style.Language == FormatStyle::LK_JavaScript &&
         FormatTok->TokenText == "function") {
-      tryToParseJSFunction();
+      tryToParseJSFunction(true);
       continue;
     }
     switch (FormatTok->Tok.getKind()) {
     case tok::caret:
       nextToken();
       if (FormatTok->is(tok::l_brace)) {
         parseChildBlock();
       }