rename all language mode classes to 'Mode'.
This commit is contained in:
parent
5224b0cf97
commit
cbb6215145
18 changed files with 80 additions and 119 deletions
|
|
@ -46,12 +46,12 @@ exports.launch = function(env) {
|
|||
var Renderer = require("ace/virtual_renderer").VirtualRenderer;
|
||||
var theme = require("ace/theme/textmate");
|
||||
var Document = require("ace/document").Document;
|
||||
var JavaScriptMode = require("ace/mode/javascript").JavaScript;
|
||||
var CssMode = require("ace/mode/css").Css;
|
||||
var HtmlMode = require("ace/mode/html").Html;
|
||||
var XmlMode = require("ace/mode/xml").Xml;
|
||||
var PythonMode = require("ace/mode/python").Python;
|
||||
var TextMode = require("ace/mode/text").Text;
|
||||
var JavaScriptMode = require("ace/mode/javascript").Mode;
|
||||
var CssMode = require("ace/mode/css").Mode;
|
||||
var HtmlMode = require("ace/mode/html").Mode;
|
||||
var XmlMode = require("ace/mode/xml").Mode;
|
||||
var PythonMode = require("ace/mode/python").Mode;
|
||||
var TextMode = require("ace/mode/text").Mode;
|
||||
var UndoManager = require("ace/undomanager").UndoManager;
|
||||
|
||||
var docs = {};
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ var oop = require("pilot/oop").oop;
|
|||
var lang = require("pilot/lang").lang;
|
||||
var EventEmitter = require("pilot/event_emitter").EventEmitter;
|
||||
var Selection = require("ace/selection").Selection;
|
||||
var TextMode = require("ace/mode/text").Text;
|
||||
var TextMode = require("ace/mode/text").Mode;
|
||||
var Range = require("ace/range").Range;
|
||||
|
||||
var Document = function(text, mode) {
|
||||
|
|
|
|||
|
|
@ -38,16 +38,16 @@
|
|||
define(function(require, exports, module) {
|
||||
|
||||
var oop = require("pilot/oop").oop;
|
||||
var TextMode = require("ace/mode/text").Text;
|
||||
var TextMode = require("ace/mode/text").Mode;
|
||||
var Tokenizer = require("ace/tokenizer").Tokenizer;
|
||||
var CssHighlightRules = require("ace/mode/css_highlight_rules").CssHighlightRules;
|
||||
var MatchingBraceOutdent = require("ace/mode/matching_brace_outdent").MatchingBraceOutdent;
|
||||
|
||||
var Css = function() {
|
||||
var Mode = function() {
|
||||
this.$tokenizer = new Tokenizer(new CssHighlightRules().getRules());
|
||||
this.$outdent = new MatchingBraceOutdent();
|
||||
};
|
||||
oop.inherits(Css, TextMode);
|
||||
oop.inherits(Mode, TextMode);
|
||||
|
||||
(function() {
|
||||
|
||||
|
|
@ -76,8 +76,8 @@ oop.inherits(Css, TextMode);
|
|||
return this.$outdent.autoOutdent(doc, row);
|
||||
};
|
||||
|
||||
}).call(Css.prototype);
|
||||
}).call(Mode.prototype);
|
||||
|
||||
exports.Css = Css;
|
||||
exports.Mode = Mode;
|
||||
|
||||
});
|
||||
|
|
|
|||
|
|
@ -38,19 +38,19 @@
|
|||
define(function(require, exports, module) {
|
||||
|
||||
var oop = require("pilot/oop").oop;
|
||||
var TextMode = require("ace/mode/text").Text;
|
||||
var JavaScriptMode = require("ace/mode/javascript").JavaScript;
|
||||
var CssMode = require("ace/mode/css").Css;
|
||||
var TextMode = require("ace/mode/text").Mode;
|
||||
var JavaScriptMode = require("ace/mode/javascript").Mode;
|
||||
var CssMode = require("ace/mode/css").Mode;
|
||||
var Tokenizer = require("ace/tokenizer").Tokenizer;
|
||||
var HtmlHighlightRules = require("ace/mode/html_highlight_rules").HtmlHighlightRules;
|
||||
|
||||
var Html = function() {
|
||||
var Mode = function() {
|
||||
this.$tokenizer = new Tokenizer(new HtmlHighlightRules().getRules());
|
||||
|
||||
this.$js = new JavaScriptMode();
|
||||
this.$css = new CssMode();
|
||||
};
|
||||
oop.inherits(Html, TextMode);
|
||||
oop.inherits(Mode, TextMode);
|
||||
|
||||
(function() {
|
||||
|
||||
|
|
@ -95,7 +95,7 @@ oop.inherits(Html, TextMode);
|
|||
return defaultHandler ? defaultHandler() : undefined;
|
||||
};
|
||||
|
||||
}).call(Html.prototype);
|
||||
}).call(Mode.prototype);
|
||||
|
||||
exports.Html = Html;
|
||||
exports.Mode = Mode;
|
||||
});
|
||||
|
|
|
|||
|
|
@ -38,17 +38,17 @@
|
|||
define(function(require, exports, module) {
|
||||
|
||||
var oop = require("pilot/oop").oop;
|
||||
var TextMode = require("ace/mode/text").Text;
|
||||
var TextMode = require("ace/mode/text").Mode;
|
||||
var Tokenizer = require("ace/tokenizer").Tokenizer;
|
||||
var JavaScriptHighlightRules = require("ace/mode/javascript_highlight_rules").JavaScriptHighlightRules;
|
||||
var MatchingBraceOutdent = require("ace/mode/matching_brace_outdent").MatchingBraceOutdent;
|
||||
var Range = require("ace/range").Range;
|
||||
|
||||
var JavaScript = function() {
|
||||
var Mode = function() {
|
||||
this.$tokenizer = new Tokenizer(new JavaScriptHighlightRules().getRules());
|
||||
this.$outdent = new MatchingBraceOutdent();
|
||||
};
|
||||
oop.inherits(JavaScript, TextMode);
|
||||
oop.inherits(Mode, TextMode);
|
||||
|
||||
(function() {
|
||||
|
||||
|
|
@ -121,7 +121,7 @@ oop.inherits(JavaScript, TextMode);
|
|||
return this.$outdent.autoOutdent(doc, row);
|
||||
};
|
||||
|
||||
}).call(JavaScript.prototype);
|
||||
}).call(Mode.prototype);
|
||||
|
||||
exports.JavaScript = JavaScript;
|
||||
exports.Mode = Mode;
|
||||
});
|
||||
|
|
|
|||
|
|
@ -38,17 +38,17 @@
|
|||
define(function(require, exports, module) {
|
||||
|
||||
var oop = require("pilot/oop").oop;
|
||||
var TextMode = require("./text").Text;
|
||||
var TextMode = require("./text").Mode;
|
||||
var Tokenizer = require("../tokenizer").Tokenizer;
|
||||
var PythonHighlightRules = require("./python_highlight_rules").PythonHighlightRules;
|
||||
var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
|
||||
var Range = require("../range").Range;
|
||||
|
||||
var Python = function() {
|
||||
var Mode = function() {
|
||||
this.$tokenizer = new Tokenizer(new PythonHighlightRules().getRules());
|
||||
this.$outdent = new MatchingBraceOutdent();
|
||||
};
|
||||
oop.inherits(Python, TextMode);
|
||||
oop.inherits(Mode, TextMode);
|
||||
|
||||
(function() {
|
||||
|
||||
|
|
@ -110,7 +110,7 @@ oop.inherits(Python, TextMode);
|
|||
return this.$outdent.autoOutdent(doc, row);
|
||||
};
|
||||
|
||||
}).call(Python.prototype);
|
||||
}).call(Mode.prototype);
|
||||
|
||||
exports.Python = Python;
|
||||
exports.Mode = Mode;
|
||||
});
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ define(function(require, exports, module) {
|
|||
var Tokenizer = require("ace/tokenizer").Tokenizer;
|
||||
var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules;
|
||||
|
||||
var Text = function() {
|
||||
var Mode = function() {
|
||||
this.$tokenizer = new Tokenizer(new TextHighlightRules().getRules());
|
||||
};
|
||||
|
||||
|
|
@ -74,7 +74,7 @@ var Text = function() {
|
|||
return "";
|
||||
};
|
||||
|
||||
}).call(Text.prototype);
|
||||
}).call(Mode.prototype);
|
||||
|
||||
exports.Text = Text;
|
||||
exports.Mode = Mode;
|
||||
});
|
||||
|
|
|
|||
|
|
@ -38,15 +38,15 @@
|
|||
define(function(require, exports, module) {
|
||||
|
||||
var oop = require("pilot/oop").oop;
|
||||
var TextMode = require("ace/mode/text").Text;
|
||||
var TextMode = require("ace/mode/text").Mode;
|
||||
var Tokenizer = require("ace/tokenizer").Tokenizer;
|
||||
var XmlHighlightRules = require("ace/mode/xml_highlight_rules").XmlHighlightRules;
|
||||
|
||||
var Xml = function() {
|
||||
var Mode = function() {
|
||||
this.$tokenizer = new Tokenizer(new XmlHighlightRules().getRules());
|
||||
};
|
||||
|
||||
oop.inherits(Xml, TextMode);
|
||||
oop.inherits(Mode, TextMode);
|
||||
|
||||
(function() {
|
||||
|
||||
|
|
@ -54,7 +54,7 @@ oop.inherits(Xml, TextMode);
|
|||
return this.$getIndent(line);
|
||||
};
|
||||
|
||||
}).call(Xml.prototype);
|
||||
}).call(Mode.prototype);
|
||||
|
||||
exports.Xml = Xml;
|
||||
exports.Mode = Mode;
|
||||
});
|
||||
|
|
|
|||
|
|
@ -35,17 +35,12 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
require.def([
|
||||
"ace/Document",
|
||||
"ace/Range",
|
||||
"ace/mode/Css"
|
||||
], function(
|
||||
Document,
|
||||
Range,
|
||||
cssMod
|
||||
) {
|
||||
define(function(require, exports, module) {
|
||||
|
||||
var Document = require("ace/document").Document;
|
||||
var Range = require("ace/range").Range;
|
||||
var Css = require("ace/mode/css").Mode;
|
||||
|
||||
var CssMode = cssMod.Css;
|
||||
var CssTest = new TestCase("mode.CssTest", {
|
||||
|
||||
setUp : function() {
|
||||
|
|
|
|||
|
|
@ -35,13 +35,10 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
require.def([
|
||||
"ace/mode/Css"
|
||||
], function(
|
||||
cssMod
|
||||
) {
|
||||
define(function(require, exports, module) {
|
||||
|
||||
var Css = require("ace/mode/css").Mode;
|
||||
|
||||
var CssMode = cssMod.Css;
|
||||
var CssTest = new TestCase("mode.CssTest", {
|
||||
|
||||
setUp : function() {
|
||||
|
|
|
|||
|
|
@ -35,17 +35,12 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
require.def([
|
||||
"ace/Document",
|
||||
"ace/Range",
|
||||
"ace/mode/Html"
|
||||
], function(
|
||||
Document,
|
||||
Range,
|
||||
htmlMod
|
||||
) {
|
||||
define(function(require, exports, module) {
|
||||
|
||||
var Document = require("ace/document").Document;
|
||||
var Range = require("ace/range").Range;
|
||||
var Html = require("ace/mode/html").Mode;
|
||||
|
||||
var HtmlMode = htmlMod.Html;
|
||||
var HtmlTest = new TestCase("mode.HtmlTest", {
|
||||
|
||||
setUp : function() {
|
||||
|
|
|
|||
|
|
@ -35,13 +35,10 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
require.def([
|
||||
"ace/mode/Html"
|
||||
], function(
|
||||
htmlMod
|
||||
) {
|
||||
define(function(require, exports, module) {
|
||||
|
||||
var Html = require("ace/mode/html").Mode;
|
||||
|
||||
var HtmlMode = htmlMod.Html;
|
||||
var HtmlTest = new TestCase("mode.HtmlTest", {
|
||||
|
||||
setUp : function() {
|
||||
|
|
|
|||
|
|
@ -35,19 +35,13 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
require.def([
|
||||
"ace/Document",
|
||||
"ace/Range",
|
||||
"ace/Tokenizer",
|
||||
"ace/mode/JavaScript"
|
||||
], function(
|
||||
Document,
|
||||
Range,
|
||||
Tokenizer,
|
||||
jsMod
|
||||
) {
|
||||
define(function(require, exports, module) {
|
||||
|
||||
var Document = require("ace/document").Document;
|
||||
var Range = require("ace/range").Range;
|
||||
var Tokenizer = require("ace/tokenizer").Tokenizer;
|
||||
var JavaScript = require("ace/mode/javascript").Mode;
|
||||
|
||||
var JavaScriptMode = jsMod.JavaScript;
|
||||
var JavaScriptTest = new TestCase("mode.JavaScriptTest", {
|
||||
|
||||
setUp : function() {
|
||||
|
|
|
|||
|
|
@ -35,13 +35,10 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
require.def([
|
||||
"ace/mode/JavaScript"
|
||||
], function(
|
||||
jsMod
|
||||
) {
|
||||
define(function(require, exports, module) {
|
||||
|
||||
var JavaScript = require("ace/mode/javascript").Mode;
|
||||
|
||||
var JavaScriptMode = jsMod.JavaScript;
|
||||
var JavaScriptTokenizerTest = new TestCase("mode.JavaScriptTokenizerTest", {
|
||||
|
||||
setUp : function() {
|
||||
|
|
|
|||
|
|
@ -35,17 +35,12 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
require.def([
|
||||
"ace/Document",
|
||||
"ace/Range",
|
||||
"ace/mode/Text"
|
||||
], function(
|
||||
Document,
|
||||
Range,
|
||||
textMod
|
||||
) {
|
||||
define(function(require, exports, module) {
|
||||
|
||||
var Document = require("ace/document").Document;
|
||||
var Range = require("ace/range").Range;
|
||||
var Text = require("ace/mode/text").Mode;
|
||||
|
||||
var TextMode = textMod.Text;
|
||||
var TextTest = new TestCase("mode.TextTest", {
|
||||
|
||||
setUp : function() {
|
||||
|
|
|
|||
|
|
@ -35,19 +35,13 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
require.def([
|
||||
"ace/Document",
|
||||
"ace/Range",
|
||||
"ace/Tokenizer",
|
||||
"ace/mode/Xml"
|
||||
], function(
|
||||
Document,
|
||||
Range,
|
||||
Tokenizer,
|
||||
xmlMod
|
||||
) {
|
||||
define(function(require, exports, module) {
|
||||
|
||||
var Document = require("ace/document").Document;
|
||||
var Range = require("ace/range").Range;
|
||||
var Tokenizer = require("ace/tokenizer").Tokenizer;
|
||||
var Xml = require("ace/mode/xml").Mode;
|
||||
|
||||
var XmlMode = xmlMod.Xml;
|
||||
var XmlTest = new TestCase("mode.XmlTest", {
|
||||
|
||||
setUp : function() {
|
||||
|
|
|
|||
|
|
@ -35,13 +35,10 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
require.def([
|
||||
"ace/mode/Xml"
|
||||
], function(
|
||||
xmlMod
|
||||
) {
|
||||
define(function(require, exports, module) {
|
||||
|
||||
var Xml = require("ace/mode/xml").Mode;
|
||||
|
||||
var XmlMode = xmlMod.Xml;
|
||||
var XmlTest = new TestCase("mode.XmlTest", {
|
||||
|
||||
setUp : function() {
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ global.location = browser.location;
|
|||
|
||||
var Document = require("../document"),
|
||||
Editor = require("../editor"),
|
||||
JavaScriptMode = require("../mode/javascript").JavaScript,
|
||||
JavaScriptMode = require("../mode/javascript").Mode,
|
||||
MockRenderer = require("./mockrenderer"),
|
||||
assert = require("./assertions");
|
||||
|
||||
|
|
@ -112,7 +112,7 @@ var Test = {
|
|||
assert.position(editor.getCursorPosition(), 2, 0);
|
||||
},
|
||||
|
||||
"__test: indent block" : function() {
|
||||
"test: indent block" : function() {
|
||||
var doc = new Document(["a12345", "b12345", "c12345"].join("\n"));
|
||||
var editor = new Editor(new MockRenderer(), doc);
|
||||
|
||||
|
|
@ -131,7 +131,7 @@ var Test = {
|
|||
assert.position(range.end, 2, 7);
|
||||
},
|
||||
|
||||
"__test: outdent block" : function() {
|
||||
"test: outdent block" : function() {
|
||||
var doc = new Document([" a12345", " b12345", " c12345"].join("\n"));
|
||||
var editor = new Editor(new MockRenderer(), doc);
|
||||
|
||||
|
|
@ -248,7 +248,7 @@ var Test = {
|
|||
assert.position(editor.getSelection().getSelectionLead(), 2, 0);
|
||||
},
|
||||
|
||||
"__test: move lines up should select moved lines" : function() {
|
||||
"test: move lines up should select moved lines" : function() {
|
||||
var doc = new Document(["11", "22", "33", "44"].join("\n"));
|
||||
var editor = new Editor(new MockRenderer(), doc);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue