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

Allow more punctuation to precede regexes #542

Merged
merged 1 commit into from
Apr 20, 2018
Merged

Allow more punctuation to precede regexes #542

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
2 changes: 1 addition & 1 deletion grammars/javascript.cson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1130,7 +1130,7 @@
'name': 'constant.language.js'
}
{
'begin': '(?<=[\\[=(?:+,!]|^|return|=>|&&|\\|\\|)\\s*(/)(?![/*+?])(?=.*/)'
'begin': '(?<=[\\[{=(?:+*,!~-]|^|return|=>|&&|\\|\\|)\\s*(/)(?![/*+?])(?=.*/)'
'beginCaptures':
'1':
'name': 'punctuation.definition.string.begin.js'
Expand Down
8 changes: 8 additions & 0 deletions spec/javascript-spec.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,14 @@ 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 "tokenizes regular expressions inside curly brackets", ->
{tokens} = grammar.tokenizeLine('{/test/}')
expect(tokens[0]).toEqual value: '{', scopes: ['source.js', 'meta.brace.curly.js']
expect(tokens[1]).toEqual value: '/', scopes: ['source.js', 'string.regexp.js', 'punctuation.definition.string.begin.js']
expect(tokens[2]).toEqual value: 'test', scopes: ['source.js', 'string.regexp.js']
expect(tokens[3]).toEqual value: '/', scopes: ['source.js', 'string.regexp.js', 'punctuation.definition.string.end.js']
expect(tokens[4]).toEqual value: '}', scopes: ['source.js', 'meta.brace.curly.js']

it "tokenizes regular expressions inside arrow function expressions", ->
{tokens} = grammar.tokenizeLine('getRegex = () => /^helloworld$/;')
expect(tokens[9]).toEqual value: '/', scopes: ['source.js', 'string.regexp.js', 'punctuation.definition.string.begin.js']
Expand Down