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

Fix @import tokenization #50

Closed
zr9 wants to merge 1 commit into from
Closed

Fix @import tokenization #50

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
22 changes: 17 additions & 5 deletions grammars/css.cson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,26 @@
'name': 'keyword.control.at-rule.import.css'
'1':
'name': 'punctuation.definition.keyword.css'
'end': '\\s*((?=;|\\}))'
'end': '\\s*(;)'
Copy link
Copy Markdown
Contributor

@winstliu winstliu Jan 21, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why can't we just match ;?

Copy link
Copy Markdown
Author

@zr9 zr9 Jan 21, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can, it probably my miss after tests, should i update?

'endCaptures':
'1':
'name': 'punctuation.terminator.rule.css'
'name': 'meta.at-rule.import.css'
'patterns': [
{
'include': '#string-double'
}
{
'include': '#string-single'
'begin': '\\s*(?=([\\\'"]))'
'end': '(?<=\\1)'
'patterns': [
{
'include': '#string-double'
}
{
'include': '#string-single'
}
{
'include': '#comment-block'
}
]
}
{
'include': '#comment-block'
Expand Down
34 changes: 34 additions & 0 deletions spec/css-spec.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,3 +179,37 @@ describe 'CSS grammar', ->
expect(tokens[10]).toEqual value: ' comment ', scopes: ['source.css', 'meta.at-rule.media.css', 'comment.block.css']
expect(tokens[11]).toEqual value: '*/', scopes: ['source.css', 'meta.at-rule.media.css', 'comment.block.css', 'punctuation.definition.comment.css']
expect(tokens[12]).toEqual value: ')', scopes: ['source.css', 'meta.at-rule.media.css']

describe 'imports', ->
it 'tokenizes plain import', ->
{tokens} = grammar.tokenizeLine '@import \'custom.css\';'

expect(tokens[0]).toEqual value: '@', scopes: ['source.css', 'meta.at-rule.import.css', 'keyword.control.at-rule.import.css', 'punctuation.definition.keyword.css']
expect(tokens[1]).toEqual value: 'import', scopes: ['source.css', 'meta.at-rule.import.css', 'keyword.control.at-rule.import.css']
expect(tokens[3]).toEqual value: '\'', scopes: ['source.css', 'meta.at-rule.import.css', 'string.quoted.single.css', 'punctuation.definition.string.begin.css']
expect(tokens[4]).toEqual value: 'custom.css', scopes: ['source.css', 'meta.at-rule.import.css', 'string.quoted.single.css']
expect(tokens[5]).toEqual value: '\'', scopes: ['source.css', 'meta.at-rule.import.css', 'string.quoted.single.css', 'punctuation.definition.string.end.css']
expect(tokens[6]).toEqual value: ';', scopes: ['source.css', 'meta.at-rule.import.css', 'punctuation.terminator.rule.css']

it 'tokenizes plain import with double quote', ->
{tokens} = grammar.tokenizeLine '@import "custom.css";'

expect(tokens[3]).toEqual value: '"', scopes: ['source.css', 'meta.at-rule.import.css', 'string.quoted.double.css', 'punctuation.definition.string.begin.css']
expect(tokens[5]).toEqual value: '"', scopes: ['source.css', 'meta.at-rule.import.css', 'string.quoted.double.css', 'punctuation.definition.string.end.css']

it 'tokenizes plain import with url link', ->
{tokens} = grammar.tokenizeLine '@import url(\'custom.css\');'

expect(tokens[3]).toEqual value: 'url', scopes: ['source.css', 'meta.at-rule.import.css', 'support.function.url.css']
expect(tokens[4]).toEqual value: '(', scopes: ['source.css', 'meta.at-rule.import.css', 'punctuation.section.function.css']
expect(tokens[5]).toEqual value: '\'', scopes: ['source.css', 'meta.at-rule.import.css', 'string.quoted.single.css', 'punctuation.definition.string.begin.css']
expect(tokens[6]).toEqual value: 'custom.css', scopes: ['source.css', 'meta.at-rule.import.css', 'string.quoted.single.css']
expect(tokens[7]).toEqual value: '\'', scopes: ['source.css', 'meta.at-rule.import.css', 'string.quoted.single.css', 'punctuation.definition.string.end.css']
expect(tokens[8]).toEqual value: ')', scopes: ['source.css', 'meta.at-rule.import.css', 'punctuation.section.function.css']

it 'tokenizes import with media query', ->
{tokens} = grammar.tokenizeLine '@import "custom.css" screen, projection;'

expect(tokens[7]).toEqual value: 'screen', scopes: ['source.css', 'meta.at-rule.import.css', 'support.constant.media.css']
expect(tokens[8]).toEqual value: ',', scopes: ['source.css', 'meta.at-rule.import.css', 'punctuation.definition.arbitrary-repetition.css']
expect(tokens[10]).toEqual value: 'projection', scopes: ['source.css', 'meta.at-rule.import.css', 'support.constant.media.css']