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

Handle syntax highlighting of custom at-rules for Microsoft/vscode-css-languageservice#51 #140

Closed
wants to merge 2 commits into from
Closed

Handle syntax highlighting of custom at-rules for Microsoft/vscode-css-languageservice#51 #140

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
2392b48
Handle custom at-rules
octref Jun 14, 2018
eb0a5fd
Update test
octref Jun 14, 2018
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
33 changes: 33 additions & 0 deletions grammars/css.cson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,39 @@
'include': '#string'
}
]
},
{
# @custom-at-rule
'begin': '(?i)(?=@[\\w-]+(\\s|\\(|/\\*|$))'
'end': '(?<=})(?!\\G)'
'patterns': [
{
'begin': '(?i)\\G(@)[\\w-]+'
'beginCaptures':
'0':
'name': 'keyword.control.at-rule.css'
'1':
'name': 'punctuation.definition.keyword.css'
'end': '(?=\\s*[{;])'
'name': 'meta.at-rule.header.css'
}
{
'begin': '{'
'beginCaptures':
'0':
'name': 'punctuation.section.begin.bracket.curly.css'
'end': '}'
'endCaptures':
'0':
'name': 'punctuation.section.end.bracket.curly.css'
'name': 'meta.at-rule.body.css'
'patterns': [
{
'include': '$self'
}
]
}
]
}
]
'color-keywords':
Expand Down
8 changes: 4 additions & 4 deletions spec/css-spec.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ describe 'CSS grammar', ->

it 'does not tokenise identifiers following an @ symbol', ->
{tokens} = grammar.tokenizeLine('@some-weird-new-feature')
expect(tokens[0]).toEqual value: '@', scopes: ['source.css']
expect(tokens[1]).toEqual value: 'some-weird-new-feature', scopes: ['source.css', 'meta.selector.css']
expect(tokens[0]).toEqual value: '@', scopes: ['source.css', 'meta.at-rule.header.css', 'keyword.control.at-rule.css', 'punctuation.definition.keyword.css']
expect(tokens[1]).toEqual value: 'some-weird-new-feature', scopes: ['source.css', 'meta.at-rule.header.css', 'keyword.control.at-rule.css']

it 'does not tokenise identifiers in unfamiliar functions', ->
{tokens} = grammar.tokenizeLine('some-edgy-new-function()')
Expand Down Expand Up @@ -619,8 +619,8 @@ describe 'CSS grammar', ->
expect(lines[0][0]).toEqual value: '/*', scopes: ['source.css', 'comment.block.css', 'punctuation.definition.comment.begin.css']
expect(lines[0][1]).toEqual value: ' Not the first line ', scopes: ['source.css', 'comment.block.css']
expect(lines[0][2]).toEqual value: '*/', scopes: ['source.css', 'comment.block.css', 'punctuation.definition.comment.end.css']
expect(lines[1][0]).toEqual value: '@', scopes: ['source.css']
expect(lines[1][1]).toEqual value: 'charset "UTF-8";', scopes: ['source.css', 'meta.selector.css']
expect(lines[1][0]).toEqual value: '@', scopes: ['source.css', 'meta.at-rule.header.css', 'keyword.control.at-rule.css', 'punctuation.definition.keyword.css']
expect(lines[1][1]).toEqual value: 'charset', scopes: ['source.css', 'meta.at-rule.header.css', 'keyword.control.at-rule.css']

it 'highlights invalid @charset statements', ->
lines = grammar.tokenizeLines " @charset 'US-ASCII';"
Expand Down