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

Rewrite #at_rule_include #137

Merged
merged 4 commits into from
Jun 25, 2016
Merged

Rewrite #at_rule_include #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d962b31
SCSS: Add specs for @-rule `include` with content block
hediyi Jun 16, 2016
4bae4ac
SCSS: Add specs for @-rule `include` with content block and arguments
hediyi Jun 16, 2016
77b1b68
SCSS: Add specs for solitary @-rule `include`
hediyi Jun 23, 2016
4591d4c
SCSS: Rewrite #at_rule_include
hediyi Jun 16, 2016
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
38 changes: 26 additions & 12 deletions grammars/scss.cson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,27 +294,41 @@
'at_rule_include':
'patterns': [
{
'begin': '\\s*((@)include\\b)\\s*'
'captures':
'begin': '(?<=@include)\\s+([\\w-]+)\\s*(\\()'
'beginCaptures':
'1':
'name': 'keyword.control.at-rule.include.scss'
'2':
'name': 'punctuation.definition.keyword.scss'
'3':
'name': 'entity.name.function.scss'
'4':
'name': 'entity.name.text.scss'
'end': '\\s*[\\)|\\s\\;]'
'2':
'name': 'punctuation.definition.parameters.begin.bracket.round.scss'
'end': '\\)'
Copy link
Contributor

Choose a reason for hiding this comment

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

Should be given an end capture.

'endCaptures':
'0':
'name': 'punctuation.definition.parameters.end.bracket.round.scss'
'name': 'meta.at-rule.include.scss'
'patterns': [
{
'include': '#function_attributes'
}
{
'include': '#functions'
}
]
}
{
'match': '(?<=@include)\\s+([\\w-]+)'
'captures':
'0':
'name': 'meta.at-rule.include.scss'
'1':
'name': 'entity.name.function.scss'
}
{
'match': '((@)include)\\b'
'captures':
'0':
'name': 'meta.at-rule.include.scss'
'1':
'name': 'keyword.control.at-rule.include.scss'
'2':
'name': 'punctuation.definition.keyword.scss'
}
]
'at_rule_keyframes':
'patterns': [
Expand Down
22 changes: 22 additions & 0 deletions spec/scss-spec.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,28 @@ describe 'SCSS grammar', ->
expect(tokens[0]).toEqual value: '@', scopes: ['source.css.scss', 'meta.at-rule.at-root.scss', 'keyword.control.at-rule.at-root.scss', 'punctuation.definition.keyword.scss']
expect(tokens[1]).toEqual value: 'at-root', scopes: ['source.css.scss', 'meta.at-rule.at-root.scss', 'keyword.control.at-rule.at-root.scss']

describe '@include', ->
it 'tokenizes it correctly', ->
{tokens} = grammar.tokenizeLine '@include'

expect(tokens[0]).toEqual value: '@', scopes: ['source.css.scss', 'meta.at-rule.include.scss', 'keyword.control.at-rule.include.scss', 'punctuation.definition.keyword.scss']
expect(tokens[1]).toEqual value: 'include', scopes: ['source.css.scss', 'meta.at-rule.include.scss', 'keyword.control.at-rule.include.scss']

{tokens} = grammar.tokenizeLine '@include media{}'

expect(tokens[0]).toEqual value: '@', scopes: ['source.css.scss', 'meta.at-rule.include.scss', 'keyword.control.at-rule.include.scss', 'punctuation.definition.keyword.scss']
expect(tokens[1]).toEqual value: 'include', scopes: ['source.css.scss', 'meta.at-rule.include.scss', 'keyword.control.at-rule.include.scss']
expect(tokens[3]).toEqual value: 'media', scopes: ['source.css.scss', 'meta.at-rule.include.scss', 'entity.name.function.scss']
expect(tokens[4]).toEqual value: '{', scopes: ['source.css.scss', 'meta.property-list.scss', 'punctuation.section.property-list.begin.bracket.curly.scss']

{tokens} = grammar.tokenizeLine '@include media($width: 100px){}'

expect(tokens[3]).toEqual value: 'media', scopes: ['source.css.scss', 'meta.at-rule.include.scss', 'entity.name.function.scss']
expect(tokens[4]).toEqual value: '(', scopes: ['source.css.scss', 'meta.at-rule.include.scss', 'punctuation.definition.parameters.begin.bracket.round.scss']
expect(tokens[6]).toEqual value: ':', scopes: ['source.css.scss', 'meta.at-rule.include.scss', 'punctuation.definition']
expect(tokens[10]).toEqual value: ')', scopes: ['source.css.scss', 'meta.at-rule.include.scss', 'punctuation.definition.parameters.end.bracket.round.scss']
expect(tokens[11]).toEqual value: '{', scopes: ['source.css.scss', 'meta.property-list.scss', 'punctuation.section.property-list.begin.bracket.curly.scss']

describe '@mixin', ->
it 'tokenizes solitary @mixin correctly', ->
{tokens} = grammar.tokenizeLine '@mixin'
Expand Down