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

Fix for improper highlighting within the pointer access operator #195

Merged
merged 3 commits into from
Jan 10, 2017
Merged

Fix for improper highlighting within the pointer access operator #195

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
da11fa9
Fix for improper highlighting within the pointer access operator
Jan 8, 2017
49168c7
Fix for improper highlighting within the dot access operator
Jan 9, 2017
8c4799a
Update spec for tokenizing of access operators
Jan 10, 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
2 changes: 1 addition & 1 deletion grammars/c.cson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@
'name': 'punctuation.separator.pointer-access.c'
'4':
'name': 'variable.other.member.c'
'match': '((\\.)|(->))([a-zA-Z_][a-zA-Z_0-9]*)\\b(?!\\s*\\()'
'match': '((\\.)|(->))\\s*([a-zA-Z_][a-zA-Z_0-9]*)\\b(?!\\s*\\()'
'block':
'patterns': [
{
Expand Down
72 changes: 56 additions & 16 deletions spec/c-spec.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,31 +510,71 @@ describe "Language-C", ->
expect(tokens[0]).toEqual value: '0b101010', scopes: ['source.c', 'constant.numeric.c']

describe "access", ->
it "should tokenizes dot access", ->
it "tokenizes the dot access operator", ->
lines = grammar.tokenizeLines '''
int main() {
A a;
a.b = NULL;
return 0;
void f() {
a.b;
}
'''
expect(lines[1][1]).toEqual value: '.', scopes: ['source.c', 'meta.function.c', 'meta.block.c', 'punctuation.separator.dot-access.c']
expect(lines[1][2]).toEqual value: 'b', scopes: ['source.c', 'meta.function.c', 'meta.block.c', 'variable.other.member.c']

expect(lines[2][0]).toEqual value: ' a', scopes: ['source.c', 'meta.function.c', 'meta.block.c']
expect(lines[2][1]).toEqual value: '.', scopes: ['source.c', 'meta.function.c', 'meta.block.c', 'punctuation.separator.dot-access.c']
expect(lines[2][2]).toEqual value: 'b', scopes: ['source.c', 'meta.function.c', 'meta.block.c', 'variable.other.member.c']
lines = grammar.tokenizeLines '''
void f() {
a. b;
}
'''
expect(lines[1][1]).toEqual value: '.', scopes: ['source.c', 'meta.function.c', 'meta.block.c', 'punctuation.separator.dot-access.c']
expect(lines[1][3]).toEqual value: 'b', scopes: ['source.c', 'meta.function.c', 'meta.block.c', 'variable.other.member.c']

lines = grammar.tokenizeLines '''
void f() {
a .b;
}
'''
expect(lines[1][1]).toEqual value: '.', scopes: ['source.c', 'meta.function.c', 'meta.block.c', 'punctuation.separator.dot-access.c']
expect(lines[1][2]).toEqual value: 'b', scopes: ['source.c', 'meta.function.c', 'meta.block.c', 'variable.other.member.c']

lines = grammar.tokenizeLines '''
void f() {
a . b;
}
'''
expect(lines[1][1]).toEqual value: '.', scopes: ['source.c', 'meta.function.c', 'meta.block.c', 'punctuation.separator.dot-access.c']
expect(lines[1][3]).toEqual value: 'b', scopes: ['source.c', 'meta.function.c', 'meta.block.c', 'variable.other.member.c']

it "should tokenizes pointer access", ->
it "tokenizes the pointer access operator", ->
lines = grammar.tokenizeLines '''
int main() {
A *a;
a->b = NULL;
return 0;
void f() {
a->b;
}
'''
expect(lines[1][1]).toEqual value: '->', scopes: ['source.c', 'meta.function.c', 'meta.block.c', 'punctuation.separator.pointer-access.c']
expect(lines[1][2]).toEqual value: 'b', scopes: ['source.c', 'meta.function.c', 'meta.block.c', 'variable.other.member.c']

expect(lines[2][0]).toEqual value: ' a', scopes: ['source.c', 'meta.function.c', 'meta.block.c']
expect(lines[2][1]).toEqual value: '->', scopes: ['source.c', 'meta.function.c', 'meta.block.c', 'punctuation.separator.pointer-access.c']
expect(lines[2][2]).toEqual value: 'b', scopes: ['source.c', 'meta.function.c', 'meta.block.c', 'variable.other.member.c']
lines = grammar.tokenizeLines '''
void f() {
a-> b;
}
'''
expect(lines[1][1]).toEqual value: '->', scopes: ['source.c', 'meta.function.c', 'meta.block.c', 'punctuation.separator.pointer-access.c']
expect(lines[1][3]).toEqual value: 'b', scopes: ['source.c', 'meta.function.c', 'meta.block.c', 'variable.other.member.c']

lines = grammar.tokenizeLines '''
void f() {
a ->b;
}
'''
expect(lines[1][1]).toEqual value: '->', scopes: ['source.c', 'meta.function.c', 'meta.block.c', 'punctuation.separator.pointer-access.c']
expect(lines[1][2]).toEqual value: 'b', scopes: ['source.c', 'meta.function.c', 'meta.block.c', 'variable.other.member.c']

lines = grammar.tokenizeLines '''
void f() {
a -> b;
}
'''
expect(lines[1][1]).toEqual value: '->', scopes: ['source.c', 'meta.function.c', 'meta.block.c', 'punctuation.separator.pointer-access.c']
expect(lines[1][3]).toEqual value: 'b', scopes: ['source.c', 'meta.function.c', 'meta.block.c', 'variable.other.member.c']

describe "operators", ->
it "tokenizes the sizeof operator", ->
Expand Down