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

Class member with visibility modifier and arrays #118

Merged
merged 5 commits into from
Dec 31, 2017
Merged

Class member with visibility modifier and arrays #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
77aa83c
fix
Spirou07 Dec 23, 2017
43f965d
fix
Spirou07 Dec 23, 2017
9a1f4aa
fix code to fulfill spec
Spirou07 Dec 26, 2017
70e6a14
fix for invalid int
Spirou07 Dec 26, 2017
7eec144
arrays in patterns + tests
Spirou07 Dec 27, 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
9 changes: 9 additions & 0 deletions grammars/java.cson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,6 +670,9 @@
'1':
'name': 'storage.type.java'
}
{
'include': '#primitive-arrays'
}
{
'match': '[a-zA-Z$_][a-zA-Z0-9$_]*'
'name': 'storage.type.generic.java'
Expand Down Expand Up @@ -1255,4 +1258,10 @@
{
'include': '#variables'
}
{
'include': '#primitive-arrays'
}
{
'include': '#object-types'
}
]
17 changes: 17 additions & 0 deletions spec/java-spec.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1253,6 +1253,8 @@ describe 'Java grammar', ->
private Integer $tar_war$;
double a,b,c;double d;
String[] primitiveArray;
private Foo<int[]> hi;
Foo<int[]> hi;
}
'''

Expand Down Expand Up @@ -1330,6 +1332,21 @@ describe 'Java grammar', ->
expect(lines[13][3]).toEqual value: ']', scopes: ['source.java', 'meta.class.java', 'meta.class.body.java', 'meta.definition.variable.java', 'punctuation.bracket.square.java']
expect(lines[13][5]).toEqual value: 'primitiveArray', scopes: ['source.java', 'meta.class.java', 'meta.class.body.java', 'meta.definition.variable.java', 'variable.other.definition.java']

expect(lines[14][1]).toEqual value: 'private', scopes: ['source.java', 'meta.class.java', 'meta.class.body.java', 'storage.modifier.java']
expect(lines[14][3]).toEqual value: 'Foo', scopes: ['source.java', 'meta.class.java', 'meta.class.body.java', 'storage.type.java']
expect(lines[14][4]).toEqual value: '<', scopes: ['source.java', 'meta.class.java', 'meta.class.body.java', 'punctuation.bracket.angle.java']
expect(lines[14][5]).toEqual value: 'int', scopes: ['source.java', 'meta.class.java', 'meta.class.body.java', 'storage.type.primitive.array.java']
expect(lines[14][6]).toEqual value: '[', scopes: ['source.java', 'meta.class.java', 'meta.class.body.java', 'punctuation.bracket.square.java']
expect(lines[14][7]).toEqual value: ']', scopes: ['source.java', 'meta.class.java', 'meta.class.body.java', 'punctuation.bracket.square.java']
expect(lines[14][8]).toEqual value: '>', scopes: ['source.java', 'meta.class.java', 'meta.class.body.java', 'punctuation.bracket.angle.java']

expect(lines[15][1]).toEqual value: 'Foo', scopes: ['source.java', 'meta.class.java', 'meta.class.body.java', 'storage.type.java']
expect(lines[15][2]).toEqual value: '<', scopes: ['source.java', 'meta.class.java', 'meta.class.body.java', 'punctuation.bracket.angle.java']
expect(lines[15][3]).toEqual value: 'int', scopes: ['source.java', 'meta.class.java', 'meta.class.body.java', 'storage.type.primitive.array.java']
expect(lines[15][4]).toEqual value: '[', scopes: ['source.java', 'meta.class.java', 'meta.class.body.java', 'punctuation.bracket.square.java']
expect(lines[15][5]).toEqual value: ']', scopes: ['source.java', 'meta.class.java', 'meta.class.body.java', 'punctuation.bracket.square.java']
expect(lines[15][6]).toEqual value: '>', scopes: ['source.java', 'meta.class.java', 'meta.class.body.java', 'punctuation.bracket.angle.java']

it 'tokenizes qualified storage types', ->
lines = grammar.tokenizeLines '''
class Test {
Expand Down