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

dom't merge embedded ruby into the standard html mode

Browse source
This commit is contained in:
Fabian Jakobs 2011-03-21 18:44:16 +08:00
commit ff7559e388
2 changed files with 0 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/ace/mode/html.js
View file

@ -41,7 +41,6 @@ var oop = require("pilot/oop");
var TextMode = require("ace/mode/text").Mode; var TextMode = require("ace/mode/text").Mode;
var JavaScriptMode = require("ace/mode/javascript").Mode; var JavaScriptMode = require("ace/mode/javascript").Mode;
var CssMode = require("ace/mode/css").Mode; var CssMode = require("ace/mode/css").Mode;
var RubyMode = require("ace/mode/ruby").Mode;
var Tokenizer = require("ace/tokenizer").Tokenizer; var Tokenizer = require("ace/tokenizer").Tokenizer;
var HtmlHighlightRules = require("ace/mode/html_highlight_rules").HtmlHighlightRules; var HtmlHighlightRules = require("ace/mode/html_highlight_rules").HtmlHighlightRules;
@ -50,7 +49,6 @@ var Mode = function() {
this.$js = new JavaScriptMode(); this.$js = new JavaScriptMode();
this.$css = new CssMode(); this.$css = new CssMode();
this.$ruby = new RubyMode();
}; };
oop.inherits(Mode, TextMode); oop.inherits(Mode, TextMode);
@ -94,12 +92,6 @@ oop.inherits(Mode, TextMode);
return this.$css[method].apply(this.$css, args); return this.$css[method].apply(this.$css, args);
} }
var split = state.split("ruby-");
if (!split[0] && split[1]) {
args[0] = split[1];
return this.$ruby[method].apply(this.$ruby, args);
}
return defaultHandler ? defaultHandler() : undefined; return defaultHandler ? defaultHandler() : undefined;
}; };

31
lib/ace/mode/html_highlight_rules.js
View file

@ -40,7 +40,6 @@ define(function(require, exports, module) {
var oop = require("pilot/oop"); var oop = require("pilot/oop");
var CssHighlightRules = require("ace/mode/css_highlight_rules").CssHighlightRules; var CssHighlightRules = require("ace/mode/css_highlight_rules").CssHighlightRules;
var JavaScriptHighlightRules = require("ace/mode/javascript_highlight_rules").JavaScriptHighlightRules; var JavaScriptHighlightRules = require("ace/mode/javascript_highlight_rules").JavaScriptHighlightRules;
var RubyHighlightRules = require("ace/mode/ruby_highlight_rules").RubyHighlightRules;
var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules; var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules;
var HtmlHighlightRules = function() { var HtmlHighlightRules = function() {
@ -68,10 +67,6 @@ var HtmlHighlightRules = function() {
token : "text", token : "text",
regex : "<(?=\s*style)", regex : "<(?=\s*style)",
next : "css" next : "css"
}, {
token : "text",
regex : "<(?=\s*%)",
next : "ruby"
}, { }, {
token : "text", // opening tag token : "text", // opening tag
regex : "<\\/?", regex : "<\\/?",
@ -120,24 +115,6 @@ var HtmlHighlightRules = function() {
regex : "'.*?'" regex : "'.*?'"
} ], } ],
ruby : [ {
token : "text",
regex : ".",
next : "ruby-start"
}, {
token : "keyword",
regex : "[-_a-zA-Z0-9:]+"
}, {
token : "text",
regex : "\\s+"
}, {
token : "string",
regex : '".*?"'
}, {
token : "string",
regex : "'.*?'"
} ],
tag : [ { tag : [ {
token : "text", token : "text",
regex : ">", regex : ">",
@ -197,14 +174,6 @@ var HtmlHighlightRules = function() {
regex: "<\\/(?=style)", regex: "<\\/(?=style)",
next: "tag" next: "tag"
}); });
var rubyRules = new RubyHighlightRules().getRules();
this.addRules(rubyRules, "ruby-");
this.$rules["ruby-start"].unshift({
token: "text",
regex: "%>",
next: "tag"
});
}; };
oop.inherits(HtmlHighlightRules, TextHighlightRules); oop.inherits(HtmlHighlightRules, TextHighlightRules);