From 15d25743dc0c84c9e5bddbe7be1167be28a99545 Mon Sep 17 00:00:00 2001 From: Garen Torikian Date: Tue, 13 Nov 2012 14:33:31 -0800 Subject: [PATCH] Reinsert numerics, fix up tests --- lib/ace/mode/ruby_highlight_rules.js | 4 +++- lib/ace/mode/ruby_highlight_rules_test.js | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/ace/mode/ruby_highlight_rules.js b/lib/ace/mode/ruby_highlight_rules.js index f2db5b57..2522525a 100644 --- a/lib/ace/mode/ruby_highlight_rules.js +++ b/lib/ace/mode/ruby_highlight_rules.js @@ -158,7 +158,9 @@ var RubyHighlightRules = function() { }, constantOtherSymbol, - + constantNumericHex, + constantNumericFloat, + { token : "constant.language.boolean", regex : "(?:true|false)\\b" diff --git a/lib/ace/mode/ruby_highlight_rules_test.js b/lib/ace/mode/ruby_highlight_rules_test.js index 2f52b3e7..66d7edbd 100644 --- a/lib/ace/mode/ruby_highlight_rules_test.js +++ b/lib/ace/mode/ruby_highlight_rules_test.js @@ -48,10 +48,10 @@ module.exports = { "test: symbol tokenizer" : function() { // https://gist.github.com/1072693 - assertValidTokens(this.tokenizer, "string", + assertValidTokens(this.tokenizer, "constant.other.symbol.ruby", [":@thing", ":$thing", ":_thing", ":thing", ":Thing", ":thing1", ":thing_a", ":THING", ":thing!", ":thing=", ":thing?", ":t?"]); - assertInvalidTokens(this.tokenizer, "string", + assertInvalidTokens(this.tokenizer, "constant.other.symbol.ruby", [":", ":@", ":$", ":1", ":1thing", ":th?ing", ":thi=ng", ":1thing", ":th!ing", ":thing#"]); }, @@ -61,9 +61,9 @@ module.exports = { var tokens = this.tokenizer.getLineTokens(line, "start").tokens; assert.equal(3, tokens.length); - assert.equal("variable.class", tokens[0].type); + assert.equal("support.class", tokens[0].type); assert.equal("text", tokens[1].type); - assert.equal("variable.class", tokens[2].type); + assert.equal("support.class", tokens[2].type); }, "test: hex tokenizer" : function() {