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.cpp

do {
     } else {
       return false;
     }
   } while (!eof());
   return false;
 }
 
 void UnwrappedLineParser::tryToParseJSFunction() {
+  // If it is regular function declaration parse as regular function.
+  // FIXME: This is a dirty way to access the previous token. Find a better
+  // solution.
+  if (Line->Tokens.empty() ||
+      Line->Tokens.back().Tok->isOneOf(tok::r_brace, tok::semi)) {
+    nextToken();
+    return;
+  }
+
   nextToken();
 
   // Consume function name.
   if (FormatTok->is(tok::identifier))
       nextToken();
 
   if (FormatTok->isNot(tok::l_paren))
     return;

unittests/Format/FormatTestJS.cpp

verifyFormat("var x = {\n"
                getGoogleJSStyleWithColumns(37));
 
   verifyFormat("return {\n"
                "  a: function SomeFunction() {\n"
                "    // ...\n"
                "    return 1;\n"
                "  }\n"
                "};");
+  verifyFormat("function outer1(a, b) {\n"
+               "  function inner1(a, b) { return a; }\n"
+               "  inner1(a, b);\n"
+               "}\n"
+               "function outer2(a, b) {\n"
+               "  function inner2(a, b) { return a; }\n"
+               "  inner2(a, b);\n"
+               "}");
 }
 
 TEST_F(FormatTestJS, MultipleFunctionLiterals) {
   verifyFormat("promise.then(\n"
                "    function success() {\n"
                "      doFoo();\n"
                "      doBar();\n"
                "    },\n"