Improve functions

[MaximSokolov]

obj.foo = function(){}
obj.prototype.foo = bar;
obj.prototype = { … }
function* foo(){}

Before:
obj – support.class
* – storage.type
foo – entity.name.function.js

After:
obj – variable.other.object
* – storage.modifier.generator
foo – variable.other.property

Code for testing

Fixes #303
Fixes #309
Fixes #193
Fixes #223
Fixes #322
Closes #197
Replaces and closes #224

[MaximSokolov]

#307 (comment):

I don't think this line [function name] is correct, as object-literal functions have to be anonymous.

¯\_(ツ)_/¯

var obj = {foo: function(){}}
console.log(obj.foo); //=> function(){}
obj = {foo: function abc(){}}
console.log(obj.foo); //=> function abc(){}

I rather keep it as is

[winstliu]

@MaximSokolov Do you want this to be reviewed alongside #307?

[MaximSokolov]

@50Wliu It's not necessary

[MaximSokolov]

New approach of functions recognition:

{
  'begin': '(?=...)'
  'end': '...'
  'name': '3'
  'patterns': [
    {
      'begin': '\\G'
      'end': '...'
      'name': '1'
      'patterns': [ ... ]
    }
    {
      'include': '#function_body' # 2 
    }
  ]
}

function foo ( ... ) { ... }
^──────────────────^ |     | - 1
|                    ^─────^ - 2
^──────────────────────────^ - 3

( ... ) => { ... }
^────────^ |     | - 1
|          ^─────^ - 2
^────────────────^ - 3

x => x + x
^──^       - 1, 3

All these regions can be scoped. Not sure what profit of nested function bodies' blocks to autocompletion, syntax highlighting; so I'll keep meta.function for the 1'st region.

[MaximSokolov]

The end pattern definitely should be improved:

[winstliu]

No need for ?: non-capturing group because we're not capturing anything here anyway.

[winstliu]

So from some testing with other grammars I think the following will also work: ((\'.*?\')|(".*?"))

[MaximSokolov]

Specs fail on

a.push("x" + y + ":function()");
a.push('x' + y + ':function()');

[winstliu]

Why remove this capture?

[MaximSokolov]

support.class -> variable.other.object for Sound as it isn't a built-in class

[winstliu]

function_params doesn't catch this as invalid: function hi(a b) {}. Not a priority for getting this PR merged though.

[winstliu]

Second square-brackets match can be shortened to [\\w$]*

[winstliu]

function_params is also missing (01) => 1 + 2 or function test(1) {}.

[winstliu]

Regression time:

function test()
{ //punctuation.definition.function.body.end.bracket.curly.js
    if(something)
    { // meta.brace.curly.js

    } // punctuation.definition.function.body.end.bracket.curly.js 
} // meta.brace.curly.js

We need to wrap curly bracket matching in a begin/end instead of a | match.

Also, in the case of Git.Repository.open(), should Repository really be tokenized as variable.other.property.js? Seems to me like it's an object just like Git.

[winstliu]

Here's another problem I found: typing the following code (same as the above example) incorrectly marks the if as a function instead of a control keyword. Adding/removing a space to try to get the grammar to realize its mistake doesn't work, but copy/pasting the code elsewhere or reloading the file does.

function test()
{
    if(something)  // entity.name.function.js!!!
    {

    }
}

[MaximSokolov]

function_params is also missing (01) => 1 + 2 or function test(1) {}

Numbers cannot be matched as illegal because of default parameters:

function multiply(a, b = 1){}

[MaximSokolov]

@50Wliu any ideas why it's happening?

function()

function(){}

[winstliu]

Looking into it...what's the highlighted scope that's flickering?

[winstliu]

Never mind, got it: meta.function.js. Not sure why though. It only seems to happen when there's an odd number of spaces.

[winstliu]

Moving the function_body include above this match appears to fix it. For safety I would arrange the patterns like this:

• comments
• function_body
• This one

[MaximSokolov]

fixed

[MaximSokolov]

Added support for:

{
  foo: p => {}
  "foo": p => {}
  'foo': p => {}
}

[winstliu]

Looks good to me - can you just address the two style comments above?
#312 (diff)
and
#312 (diff)

I wasn't able to find any glaring bugs through some testing, so I think this is ready to 🚢 and get some more extensive testing on Atom master :).