temporary workaround for tokenizer not working for rules ending with $

This commit is contained in:
nightwing 2013-04-17 16:12:44 +04:00
commit 635da1f2ea
7 changed files with 19 additions and 19 deletions

View file

@ -87,8 +87,8 @@ var ActionScriptHighlightRules = function() {
next: 'pop' }, next: 'pop' },
{ defaultToken: 'comment.block.actionscript.2' } ] }, { defaultToken: 'comment.block.actionscript.2' } ] },
{ token: 'punctuation.definition.comment.actionscript.2', { token: 'punctuation.definition.comment.actionscript.2',
regex: '//', regex: '//.*$',
push: push_:
[ { token: 'comment.line.double-slash.actionscript.2', [ { token: 'comment.line.double-slash.actionscript.2',
regex: '$', regex: '$',
next: 'pop' }, next: 'pop' },

View file

@ -170,7 +170,7 @@ var ClojureHighlightRules = function() {
regex : '"', regex : '"',
next: "string" next: "string"
}, { }, {
token : "string", // symbol token : "constant", // symbol
regex : /:[\w*+!\-_?:\/]+/ regex : /:[\w*+!\-_?:\/]+/
}, { }, {
token : "string.regexp", //Regular Expressions token : "string.regexp", //Regular Expressions

View file

@ -119,8 +119,8 @@ var ErlangHighlightRules = function() {
{ token: 'invalid.illegal.character.erlang', regex: '\\$.?' } ], { token: 'invalid.illegal.character.erlang', regex: '\\$.?' } ],
'#comment': '#comment':
[ { token: 'punctuation.definition.comment.erlang', [ { token: 'punctuation.definition.comment.erlang',
regex: '%', regex: '%.*$',
push: push_:
[ { token: 'comment.line.percentage.erlang', [ { token: 'comment.line.percentage.erlang',
regex: '$', regex: '$',
next: 'pop' }, next: 'pop' },

View file

@ -171,8 +171,8 @@ var HaskellHighlightRules = function() {
{ defaultToken: 'comment.block.haskell' } ] } ], { defaultToken: 'comment.block.haskell' } ] } ],
'#comments': '#comments':
[ { token: 'punctuation.definition.comment.haskell', [ { token: 'punctuation.definition.comment.haskell',
regex: '--', regex: '--.*',
push: push_:
[ { token: 'comment.line.double-dash.haskell', [ { token: 'comment.line.double-dash.haskell',
regex: '$', regex: '$',
next: 'pop' }, next: 'pop' },

View file

@ -46,15 +46,15 @@ var IniHighlightRules = function() {
this.$rules = { start: this.$rules = { start:
[ { token: 'punctuation.definition.comment.ini', [ { token: 'punctuation.definition.comment.ini',
regex: '#', regex: '#.*',
push: push_:
[ { token: 'comment.line.number-sign.ini', [ { token: 'comment.line.number-sign.ini',
regex: '$', regex: '$',
next: 'pop' }, next: 'pop' },
{ defaultToken: 'comment.line.number-sign.ini' } ] }, { defaultToken: 'comment.line.number-sign.ini' } ] },
{ token: 'punctuation.definition.comment.ini', { token: 'punctuation.definition.comment.ini',
regex: ';', regex: ';.*',
push: push_:
[ { token: 'comment.line.semicolon.ini', regex: '$', next: 'pop' }, [ { token: 'comment.line.semicolon.ini', regex: '$', next: 'pop' },
{ defaultToken: 'comment.line.semicolon.ini' } ] }, { defaultToken: 'comment.line.semicolon.ini' } ] },
{ token: { token:

View file

@ -69,15 +69,15 @@ var PascalHighlightRules = function() {
{ token: 'constant.numeric.pascal', { token: 'constant.numeric.pascal',
regex: '\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)(L|l|UL|ul|u|U|F|f|ll|LL|ull|ULL)?\\b' }, regex: '\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)(L|l|UL|ul|u|U|F|f|ll|LL|ull|ULL)?\\b' },
{ token: 'punctuation.definition.comment.pascal', { token: 'punctuation.definition.comment.pascal',
regex: '--', regex: '--.*$',
push: push_:
[ { token: 'comment.line.double-dash.pascal.one', [ { token: 'comment.line.double-dash.pascal.one',
regex: '$', regex: '$',
next: 'pop' }, next: 'pop' },
{ defaultToken: 'comment.line.double-dash.pascal.one' } ] }, { defaultToken: 'comment.line.double-dash.pascal.one' } ] },
{ token: 'punctuation.definition.comment.pascal', { token: 'punctuation.definition.comment.pascal',
regex: '//', regex: '//.*$',
push: push_:
[ { token: 'comment.line.double-slash.pascal.two', [ { token: 'comment.line.double-slash.pascal.two',
regex: '$', regex: '$',
next: 'pop' }, next: 'pop' },

View file

@ -89,15 +89,15 @@ var RustHighlightRules = function() {
{ token: 'constant.numeric.float.source.rust', { token: 'constant.numeric.float.source.rust',
regex: '[0-9][0-9_]*(?:f32|f64|f)|[0-9][0-9_]*[eE][+-]=[0-9_]+|[0-9][0-9_]*[eE][+-]=[0-9_]+(?:f32|f64|f)|[0-9][0-9_]*\\.[0-9_]+|[0-9][0-9_]*\\.[0-9_]+(?:f32|f64|f)|[0-9][0-9_]*\\.[0-9_]+%[eE][+-]=[0-9_]+|[0-9][0-9_]*\\.[0-9_]+%[eE][+-]=[0-9_]+(?:f32|f64|f)' }, regex: '[0-9][0-9_]*(?:f32|f64|f)|[0-9][0-9_]*[eE][+-]=[0-9_]+|[0-9][0-9_]*[eE][+-]=[0-9_]+(?:f32|f64|f)|[0-9][0-9_]*\\.[0-9_]+|[0-9][0-9_]*\\.[0-9_]+(?:f32|f64|f)|[0-9][0-9_]*\\.[0-9_]+%[eE][+-]=[0-9_]+|[0-9][0-9_]*\\.[0-9_]+%[eE][+-]=[0-9_]+(?:f32|f64|f)' },
{ token: 'comment.line.documentation.source.rust', { token: 'comment.line.documentation.source.rust',
regex: '//!', regex: '//!.*$',
push: push_:
[ { token: 'comment.line.documentation.source.rust', [ { token: 'comment.line.documentation.source.rust',
regex: '$', regex: '$',
next: 'pop' }, next: 'pop' },
{ defaultToken: 'comment.line.documentation.source.rust' } ] }, { defaultToken: 'comment.line.documentation.source.rust' } ] },
{ token: 'comment.line.double-dash.source.rust', { token: 'comment.line.double-dash.source.rust',
regex: '//', regex: '//.*$',
push: push_:
[ { token: 'comment.line.double-dash.source.rust', [ { token: 'comment.line.double-dash.source.rust',
regex: '$', regex: '$',
next: 'pop' }, next: 'pop' },