Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.

Fix function keyword as property name #417

Merged
merged 4 commits into from
Aug 23, 2016
Merged

Fix function keyword as property name #417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ef4d79
:bug: Fix function keyword as property name
MaximSokolov Aug 23, 2016
3a2cb94
:white_check_mark: Add test for arrow function
MaximSokolov Aug 23, 2016
86b6ac1
:bug: Allow whitespaces before colon with arrow function as a property
MaximSokolov Aug 23, 2016
3a402d4
:white_check_mark: Test
MaximSokolov Aug 23, 2016
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
4 changes: 2 additions & 2 deletions grammars/javascript.cson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@
{
# [async] function [name](params)
# function* name(params) – generator function declaration
'begin': '(?=(\\basync\\b\\s*)?\\bfunction\\b)'
'begin': '(?=(\\basync\\b\\s*)?\\bfunction\\b(?!\\s*:))'
'end': '(?<=})'
'patterns': [
{
Expand Down Expand Up @@ -591,7 +591,7 @@
(?<=})|
((?!
\\s*{|
\\G[\\w$]+:|
\\G[\\w$]+\\s*:|
\\s*/\\*|\\s*//
)(?=\\s*\\S))
'''
Expand Down
17 changes: 17 additions & 0 deletions spec/javascript-spec.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1084,6 +1084,23 @@ describe "Javascript grammar", ->
expect(tokens[7]).toEqual value: 'foo', scopes: ['source.js', 'meta.function.json.js', 'entity.name.function.js']
expect(tokens[8]).toEqual value: '(', scopes: ['source.js', 'meta.function.json.js', 'meta.parameters.js', 'punctuation.definition.parameters.begin.bracket.round.js']

{tokens} = grammar.tokenizeLine('function : a => a')
expect(tokens[0]).toEqual value: 'function', scopes: ['source.js', 'meta.function.arrow.json.js', 'entity.name.function.js']
expect(tokens[2]).toEqual value: ':', scopes: ['source.js', 'meta.function.arrow.json.js', 'keyword.operator.assignment.js']
expect(tokens[4]).toEqual value: 'a', scopes: ['source.js', 'meta.function.arrow.json.js', 'meta.parameters.js', 'variable.parameter.function.js']
expect(tokens[6]).toEqual value: '=>', scopes: ['source.js', 'meta.function.arrow.json.js', 'storage.type.function.arrow.js']
expect(tokens[7]).toEqual value: ' a', scopes: ['source.js']

{tokens} = grammar.tokenizeLine('"func": a => a')
expect(tokens[1]).toEqual value: 'func', scopes: ['source.js', 'meta.function.arrow.json.js', 'string.quoted.double.js', 'entity.name.function.js']
expect(tokens[3]).toEqual value: ':', scopes: ['source.js', 'meta.function.arrow.json.js', 'keyword.operator.assignment.js']
expect(tokens[5]).toEqual value: 'a', scopes: ['source.js', 'meta.function.arrow.json.js', 'meta.parameters.js', 'variable.parameter.function.js']
expect(tokens[7]).toEqual value: '=>', scopes: ['source.js', 'meta.function.arrow.json.js', 'storage.type.function.arrow.js']
expect(tokens[8]).toEqual value: ' a', scopes: ['source.js']

{tokens} = grammar.tokenizeLine('"func" : a => a')
expect(tokens[8]).toEqual value: '=>', scopes: ['source.js', 'meta.function.arrow.json.js', 'storage.type.function.arrow.js']

it "tokenizes generator functions", ->
{tokens} = grammar.tokenizeLine('function* foo(){}')
expect(tokens[0]).toEqual value: 'function', scopes: ['source.js', 'meta.function.js', 'storage.type.function.js']
Expand Down