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

fix incorrect highlighting in c and haskell modes

Browse source
This commit is contained in:
nightwing 2014-12-21 12:26:35 +04:00
commit 7a3257ab58
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/ace/mode/c_cpp_highlight_rules.js
View file

@ -84,11 +84,11 @@ var c_cppHighlightRules = function() {
regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?(L|l|UL|ul|u|U|F|f|ll|LL|ull|ULL)?\\b" regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?(L|l|UL|ul|u|U|F|f|ll|LL|ull|ULL)?\\b"
}, { }, {
token : "keyword", // pre-compiler directives token : "keyword", // pre-compiler directives
regex : "#\\s*(?:include|import|pragma|line|define|undef|if|ifdef|else|elif|ifndef)\\b", regex : "#\\s*(?:include|import|pragma|line|define|undef)\\b",
next : "directive" next : "directive"
}, { }, {
token : "keyword", // special case pre-compiler directive token : "keyword", // special case pre-compiler directive
regex : "(?:#\\s*endif)\\b" regex : "#\\s*(?:endif|if|ifdef|else|elif|ifndef)\\b"
}, { }, {
token : "support.function.C99.c", token : "support.function.C99.c",
regex : cFunctions regex : cFunctions

4
lib/ace/mode/haskell_highlight_rules.js
View file

@ -55,9 +55,9 @@ var HaskellHighlightRules = function() {
{ token: 'constant.language.empty-list.haskell', { token: 'constant.language.empty-list.haskell',
regex: '\\[\\]' }, regex: '\\[\\]' },
{ token: 'keyword.other.haskell', { token: 'keyword.other.haskell',
regex: 'module', regex: '\\bmodule\\b',
push: push:
[ { token: 'keyword.other.haskell', regex: 'where', next: 'pop' }, [ { token: 'keyword.other.haskell', regex: '\\bwhere\\b', next: 'pop' },
{ include: '#module_name' }, { include: '#module_name' },
{ include: '#module_exports' }, { include: '#module_exports' },
{ token: 'invalid', regex: '[a-z]+' }, { token: 'invalid', regex: '[a-z]+' },