Permalink
Browse files

update ace++

  • Loading branch information...
1 parent fce326a commit ce69ff01ea2be7600d1c60b86befa2c17adb6c99 @nightwing nightwing committed Dec 24, 2011
Showing with 1,113 additions and 159 deletions.
  1. +130 −80 chrome/content/ace++/res/ace/ace-uncompressed.js
  2. +22 −18 chrome/content/ace++/res/ace/mode-html.js
  3. +2 −3 chrome/content/ace++/res/ace/mode-json.js
  4. +2 −2 chrome/content/ace++/res/ace/mode-xml.js
  5. +177 −0 chrome/content/ace++/res/ace/theme-chrome.js
  6. +3 −2 chrome/content/ace++/res/ace/theme-clouds.js
  7. +3 −2 chrome/content/ace++/res/ace/theme-clouds_midnight.js
  8. +2 −2 chrome/content/ace++/res/ace/theme-cobalt.js
  9. +2 −3 chrome/content/ace++/res/ace/theme-crimson_editor.js
  10. +2 −2 chrome/content/ace++/res/ace/theme-dawn.js
  11. +3 −3 chrome/content/ace++/res/ace/theme-eclipse.js
  12. +2 −2 chrome/content/ace++/res/ace/theme-idle_fingers.js
  13. +2 −2 chrome/content/ace++/res/ace/theme-kr_theme.js
  14. +2 −2 chrome/content/ace++/res/ace/theme-merbivore.js
  15. +2 −2 chrome/content/ace++/res/ace/theme-merbivore_soft.js
  16. +2 −2 chrome/content/ace++/res/ace/theme-mono_industrial.js
  17. +2 −2 chrome/content/ace++/res/ace/theme-monokai.js
  18. +2 −2 chrome/content/ace++/res/ace/theme-pastel_on_dark.js
  19. +2 −2 chrome/content/ace++/res/ace/theme-solarized_dark.js
  20. +2 −2 chrome/content/ace++/res/ace/theme-solarized_light.js
  21. +2 −2 chrome/content/ace++/res/ace/theme-tomorrow.js
  22. +2 −2 chrome/content/ace++/res/ace/theme-tomorrow_night.js
  23. +2 −2 chrome/content/ace++/res/ace/theme-tomorrow_night_blue.js
  24. +2 −2 chrome/content/ace++/res/ace/theme-tomorrow_night_bright.js
  25. +2 −2 chrome/content/ace++/res/ace/theme-tomorrow_night_eighties.js
  26. +2 −2 chrome/content/ace++/res/ace/theme-twilight.js
  27. +2 −2 chrome/content/ace++/res/ace/theme-vibrant_ink.js
  28. +710 −0 chrome/content/ace++/res/beautify.js
  29. +2 −2 chrome/content/ace++/res/coffee-script.js
  30. 0 chrome/content/ace++/scrollbar.js
  31. +21 −8 chrome/content/ace++/startup.js
