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

Improve function-params regex #184

Merged
merged 2 commits into from
Aug 2, 2015
Merged

Improve function-params regex #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e8d0ba
Improve function-params regex
winstliu Aug 1, 2015
33c4717
Allow +/- in front of numbers
winstliu Aug 2, 2015
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
63 changes: 53 additions & 10 deletions grammars/javascript.cson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,23 @@
}
]
}
{
'begin': '\\b(constructor)\\s*(\\()'
'beginCaptures':
'1':
'name': 'entity.name.constructor.js'
'2':
'name': 'punctuation.definition.parameters.begin.js'
'end': '(\\))'
'endCaptures':
'1':
'name': 'punctuation.definition.parameters.end.js'
'patterns': [
{
'include': '#function-params'
}
]
}
{
'include': '#methods'
}
Expand Down Expand Up @@ -315,8 +332,7 @@
'name': 'support.function.js.console'
}
{
'match': '\\b((0(x|X)[0-9a-fA-F]+)|(0(b|B)[01]+)|(0(o|O)[0-7]+)|([0-9]+(\\.[0-9]+)?)((e|E)[+-]?[0-9]+)?)\\b'
'name': 'constant.numeric.js'
'include': '#numbers'
}
{
'include': '#strings'
Expand Down Expand Up @@ -555,6 +571,13 @@
}
]
'repository':
'numbers':
'patterns': [
{
'match': '(\\+|\\-)?\\b((0(x|X)[0-9a-fA-F]+)|(0(b|B)[01]+)|(0(o|O)[0-7]+)|([0-9]+(\\.[0-9]+)?)((e|E)[+-]?[0-9]+)?)\\b'
'name': 'constant.numeric.js'
}
]
'strings':
'patterns': [
{
Expand Down Expand Up @@ -643,18 +666,38 @@
'function-params':
'patterns': [
{
'begin': '(?=[\\p{L}\\p{Nl}$_])'
'end': '(?=[,)\\/])'
'patterns': [
{
'match': '\\G[\\p{L}\\p{Nl}$_][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}]*'
'name': 'variable.parameter.function.js'
}
]
'include': '#numbers'
}
{
'include': '#strings'
}
{
'match': '\\(|\\)'
'name': 'meta.brace.round.js'
}
{
'match': '\\[|\\]'
'name': 'meta.brace.square.js'
}
{
'match': '\\{|\\}'
'name': 'meta.brace.curly.js'
}
{
'match': ','
'name': 'meta.object.delimiter.js'
}
{
'match': '='
'name': 'keyword.operator.js'
}
{
'include': '#comments'
}
{
'match': '[a-zA-Z_$][a-zA-Z_$0-9]*'
'name': 'variable.parameter.function.js'
}
]
'interpolated_js':
'patterns': [
Expand Down
61 changes: 54 additions & 7 deletions spec/javascript-spec.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,30 +95,41 @@ describe "Javascript grammar", ->
expect(tokens[6]).toEqual value: '/', scopes: ['source.js', 'string.regexp.js', 'punctuation.definition.string.end.js']
expect(tokens[7]).toEqual value: ']', scopes: ['source.js', 'meta.brace.square.js']

it "verifies that regular expressions have explicit count modifiers", ->
source = fs.readFileSync(path.resolve(__dirname, '..', 'grammars', 'javascript.cson'), 'utf8')
expect(source.search /{,/).toEqual -1

source = fs.readFileSync(path.resolve(__dirname, '..', 'grammars', 'regular expressions (javascript).cson'), 'utf8')
expect(source.search /{,/).toEqual -1

describe "numbers", ->
it "tokenizes hexadecimals", ->
{tokens} = grammar.tokenizeLine('0x1D306')
expect(tokens[0]).toEqual value: '0x1D306', scopes: ['source.js', 'constant.numeric.js']

{tokens} = grammar.tokenizeLine('0X1D306')
expect(tokens[0]).toEqual value: '0X1D306', scopes: ['source.js', 'constant.numeric.js']

it "tokenizes binary literals", ->
{tokens} = grammar.tokenizeLine('0b011101110111010001100110')
expect(tokens[0]).toEqual value: '0b011101110111010001100110', scopes: ['source.js', 'constant.numeric.js']

{tokens} = grammar.tokenizeLine('0B011101110111010001100110')
expect(tokens[0]).toEqual value: '0B011101110111010001100110', scopes: ['source.js', 'constant.numeric.js']

it "tokenizes octal literals", ->
{tokens} = grammar.tokenizeLine('0o1411')
expect(tokens[0]).toEqual value: '0o1411', scopes: ['source.js', 'constant.numeric.js']

{tokens} = grammar.tokenizeLine('0O1411')
expect(tokens[0]).toEqual value: '0O1411', scopes: ['source.js', 'constant.numeric.js']

it "verifies that regular expressions have explicit count modifiers", ->
source = fs.readFileSync(path.resolve(__dirname, '..', 'grammars', 'javascript.cson'), 'utf8')
expect(source.search /{,/).toEqual -1
it "tokenizes decimals", ->
{tokens} = grammar.tokenizeLine('5e-10')
expect(tokens[0]).toEqual value: '5e-10', scopes: ['source.js', 'constant.numeric.js']

source = fs.readFileSync(path.resolve(__dirname, '..', 'grammars', 'regular expressions (javascript).cson'), 'utf8')
expect(source.search /{,/).toEqual -1
{tokens} = grammar.tokenizeLine('-5E+5')
expect(tokens[0]).toEqual value: '-5E+5', scopes: ['source.js', 'constant.numeric.js']

describe "operators", ->
it "tokenizes void correctly", ->
Expand Down Expand Up @@ -325,6 +336,16 @@ describe "Javascript grammar", ->
expect(tokens[2]).toEqual value: 'extends', scopes: ['source.js', 'meta.class.js', 'storage.modifier.js']
expect(tokens[4]).toEqual value: 'SomeClass', scopes: ['source.js', 'meta.class.js', 'entity.name.type.js']

it "tokenizes constructors", ->
{tokens} = grammar.tokenizeLine('constructor(a, b)')
expect(tokens[0]).toEqual value: 'constructor', scopes: ['source.js', 'entity.name.constructor.js']
expect(tokens[1]).toEqual value: '(', scopes: ['source.js', 'punctuation.definition.parameters.begin.js']
expect(tokens[2]).toEqual value: 'a', scopes: ['source.js', 'variable.parameter.function.js']
expect(tokens[3]).toEqual value: ',', scopes: ['source.js', 'meta.object.delimiter.js']
expect(tokens[4]).toEqual value: ' ', scopes: ['source.js']
expect(tokens[5]).toEqual value: 'b', scopes: ['source.js', 'variable.parameter.function.js']
expect(tokens[6]).toEqual value: ')', scopes: ['source.js', 'punctuation.definition.parameters.end.js']

describe "ES6 import", ->
it "Tokenizes import ... as", ->
{tokens} = grammar.tokenizeLine('import \'react\' as React')
Expand Down Expand Up @@ -410,8 +431,34 @@ describe "Javascript grammar", ->
expect(tokens[0]).toEqual value: 'f', scopes: ['source.js', 'meta.method.js', 'entity.name.function.js']
expect(tokens[1]).toEqual value: '(', scopes: ['source.js', 'meta.method.js', 'punctuation.definition.parameters.begin.js']
expect(tokens[2]).toEqual value: 'a', scopes: ['source.js', 'meta.method.js', 'variable.parameter.function.js']
expect(tokens[4]).toEqual value: 'b', scopes: ['source.js', 'meta.method.js', 'variable.parameter.function.js']
expect(tokens[5]).toEqual value: ')', scopes: ['source.js', 'meta.method.js', 'punctuation.definition.parameters.end.js']
expect(tokens[3]).toEqual value: ',', scopes: ['source.js', 'meta.method.js', 'meta.object.delimiter.js']
expect(tokens[5]).toEqual value: 'b', scopes: ['source.js', 'meta.method.js', 'variable.parameter.function.js']
expect(tokens[6]).toEqual value: ')', scopes: ['source.js', 'meta.method.js', 'punctuation.definition.parameters.end.js']

{tokens} = grammar.tokenizeLine('hi({host, root = "./", plugins = [a, "b", "c", d]}) {}')
expect(tokens[0]).toEqual value: 'hi', scopes: ['source.js', 'meta.method.js', 'entity.name.function.js']
expect(tokens[1]).toEqual value: '(', scopes: ['source.js', 'meta.method.js', 'punctuation.definition.parameters.begin.js']
expect(tokens[2]).toEqual value: '{', scopes: ['source.js', 'meta.method.js', 'meta.brace.curly.js']
expect(tokens[3]).toEqual value: 'host', scopes: ['source.js', 'meta.method.js', 'variable.parameter.function.js']
expect(tokens[4]).toEqual value: ',', scopes: ['source.js', 'meta.method.js', 'meta.object.delimiter.js']
expect(tokens[6]).toEqual value: 'root', scopes: ['source.js', 'meta.method.js', 'variable.parameter.function.js']
expect(tokens[8]).toEqual value: '=', scopes: ['source.js', 'meta.method.js', 'keyword.operator.js']
expect(tokens[10]).toEqual value: '"', scopes: ['source.js', 'meta.method.js', 'string.quoted.double.js', 'punctuation.definition.string.begin.js']
expect(tokens[11]).toEqual value: './', scopes: ['source.js', 'meta.method.js', 'string.quoted.double.js']
expect(tokens[12]).toEqual value: '"', scopes: ['source.js', 'meta.method.js', 'string.quoted.double.js', 'punctuation.definition.string.end.js']
expect(tokens[13]).toEqual value: ',', scopes: ['source.js', 'meta.method.js', 'meta.object.delimiter.js']
expect(tokens[15]).toEqual value: 'plugins', scopes: ['source.js', 'meta.method.js', 'variable.parameter.function.js']
expect(tokens[17]).toEqual value: '=', scopes: ['source.js', 'meta.method.js', 'keyword.operator.js']
expect(tokens[19]).toEqual value: '[', scopes: ['source.js', 'meta.method.js', 'meta.brace.square.js']
expect(tokens[20]).toEqual value: 'a', scopes: ['source.js', 'meta.method.js', 'variable.parameter.function.js']
expect(tokens[21]).toEqual value: ',', scopes: ['source.js', 'meta.method.js', 'meta.object.delimiter.js']
expect(tokens[23]).toEqual value: '"', scopes: ['source.js', 'meta.method.js', 'string.quoted.double.js', 'punctuation.definition.string.begin.js']
expect(tokens[26]).toEqual value: ',', scopes: ['source.js', 'meta.method.js', 'meta.object.delimiter.js']
expect(tokens[28]).toEqual value: '"', scopes: ['source.js', 'meta.method.js', 'string.quoted.double.js', 'punctuation.definition.string.begin.js']
expect(tokens[33]).toEqual value: 'd', scopes: ['source.js', 'meta.method.js', 'variable.parameter.function.js']
expect(tokens[34]).toEqual value: ']', scopes: ['source.js', 'meta.method.js', 'meta.brace.square.js']
expect(tokens[35]).toEqual value: '}', scopes: ['source.js', 'meta.method.js', 'meta.brace.curly.js']
expect(tokens[36]).toEqual value: ')', scopes: ['source.js', 'meta.method.js', 'punctuation.definition.parameters.end.js']

it "tokenizes functions", ->
{tokens} = grammar.tokenizeLine('var func = function nonAnonymous(')
Expand Down