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

Added support of async functions #136

Merged
merged 1 commit into from
Apr 10, 2015
Merged

Added support of async functions #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 30 additions & 18 deletions grammars/javascript.cson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
'name': 'meta.class.js'
}
{
'begin': '([a-zA-Z_?.$][\\w?.$]*)\\.(prototype)\\.([a-zA-Z_?.$][\\w?.$]*)\\s*(=)\\s*(function\\*?)\\s*(\\*?)(\\()'
'begin': '([a-zA-Z_?.$][\\w?.$]*)\\.(prototype)\\.([a-zA-Z_?.$][\\w?.$]*)\\s*(=)\\s*(?:(async)(?:\\s+))?(function\\*?)\\s*(\\*?)(\\()'
'beginCaptures':
'1':
'name': 'support.class.js'
Expand All @@ -67,10 +67,12 @@
'4':
'name': 'keyword.operator.js'
'5':
'name': 'storage.type.function.js'
'name': 'storage.modifier.js'
'6':
'name': 'storage.type.function.js'
'7':
'name': 'storage.type.function.js'
'8':
'name': 'punctuation.definition.parameters.begin.js'
'comment': 'match stuff like: Sound.prototype.play = function() { … }'
'end': '(\\))'
Expand Down Expand Up @@ -99,7 +101,7 @@
'name': 'meta.function.js'
}
{
'begin': '([a-zA-Z_?.$][\\w?.$]*)\\.([a-zA-Z_?.$][\\w?.$]*)\\s*(=)\\s*(function\\*?)\\s*(\\*?)\\s*([a-zA-Z_?$][\\w?$]*)?\\s*(\\()'
'begin': '([a-zA-Z_?.$][\\w?.$]*)\\.([a-zA-Z_?.$][\\w?.$]*)\\s*(=)\\s*(?:(async)(?:\\s+))?(function\\*?)\\s*(\\*?)\\s*([a-zA-Z_?$][\\w?$]*)?\\s*(\\()'
'beginCaptures':
'1':
'name': 'support.class.js'
Expand All @@ -108,12 +110,14 @@
'3':
'name': 'keyword.operator.js'
'4':
'name': 'storage.type.function.js'
'name': 'storage.modifier.js'
'5':
'name': 'storage.type.function.js'
'6':
'name': 'entity.name.function.js'
'name': 'storage.type.function.js'
'7':
'name': 'entity.name.function.js'
'8':
'name': 'punctuation.definition.parameters.begin.js'
'comment': 'match stuff like: Sound.play = function() { … }'
'end': '(\\))'
Expand All @@ -128,19 +132,21 @@
]
}
{
'begin': '([a-zA-Z_?$][\\w?$]*)\\s*(=)\\s*(function\\*?)\\s*(\\*?)\\s*([a-zA-Z_?$][\\w?$]*)?\\s*(\\()'
'begin': '([a-zA-Z_?$][\\w?$]*)\\s*(=)\\s*(?:(async)(?:\\s+))?(function\\*?)\\s*(\\*?)\\s*([a-zA-Z_?$][\\w?$]*)?\\s*(\\()'
'beginCaptures':
'1':
'name': 'entity.name.function.js'
'2':
'name': 'keyword.operator.js'
'3':
'name': 'storage.type.function.js'
'name': 'storage.modifier.js'
'4':
'name': 'storage.type.function.js'
'5':
'name': 'entity.name.function.js'
'name': 'storage.type.function.js'
'6':
'name': 'entity.name.function.js'
'7':
'name': 'punctuation.definition.parameters.begin.js'
'comment': 'match stuff like: play = function() { … }'
'end': '(\\))'
Expand All @@ -155,15 +161,17 @@
]
}
{
'begin': '\\b(function\\*?)\\s*((\\*)|(?:(?:\\s+)(\\*?[a-zA-Z_$]\\w*)))?\\s*(\\()'
'begin': '\\b(?:(async)(?:\\s+))?(function\\*?)\\s*((\\*)|(?:(?:\\s+)(\\*?[a-zA-Z_$]\\w*)))?\\s*(\\()'
'beginCaptures':
'1':
'name': 'storage.type.function.js'
'3':
'name': 'storage.modifier.js'
'2':
'name': 'storage.type.function.js'
'4':
'name': 'entity.name.function.js'
'name': 'storage.type.function.js'
'5':
'name': 'entity.name.function.js'
'6':
'name': 'punctuation.definition.parameters.begin.js'
'comment': 'match regular function like: function myFunc(arg) { … }'
'end': '(\\))'
Expand All @@ -178,17 +186,19 @@
]
}
{
'begin': '\\b([a-zA-Z_?.$][\\w?.$]*)\\s*:\\s*\\b(function\\*?)\\s*(\\*?)\\s*([a-zA-Z_?$][\\w?$]*)?\\s*(\\()'
'begin': '\\b([a-zA-Z_?.$][\\w?.$]*)\\s*:\\s*\\b(?:(async)(?:\\s+))?(function\\*?)\\s*(\\*?)\\s*([a-zA-Z_?$][\\w?$]*)?\\s*(\\()'
'beginCaptures':
'1':
'name': 'entity.name.function.js'
'2':
'name': 'storage.type.function.js'
'name': 'storage.modifier.js'
'3':
'name': 'storage.type.function.js'
'4':
'name': 'entity.name.function.js'
'name': 'storage.type.function.js'
'5':
'name': 'entity.name.function.js'
'6':
'name': 'punctuation.definition.parameters.begin.js'
'comment': 'match stuff like: foobar: function() { … }'
'end': '(\\))'
Expand All @@ -203,7 +213,7 @@
]
}
{
'begin': '(?:((\')(.*?)(\'))|((")(.*?)(")))\\s*:\\s*\\b(function\\*?)\\s*(\\*?)\\s*([a-zA-Z_?$][\\w?$]*)?\\s*(\\()'
'begin': '(?:((\')(.*?)(\'))|((")(.*?)(")))\\s*:\\s*\\b(?:(async)(?:\\s+))?(function\\*?)\\s*(\\*?)\\s*([a-zA-Z_?$][\\w?$]*)?\\s*(\\()'
'beginCaptures':
'1':
'name': 'string.quoted.single.js'
Expand All @@ -222,12 +232,14 @@
'8':
'name': 'punctuation.definition.string.end.js'
'9':
'name': 'storage.type.function.js'
'name': 'storage.modifier.js'
'10':
'name': 'storage.type.function.js'
'11':
'name': 'entity.name.function.js'
'name': 'storage.type.function.js'
'12':
'name': 'entity.name.function.js'
'13':
'name': 'punctuation.definition.parameters.begin.js'
'comment': 'Attempt to match "foo": function'
'end': '(\\))'
Expand Down
6 changes: 6 additions & 0 deletions spec/javascript-spec.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,12 @@ describe "Javascript grammar", ->
expect(tokens[6]).toEqual value: 'nonAnonymous', scopes: ['source.js', 'meta.function.json.js', 'entity.name.function.js']
expect(tokens[7]).toEqual value: '(', scopes: ['source.js', 'meta.function.json.js', 'punctuation.definition.parameters.begin.js']

it "tokenizes async functions", ->
{tokens} = grammar.tokenizeLine('async function f(){}')
expect(tokens[0]).toEqual value: 'async', scopes: ['source.js', 'meta.function.js', 'storage.modifier.js']
expect(tokens[2]).toEqual value: 'function', scopes: ['source.js', 'meta.function.js', 'storage.type.function.js']
expect(tokens[4]).toEqual value: 'f', scopes: ['source.js', 'meta.function.js', 'entity.name.function.js']

it "tokenizes /* */ comments", ->
{tokens} = grammar.tokenizeLine('/**/')

Expand Down