Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions grammars/javascript.cson
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,25 @@
'name': 'entity.name.type.js'
'name': 'meta.class.js'
}
{
'name': 'meta.function.arrow.js'
'begin': '(?<![A-Za-z0-9])(\\()(?=(?:[^\\(\\)]*)?\\)\\s*=>)'
'beginCaptures':
'1':
'name': 'punctuation.definition.parameters.begin.js'

'end': '(\\))(\\s*=>)'
'endCaptures':
'1':
'name': 'punctuation.definition.parameters.end.js'
'2':
'name': 'storage.type.arrow.js'
'patterns': [
{
'include': '#function-params'
}
]
}
{
'captures':
'1':
Expand Down
8 changes: 8 additions & 0 deletions spec/javascript-spec.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,14 @@ describe "Javascript grammar", ->
{tokens} = grammar.tokenizeLine('default: ')
expect(tokens[0]).toEqual value: 'default', scopes: ['source.js', 'keyword.control.js']

it "tokenizes arrow functions with params", ->
{tokens} = grammar.tokenizeLine('(param1,param2)=>{}')
expect(tokens[0]).toEqual value: '(', scopes: ['source.js', 'meta.function.arrow.js', 'punctuation.definition.parameters.begin.js']
expect(tokens[1]).toEqual value: 'param1', scopes: ['source.js', 'meta.function.arrow.js', 'variable.parameter.function.js']
expect(tokens[3]).toEqual value: 'param2', scopes: ['source.js', 'meta.function.arrow.js', 'variable.parameter.function.js']
expect(tokens[4]).toEqual value: ')', scopes: ['source.js', 'meta.function.arrow.js', 'punctuation.definition.parameters.end.js']
expect(tokens[5]).toEqual value: '=>', scopes: ['source.js', 'meta.function.arrow.js', 'storage.type.arrow.js']

it "tokenizes comments in function params", ->
{tokens} = grammar.tokenizeLine('foo: function (/**Bar*/bar){')

Expand Down