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

Mark type and function definitions with meta.definition.___ #123

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Mark type and function definitions with meta.definition.___ #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f5972c
Update rust.cson
Oct 24, 2017
9ce2e9e
Update rust-spec.coffee
Oct 24, 2017
9b1caa5
Update rust-spec.coffee
Oct 24, 2017
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
6 changes: 3 additions & 3 deletions grammars/rust.cson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@
'end': '[\\{;]'
'beginCaptures': {
'1': { 'name': 'keyword.other.fn.rust' }
'2': { 'name': 'entity.name.function.rust' }
'2': { 'name': 'entity.name.function.rust meta.definition.function.rust' }
}
'patterns': [
{ 'include': '#block_comment' }
Expand Down Expand Up @@ -417,7 +417,7 @@
'end': '[\\{\\(;]'
'beginCaptures': {
'1': { 'name': 'storage.type.rust' }
'2': { 'name': 'entity.name.type.rust' }
'2': { 'name': 'entity.name.type.rust meta.definition.type.rust' }
}
'patterns': [
{ 'include': '#block_comment' }
Expand All @@ -437,7 +437,7 @@
'end': ';'
'beginCaptures': {
'1': { 'name': 'storage.type.rust' }
'2': { 'name': 'entity.name.type.rust' }
'2': { 'name': 'entity.name.type.rust meta.definition.type.rust' }
}
'patterns': [
{ 'include': '#block_comment' }
Expand Down
16 changes: 8 additions & 8 deletions spec/rust-spec.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ describe 'Rust grammar', ->
''')
expect(tokens[0][0]).toEqual value: 'pub', scopes: ['source.rust', 'storage.modifier.visibility.rust']
expect(tokens[0][2]).toEqual value: 'enum', scopes: ['source.rust', 'storage.type.rust']
expect(tokens[0][4]).toEqual value: 'MyEnum', scopes: ['source.rust', 'entity.name.type.rust']
expect(tokens[0][4]).toEqual value: 'MyEnum', scopes: ['source.rust', 'entity.name.type.rust meta.definition.type.rust']

it 'tokenizes structs', ->
tokens = grammar.tokenizeLines('''
Expand All @@ -424,7 +424,7 @@ describe 'Rust grammar', ->
''')
expect(tokens[0][0]).toEqual value: 'pub', scopes: ['source.rust', 'storage.modifier.visibility.rust']
expect(tokens[0][2]).toEqual value: 'struct', scopes: ['source.rust', 'storage.type.rust']
expect(tokens[0][4]).toEqual value: 'MyStruct', scopes: ['source.rust', 'entity.name.type.rust']
expect(tokens[0][4]).toEqual value: 'MyStruct', scopes: ['source.rust', 'entity.name.type.rust meta.definition.type.rust']
expect(tokens[0][5]).toEqual value: '<', scopes: ['source.rust', 'meta.type_params.rust']
expect(tokens[0][6]).toEqual value: '\'', scopes: ['source.rust', 'meta.type_params.rust', 'storage.modifier.lifetime.rust']
expect(tokens[0][7]).toEqual value: 'foo', scopes: ['source.rust', 'meta.type_params.rust', 'storage.modifier.lifetime.rust', 'entity.name.lifetime.rust']
Expand All @@ -438,7 +438,7 @@ describe 'Rust grammar', ->
{tokens} = grammar.tokenizeLine('pub struct MyTupleStruct(pub i32, u32);')
expect(tokens[0]).toEqual value: 'pub', scopes: ['source.rust', 'storage.modifier.visibility.rust']
expect(tokens[2]).toEqual value: 'struct', scopes: ['source.rust', 'storage.type.rust']
expect(tokens[4]).toEqual value: 'MyTupleStruct', scopes: ['source.rust', 'entity.name.type.rust']
expect(tokens[4]).toEqual value: 'MyTupleStruct', scopes: ['source.rust', 'entity.name.type.rust meta.definition.type.rust']
expect(tokens[6]).toEqual value: 'pub', scopes: ['source.rust', 'storage.modifier.visibility.rust']

it 'tokenizes unions', ->
Expand All @@ -451,7 +451,7 @@ describe 'Rust grammar', ->
''')
expect(tokens[0][0]).toEqual value: 'pub', scopes: ['source.rust', 'storage.modifier.visibility.rust']
expect(tokens[0][2]).toEqual value: 'union', scopes: ['source.rust', 'storage.type.rust']
expect(tokens[0][4]).toEqual value: 'MyUnion', scopes: ['source.rust', 'entity.name.type.rust']
expect(tokens[0][4]).toEqual value: 'MyUnion', scopes: ['source.rust', 'entity.name.type.rust meta.definition.type.rust']
expect(tokens[0][5]).toEqual value: '<', scopes: ['source.rust', 'meta.type_params.rust']
expect(tokens[0][6]).toEqual value: '\'', scopes: ['source.rust', 'meta.type_params.rust', 'storage.modifier.lifetime.rust']
expect(tokens[0][7]).toEqual value: 'foo', scopes: ['source.rust', 'meta.type_params.rust', 'storage.modifier.lifetime.rust', 'entity.name.lifetime.rust']
Expand All @@ -465,7 +465,7 @@ describe 'Rust grammar', ->
it 'tokenizes type aliases', ->
{tokens} = grammar.tokenizeLine('type MyType = u32;')
expect(tokens[0]).toEqual value: 'type', scopes: ['source.rust', 'storage.type.rust']
expect(tokens[2]).toEqual value: 'MyType', scopes: ['source.rust', 'entity.name.type.rust']
expect(tokens[2]).toEqual value: 'MyType', scopes: ['source.rust', 'entity.name.type.rust meta.definition.type.rust']
expect(tokens[4]).toEqual value: 'u32', scopes: ['source.rust', 'storage.type.core.rust']

it 'tokenizes constants', ->
Expand All @@ -485,7 +485,7 @@ describe 'Rust grammar', ->
''')
expect(tokens[0][0]).toEqual value: 'pub', scopes: ['source.rust', 'storage.modifier.visibility.rust']
expect(tokens[0][2]).toEqual value: 'trait', scopes: ['source.rust', 'storage.type.rust']
expect(tokens[0][4]).toEqual value: 'MyTrait', scopes: ['source.rust', 'entity.name.type.rust']
expect(tokens[0][4]).toEqual value: 'MyTrait', scopes: ['source.rust', 'entity.name.type.rust meta.definition.type.rust']
expect(tokens[1][1]).toEqual value: 'fn', scopes: ['source.rust', 'keyword.other.fn.rust']
expect(tokens[1][12]).toEqual value: 'Option', scopes: ['source.rust', 'storage.type.core.rust']
expect(tokens[1][14]).toEqual value: 'Self', scopes: ['source.rust', 'meta.type_params.rust', 'storage.type.core.rust']
Expand Down Expand Up @@ -658,7 +658,7 @@ describe 'Rust grammar', ->
{tokens} = grammar.tokenizeLine('fn foo(fn_x: ()) {}')
expect(tokens[0]).toEqual value: 'fn', scopes: ['source.rust', 'keyword.other.fn.rust']
expect(tokens[1]).toEqual value: ' ', scopes: ['source.rust']
expect(tokens[2]).toEqual value : 'foo', scopes : [ 'source.rust', 'entity.name.function.rust' ]
expect(tokens[2]).toEqual value : 'foo', scopes : [ 'source.rust', 'entity.name.function.rust meta.definition.function.rust' ]
expect(tokens[3]).toEqual value : '(fn_x: ()) ', scopes : [ 'source.rust' ]

it 'tokenizes function calls with type arguments (issue \\#98)', ->
Expand Down Expand Up @@ -752,7 +752,7 @@ describe 'Rust grammar', ->
fn clone(&self) {}
}
''')
expect(tokens[0][2]).toEqual value: 'MyObject', scopes: ['source.rust', 'entity.name.type.rust']
expect(tokens[0][2]).toEqual value: 'MyObject', scopes: ['source.rust', 'entity.name.type.rust meta.definition.type.rust']
expect(tokens[3][6]).toEqual value: 'MyObject', scopes: ['source.rust', 'entity.name.type.rust']
expect(tokens[6][6]).toEqual value: 'Clone', scopes: ['source.rust', 'support.type.core.rust']
expect(tokens[6][10]).toEqual value: 'MyObject', scopes: ['source.rust', 'entity.name.type.rust']
Expand Down