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

Give priority to strings in functions #179

Merged
merged 1 commit into from
Jul 26, 2015
Merged

Give priority to strings in functions #179

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
3 changes: 3 additions & 0 deletions grammars/javascript.cson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,6 +626,9 @@
{
'include': '#function-params'
}
{
'include': '#strings'
}
]

'end': '(\\))'
Expand Down
11 changes: 10 additions & 1 deletion spec/javascript-spec.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ describe "Javascript grammar", ->
expect(tokens[0]).toEqual value: 'yield', scopes: ['source.js', 'meta.control.yield.js', 'keyword.control.js']
expect(tokens[2]).toEqual value: '*', scopes: ['source.js', 'meta.control.yield.js', 'storage.modifier.js']

it "doesn't confuse strings and functions (regression)", ->
it "doesn't confuse strings and functions", ->
{tokens} = grammar.tokenizeLine("'a'.b(':c(d)')")

expect(tokens[0]).toEqual value: "'", scopes: ['source.js', 'string.quoted.single.js', 'punctuation.definition.string.begin.js']
Expand All @@ -318,6 +318,15 @@ describe "Javascript grammar", ->
expect(tokens[8]).toEqual value: "'", scopes: ['source.js', 'string.quoted.single.js', 'punctuation.definition.string.end.js']
expect(tokens[9]).toEqual value: ")", scopes: ['source.js', 'meta.brace.round.js']

{tokens} = grammar.tokenizeLine('write("){");')
expect(tokens[0]).toEqual value: 'write', 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', 'string.quoted.double.js', 'punctuation.definition.string.begin.js']
expect(tokens[3]).toEqual value: '){', scopes: ['source.js', 'meta.method.js', 'string.quoted.double.js']
expect(tokens[4]).toEqual value: '"', scopes: ['source.js', 'meta.method.js', 'string.quoted.double.js', 'punctuation.definition.string.end.js']
expect(tokens[5]).toEqual value: ')', scopes: ['source.js', 'meta.method.js', 'punctuation.definition.parameters.end.js']
expect(tokens[6]).toEqual value: ';', scopes: ['source.js', 'punctuation.terminator.statement.js']

describe "default: in a switch statement", ->
it "tokenizes it as a keyword", ->
{tokens} = grammar.tokenizeLine('default: ')
Expand Down