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

Mark do as a keyword and do catch as a control keyword. #102

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Mark do as a keyword and do catch as a control keyword. #102

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
4 changes: 2 additions & 2 deletions grammars/rust.cson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,12 +241,12 @@
{
'comment': 'Control keyword'
'name': 'keyword.control.rust'
'match': '\\b(break|continue|else|if|in|for|loop|match|return|while)\\b'
'match': '\\b(break|continue|do catch|else|if|in|for|loop|match|return|while)\\b'
}
{
'comment': 'Keyword'
'name': 'keyword.other.rust'
'match': '\\b(crate|extern|mod|let|proc|ref|use|super|as|move)\\b'
'match': '\\b(crate|do|extern|mod|let|proc|ref|use|super|as|move)\\b'
}
{ 'include': '#unsafe' }
{ 'include': '#sigils' }
Expand Down
8 changes: 6 additions & 2 deletions spec/rust-spec.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,14 +294,14 @@ describe 'Rust grammar', ->
#

it 'tokenizes control keywords', ->
for t in ['break', 'continue', 'else', 'if', 'in', 'for', 'loop', 'match', 'return', 'while']
for t in ['break', 'continue', 'do catch', 'else', 'if', 'in', 'for', 'loop', 'match', 'return', 'while']
{tokens} = grammar.tokenizeLine("text #{t} text")
expect(tokens[0]).toEqual value: 'text ', scopes: ['source.rust']
expect(tokens[1]).toEqual value: t, scopes: ['source.rust', 'keyword.control.rust']
expect(tokens[2]).toEqual value: ' text', scopes: ['source.rust']

it 'tokenizes keywords', ->
for t in ['crate', 'extern', 'mod', 'let', 'proc', 'ref', 'use', 'super', 'as', 'move']
for t in ['crate', 'do', 'extern', 'mod', 'let', 'proc', 'ref', 'use', 'super', 'as', 'move']
{tokens} = grammar.tokenizeLine("text #{t} text")
expect(tokens[0]).toEqual value: 'text ', scopes: ['source.rust']
expect(tokens[1]).toEqual value: t, scopes: ['source.rust', 'keyword.other.rust']
Expand Down Expand Up @@ -630,3 +630,7 @@ describe 'Rust grammar', ->
expect(tokens[8][0]).toEqual value: '_a0', scopes: ['source.rust', 'entity.name.function.rust']
expect(tokens[9][0]).toEqual value: '_0a', scopes: ['source.rust', 'entity.name.function.rust']
expect(tokens[10][0]).toEqual value: '__', scopes: ['source.rust', 'entity.name.function.rust']

it 'tokenizes sole catch as text', ->
{tokens} = grammar.tokenizeLine('catch')
expect(tokens[0]).toEqual value: 'catch', scopes: ['source.rust']