Oops, something went wrong.
@@ -1,5 +1,5 @@
define("ace/mode/html",[], function(require, exports, module) {
-
+
var oop = require("ace/lib/oop");
var TextMode = require("ace/mode/text").Mode;
var JavaScriptMode = require("ace/mode/javascript").Mode;
@@ -45,7 +45,7 @@ exports.Mode = Mode;
});
define("ace/mode/javascript",[], function(require, exports, module) {
-
+
var oop = require("ace/lib/oop");
var TextMode = require("ace/mode/text").Mode;
var Tokenizer = require("ace/tokenizer").Tokenizer;
@@ -140,7 +140,7 @@ exports.Mode = Mode;
});
define("ace/mode/css",[], function(require, exports, module) {
-
+
var oop = require("ace/lib/oop");
var TextMode = require("ace/mode/text").Mode;
var Tokenizer = require("ace/tokenizer").Tokenizer;
@@ -191,7 +191,7 @@ exports.Mode = Mode;
});
define("ace/mode/html_highlight_rules",[], function(require, exports, module) {
-
+
var oop = require("ace/lib/oop");
var CssHighlightRules = require("ace/mode/css_highlight_rules").CssHighlightRules;
var JavaScriptHighlightRules = require("ace/mode/javascript_highlight_rules").JavaScriptHighlightRules;
@@ -288,7 +288,7 @@ exports.HtmlHighlightRules = HtmlHighlightRules;
});
define("ace/mode/behaviour/xml",[], function(require, exports, module) {
-
+
var oop = require("ace/lib/oop");
var Behaviour = require("ace/mode/behaviour").Behaviour;
var CstyleBehaviour = require("ace/mode/behaviour/cstyle").CstyleBehaviour;
@@ -342,7 +342,7 @@ exports.XmlBehaviour = XmlBehaviour;
});
define("ace/mode/folding/html",[], function(require, exports, module) {
-
+
var oop = require("ace/lib/oop");
var MixedFoldMode = require("ace/mode/folding/mixed").FoldMode;
var XmlFoldMode = require("ace/mode/folding/xml").FoldMode;
@@ -391,7 +391,7 @@ oop.inherits(FoldMode, MixedFoldMode);
});
define("ace/mode/javascript_highlight_rules",[], function(require, exports, module) {
-
+
var oop = require("ace/lib/oop");
var lang = require("ace/lib/lang");
var unicode = require("ace/unicode");
@@ -679,7 +679,7 @@ exports.JavaScriptHighlightRules = JavaScriptHighlightRules;
});
define("ace/mode/matching_brace_outdent",[], function(require, exports, module) {
-
+
var Range = require("ace/range").Range;
var MatchingBraceOutdent = function() {};
@@ -723,7 +723,7 @@ exports.MatchingBraceOutdent = MatchingBraceOutdent;
});
define("ace/mode/behaviour/cstyle",[], function(require, exports, module) {
-
+
var oop = require("ace/lib/oop");
var Behaviour = require("ace/mode/behaviour").Behaviour;
@@ -908,7 +908,7 @@ exports.CstyleBehaviour = CstyleBehaviour;
});
define("ace/mode/folding/cstyle",[], function(require, exports, module) {
-
+
var oop = require("ace/lib/oop");
var Range = require("ace/range").Range;
var BaseFoldMode = require("ace/mode/folding/fold_mode").FoldMode;
@@ -966,7 +966,7 @@ oop.inherits(FoldMode, BaseFoldMode);
});
define("ace/mode/css_highlight_rules",[], function(require, exports, module) {
-
+
var oop = require("ace/lib/oop");
var lang = require("ace/lib/lang");
var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules;
@@ -1195,6 +1195,7 @@ exports.CssHighlightRules = CssHighlightRules;
});
define("ace/mode/xml_util",[], function(require, exports, module) {
+
var lang = require("ace/lib/lang");
var formTags = lang.arrayToMap(
@@ -1303,7 +1304,7 @@ exports.tag = function(states, name, nextState) {
});
define("ace/mode/folding/mixed",[], function(require, exports, module) {
-
+
var oop = require("ace/lib/oop");
var BaseFoldMode = require("ace/mode/folding/fold_mode").FoldMode;
@@ -1354,7 +1355,7 @@ oop.inherits(FoldMode, BaseFoldMode);
});
define("ace/mode/folding/xml",[], function(require, exports, module) {
-
+
var oop = require("ace/lib/oop");
var lang = require("ace/lib/lang");
var Range = require("ace/range").Range;
@@ -1520,7 +1521,7 @@ oop.inherits(FoldMode, BaseFoldMode);
var iterator = new TokenIterator(session, row, firstTag.column);
var start = {
row: row,
- column: firstTag.column + firstTag.tagName.length + 2
+ column: firstTag.column + firstTag.match.length
};
while (tag = this._readTagForward(iterator)) {
if (tag.selfClosing) {
@@ -1562,8 +1563,11 @@ oop.inherits(FoldMode, BaseFoldMode);
if (!tag.closing) {
this._pop(stack, tag);
if (stack.length == 0) {
- tag.start.column += tag.tagName.length + 2;
- return Range.fromPoints(tag.start, end);
+ if (tag.start.row != tag.end.row) {
+ tag.end.row = tag.start.row;
+ tag.end.column = Infinity;
+ }
+ return Range.fromPoints(tag.end, end);
}
}
else {
@@ -1579,7 +1583,7 @@ oop.inherits(FoldMode, BaseFoldMode);
});
define("ace/mode/doc_comment_highlight_rules",[], function(require, exports, module) {
-
+
var oop = require("ace/lib/oop");
var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules;
@@ -1638,7 +1642,7 @@ exports.DocCommentHighlightRules = DocCommentHighlightRules;
});
define("ace/mode/folding/fold_mode",[], function(require, exports, module) {
-
+
var Range = require("ace/range").Range;
var FoldMode = exports.FoldMode = function() {};
@@ -1,5 +1,5 @@
define("ace/mode/json",[], function(require, exports, module) {
-
+
var oop = require("ace/lib/oop");
var TextMode = require("ace/mode/text").Mode;
var Tokenizer = require("ace/tokenizer").Tokenizer;
@@ -45,9 +45,8 @@ exports.Mode = Mode;
});
define("ace/mode/json_highlight_rules",[], function(require, exports, module) {
-
+
var oop = require("ace/lib/oop");
-var lang = require("ace/lib/lang");
var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules;
var JsonHighlightRules = function() {
@@ -1,5 +1,5 @@
define("ace/mode/xml",[], function(require, exports, module) {
-
+
var oop = require("ace/lib/oop");
var TextMode = require("ace/mode/text").Mode;
var Tokenizer = require("ace/tokenizer").Tokenizer;
@@ -27,7 +27,7 @@ exports.Mode = Mode;
});
define("ace/mode/xml_highlight_rules",[], function(require, exports, module) {
-
+
var oop = require("ace/lib/oop");
var xmlUtil = require("ace/mode/xml_util");
var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules;
@@ -0,0 +1,177 @@
+define("ace/theme/chrome",[], function(require, exports, module) {
+
+exports.cssClass = "ace-chrome";
+exports.cssText = ".ace-chrome .ace_editor {\
+ border: 2px solid rgb(159, 159, 159);\
+}\
+\
+.ace-chrome .ace_editor.ace_focus {\
+ border: 2px solid #327fbd;\
+}\
+\
+.ace-chrome .ace_gutter {\
+ width: 50px;\
+ background: #e8e8e8;\
+ color: #333;\
+ overflow : hidden;\
+}\
+\
+.ace-chrome .ace_gutter-layer {\
+ width: 100%;\
+ text-align: right;\
+}\
+\
+.ace-chrome .ace_gutter-layer .ace_gutter-cell {\
+ padding-right: 6px;\
+}\
+\
+.ace-chrome .ace_print_margin {\
+ width: 1px;\
+ background: #e8e8e8;\
+}\
+\
+.ace-chrome .ace_text-layer {\
+ cursor: text;\
+}\
+\
+.ace-chrome .ace_cursor {\
+ border-left: 2px solid black;\
+}\
+\
+.ace-chrome .ace_cursor.ace_overwrite {\
+ border-left: 0px;\
+ border-bottom: 1px solid black;\
+}\
+ \
+.ace-chrome .ace_line .ace_invisible {\
+ color: rgb(191, 191, 191);\
+}\
+\
+.ace-chrome .ace_line .ace_keyword {\
+ color: blue;\
+}\
+\
+.ace-chrome .ace_line .ace_constant.ace_buildin {\
+ color: rgb(88, 72, 246);\
+}\
+\
+.ace-chrome .ace_line .ace_constant.ace_language {\
+ color: rgb(88, 92, 246);\
+}\
+\
+.ace-chrome .ace_line .ace_constant.ace_library {\
+ color: rgb(6, 150, 14);\
+}\
+\
+.ace-chrome .ace_line .ace_invalid {\
+ background-color: rgb(153, 0, 0);\
+ color: white;\
+}\
+\
+.ace-chrome .ace_line .ace_fold {\
+}\
+\
+.ace-chrome .ace_line .ace_support.ace_function {\
+ color: rgb(60, 76, 114);\
+}\
+\
+.ace-chrome .ace_line .ace_support.ace_constant {\
+ color: rgb(6, 150, 14);\
+}\
+\
+.ace-chrome .ace_line .ace_support.ace_type,\
+.ace-chrome .ace_line .ace_support.ace_class {\
+ color: rgb(109, 121, 222);\
+}\
+\
+.ace-chrome .ace_line .ace_keyword.ace_operator {\
+ color: rgb(104, 118, 135);\
+}\
+\
+.ace-chrome .ace_line .ace_string {\
+ color: #1919a6;\
+}\
+\
+.ace-chrome .ace_line .ace_comment {\
+ color: #236e24;\
+}\
+\
+.ace-chrome .ace_line .ace_comment.ace_doc {\
+ color: #236e24;\
+}\
+\
+.ace-chrome .ace_line .ace_comment.ace_doc.ace_tag {\
+ color: #236e24;\
+}\
+\
+.ace-chrome .ace_line .ace_constant.ace_numeric {\
+ color: rgb(0, 0, 205);\
+}\
+\
+.ace-chrome .ace_line .ace_variable {\
+ color: rgb(49, 132, 149);\
+}\
+\
+.ace-chrome .ace_line .ace_xml_pe {\
+ color: rgb(104, 104, 91);\
+}\
+\
+.ace-chrome .ace_entity.ace_name.ace_function {\
+ color: #0000A2;\
+}\
+\
+.ace-chrome .ace_markup.ace_markupine {\
+ text-decoration:underline;\
+}\
+\
+.ace-chrome .ace_markup.ace_heading {\
+ color: rgb(12, 7, 255);\
+}\
+\
+.ace-chrome .ace_markup.ace_list {\
+ color:rgb(185, 6, 144);\
+}\
+\
+.ace-chrome .ace_marker-layer .ace_selection {\
+ background: rgb(181, 213, 255);\
+}\
+\
+.ace-chrome .ace_marker-layer .ace_step {\
+ background: rgb(252, 255, 0);\
+}\
+\
+.ace-chrome .ace_marker-layer .ace_stack {\
+ background: rgb(164, 229, 101);\
+}\
+\
+.ace-chrome .ace_marker-layer .ace_bracket {\
+ margin: -1px 0 0 -1px;\
+ border: 1px solid rgb(192, 192, 192);\
+}\
+\
+.ace-chrome .ace_marker-layer .ace_active_line {\
+ background: rgba(0, 0, 0, 0.07);\
+}\
+\
+.ace-chrome .ace_marker-layer .ace_selected_word {\
+ background: rgb(250, 250, 255);\
+ border: 1px solid rgb(200, 200, 250);\
+}\
+\
+.ace-chrome .ace_meta.ace_tag {\
+ color: rgb(147, 15, 128);\
+}\
+\
+.ace-chrome .ace_string.ace_regex {\
+ color: rgb(255, 0, 0)\
+}\
+\
+.ace-chrome .ace_entity.ace_other.ace_attribute-name{\
+ color: #994409;\
+}";
+
+var dom = require("ace/lib/dom");
+dom.importCssString(exports.cssText, exports.cssClass);
+
+});
+
@@ -109,7 +109,8 @@ exports.cssText = "\
text-decoration:underline;\
}";
- var dom = require("ace/lib/dom");
- dom.importCssString(exports.cssText);
+var dom = require("ace/lib/dom");
+dom.importCssString(exports.cssText, exports.cssClass);
+
});
@@ -110,7 +110,8 @@ background-color:#E92E2E;\
text-decoration:underline;\
}";
- var dom = require("ace/lib/dom");
- dom.importCssString(exports.cssText);
+var dom = require("ace/lib/dom");
+dom.importCssString(exports.cssText, exports.cssClass);
+
});
Oops, something went wrong.

0 comments on commit ce69ff0

Please sign in to comment.