jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix bracket matching in vala mode

Browse source
This commit is contained in:
nightwing 2014-08-01 20:53:08 +04:00
commit 5744a3c6e3
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/ace/mode/vala_highlight_rules.js
View file

@ -136,7 +136,7 @@ var ValaHighlightRules = function() {
[ { token: 'meta.class.vala', [ { token: 'meta.class.vala',
regex: '(?=\\w?[\\w\\s]*(?:class|(?:@)?interface|enum|struct|namespace)\\s+\\w+)', regex: '(?=\\w?[\\w\\s]*(?:class|(?:@)?interface|enum|struct|namespace)\\s+\\w+)',
push: push:
[ { token: 'punctuation.section.class.end.vala', [ { token: 'paren.vala',
regex: '}', regex: '}',
next: 'pop' }, next: 'pop' },
{ include: '#storage-modifiers' }, { include: '#storage-modifiers' },
@ -166,10 +166,10 @@ var ValaHighlightRules = function() {
{ include: '#object-types-inherited' }, { include: '#object-types-inherited' },
{ include: '#comments' }, { include: '#comments' },
{ defaultToken: 'meta.definition.class.implemented.interfaces.vala' } ] }, { defaultToken: 'meta.definition.class.implemented.interfaces.vala' } ] },
{ token: 'meta.class.body.vala', { token: 'paren.vala',
regex: '{', regex: '{',
push: push:
[ { token: 'meta.class.body.vala', regex: '(?=})', next: 'pop' }, [ { token: 'paren.vala', regex: '(?=})', next: 'pop' },
{ include: '#class-body' }, { include: '#class-body' },
{ defaultToken: 'meta.class.body.vala' } ] }, { defaultToken: 'meta.class.body.vala' } ] },
{ defaultToken: 'meta.class.vala' } ], { defaultToken: 'meta.class.vala' } ],
@ -266,7 +266,7 @@ var ValaHighlightRules = function() {
[ { token: 'meta.method.vala', [ { token: 'meta.method.vala',
regex: '(?!new)(?=\\w.*\\s+)(?=[^=]+\\()', regex: '(?!new)(?=\\w.*\\s+)(?=[^=]+\\()',
push: push:
[ { token: 'meta.method.vala', regex: '}|(?=;)', next: 'pop' }, [ { token: 'paren.vala', regex: '}|(?=;)', next: 'pop' },
{ include: '#storage-modifiers' }, { include: '#storage-modifiers' },
{ token: [ 'entity.name.function.vala', 'meta.method.identifier.vala' ], { token: [ 'entity.name.function.vala', 'meta.method.identifier.vala' ],
regex: '([\\~\\w\\.]+)(\\s*\\()', regex: '([\\~\\w\\.]+)(\\s*\\()',
@ -285,10 +285,10 @@ var ValaHighlightRules = function() {
{ include: '#all-types' }, { include: '#all-types' },
{ defaultToken: 'meta.method.return-type.vala' } ] }, { defaultToken: 'meta.method.return-type.vala' } ] },
{ include: '#throws' }, { include: '#throws' },
{ token: 'meta.method.body.vala', { token: 'paren.vala',
regex: '{', regex: '{',
push: push:
[ { token: 'meta.method.body.vala', regex: '(?=})', next: 'pop' }, [ { token: 'paren.vala', regex: '(?=})', next: 'pop' },
{ include: '#code' }, { include: '#code' },
{ defaultToken: 'meta.method.body.vala' } ] }, { defaultToken: 'meta.method.body.vala' } ] },
{ defaultToken: 'meta.method.vala' } ] } ], { defaultToken: 'meta.method.vala' } ] } ],