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

Merge branch 'master' of git://github.com/ajaxorg/ace

Browse source
This commit is contained in:
C9 2012-10-01 13:20:06 -04:00
commit 3c4d90dc55
59 changed files with 615 additions and 629 deletions
Download patch file Download diff file Expand all files Collapse all files

2
demo/kitchen-sink/docs/diff.diff
View file

@ -16,7 +16,7 @@ index 23fc3fc..ed3b273 100644
+ this.highlight = function(re) { + this.highlight = function(re) {
+ if (!this.$searchHighlight) { + if (!this.$searchHighlight) {
+ var highlight = new SearchHighlight(null, "ace_selected_word", "text"); + var highlight = new SearchHighlight(null, "ace_selected-word", "text");
+ this.$searchHighlight = this.addDynamicMarker(highlight); + this.$searchHighlight = this.addDynamicMarker(highlight);
+ } + }
+ this.$searchHighlight.setRegexp(re); + this.$searchHighlight.setRegexp(re);

2
demo/kitchen-sink/docs/svg.svg
View file

@ -47,7 +47,7 @@
setTimeout("ShowAndGrowElement()", timer_increment) setTimeout("ShowAndGrowElement()", timer_increment)
} }
window.ShowAndGrowElement = ShowAndGrowElement window.ShowAndGrowElement = ShowAndGrowElement
]]</script> ]]></script>
<rect <rect
fill="#2e3436" fill="#2e3436"

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

Before After
Before After

BIN
doc/site/images/zorba-logo.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

Before After
Before After

8
index.html
View file

@ -17,10 +17,6 @@
<link href="./doc/resources/ace/skeleton/images/favicon.ico" rel="icon" type="image/x-icon"> <link href="./doc/resources/ace/skeleton/images/favicon.ico" rel="icon" type="image/x-icon">
</head> </head>
<body> <body>
<a href="http://github.com/ajaxorg/ace">
<img style="z-index: 50000; position: absolute; top: 0; right: 0; border: 0;" src="https://a248.e.akamai.net/camo.github.com/e6bef7a091f5f3138b8cd40bc3e114258dd68ddf/687474703a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f7265645f6161303030302e706e67"
alt="Fork me on GitHub">
</a>
<div id="wrapper"> <div id="wrapper">
<div class="content"> <div class="content">
<div class="column2"> <div class="column2">
@ -161,7 +157,7 @@ console.log(addResult);</div>
return x; return x;
}&lt;/div> }&lt;/div>
&lt;script src="http://d1n0x3qji82z53.cloudfront.net/src-min-noconflict/ace.js" type="text/javascript" charset="utf-8">&lt;/script> &lt;script src="//d1n0x3qji82z53.cloudfront.net/src-min-noconflict/ace.js" type="text/javascript" charset="utf-8">&lt;/script>
&lt;script> &lt;script>
var editor = ace.edit("editor"); var editor = ace.edit("editor");
editor.setTheme("ace/theme/monokai"); editor.setTheme("ace/theme/monokai");
@ -487,7 +483,7 @@ tests for the highlighting.</p>
</li> </li>
<li> <li>
<img src="doc/site/images/zorba-logo.png" <img src="doc/site/images/zorba-logo.png"
style="position: relative; left: -5px; top: 16px; background: #fff; style="position: relative; left: -7px; top: 16px;
padding: 6px 4px 6px 6px;" /> padding: 6px 4px 6px 6px;" />
<a href="http://www.zorba-xquery.com/html/demo">Zorba XQuery</a> <a href="http://www.zorba-xquery.com/html/demo">Zorba XQuery</a>
</li> </li>

63
lib/ace/css/editor.css
View file

@ -12,9 +12,9 @@
.ace_content { .ace_content {
position: absolute; position: absolute;
box-sizing: border-box;
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box;
cursor: text; cursor: text;
} }
@ -27,13 +27,13 @@
z-index: 4; z-index: 4;
} }
.ace_gutter_active_line { .ace_gutter-active-line {
position: absolute; position: absolute;
left: 0; left: 0;
right: 0; right: 0;
} }
.ace_scroller.horscroll { .ace_scroller.ace_scroll-left {
box-shadow: 17px 0 16px -16px rgba(0, 0, 0, 0.4) inset; box-shadow: 17px 0 16px -16px rgba(0, 0, 0, 0.4) inset;
} }
@ -62,50 +62,40 @@
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoTWFjaW50b3NoKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpGRTk5MTVGREIxNDkxMUUxOTc5Q0FFREQyMTNGMjBFQyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpGRTk5MTVGRUIxNDkxMUUxOTc5Q0FFREQyMTNGMjBFQyI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkZFOTkxNUZCQjE0OTExRTE5NzlDQUVERDIxM0YyMEVDIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkZFOTkxNUZDQjE0OTExRTE5NzlDQUVERDIxM0YyMEVDIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+SIDkjAAAAJ1JREFUeNpi/P//PwMlgImBQkB7A6qrq/+DMC55FkIGKCoq4pVnpFkgTp069f/+/fv/r1u37r+tre1/kg0A+ptn9uzZYLaRkRHpLvjw4cNXWVlZhufPnzOcO3eOdAO0tbVPAjHDmzdvGA4fPsxIsgGSkpJmv379Ynj37h2DjIyMCMkG3LhxQ/T27dsMampqDHZ2dq/pH41DxwCAAAMAFdc68dUsFZgAAAAASUVORK5CYII="); background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoTWFjaW50b3NoKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpGRTk5MTVGREIxNDkxMUUxOTc5Q0FFREQyMTNGMjBFQyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpGRTk5MTVGRUIxNDkxMUUxOTc5Q0FFREQyMTNGMjBFQyI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkZFOTkxNUZCQjE0OTExRTE5NzlDQUVERDIxM0YyMEVDIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkZFOTkxNUZDQjE0OTExRTE5NzlDQUVERDIxM0YyMEVDIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+SIDkjAAAAJ1JREFUeNpi/P//PwMlgImBQkB7A6qrq/+DMC55FkIGKCoq4pVnpFkgTp069f/+/fv/r1u37r+tre1/kg0A+ptn9uzZYLaRkRHpLvjw4cNXWVlZhufPnzOcO3eOdAO0tbVPAjHDmzdvGA4fPsxIsgGSkpJmv379Ynj37h2DjIyMCMkG3LhxQ/T27dsMampqDHZ2dq/pH41DxwCAAAMAFdc68dUsFZgAAAAASUVORK5CYII=");
} }
.ace_editor .ace_sb { .ace_scrollbar {
position: absolute; position: absolute;
overflow-x: hidden; overflow-x: hidden;
overflow-y: scroll; overflow-y: scroll;
right: 0; right: 0;
} }
.ace_editor .ace_sb div { .ace_scrollbar-inner {
position: absolute; position: absolute;
width: 1px; width: 1px;
left: 0; left: 0;
} }
.ace_editor .ace_print_margin_layer { .ace_print-margin {
z-index: 0;
position: absolute;
overflow: hidden;
margin: 0;
left: 0;
height: 100%;
width: 100%;
}
.ace_editor .ace_print_margin {
position: absolute; position: absolute;
height: 100%; height: 100%;
} }
.ace_editor > textarea { .ace_text-input {
position: absolute; position: absolute;
z-index: 0; z-index: 0;
width: 0.5em; width: 0.5em;
height: 1em; height: 1em;
opacity: 0; opacity: 0;
background: transparent; background: transparent;
appearance: none;
-moz-appearance: none; -moz-appearance: none;
appearance: none;
border: none; border: none;
resize: none; resize: none;
outline: none; outline: none;
overflow: hidden; overflow: hidden;
} }
.ace_editor > textarea.ace_composition { .ace_text-input.ace_composition {
background: #fff; background: #fff;
color: #000; color: #000;
z-index: 1000; z-index: 1000;
@ -121,15 +111,15 @@
white-space: nowrap; white-space: nowrap;
height: 100%; height: 100%;
width: 100%; width: 100%;
box-sizing: border-box;
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box;
/* setting pointer-events: auto; on node under the mouse, which changes /* setting pointer-events: auto; on node under the mouse, which changes
during scroll, will break mouse wheel scrolling in Safari */ during scroll, will break mouse wheel scrolling in Safari */
pointer-events: none; pointer-events: none;
} }
.ace_gutter .ace_layer { .ace_gutter-layer {
position: relative; position: relative;
width: auto; width: auto;
text-align: right; text-align: right;
@ -153,13 +143,16 @@
.ace_cursor { .ace_cursor {
z-index: 4; z-index: 4;
position: absolute; position: absolute;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
} }
.ace_cursor.ace_hidden { .ace_cursor.ace_hidden {
opacity: 0.2; opacity: 0.2;
} }
.ace_editor.multiselect .ace_cursor { .ace_editor.ace_multiselect .ace_cursor {
border-left-width: 1px; border-left-width: 1px;
} }
@ -182,23 +175,23 @@
z-index: 6; z-index: 6;
} }
.ace_marker-layer .ace_active_line { .ace_marker-layer .ace_active-line {
position: absolute; position: absolute;
z-index: 2; z-index: 2;
} }
.ace_marker-layer .ace_selected_word { .ace_marker-layer .ace_selected-word {
position: absolute; position: absolute;
z-index: 4; z-index: 4;
box-sizing: border-box;
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box;
} }
.ace_line .ace_fold { .ace_line .ace_fold {
box-sizing: border-box;
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box;
display: inline-block; display: inline-block;
height: 11px; height: 11px;
@ -232,11 +225,11 @@
background-position: center center, top left; background-position: center center, top left;
} }
.ace_dragging .ace_content { .ace_editor.ace_dragging .ace_content {
cursor: move; cursor: move;
} }
.ace_gutter_tooltip { .ace_gutter-tooltip {
background-color: #FFFFD5; background-color: #FFFFD5;
border: 1px solid gray; border: 1px solid gray;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.4); box-shadow: 0 1px 1px rgba(0, 0, 0, 0.4);
@ -245,9 +238,9 @@
padding: 4px; padding: 4px;
position: absolute; position: absolute;
z-index: 300; z-index: 300;
box-sizing: border-box;
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box;
cursor: default; cursor: default;
} }
@ -256,9 +249,9 @@
} }
.ace_fold-widget { .ace_fold-widget {
box-sizing: border-box;
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box;
margin: 0 -12px 0 1px; margin: 0 -12px 0 1px;
display: inline-block; display: inline-block;
@ -274,11 +267,11 @@
border: 1px solid transparent; border: 1px solid transparent;
} }
.ace_fold-widget.end { .ace_fold-widget.ace_end {
background-image: url("data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%05%00%00%00%05%08%06%00%00%00%8Do%26%E5%00%00%004IDATx%DAm%C7%C1%09%000%08C%D1%8C%ECE%C8E(%8E%EC%02)%1EZJ%F1%C1'%04%07I%E1%E5%EE%CAL%F5%A2%99%99%22%E2%D6%1FU%B5%FE0%D9x%A7%26Wz5%0E%D5%00%00%00%00IEND%AEB%60%82"); background-image: url("data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%05%00%00%00%05%08%06%00%00%00%8Do%26%E5%00%00%004IDATx%DAm%C7%C1%09%000%08C%D1%8C%ECE%C8E(%8E%EC%02)%1EZJ%F1%C1'%04%07I%E1%E5%EE%CAL%F5%A2%99%99%22%E2%D6%1FU%B5%FE0%D9x%A7%26Wz5%0E%D5%00%00%00%00IEND%AEB%60%82");
} }
.ace_fold-widget.closed { .ace_fold-widget.ace_closed {
background-image: url("data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%03%00%00%00%06%08%06%00%00%00%06%E5%24%0C%00%00%009IDATx%DA5%CA%C1%09%000%08%03%C0%AC*(%3E%04%C1%0D%BA%B1%23%A4Uh%E0%20%81%C0%CC%F8%82%81%AA%A2%AArGfr%88%08%11%11%1C%DD%7D%E0%EE%5B%F6%F6%CB%B8%05Q%2F%E9tai%D9%00%00%00%00IEND%AEB%60%82"); background-image: url("data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%03%00%00%00%06%08%06%00%00%00%06%E5%24%0C%00%00%009IDATx%DA5%CA%C1%09%000%08%03%C0%AC*(%3E%04%C1%0D%BA%B1%23%A4Uh%E0%20%81%C0%CC%F8%82%81%AA%A2%AArGfr%88%08%11%11%1C%DD%7D%E0%EE%5B%F6%F6%CB%B8%05Q%2F%E9tai%D9%00%00%00%00IEND%AEB%60%82");
} }
@ -303,10 +296,10 @@
.ace_dark .ace_fold-widget { .ace_dark .ace_fold-widget {
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHklEQVQIW2P4//8/AzoGEQ7oGCaLLAhWiSwB146BAQCSTPYocqT0AAAAAElFTkSuQmCC"); background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHklEQVQIW2P4//8/AzoGEQ7oGCaLLAhWiSwB146BAQCSTPYocqT0AAAAAElFTkSuQmCC");
} }
.ace_dark .ace_fold-widget.end { .ace_dark .ace_fold-widget.ace_end {
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAH0lEQVQIW2P4//8/AxQ7wNjIAjDMgC4AxjCVKBirIAAF0kz2rlhxpAAAAABJRU5ErkJggg=="); background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAH0lEQVQIW2P4//8/AxQ7wNjIAjDMgC4AxjCVKBirIAAF0kz2rlhxpAAAAABJRU5ErkJggg==");
} }
.ace_dark .ace_fold-widget.closed { .ace_dark .ace_fold-widget.ace_closed {
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAAFCAYAAACAcVaiAAAAHElEQVQIW2P4//+/AxAzgDADlOOAznHAKgPWAwARji8UIDTfQQAAAABJRU5ErkJggg=="); background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAAFCAYAAACAcVaiAAAAHElEQVQIW2P4//+/AxAzgDADlOOAznHAKgPWAwARji8UIDTfQQAAAABJRU5ErkJggg==");
} }
.ace_dark .ace_fold-widget:hover { .ace_dark .ace_fold-widget:hover {
@ -321,7 +314,7 @@
.ace_fold-widget.invalid { .ace_fold-widget.ace_invalid {
background-color: #FFB4B4; background-color: #FFB4B4;
border-color: #DE5555; border-color: #DE5555;
} }

2
lib/ace/edit_session.js
View file

@ -378,7 +378,7 @@ var EditSession = function(text, mode) {
this.highlight = function(re) { this.highlight = function(re) {
if (!this.$searchHighlight) { if (!this.$searchHighlight) {
var highlight = new SearchHighlight(null, "ace_selected_word", "text"); var highlight = new SearchHighlight(null, "ace_selected-word", "text");
this.$searchHighlight = this.addDynamicMarker(highlight); this.$searchHighlight = this.addDynamicMarker(highlight);
} }
this.$searchHighlight.setRegexp(re); this.$searchHighlight.setRegexp(re);

2
lib/ace/editor.js
View file

@ -497,7 +497,7 @@ var Editor = function(renderer, session) {
} else { } else {
range = new Range(cursor.row, 0, cursor.row+1, 0); range = new Range(cursor.row, 0, cursor.row+1, 0);
} }
session.$highlightLineMarker = session.addMarker(range, "ace_active_line", "background"); session.$highlightLineMarker = session.addMarker(range, "ace_active-line", "background");
} }
} }
}; };

1
lib/ace/keyboard/emacs.js
View file

@ -57,6 +57,7 @@ exports.handler.attach = function(editor) {
.emacs-mode .ace_cursor{\ .emacs-mode .ace_cursor{\
border: 2px rgba(50,250,50,0.8) solid!important;\ border: 2px rgba(50,250,50,0.8) solid!important;\
-moz-box-sizing: border-box!important;\ -moz-box-sizing: border-box!important;\
-webkit-box-sizing: border-box!important;\
box-sizing: border-box!important;\ box-sizing: border-box!important;\
background-color: rgba(0,250,0,0.9);\ background-color: rgba(0,250,0,0.9);\
opacity: 0.5;\ opacity: 0.5;\

4
lib/ace/keyboard/textinput.js
View file

@ -37,6 +37,7 @@ var dom = require("../lib/dom");
var TextInput = function(parentNode, host) { var TextInput = function(parentNode, host) {
var text = dom.createElement("textarea"); var text = dom.createElement("textarea");
text.className = "ace_text-input";
/*/ debug /*/ debug
text.style.opacity = 1 text.style.opacity = 1
text.style.background = "rgba(0, 250, 0, 0.3)" text.style.background = "rgba(0, 250, 0, 0.3)"
@ -46,7 +47,8 @@ var TextInput = function(parentNode, host) {
if (useragent.isTouchPad) if (useragent.isTouchPad)
text.setAttribute("x-palm-disable-auto-cap", true); text.setAttribute("x-palm-disable-auto-cap", true);
text.setAttribute("wrap", "off"); text.wrap = "off";
text.spellcheck = false;
text.style.top = "-2em"; text.style.top = "-2em";
parentNode.insertBefore(text, parentNode.firstChild); parentNode.insertBefore(text, parentNode.firstChild);

181
lib/ace/keyboard/vim/maps/motions.js
View file

@ -28,9 +28,9 @@
* *
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
"use strict"
define(function(require, exports, module) { define(function(require, exports, module) {
"use strict";
var util = require("./util"); var util = require("./util");
@ -42,42 +42,27 @@ var keepScrollPosition = function(editor, fn) {
editor.renderer.scrollToRow(editor.getCursorPosition().row - diff); editor.renderer.scrollToRow(editor.getCursorPosition().row - diff);
}; };
function Motion(getRange, type){ function Motion(m) {
if (type == 'extend') if (typeof m == "function") {
var extend = true; var getPos = m;
else m = this;
var reverse = type; } else {
var getPos = m.getPos;
this.nav = function(editor) { }
var r = getRange(editor); m.nav = function(editor, range, count, param) {
if (!r) var a = getPos(editor, range, count, param, false);
if (!a)
return; return;
if (!r.end)
var a = r;
else if (reverse)
var a = r.start;
else
var a = r.end;
editor.clearSelection(); editor.clearSelection();
editor.moveCursorTo(a.row, a.column); editor.moveCursorTo(a.row, a.column);
} };
this.sel = function(editor){ m.sel = function(editor, range, count, param) {
var r = getRange(editor); var a = getPos(editor, range, count, param, true);
if (!r) if (!a)
return; return;
if (extend)
return editor.selection.setSelectionRange(r);
if (!r.end)
var a = r;
else if (reverse)
var a = r.start;
else
var a = r.end;
editor.selection.selectTo(a.row, a.column); editor.selection.selectTo(a.row, a.column);
} };
return m;
} }
var nonWordRe = /[\s.\/\\()\"'-:,.;<>~!@#$%^&*|+=\[\]{}`~?]/; var nonWordRe = /[\s.\/\\()\"'-:,.;<>~!@#$%^&*|+=\[\]{}`~?]/;
@ -90,20 +75,20 @@ var StringStream = function(editor, cursor) {
this.row = cursor.row; this.row = cursor.row;
this.col = cursor.column; this.col = cursor.column;
var line = editor.session.getLine(this.row); var line = editor.session.getLine(this.row);
var maxRow = editor.session.getLength() var maxRow = editor.session.getLength();
this.ch = line[this.col] || '\n' this.ch = line[this.col] || '\n';
this.skippedLines = 0; this.skippedLines = 0;
this.next = function() { this.next = function() {
this.ch = line[++this.col] || this.handleNewLine(1); this.ch = line[++this.col] || this.handleNewLine(1);
//this.debug() //this.debug()
return this.ch; return this.ch;
} };
this.prev = function() { this.prev = function() {
this.ch = line[--this.col] || this.handleNewLine(-1); this.ch = line[--this.col] || this.handleNewLine(-1);
//this.debug() //this.debug()
return this.ch; return this.ch;
} };
this.peek = function(dir) { this.peek = function(dir) {
var ch = line[this.col + dir]; var ch = line[this.col + dir];
if (ch) if (ch)
@ -113,7 +98,7 @@ var StringStream = function(editor, cursor) {
if (this.col == line.length - 1) if (this.col == line.length - 1)
return '\n'; return '\n';
return editor.session.getLine(this.row + 1)[0] || '\n'; return editor.session.getLine(this.row + 1)[0] || '\n';
} };
this.handleNewLine = function(dir) { this.handleNewLine = function(dir) {
if (dir == 1){ if (dir == 1){
@ -128,7 +113,7 @@ var StringStream = function(editor, cursor) {
return line[0] || '\n'; return line[0] || '\n';
} }
if (dir == -1) { if (dir == -1) {
if (this.row == 0) if (this.row === 0)
return ''; return '';
this.row --; this.row --;
line = editor.session.getLine(this.row); line = editor.session.getLine(this.row);
@ -136,11 +121,11 @@ var StringStream = function(editor, cursor) {
this.skippedLines--; this.skippedLines--;
return '\n'; return '\n';
} }
} };
this.debug = function() { this.debug = function() {
console.log(line.substring(0, this.col)+'|'+this.ch+'\''+this.col+'\''+line.substr(this.col+1)); console.log(line.substring(0, this.col)+'|'+this.ch+'\''+this.col+'\''+line.substr(this.col+1));
} };
} };
var Search = require("ace/search").Search; var Search = require("ace/search").Search;
var search = new Search(); var search = new Search();
@ -179,7 +164,7 @@ module.exports = {
else else
str.next(); str.next();
return {column: str.col, row: str.row} return {column: str.col, row: str.row};
}), }),
"b": new Motion(function(editor) { "b": new Motion(function(editor) {
var str = new StringStream(editor); var str = new StringStream(editor);
@ -199,7 +184,7 @@ module.exports = {
return {column: str.col, row: str.row}; return {column: str.col, row: str.row};
}), }),
"B": new Motion(function(editor) { "B": new Motion(function(editor) {
var str = new StringStream(editor) var str = new StringStream(editor);
str.prev(); str.prev();
while(str.ch && !(!whiteRe.test(str.ch) && whiteRe.test(str.peek(-1))) && str.skippedLines > -2) while(str.ch && !(!whiteRe.test(str.ch) && whiteRe.test(str.peek(-1))) && str.skippedLines > -2)
str.prev(); str.prev();
@ -208,7 +193,7 @@ module.exports = {
str.next(); str.next();
return {column: str.col, row: str.row}; return {column: str.col, row: str.row};
}, true), }),
"e": new Motion(function(editor) { "e": new Motion(function(editor) {
var str = new StringStream(editor); var str = new StringStream(editor);
@ -389,98 +374,58 @@ module.exports = {
} }
}, },
"f": { "f": new Motion({
param: true, param: true,
handlesCount: true, handlesCount: true,
nav: function(editor, range, count, param) { getPos: function(editor, range, count, param, isSel) {
var ed = editor; var cursor = editor.getCursorPosition();
var cursor = ed.getCursorPosition();
var column = util.getRightNthChar(editor, cursor, param, count || 1); var column = util.getRightNthChar(editor, cursor, param, count || 1);
if (typeof column === "number") { if (typeof column === "number") {
ed.selection.clearSelection(); // Why does it select in the first place? cursor.column += column + (isSel ? 2 : 1);
ed.moveCursorTo(cursor.row, column + cursor.column + 1); return cursor;
} }
}, }
sel: function(editor, range, count, param) { }),
var ed = editor; "F": new Motion({
var cursor = ed.getCursorPosition(); param: true,
handlesCount: true,
getPos: function(editor, range, count, param, isSel) {
var cursor = editor.getCursorPosition();
var column = util.getLeftNthChar(editor, cursor, param, count || 1);
if (typeof column === "number") {
cursor.column -= column + 1;
return cursor;
}
}
}),
"t": new Motion({
param: true,
handlesCount: true,
getPos: function(editor, range, count, param, isSel) {
var cursor = editor.getCursorPosition();
var column = util.getRightNthChar(editor, cursor, param, count || 1); var column = util.getRightNthChar(editor, cursor, param, count || 1);
if (typeof column === "number") { if (typeof column === "number") {
ed.moveCursorTo(cursor.row, column + cursor.column + 1); cursor.column += column + (isSel ? 1 : 0);
return cursor;
} }
} }
}, }),
"F": { "T": new Motion({
param: true, param: true,
handlesCount: true, handlesCount: true,
nav: function(editor, range, count, param) { getPos: function(editor, range, count, param, isSel) {
var ed = editor; var cursor = editor.getCursorPosition();
var cursor = ed.getCursorPosition();
var column = util.getLeftNthChar(editor, cursor, param, count || 1); var column = util.getLeftNthChar(editor, cursor, param, count || 1);
if (typeof column === "number") { if (typeof column === "number") {
ed.selection.clearSelection(); // Why does it select in the first place? cursor.column -= column;
ed.moveCursorTo(cursor.row, cursor.column - column - 1); return cursor;
}
},
sel: function(editor, range, count, param) {
var ed = editor;
var cursor = ed.getCursorPosition();
var column = util.getLeftNthChar(editor, cursor, param, count || 1);
if (typeof column === "number") {
ed.moveCursorTo(cursor.row, cursor.column - column - 1);
} }
} }
}, }),
"t": {
param: true,
handlesCount: true,
nav: function(editor, range, count, param) {
var ed = editor;
var cursor = ed.getCursorPosition();
var column = util.getRightNthChar(editor, cursor, param, count || 1);
if (typeof column === "number") {
ed.selection.clearSelection(); // Why does it select in the first place?
ed.moveCursorTo(cursor.row, column + cursor.column);
}
},
sel: function(editor, range, count, param) {
var ed = editor;
var cursor = ed.getCursorPosition();
var column = util.getRightNthChar(editor, cursor, param, count || 1);
if (typeof column === "number") {
ed.moveCursorTo(cursor.row, column + cursor.column);
}
}
},
"T": {
param: true,
handlesCount: true,
nav: function(editor, range, count, param) {
var ed = editor;
var cursor = ed.getCursorPosition();
var column = util.getLeftNthChar(editor, cursor, param, count || 1);
if (typeof column === "number") {
ed.selection.clearSelection(); // Why does it select in the first place?
ed.moveCursorTo(cursor.row, -column + cursor.column);
}
},
sel: function(editor, range, count, param) {
var ed = editor;
var cursor = ed.getCursorPosition();
var column = util.getLeftNthChar(editor, cursor, param, count || 1);
if (typeof column === "number") {
ed.moveCursorTo(cursor.row, -column + cursor.column);
}
}
},
"^": { "^": {
nav: function(editor) { nav: function(editor) {

4
lib/ace/layer/cursor.js
View file

@ -177,7 +177,7 @@ var Cursor = function(parentEl) {
var overwrite = this.session.getOverwrite(); var overwrite = this.session.getOverwrite();
if (overwrite != this.overwrite) if (overwrite != this.overwrite)
this.$setOverite(overwrite); this.$setOverwrite(overwrite);
// cache for textarea and gutter highlight // cache for textarea and gutter highlight
this.$pixelPos = pixelPos; this.$pixelPos = pixelPos;
@ -185,7 +185,7 @@ var Cursor = function(parentEl) {
this.restartTimer(); this.restartTimer();
}; };
this.$setOverite = function(overwrite) { this.$setOverwrite = function(overwrite) {
this.overwrite = overwrite; this.overwrite = overwrite;
for (var i = this.cursors.length; i--; ) { for (var i = this.cursors.length; i--; ) {
if (overwrite) if (overwrite)

4
lib/ace/layer/gutter.js
View file

@ -129,8 +129,8 @@ var Gutter = function(parentEl) {
c = foldWidgets[i] = this.session.getFoldWidget(i); c = foldWidgets[i] = this.session.getFoldWidget(i);
if (c) if (c)
html.push( html.push(
"<span class='ace_fold-widget ", c, "<span class='ace_fold-widget ace_", c,
c == "start" && i == foldStart && i < fold.end.row ? " closed" : " open", c == "start" && i == foldStart && i < fold.end.row ? " ace_closed" : " ace_open",
"' style='height:", config.lineHeight, "px", "' style='height:", config.lineHeight, "px",
"'></span>" "'></span>"
); );

6
lib/ace/layer/marker.js
View file

@ -95,7 +95,7 @@ var Marker = function(parentEl) {
} }
else { else {
this.drawSingleLineMarker( this.drawSingleLineMarker(
html, range, marker.clazz + " start", config, html, range, marker.clazz + " ace_start", config,
null, marker.type null, marker.type
); );
} }
@ -116,7 +116,7 @@ var Marker = function(parentEl) {
row, range.start.column, row, range.start.column,
row, this.session.getScreenLastRowColumn(row) row, this.session.getScreenLastRowColumn(row)
); );
this.drawSingleLineMarker(stringBuilder, lineRange, clazz + " start", layerConfig, 1, "text"); this.drawSingleLineMarker(stringBuilder, lineRange, clazz + " ace_start", layerConfig, 1, "text");
// selection end // selection end
row = range.end.row; row = range.end.row;
@ -140,7 +140,7 @@ var Marker = function(parentEl) {
var left = Math.round(padding + range.start.column * config.characterWidth); var left = Math.round(padding + range.start.column * config.characterWidth);
stringBuilder.push( stringBuilder.push(
"<div class='", clazz, " start' style='", "<div class='", clazz, " ace_start' style='",
"height:", height, "px;", "height:", height, "px;",
"right:0;", "right:0;",
"top:", top, "px;", "top:", top, "px;",

2
lib/ace/mode/_test/tokens_diff.json
View file

@ -193,7 +193,7 @@
"state": "start", "state": "start",
"data": [ "data": [
[ "support.constant", "+" ], [ "support.constant", "+" ],
[ "text", " var highlight = new SearchHighlight(null, \"ace_selected_word\", \"text\");" ] [ "text", " var highlight = new SearchHighlight(null, \"ace_selected-word\", \"text\");" ]
] ]
}, },
{ {

2
lib/ace/mode/_test/tokens_xml.json
View file

@ -2,7 +2,7 @@
{ {
"state": "start", "state": "start",
"data": [ "data": [
[ "xml_pe", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" ] [ "xml-pe", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" ]
] ]
}, },
{ {

123
lib/ace/mode/coffee_highlight_rules.js
View file

@ -45,25 +45,28 @@ define(function(require, exports, module) {
}; };
var keywords = ( var keywords = (
"this|throw|then|try|typeof|super|switch|return|break|by)|continue|" + "this|throw|then|try|typeof|super|switch|return|break|by|continue|" +
"catch|class|in|instanceof|is|isnt|if|else|extends|for|forown|" + "catch|class|in|instanceof|is|isnt|if|else|extends|for|forown|" +
"finally|function|while|when|new|no|not|delete|debugger|do|loop|of|off|" + "finally|function|while|when|new|no|not|delete|debugger|do|loop|of|off|" +
"or|on|unless|until|and|yes" "or|on|unless|until|and|yes"
); );
var langConstant = ( var langConstant = (
"true|false|null|undefined" "true|false|null|undefined|NaN|Infinity"
); );
var illegal = ( var illegal = (
"case|const|default|function|var|void|with|enum|export|implements|" + "case|const|default|function|var|void|with|enum|export|implements|" +
"interface|let|package|private|protected|public|static|yield|" + "interface|let|package|private|protected|public|static|yield|" +
"__hasProp|extends|slice|bind|indexOf" "__hasProp|slice|bind|indexOf"
); );
var supportClass = ( var supportClass = (
"Array|Boolean|Date|Function|Number|Object|RegExp|ReferenceError|" + "Array|Boolean|Date|Function|Number|Object|RegExp|ReferenceError|String|" +
"String|RangeError|SyntaxError|Error|EvalError|TypeError|URIError" "Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|" +
"SyntaxError|TypeError|URIError|" +
"ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|" +
"Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray"
); );
var supportFunction = ( var supportFunction = (
@ -71,26 +74,44 @@ define(function(require, exports, module) {
"encodeURIComponent|decodeURI|decodeURIComponent|String|" "encodeURIComponent|decodeURI|decodeURIComponent|String|"
); );
var variableLanguage = (
"window|arguments|prototype|document"
);
var keywordMapper = this.createKeywordMapper({ var keywordMapper = this.createKeywordMapper({
"keyword": keywords, "keyword": keywords,
"constant.language": langConstant, "constant.language": langConstant,
"invalid.illegal": illegal, "invalid.illegal": illegal,
"language.support.class": supportClass, "language.support.class": supportClass,
"language.support.function": supportFunction, "language.support.function": supportFunction,
"variable.language": variableLanguage
}, "identifier"); }, "identifier");
var headRe = "[$A-Za-z_\\x7f-\\uffff]";
var functionRe = {
"({args})->": {
token: ["paren.lparen", "text", "paren.lparen", "text", "variable.parameter", "text", "paren.rparen", "text", "paren.rparen", "text", "storage.type"],
regex: "(\\()(\\s*)(\\{)(\\s*)(" + headRe + "[$\\w\\s,\\x7f-\\uffff]*" + ")(\\s*)(\\})(\\s*)(\\))(\\s*)([\\-=]>)"
},
"({})->": {
token: ["paren.lparen", "text", "paren.lparen", "text", "paren.rparen", "text", "paren.rparen", "text", "storage.type"],
regex: "(\\()(\\s*)(\\{)(\\s*)(\\})(\\s*)(\\))(\\s*)([\\-=]>)"
},
"(args)->": {
token: ["paren.lparen", "text", "variable.parameter", "text", "paren.rparen", "text", "storage.type"],
regex: "(\\()(\\s*)(" + [headRe, headRe + "[$\\w\\x7f-\\uffff]", headRe + "[^#)]*[^#(){}=,\\/\\\\]"].join("|") + ")(\\s*)(\\))(\\s*)([\\-=]>)"
},
"()->": {
token: ["paren.lparen", "text", "paren.rparen", "text", "storage.type"],
regex: "(\\()(\\s*)(\\))(\\s*)([\\-=]>)"
}
};
this.$rules = { this.$rules = {
start : [ start : [
{ {
token : "identifier",
regex : "(?:(?:\\.|::)\\s*)" + identifier
}, {
token : "variable",
regex : "@(?:" + identifier + ")?"
}, {
token: keywordMapper,
regex : identifier
}, {
token : "constant.numeric", token : "constant.numeric",
regex : "(?:0x[\\da-fA-F]+|(?:\\d+(?:\\.\\d+)?|\\.\\d+)(?:[eE][+-]?\\d+)?)" regex : "(?:0x[\\da-fA-F]+|(?:\\d+(?:\\.\\d+)?|\\.\\d+)(?:[eE][+-]?\\d+)?)"
}, { }, {
@ -134,12 +155,84 @@ define(function(require, exports, module) {
}, { }, {
token : "comment", token : "comment",
regex : "#.*" regex : "#.*"
}, {
token : [
"punctuation.operator", "identifier"
],
regex : "(\\.)(" + illegal + ")"
}, {
token : "punctuation.operator",
regex : "\\."
}, {
//class A extends B
token : [
"keyword", "text", "language.support.class", "text", "keyword", "text", "language.support.class"
],
regex : "(class)(\\s+)(" + identifier + ")(\\s+)(extends)(\\s+)(" + identifier + ")"
}, {
//class A
token : [
"keyword", "text", "language.support.class"
],
regex : "(class)(\\s+)(" + identifier + ")"
}, {
//play = ({args}) ->
//play : ({args}) ->
token : [
"entity.name.function", "text", "keyword.operator", "text"
].concat(functionRe["({args})->"].token),
regex : "(" + identifier + ")(\\s*)(=|:)(\\s*)" + functionRe["({args})->"].regex
}, {
//play = ({}) ->
//play : ({}) ->
token : [
"entity.name.function", "text", "keyword.operator", "text"
].concat(functionRe["({})->"].token),
regex : "(" + identifier + ")(\\s*)(=|:)(\\s*)" + functionRe["({})->"].regex
}, {
//play = (args) ->
//play : (args) ->
token : [
"entity.name.function", "text", "keyword.operator", "text"
].concat(functionRe["(args)->"].token),
regex : "(" + identifier + ")(\\s*)(=|:)(\\s*)" + functionRe["(args)->"].regex
}, {
//play = () ->
//play : () ->
token : [
"entity.name.function", "text", "keyword.operator", "text"
].concat(functionRe["()->"].token),
regex : "(" + identifier + ")(\\s*)(=|:)(\\s*)" + functionRe["()->"].regex
}, {
//play = ->
//play : ->
token : [
"entity.name.function", "text", "keyword.operator", "text", "storage.type"
],
regex : "(" + identifier + ")(\\s*)(=|:)(\\s*)([\\-=]>)"
},
functionRe["({args})->"],
functionRe["({})->"],
functionRe["(args)->"],
functionRe["()->"]
, {
token : "identifier",
regex : "(?:(?:\\.|::)\\s*)" + identifier
}, {
token : "variable",
regex : "@(?:" + identifier + ")?"
}, {
token: keywordMapper,
regex : identifier
}, { }, {
token : "punctuation.operator", token : "punctuation.operator",
regex : "\\?|\\:|\\,|\\." regex : "\\?|\\:|\\,|\\."
}, {
token : "storage.type",
regex : "[\\-=]>"
}, { }, {
token : "keyword.operator", token : "keyword.operator",
regex : "(?:[\\-=]>|[-+*/%<>&|^!?=]=|>>>=?|\\-\\-|\\+\\+|::|&&=|\\|\\|=|<<=|>>=|\\?\\.|\\.{2,3}|[!*+-=><])" regex : "(?:[-+*/%<>&|^!?=]=|>>>=?|\\-\\-|\\+\\+|::|&&=|\\|\\|=|<<=|>>=|\\?\\.|\\.{2,3}|[!*+-=><])"
}, { }, {
token : "paren.lparen", token : "paren.lparen",
regex : "[({[]" regex : "[({[]"

206
lib/ace/mode/coffee_highlight_rules_test.js
View file

@ -41,6 +41,11 @@ var assert = require("../test/assertions");
module.exports = { module.exports = {
setUp : function() { setUp : function() {
this.tokenizer = new Mode().getTokenizer(); this.tokenizer = new Mode().getTokenizer();
this.testTokens = function(tokens, correct) {
correct.forEach(function(type, i) {
assert.equal(tokens[i].type, type);
});
};
}, },
"test: tokenize keyword": function() { "test: tokenize keyword": function() {
@ -49,6 +54,207 @@ module.exports = {
assert.equal(tokens[0].type, "keyword"); assert.equal(tokens[0].type, "keyword");
}, },
"test: tokenize function: 'foo = ({args}) ->'": function() {
var tokens = this.tokenizer.getLineTokens("foo = ({args}) ->", "start").tokens;
var correct = [
"entity.name.function", "text", "keyword.operator", "text",
"paren.lparen", "paren.lparen", "variable.parameter", "paren.rparen", "paren.rparen", "text", "storage.type"
];
assert.equal(tokens.length, 11);
this.testTokens(tokens, correct);
tokens = this.tokenizer.getLineTokens("foo = ({arg1, arg2}) ->", "start").tokens;
assert.equal(tokens.length, 11);
this.testTokens(tokens, correct);
tokens = this.tokenizer.getLineTokens("foo : ({arg1, arg2}) ->", "start").tokens;
assert.equal(tokens.length, 11);
this.testTokens(tokens, correct);
},
"test: tokenize function: invalid case: 'foo = ({args}) ->'": function() {
var tokens = this.tokenizer.getLineTokens("foo = ({0abc}) ->", "start").tokens;
assert.notEqual(tokens[0].type, "entity.name.function");
tokens = this.tokenizer.getLineTokens("foo = ({/abc}) ->", "start").tokens;
assert.notEqual(tokens[0].type, "entity.name.function");
tokens = this.tokenizer.getLineTokens("foo = ({abc/}) ->", "start").tokens;
assert.notEqual(tokens[0].type, "entity.name.function");
tokens = this.tokenizer.getLineTokens("foo = ({#abc}) ->", "start").tokens;
assert.notEqual(tokens[0].type, "entity.name.function");
tokens = this.tokenizer.getLineTokens("foo = ({abc#}) ->", "start").tokens;
assert.notEqual(tokens[0].type, "entity.name.function");
tokens = this.tokenizer.getLineTokens("foo = ({)abc}) ->", "start").tokens;
assert.notEqual(tokens[0].type, "entity.name.function");
tokens = this.tokenizer.getLineTokens("foo = ({abc)}) ->", "start").tokens;
assert.notEqual(tokens[0].type, "entity.name.function");
tokens = this.tokenizer.getLineTokens("foo = ({a{bc}) ->", "start").tokens;
assert.notEqual(tokens[0].type, "entity.name.function");
},
"test: tokenize function: 'foo = ({}) ->'": function() {
var tokens = this.tokenizer.getLineTokens("foo = ({}) ->", "start").tokens;
var correct = [
"entity.name.function", "text", "keyword.operator", "text",
"paren.lparen", "paren.lparen", "paren.rparen", "paren.rparen", "text", "storage.type"
];
assert.equal(tokens.length, 10);
this.testTokens(tokens, correct);
tokens = this.tokenizer.getLineTokens("foo : ({}) ->", "start").tokens;
assert.equal(tokens.length, 10);
this.testTokens(tokens, correct);
tokens = this.tokenizer.getLineTokens("foo = ({ }) ->", "start").tokens;
correct = [
"entity.name.function", "text", "keyword.operator", "text",
"paren.lparen", "paren.lparen", "text", "paren.rparen", "paren.rparen", "text", "storage.type"
];
assert.equal(tokens.length, 11);
this.testTokens(tokens, correct);
},
"test: tokenize function: 'foo = (args) ->'": function() {
var tokens = this.tokenizer.getLineTokens("foo = (args) ->", "start").tokens;
var correct = [
"entity.name.function", "text", "keyword.operator", "text",
"paren.lparen", "variable.parameter", "paren.rparen", "text", "storage.type"
];
assert.equal(tokens.length, 9);
this.testTokens(tokens, correct);
tokens = this.tokenizer.getLineTokens("foo = (arg1, arg2) ->", "start").tokens;
assert.equal(tokens.length, 9);
this.testTokens(tokens, correct);
tokens = this.tokenizer.getLineTokens("foo = (arg1 = 1, arg2 = 'name') ->", "start").tokens;
assert.equal(tokens.length, 9);
this.testTokens(tokens, correct);
},
"test: tokenize function: invalid case: 'foo=(args) ->'": function() {
var tokens = this.tokenizer.getLineTokens("foo=(args#) ->", "start").tokens;
assert.notEqual(tokens[0].type, "entity.name.function");
tokens = this.tokenizer.getLineTokens("foo=(args=) ->", "start").tokens;
assert.notEqual(tokens[0].type, "entity.name.function");
tokens = this.tokenizer.getLineTokens("foo=(args{) ->", "start").tokens;
assert.notEqual(tokens[0].type, "entity.name.function");
tokens = this.tokenizer.getLineTokens("foo=(args}) ->", "start").tokens;
assert.notEqual(tokens[0].type, "entity.name.function");
tokens = this.tokenizer.getLineTokens("foo=(}args) ->", "start").tokens;
assert.notEqual(tokens[0].type, "entity.name.function");
tokens = this.tokenizer.getLineTokens("foo=(a)rgs) ->", "start").tokens;
assert.notEqual(tokens[0].type, "entity.name.function");
tokens = this.tokenizer.getLineTokens("foo=(args/) ->", "start").tokens;
assert.notEqual(tokens[0].type, "entity.name.function");
tokens = this.tokenizer.getLineTokens("foo=(args\\) ->", "start").tokens;
assert.notEqual(tokens[0].type, "entity.name.function");
},
"test: tokenize function: 'foo = () ->'": function() {
var tokens = this.tokenizer.getLineTokens("foo = () ->", "start").tokens;
var correct = [
"entity.name.function", "text", "keyword.operator", "text",
"paren.lparen", "paren.rparen", "text", "storage.type"
];
assert.equal(tokens.length, 8);
this.testTokens(tokens, correct);
tokens = this.tokenizer.getLineTokens("foo : ( ) ->", "start").tokens;
correct = [
"entity.name.function", "text", "keyword.operator", "text",
"paren.lparen", "text", "paren.rparen", "text", "storage.type"
];
assert.equal(tokens.length, 9);
this.testTokens(tokens, correct);
},
"test: tokenize function: 'window.foo = (args) ->'": function() {
var tokens = this.tokenizer.getLineTokens("window.foo = (args) ->", "start").tokens;
var correct = [
"variable.language", "punctuation.operator", "entity.name.function", "text", "keyword.operator", "text",
"paren.lparen", "variable.parameter", "paren.rparen", "text", "storage.type"
];
assert.equal(tokens.length, 11);
this.testTokens(tokens, correct);
this.tokenizer.getLineTokens("window.foo = (args) ->", "start").tokens;
assert.equal(tokens.length, 11);
this.testTokens(tokens, correct);
},
"test: tokenize function: 'foo = ->'": function() {
var tokens = this.tokenizer.getLineTokens("foo = ->", "start").tokens;
var correct = [
"entity.name.function", "text", "keyword.operator", "text", "storage.type"
];
assert.equal(tokens.length, 5);
this.testTokens(tokens, correct);
this.tokenizer.getLineTokens("foo : ->", "start").tokens;
assert.equal(tokens.length, 5);
this.testTokens(tokens, correct);
},
"test: tokenize callback function: 'foo bar: 1, (args) ->'": function() {
var tokens = this.tokenizer.getLineTokens("foo bar: 1, (args) ->", "start").tokens;
var correct = [
"identifier", "text", "identifier", "punctuation.operator", "text", "constant.numeric", "punctuation.operator", "text",
"paren.lparen", "variable.parameter", "paren.rparen", "text", "storage.type"
];
assert.equal(tokens.length, 13);
this.testTokens(tokens, correct);
},
"test: tokenize class: 'class Foo'": function() {
var tokens = this.tokenizer.getLineTokens("class Foo", "start").tokens;
var correct = [
"keyword", "text", "language.support.class"
];
assert.equal(tokens.length, 3);
this.testTokens(tokens, correct);
},
"test: tokenize class 'class Foo extends Bar'": function() {
var tokens = this.tokenizer.getLineTokens("class Foo extends Bar", "start").tokens;
var correct = [
"keyword", "text", "language.support.class", "text", "keyword", "text", "language.support.class"
];
assert.equal(tokens.length, 7);
this.testTokens(tokens, correct);
},
"test: tokenize illegal name property: 'foo.static.function'": function() {
var tokens = this.tokenizer.getLineTokens("foo.static.function", "start").tokens;
var correct = [
"identifier", "punctuation.operator", "identifier", "punctuation.operator", "identifier"
];
assert.equal(tokens.length, 5);
this.testTokens(tokens, correct);
},
// TODO: disable. not yet implemented // TODO: disable. not yet implemented
"!test tokenize string with interpolation": function() { "!test tokenize string with interpolation": function() {
var tokens = this.tokenizer.getLineTokens('"#{ 22 / 7 } is a decent approximation of π"', "start").tokens; var tokens = this.tokenizer.getLineTokens('"#{ 22 / 7 } is a decent approximation of π"', "start").tokens;

2
lib/ace/mode/coldfusion_highlight_rules.js
View file

@ -49,7 +49,7 @@ var ColdfusionHighlightRules = function() {
regex : "<\\!\\[CDATA\\[", regex : "<\\!\\[CDATA\\[",
next : "cdata" next : "cdata"
}, { }, {
token : "xml_pe", token : "xml-pe",
regex : "<\\?.*?\\?>" regex : "<\\?.*?\\?>"
}, { }, {
token : "comment", token : "comment",

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

@ -68,7 +68,7 @@ var HtmlHighlightRules = function() {
regex : "<\\!\\[CDATA\\[", regex : "<\\!\\[CDATA\\[",
next : "cdata" next : "cdata"
}, { }, {
token : "xml_pe", token : "xml-pe",
regex : "<\\?.*?\\?>" regex : "<\\?.*?\\?>"
}, { }, {
token : "comment", token : "comment",
@ -76,7 +76,7 @@ var HtmlHighlightRules = function() {
regex : "<\\!--", regex : "<\\!--",
next : "comment" next : "comment"
}, { }, {
token : "xml_pe", token : "xml-pe",
regex : "<\\!.*?>" regex : "<\\!.*?>"
}, { }, {
token : "meta.tag", token : "meta.tag",

2
lib/ace/mode/javascript_highlight_rules.js
View file

@ -70,7 +70,7 @@ var JavaScriptHighlightRules = function() {
var kwBeforeRe = "case|do|else|finally|in|instanceof|return|throw|try|typeof|yield"; var kwBeforeRe = "case|do|else|finally|in|instanceof|return|throw|try|typeof|yield";
// TODO: Unicode escape sequences // TODO: Unicode escape sequences
var identifierRe = "[a-zA-Z\\$_\u00a1-\uffff][a-zA-Z\d\\$_\u00a1-\uffff]*\\b"; var identifierRe = "[a-zA-Z\\$_\u00a1-\uffff][a-zA-Z\\d\\$_\u00a1-\uffff]*\\b";
var escapedRe = "\\\\(?:x[0-9a-fA-F]{2}|" + // hex var escapedRe = "\\\\(?:x[0-9a-fA-F]{2}|" + // hex
"u[0-9a-fA-F]{4}|" + // unicode "u[0-9a-fA-F]{4}|" + // unicode

2
lib/ace/mode/liquid_highlight_rules.js
View file

@ -87,7 +87,7 @@ var LiquidHighlightRules = function() {
regex : "<\\!\\[CDATA\\[", regex : "<\\!\\[CDATA\\[",
next : "cdata" next : "cdata"
}, { }, {
token : "xml_pe", token : "xml-pe",
regex : "<\\?.*?\\?>" regex : "<\\?.*?\\?>"
}, { }, {
token : "comment", token : "comment",

4
lib/ace/mode/xml_highlight_rules.js
View file

@ -45,7 +45,7 @@ var XmlHighlightRules = function() {
regex : "<\\!\\[CDATA\\[", regex : "<\\!\\[CDATA\\[",
next : "cdata" next : "cdata"
}, { }, {
token : "xml_pe", token : "xml-pe",
regex : "<\\?.*?\\?>" regex : "<\\?.*?\\?>"
}, { }, {
token : "comment", token : "comment",
@ -53,7 +53,7 @@ var XmlHighlightRules = function() {
regex : "<\\!--", regex : "<\\!--",
next : "comment" next : "comment"
}, { }, {
token : "xml_pe", token : "xml-pe",
regex : "<\\!.*?>" regex : "<\\!.*?>"
}, { }, {
token : "meta.tag", // opening tag token : "meta.tag", // opening tag

4
lib/ace/mode/xquery/XQueryParser.js
View file

@ -121,12 +121,12 @@ var XQueryParser = function(input, state) {
this.ap = function(token) this.ap = function(token)
{ {
this.addToken(token, "xml_pe"); this.addToken(token, "xml-pe");
}; };
this.ax = function(start, stop) this.ax = function(start, stop)
{ {
this.highlighter.addToken(start.getStartIndex(), stop.getStopIndex(), "xml_pe"); this.highlighter.addToken(start.getStartIndex(), stop.getStopIndex(), "xml-pe");
}; };
this.at = function(start, stop) this.at = function(start, stop)

2
lib/ace/mode/xquery_highlight_rules.js
View file

@ -48,7 +48,7 @@ var XQueryHighlightRules = function() {
regex : "<\\!\\[CDATA\\[", regex : "<\\!\\[CDATA\\[",
next : "cdata" next : "cdata"
}, { }, {
token : "xml_pe", token : "xml-pe",
regex : "<\\?.*?\\?>" regex : "<\\?.*?\\?>"
}, { }, {
token : "comment", token : "comment",

2
lib/ace/mouse/default_gutter_handler.js
View file

@ -61,7 +61,7 @@ function GutterHandler(mouseHandler) {
var tooltipTimeout, mouseEvent, tooltip, tooltipAnnotation; var tooltipTimeout, mouseEvent, tooltip, tooltipAnnotation;
function createTooltip() { function createTooltip() {
tooltip = dom.createElement("div"); tooltip = dom.createElement("div");
tooltip.className = "ace_gutter_tooltip"; tooltip.className = "ace_gutter-tooltip";
tooltip.style.maxWidth = "500px"; tooltip.style.maxWidth = "500px";
tooltip.style.display = "none"; tooltip.style.display = "none";
editor.container.appendChild(tooltip); editor.container.appendChild(tooltip);

4
lib/ace/multi_select.js
View file

@ -399,7 +399,7 @@ var Editor = require("./editor").Editor;
return; return;
this.inMultiSelectMode = true; this.inMultiSelectMode = true;
this.setStyle("multiselect"); this.setStyle("ace_multiselect");
this.keyBinding.addKeyboardHandler(commands.keyboardHandler); this.keyBinding.addKeyboardHandler(commands.keyboardHandler);
this.commands.on("exec", this.$onMultiSelectExec); this.commands.on("exec", this.$onMultiSelectExec);
@ -412,7 +412,7 @@ var Editor = require("./editor").Editor;
return; return;
this.inMultiSelectMode = false; this.inMultiSelectMode = false;
this.unsetStyle("multiselect"); this.unsetStyle("ace_multiselect");
this.keyBinding.removeKeyboardHandler(commands.keyboardHandler); this.keyBinding.removeKeyboardHandler(commands.keyboardHandler);
this.commands.removeEventListener("exec", this.$onMultiSelectExec); this.commands.removeEventListener("exec", this.$onMultiSelectExec);

3
lib/ace/scrollbar.js
View file

@ -52,9 +52,10 @@ var EventEmitter = require("./lib/event_emitter").EventEmitter;
**/ **/
var ScrollBar = function(parent) { var ScrollBar = function(parent) {
this.element = dom.createElement("div"); this.element = dom.createElement("div");
this.element.className = "ace_sb"; this.element.className = "ace_scrollbar";
this.inner = dom.createElement("div"); this.inner = dom.createElement("div");
this.inner.className = "ace_scrollbar-inner";
this.element.appendChild(this.inner); this.element.appendChild(this.inner);
parent.appendChild(this.element); parent.appendChild(this.element);

68
lib/ace/theme/ambiance.css
View file

@ -1,16 +1,5 @@
.ace-ambiance {
background-color: #202020;
}
.ace-ambiance .ace_editor {
border: 2px solid rgb(159, 159, 159);
}
.ace-ambiance .ace_editor.ace_focus {
border: 2px solid #327fbd;
}
.ace-ambiance .ace_gutter { .ace-ambiance .ace_gutter {
background-color: #3d3d3d;
background-image: -moz-linear-gradient(left, #3D3D3D, #333); background-image: -moz-linear-gradient(left, #3D3D3D, #333);
background-image: -ms-linear-gradient(left, #3D3D3D, #333); background-image: -ms-linear-gradient(left, #3D3D3D, #333);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#3D3D3D), to(#333)); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#3D3D3D), to(#333));
@ -18,51 +7,46 @@
background-image: -o-linear-gradient(left, #3D3D3D, #333); background-image: -o-linear-gradient(left, #3D3D3D, #333);
background-image: linear-gradient(left, #3D3D3D, #333); background-image: linear-gradient(left, #3D3D3D, #333);
background-repeat: repeat-x; background-repeat: repeat-x;
border-right: 1px solid #4d4d4d;
text-shadow: 0px 1px 1px #4d4d4d; text-shadow: 0px 1px 1px #4d4d4d;
color: #222; color: #222;
border-right: 1px solid #4d4d4d;
overflow : hidden;
} }
.ace-ambiance .ace_gutter-layer { .ace-ambiance .ace_gutter-layer {
background: repeat left top; background: repeat left top;
width: 100%;
text-align: right;
} }
.ace-ambiance .ace_gutter-layer .ace_gutter-cell .ace_fold-widget { .ace-ambiance .ace_fold-widget {
position: absolute; text-align: center;
right: 2px; }
margin: 0;
vertical-align: middle; .ace-ambiance .ace_fold-widget:hover {
height: inherit; color: #777;
width: auto; }
.ace-ambiance .ace_fold-widget.ace_start,
.ace-ambiance .ace_fold-widget.ace_end,
.ace-ambiance .ace_fold-widget.ace_closed{
background: none; background: none;
border: none; border: none;
box-shadow: none; box-shadow: none;
outline: none;
} }
.ace-ambiance .ace_gutter-layer .ace_gutter-cell .ace_fold-widget:hover { .ace-ambiance .ace_fold-widget.ace_start:after {
color: #777;
}
.ace-ambiance .ace_gutter-layer .ace_gutter-cell .ace_fold-widget:hover {
color: #777;
}
.ace-ambiance .ace_gutter-layer .ace_gutter-cell .ace_fold-widget.open:after {
content: '▾' content: '▾'
} }
.ace-ambiance .ace_gutter-layer .ace_gutter-cell .ace_fold-widget.closed:after { .ace-ambiance .ace_fold-widget.ace_end:after {
content: '▴'
}
.ace-ambiance .ace_fold-widget.ace_closed:after {
content: '‣' content: '‣'
} }
.ace-ambiance .ace_print_margin { .ace-ambiance .ace_print-margin {
border-left: 1px dotted #2D2D2D; border-left: 1px dotted #2D2D2D;
width: 100%; right: 0;
background: #262626; background: #262626;
} }
@ -75,9 +59,7 @@
} }
.ace-ambiance .ace_text-layer { .ace-ambiance .ace_text-layer {
cursor: text;
color: #E6E1DC; color: #E6E1DC;
background: url("noise.png") repeat left top;
} }
.ace-ambiance .ace_cursor { .ace-ambiance .ace_cursor {
@ -97,7 +79,7 @@
background: rgba(221, 240, 255, 0.20); background: rgba(221, 240, 255, 0.20);
} }
.ace-ambiance .ace_marker-layer .ace_selected_word { .ace-ambiance .ace_marker-layer .ace_selected-word {
border-radius: 4px; border-radius: 4px;
border: 8px solid #3f475d; border: 8px solid #3f475d;
box-shadow: 0 0 4px black; box-shadow: 0 0 4px black;
@ -112,12 +94,10 @@
border: 1px solid rgba(255, 255, 255, 0.25); border: 1px solid rgba(255, 255, 255, 0.25);
} }
.ace-ambiance .ace_marker-layer .ace_active_line { .ace-ambiance .ace_marker-layer .ace_active-line {
background: rgba(255, 255, 255, 0.031); background: rgba(255, 255, 255, 0.031);
} }
.ace-ambiance .ace_invisible { .ace-ambiance .ace_invisible {
color: #333; color: #333;
} }
@ -223,7 +203,7 @@
color: #9b859d; color: #9b859d;
} }
.ace-ambiance .ace_xml_pe { .ace-ambiance .ace_xml-pe {
color: #494949; color: #494949;
} }

20
lib/ace/theme/chrome.css
View file

@ -1,18 +1,10 @@
.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 { .ace-chrome .ace_gutter {
background: #ebebeb; background: #ebebeb;
color: #333; color: #333;
overflow : hidden; overflow : hidden;
} }
.ace-chrome .ace_print_margin { .ace-chrome .ace_print-margin {
width: 1px; width: 1px;
background: #e8e8e8; background: #e8e8e8;
} }
@ -64,7 +56,7 @@
.ace-chrome .ace_line .ace_support.ace_type, .ace-chrome .ace_line .ace_support.ace_type,
.ace-chrome .ace_line .ace_support.ace_class .ace-chrome .ace_line .ace_support.ace_class
.ace-chrome .ace_line .ace_support.ace_other, { .ace-chrome .ace_line .ace_support.ace_other {
color: rgb(109, 121, 222); color: rgb(109, 121, 222);
} }
@ -96,7 +88,7 @@
color: rgb(49, 132, 149); color: rgb(49, 132, 149);
} }
.ace-chrome .ace_line .ace_xml_pe { .ace-chrome .ace_line .ace_xml-pe {
color: rgb(104, 104, 91); color: rgb(104, 104, 91);
} }
@ -130,15 +122,15 @@
border: 1px solid rgb(192, 192, 192); border: 1px solid rgb(192, 192, 192);
} }
.ace-chrome .ace_marker-layer .ace_active_line { .ace-chrome .ace_marker-layer .ace_active-line {
background: rgba(0, 0, 0, 0.07); background: rgba(0, 0, 0, 0.07);
} }
.ace-chrome .ace_gutter_active_line { .ace-chrome .ace_gutter-active-line {
background-color : #dcdcdc; background-color : #dcdcdc;
} }
.ace-chrome .ace_marker-layer .ace_selected_word { .ace-chrome .ace_marker-layer .ace_selected-word {
background: rgb(250, 250, 255); background: rgb(250, 250, 255);
border: 1px solid rgb(200, 200, 250); border: 1px solid rgb(200, 200, 250);
} }

18
lib/ace/theme/clouds.css
View file

@ -1,17 +1,9 @@
.ace-clouds .ace_editor {
border: 2px solid rgb(159, 159, 159)
}
.ace-clouds .ace_editor.ace_focus {
border: 2px solid #327fbd
}
.ace-clouds .ace_gutter { .ace-clouds .ace_gutter {
background: #ebebeb; background: #ebebeb;
color: #333 color: #333
} }
.ace-clouds .ace_print_margin { .ace-clouds .ace_print-margin {
width: 1px; width: 1px;
background: #e8e8e8 background: #e8e8e8
} }
@ -37,7 +29,7 @@
background: #BDD5FC background: #BDD5FC
} }
.ace-clouds.multiselect .ace_selection.start { .ace-clouds.ace_multiselect .ace_selection.ace_start {
box-shadow: 0 0 3px 0px #FFFFFF; box-shadow: 0 0 3px 0px #FFFFFF;
border-radius: 2px border-radius: 2px
} }
@ -51,15 +43,15 @@
border: 1px solid #BFBFBF border: 1px solid #BFBFBF
} }
.ace-clouds .ace_marker-layer .ace_active_line { .ace-clouds .ace_marker-layer .ace_active-line {
background: #FFFBD1 background: #FFFBD1
} }
.ace-clouds .ace_gutter_active_line { .ace-clouds .ace_gutter-active-line {
background-color : #dcdcdc background-color : #dcdcdc
} }
.ace-clouds .ace_marker-layer .ace_selected_word { .ace-clouds .ace_marker-layer .ace_selected-word {
border: 1px solid #BDD5FC border: 1px solid #BDD5FC
} }

18
lib/ace/theme/clouds_midnight.css
View file

@ -1,17 +1,9 @@
.ace-clouds-midnight .ace_editor {
border: 2px solid rgb(159, 159, 159)
}
.ace-clouds-midnight .ace_editor.ace_focus {
border: 2px solid #327fbd
}
.ace-clouds-midnight .ace_gutter { .ace-clouds-midnight .ace_gutter {
background: #232323; background: #232323;
color: #929292 color: #929292
} }
.ace-clouds-midnight .ace_print_margin { .ace-clouds-midnight .ace_print-margin {
width: 1px; width: 1px;
background: #232323 background: #232323
} }
@ -37,7 +29,7 @@
background: #000000 background: #000000
} }
.ace-clouds-midnight.multiselect .ace_selection.start { .ace-clouds-midnight.ace_multiselect .ace_selection.ace_start {
box-shadow: 0 0 3px 0px #191919; box-shadow: 0 0 3px 0px #191919;
border-radius: 2px border-radius: 2px
} }
@ -51,15 +43,15 @@
border: 1px solid #BFBFBF border: 1px solid #BFBFBF
} }
.ace-clouds-midnight .ace_marker-layer .ace_active_line { .ace-clouds-midnight .ace_marker-layer .ace_active-line {
background: rgba(215, 215, 215, 0.031) background: rgba(215, 215, 215, 0.031)
} }
.ace-clouds-midnight .ace_gutter_active_line { .ace-clouds-midnight .ace_gutter-active-line {
background-color: rgba(215, 215, 215, 0.031) background-color: rgba(215, 215, 215, 0.031)
} }
.ace-clouds-midnight .ace_marker-layer .ace_selected_word { .ace-clouds-midnight .ace_marker-layer .ace_selected-word {
border: 1px solid #000000 border: 1px solid #000000
} }

18
lib/ace/theme/cobalt.css
View file

@ -1,17 +1,9 @@
.ace-cobalt .ace_editor {
border: 2px solid rgb(159, 159, 159)
}
.ace-cobalt .ace_editor.ace_focus {
border: 2px solid #327fbd
}
.ace-cobalt .ace_gutter { .ace-cobalt .ace_gutter {
background: #011e3a; background: #011e3a;
color: #fff color: #fff
} }
.ace-cobalt .ace_print_margin { .ace-cobalt .ace_print-margin {
width: 1px; width: 1px;
background: #011e3a background: #011e3a
} }
@ -37,7 +29,7 @@
background: rgba(179, 101, 57, 0.75) background: rgba(179, 101, 57, 0.75)
} }
.ace-cobalt.multiselect .ace_selection.start { .ace-cobalt.ace_multiselect .ace_selection.ace_start {
box-shadow: 0 0 3px 0px #002240; box-shadow: 0 0 3px 0px #002240;
border-radius: 2px border-radius: 2px
} }
@ -51,15 +43,15 @@
border: 1px solid rgba(255, 255, 255, 0.15) border: 1px solid rgba(255, 255, 255, 0.15)
} }
.ace-cobalt .ace_marker-layer .ace_active_line { .ace-cobalt .ace_marker-layer .ace_active-line {
background: rgba(0, 0, 0, 0.35) background: rgba(0, 0, 0, 0.35)
} }
.ace-cobalt .ace_gutter_active_line { .ace-cobalt .ace_gutter-active-line {
background-color: rgba(0, 0, 0, 0.35) background-color: rgba(0, 0, 0, 0.35)
} }
.ace-cobalt .ace_marker-layer .ace_selected_word { .ace-cobalt .ace_marker-layer .ace_selected-word {
border: 1px solid rgba(179, 101, 57, 0.75) border: 1px solid rgba(179, 101, 57, 0.75)
} }

18
lib/ace/theme/crimson_editor.css
View file

@ -1,11 +1,3 @@
.ace-crimson-editor .ace_editor {
border: 2px solid rgb(159, 159, 159);
}
.ace-crimson-editor .ace_editor.ace_focus {
border: 2px solid #327fbd;
}
.ace-crimson-editor .ace_gutter { .ace-crimson-editor .ace_gutter {
background: #ebebeb; background: #ebebeb;
color: #333; color: #333;
@ -17,7 +9,7 @@
text-align: right; text-align: right;
} }
.ace-crimson-editor .ace_print_margin { .ace-crimson-editor .ace_print-margin {
width: 1px; width: 1px;
background: #e8e8e8; background: #e8e8e8;
} }
@ -112,7 +104,7 @@
color: rgb(0, 64, 128); color: rgb(0, 64, 128);
} }
.ace-crimson-editor .ace_line .ace_xml_pe { .ace-crimson-editor .ace_line .ace_xml-pe {
color: rgb(104, 104, 91); color: rgb(104, 104, 91);
} }
@ -133,11 +125,11 @@
border: 1px solid rgb(192, 192, 192); border: 1px solid rgb(192, 192, 192);
} }
.ace-crimson-editor .ace_marker-layer .ace_active_line { .ace-crimson-editor .ace_marker-layer .ace_active-line {
background: rgb(232, 242, 254); background: rgb(232, 242, 254);
} }
.ace-crimson-editor .ace_gutter_active_line { .ace-crimson-editor .ace_gutter-active-line {
background-color : #dcdcdc; background-color : #dcdcdc;
} }
@ -145,7 +137,7 @@
color:rgb(28, 2, 255); color:rgb(28, 2, 255);
} }
.ace-crimson-editor .ace_marker-layer .ace_selected_word { .ace-crimson-editor .ace_marker-layer .ace_selected-word {
background: rgb(250, 250, 255); background: rgb(250, 250, 255);
border: 1px solid rgb(200, 200, 250); border: 1px solid rgb(200, 200, 250);
} }

18
lib/ace/theme/dawn.css
View file

@ -1,17 +1,9 @@
.ace-dawn .ace_editor {
border: 2px solid rgb(159, 159, 159)
}
.ace-dawn .ace_editor.ace_focus {
border: 2px solid #327fbd
}
.ace-dawn .ace_gutter { .ace-dawn .ace_gutter {
background: #ebebeb; background: #ebebeb;
color: #333 color: #333
} }
.ace-dawn .ace_print_margin { .ace-dawn .ace_print-margin {
width: 1px; width: 1px;
background: #e8e8e8 background: #e8e8e8
} }
@ -37,7 +29,7 @@
background: rgba(39, 95, 255, 0.30) background: rgba(39, 95, 255, 0.30)
} }
.ace-dawn.multiselect .ace_selection.start { .ace-dawn.ace_multiselect .ace_selection.ace_start {
box-shadow: 0 0 3px 0px #F9F9F9; box-shadow: 0 0 3px 0px #F9F9F9;
border-radius: 2px border-radius: 2px
} }
@ -51,15 +43,15 @@
border: 1px solid rgba(75, 75, 126, 0.50) border: 1px solid rgba(75, 75, 126, 0.50)
} }
.ace-dawn .ace_marker-layer .ace_active_line { .ace-dawn .ace_marker-layer .ace_active-line {
background: rgba(36, 99, 180, 0.12) background: rgba(36, 99, 180, 0.12)
} }
.ace-dawn .ace_gutter_active_line { .ace-dawn .ace_gutter-active-line {
background-color : #dcdcdc background-color : #dcdcdc
} }
.ace-dawn .ace_marker-layer .ace_selected_word { .ace-dawn .ace_marker-layer .ace_selected-word {
border: 1px solid rgba(39, 95, 255, 0.30) border: 1px solid rgba(39, 95, 255, 0.30)
} }

16
lib/ace/theme/dreamweaver.css
View file

@ -1,17 +1,9 @@
.ace-dreamweaver .ace_editor {
border: 2px solid rgb(159, 159, 159);
}
.ace-dreamweaver .ace_editor.ace_focus {
border: 2px solid #327fbd;
}
.ace-dreamweaver .ace_gutter { .ace-dreamweaver .ace_gutter {
background: #e8e8e8; background: #e8e8e8;
color: #333; color: #333;
} }
.ace-dreamweaver .ace_print_margin { .ace-dreamweaver .ace_print-margin {
width: 1px; width: 1px;
background: #e8e8e8; background: #e8e8e8;
} }
@ -107,7 +99,7 @@
color: #06F color: #06F
} }
.ace-dreamweaver .ace_line .ace_xml_pe { .ace-dreamweaver .ace_line .ace_xml-pe {
color: rgb(104, 104, 91); color: rgb(104, 104, 91);
} }
@ -141,11 +133,11 @@
border: 1px solid rgb(192, 192, 192); border: 1px solid rgb(192, 192, 192);
} }
.ace-dreamweaver .ace_marker-layer .ace_active_line { .ace-dreamweaver .ace_marker-layer .ace_active-line {
background: rgba(0, 0, 0, 0.07); background: rgba(0, 0, 0, 0.07);
} }
.ace-dreamweaver .ace_marker-layer .ace_selected_word { .ace-dreamweaver .ace_marker-layer .ace_selected-word {
background: rgb(250, 250, 255); background: rgb(250, 250, 255);
border: 1px solid rgb(200, 200, 250); border: 1px solid rgb(200, 200, 250);
} }

16
lib/ace/theme/eclipse.css
View file

@ -1,18 +1,10 @@
.ace-eclipse .ace_editor {
border: 2px solid rgb(159, 159, 159);
}
.ace-eclipse .ace_editor.ace_focus {
border: 2px solid #327fbd;
}
.ace-eclipse .ace_gutter { .ace-eclipse .ace_gutter {
background: #ebebeb; background: #ebebeb;
border-right: 1px solid rgb(159, 159, 159); border-right: 1px solid rgb(159, 159, 159);
color: rgb(136, 136, 136); color: rgb(136, 136, 136);
} }
.ace-eclipse .ace_print_margin { .ace-eclipse .ace_print-margin {
width: 1px; width: 1px;
background: #ebebeb; background: #ebebeb;
} }
@ -77,7 +69,7 @@
color: rgb(127, 0, 127); color: rgb(127, 0, 127);
} }
.ace-eclipse .ace_line .ace_xml_pe { .ace-eclipse .ace_line .ace_xml-pe {
color: rgb(104, 104, 91); color: rgb(104, 104, 91);
} }
@ -101,11 +93,11 @@
background: rgb(255, 255, 0); background: rgb(255, 255, 0);
} }
.ace-eclipse .ace_marker-layer .ace_active_line { .ace-eclipse .ace_marker-layer .ace_active-line {
background: rgb(232, 242, 254); background: rgb(232, 242, 254);
} }
.ace-eclipse .ace_marker-layer .ace_selected_word { .ace-eclipse .ace_marker-layer .ace_selected-word {
border: 1px solid rgb(181, 213, 255); border: 1px solid rgb(181, 213, 255);
} }

32
lib/ace/theme/github.css
View file

@ -1,18 +1,5 @@
/* CSS style content from github's default pygments highlighter template. /* CSS style content from github's default pygments highlighter template.
Cursor and selection styles from textmate.css. */ Cursor and selection styles from textmate.css. */
.ace-github .ace_editor {
color: #333;
background-color: #F8F8F8;
border: 1px solid #CCC;
font: 13px 'Bitstream Vera Sans Mono', Courier, monospace !important;
line-height: 19px !important;
overflow: auto;
padding: 6px 10px;
border-radius: 3px;
position: relative;
margin-bottom: 15px;
}
.ace-github .ace_gutter { .ace-github .ace_gutter {
background: #e8e8e8; background: #e8e8e8;
color: #AAA; color: #AAA;
@ -68,7 +55,7 @@
font-weight: normal; font-weight: normal;
} }
.ace-github .ace_variable.ace_instancce { .ace-github .ace_variable.ace_instance {
color: teal; color: teal;
} }
@ -88,21 +75,18 @@
border-bottom: 1px solid black; border-bottom: 1px solid black;
} }
.ace-github .ace_marker-layer .ace_active_line { .ace-github .ace_marker-layer .ace_active-line {
background: rgb(255, 255, 204); background: rgb(255, 255, 204);
} }
.ace-github .ace_marker-layer .ace_selection { .ace-github .ace_marker-layer .ace_selection {
background: rgb(181, 213, 255); background: rgb(181, 213, 255);
} }
.ace-github.multiselect .ace_selection.start {
.ace-github.ace_multiselect .ace_selection.ace_start {
box-shadow: 0 0 3px 0px white; box-shadow: 0 0 3px 0px white;
border-radius: 2px; border-radius: 2px;
} }
/* bold keywords cause cursor issues for some fonts */
/* this disables bold style for editor and keeps for static highlighter */
.ace-github.ace_editor .ace_line > span {
font-weight: normal !important;
}
.ace-github .ace_marker-layer .ace_step { .ace-github .ace_marker-layer .ace_step {
background: rgb(252, 255, 0); background: rgb(252, 255, 0);
@ -117,17 +101,17 @@
border: 1px solid rgb(192, 192, 192); border: 1px solid rgb(192, 192, 192);
} }
.ace-github .ace_gutter_active_line { .ace-github .ace_gutter-active-line {
background-color : rgba(0, 0, 0, 0.07); background-color : rgba(0, 0, 0, 0.07);
} }
.ace-github .ace_marker-layer .ace_selected_word { .ace-github .ace_marker-layer .ace_selected-word {
background: rgb(250, 250, 255); background: rgb(250, 250, 255);
border: 1px solid rgb(200, 200, 250); border: 1px solid rgb(200, 200, 250);
} }
.ace-github .ace_print_margin { .ace-github .ace_print-margin {
width: 1px; width: 1px;
background: #e8e8e8; background: #e8e8e8;
} }

18
lib/ace/theme/idle_fingers.css
View file

@ -1,17 +1,9 @@
.ace-idle-fingers .ace_editor {
border: 2px solid rgb(159, 159, 159)
}
.ace-idle-fingers .ace_editor.ace_focus {
border: 2px solid #327fbd
}
.ace-idle-fingers .ace_gutter { .ace-idle-fingers .ace_gutter {
background: #3b3b3b; background: #3b3b3b;
color: #fff color: #fff
} }
.ace-idle-fingers .ace_print_margin { .ace-idle-fingers .ace_print-margin {
width: 1px; width: 1px;
background: #3b3b3b background: #3b3b3b
} }
@ -37,7 +29,7 @@
background: rgba(90, 100, 126, 0.88) background: rgba(90, 100, 126, 0.88)
} }
.ace-idle-fingers.multiselect .ace_selection.start { .ace-idle-fingers.ace_multiselect .ace_selection.ace_start {
box-shadow: 0 0 3px 0px #323232; box-shadow: 0 0 3px 0px #323232;
border-radius: 2px border-radius: 2px
} }
@ -51,15 +43,15 @@
border: 1px solid #404040 border: 1px solid #404040
} }
.ace-idle-fingers .ace_marker-layer .ace_active_line { .ace-idle-fingers .ace_marker-layer .ace_active-line {
background: #353637 background: #353637
} }
.ace-idle-fingers .ace_gutter_active_line { .ace-idle-fingers .ace_gutter-active-line {
background-color: #353637 background-color: #353637
} }
.ace-idle-fingers .ace_marker-layer .ace_selected_word { .ace-idle-fingers .ace_marker-layer .ace_selected-word {
border: 1px solid rgba(90, 100, 126, 0.88) border: 1px solid rgba(90, 100, 126, 0.88)
} }

18
lib/ace/theme/kr_theme.css
View file

@ -1,17 +1,9 @@
.ace-kr-theme .ace_editor {
border: 2px solid rgb(159, 159, 159)
}
.ace-kr-theme .ace_editor.ace_focus {
border: 2px solid #327fbd
}
.ace-kr-theme .ace_gutter { .ace-kr-theme .ace_gutter {
background: #1c1917; background: #1c1917;
color: #FCFFE0 color: #FCFFE0
} }
.ace-kr-theme .ace_print_margin { .ace-kr-theme .ace_print-margin {
width: 1px; width: 1px;
background: #1c1917 background: #1c1917
} }
@ -37,7 +29,7 @@
background: rgba(170, 0, 255, 0.45) background: rgba(170, 0, 255, 0.45)
} }
.ace-kr-theme.multiselect .ace_selection.start { .ace-kr-theme.ace_multiselect .ace_selection.ace_start {
box-shadow: 0 0 3px 0px #0B0A09; box-shadow: 0 0 3px 0px #0B0A09;
border-radius: 2px border-radius: 2px
} }
@ -51,15 +43,15 @@
border: 1px solid rgba(255, 177, 111, 0.32) border: 1px solid rgba(255, 177, 111, 0.32)
} }
.ace-kr-theme .ace_marker-layer .ace_active_line { .ace-kr-theme .ace_marker-layer .ace_active-line {
background: #38403D background: #38403D
} }
.ace-kr-theme .ace_gutter_active_line { .ace-kr-theme .ace_gutter-active-line {
background-color : #38403D background-color : #38403D
} }
.ace-kr-theme .ace_marker-layer .ace_selected_word { .ace-kr-theme .ace_marker-layer .ace_selected-word {
border: 1px solid rgba(170, 0, 255, 0.45) border: 1px solid rgba(170, 0, 255, 0.45)
} }

18
lib/ace/theme/merbivore.css
View file

@ -1,17 +1,9 @@
.ace-merbivore .ace_editor {
border: 2px solid rgb(159, 159, 159)
}
.ace-merbivore .ace_editor.ace_focus {
border: 2px solid #327fbd
}
.ace-merbivore .ace_gutter { .ace-merbivore .ace_gutter {
background: #202020; background: #202020;
color: #E6E1DC color: #E6E1DC
} }
.ace-merbivore .ace_print_margin { .ace-merbivore .ace_print-margin {
width: 1px; width: 1px;
background: #555651 background: #555651
} }
@ -37,7 +29,7 @@
background: #454545 background: #454545
} }
.ace-merbivore.multiselect .ace_selection.start { .ace-merbivore.ace_multiselect .ace_selection.ace_start {
box-shadow: 0 0 3px 0px #161616; box-shadow: 0 0 3px 0px #161616;
border-radius: 2px border-radius: 2px
} }
@ -51,15 +43,15 @@
border: 1px solid #404040 border: 1px solid #404040
} }
.ace-merbivore .ace_marker-layer .ace_active_line { .ace-merbivore .ace_marker-layer .ace_active-line {
background: #333435 background: #333435
} }
.ace-merbivore .ace_gutter_active_line { .ace-merbivore .ace_gutter-active-line {
background-color: #333435 background-color: #333435
} }
.ace-merbivore .ace_marker-layer .ace_selected_word { .ace-merbivore .ace_marker-layer .ace_selected-word {
border: 1px solid #454545 border: 1px solid #454545
} }

18
lib/ace/theme/merbivore_soft.css
View file

@ -1,17 +1,9 @@
.ace-merbivore-soft .ace_editor {
border: 2px solid rgb(159, 159, 159)
}
.ace-merbivore-soft .ace_editor.ace_focus {
border: 2px solid #327fbd
}
.ace-merbivore-soft .ace_gutter { .ace-merbivore-soft .ace_gutter {
background: #262424; background: #262424;
color: #E6E1DC color: #E6E1DC
} }
.ace-merbivore-soft .ace_print_margin { .ace-merbivore-soft .ace_print-margin {
width: 1px; width: 1px;
background: #262424 background: #262424
} }
@ -37,7 +29,7 @@
background: #494949 background: #494949
} }
.ace-merbivore-soft.multiselect .ace_selection.start { .ace-merbivore-soft.ace_multiselect .ace_selection.ace_start {
box-shadow: 0 0 3px 0px #1C1C1C; box-shadow: 0 0 3px 0px #1C1C1C;
border-radius: 2px border-radius: 2px
} }
@ -51,15 +43,15 @@
border: 1px solid #404040 border: 1px solid #404040
} }
.ace-merbivore-soft .ace_marker-layer .ace_active_line { .ace-merbivore-soft .ace_marker-layer .ace_active-line {
background: #333435 background: #333435
} }
.ace-merbivore-soft .ace_gutter_active_line { .ace-merbivore-soft .ace_gutter-active-line {
background-color: #333435 background-color: #333435
} }
.ace-merbivore-soft .ace_marker-layer .ace_selected_word { .ace-merbivore-soft .ace_marker-layer .ace_selected-word {
border: 1px solid #494949 border: 1px solid #494949
} }

18
lib/ace/theme/mono_industrial.css
View file

@ -1,17 +1,9 @@
.ace-mono-industrial .ace_editor {
border: 2px solid rgb(159, 159, 159)
}
.ace-mono-industrial .ace_editor.ace_focus {
border: 2px solid #327fbd
}
.ace-mono-industrial .ace_gutter { .ace-mono-industrial .ace_gutter {
background: #1d2521; background: #1d2521;
color: #C5C9C9 color: #C5C9C9
} }
.ace-mono-industrial .ace_print_margin { .ace-mono-industrial .ace_print-margin {
width: 1px; width: 1px;
background: #555651 background: #555651
} }
@ -37,7 +29,7 @@
background: rgba(145, 153, 148, 0.40) background: rgba(145, 153, 148, 0.40)
} }
.ace-mono-industrial.multiselect .ace_selection.start { .ace-mono-industrial.ace_multiselect .ace_selection.ace_start {
box-shadow: 0 0 3px 0px #222C28; box-shadow: 0 0 3px 0px #222C28;
border-radius: 2px border-radius: 2px
} }
@ -51,15 +43,15 @@
border: 1px solid rgba(102, 108, 104, 0.50) border: 1px solid rgba(102, 108, 104, 0.50)
} }
.ace-mono-industrial .ace_marker-layer .ace_active_line { .ace-mono-industrial .ace_marker-layer .ace_active-line {
background: rgba(12, 13, 12, 0.25) background: rgba(12, 13, 12, 0.25)
} }
.ace-mono-industrial .ace_gutter_active_line { .ace-mono-industrial .ace_gutter-active-line {
background-color: rgba(12, 13, 12, 0.25) background-color: rgba(12, 13, 12, 0.25)
} }
.ace-mono-industrial .ace_marker-layer .ace_selected_word { .ace-mono-industrial .ace_marker-layer .ace_selected-word {
border: 1px solid rgba(145, 153, 148, 0.40) border: 1px solid rgba(145, 153, 148, 0.40)
} }

18
lib/ace/theme/monokai.css
View file

@ -1,17 +1,9 @@
.ace-monokai .ace_editor {
border: 2px solid rgb(159, 159, 159)
}
.ace-monokai .ace_editor.ace_focus {
border: 2px solid #327fbd
}
.ace-monokai .ace_gutter { .ace-monokai .ace_gutter {
background: #2f3129; background: #2f3129;
color: #f1f1f1 color: #f1f1f1
} }
.ace-monokai .ace_print_margin { .ace-monokai .ace_print-margin {
width: 1px; width: 1px;
background: #555651 background: #555651
} }
@ -37,7 +29,7 @@
background: #49483E background: #49483E
} }
.ace-monokai.multiselect .ace_selection.start { .ace-monokai.ace_multiselect .ace_selection.ace_start {
box-shadow: 0 0 3px 0px #272822; box-shadow: 0 0 3px 0px #272822;
border-radius: 2px border-radius: 2px
} }
@ -51,15 +43,15 @@
border: 1px solid #49483E border: 1px solid #49483E
} }
.ace-monokai .ace_marker-layer .ace_active_line { .ace-monokai .ace_marker-layer .ace_active-line {
background: #202020 background: #202020
} }
.ace-monokai .ace_gutter_active_line { .ace-monokai .ace_gutter-active-line {
background-color: #272727 background-color: #272727
} }
.ace-monokai .ace_marker-layer .ace_selected_word { .ace-monokai .ace_marker-layer .ace_selected-word {
border: 1px solid #49483E border: 1px solid #49483E
} }

20
lib/ace/theme/pastel_on_dark.css
View file

@ -1,17 +1,9 @@
.ace-pastel-on-dark .ace_editor {
border: 2px solid rgb(159, 159, 159)
}
.ace-pastel-on-dark .ace_editor.ace_focus {
border: 2px solid #327fbd
}
.ace-pastel-on-dark .ace_gutter { .ace-pastel-on-dark .ace_gutter {
background: #353030; background: #353030;
color: #8F938F color: #8F938F
} }
.ace-pastel-on-dark .ace_print_margin { .ace-pastel-on-dark .ace_print-margin {
width: 1px; width: 1px;
background: #353030 background: #353030
} }
@ -37,7 +29,7 @@
background: rgba(221, 240, 255, 0.20) background: rgba(221, 240, 255, 0.20)
} }
.ace-pastel-on-dark.multiselect .ace_selection.start { .ace-pastel-on-dark.ace_multiselect .ace_selection.ace_start {
box-shadow: 0 0 3px 0px #2C2828; box-shadow: 0 0 3px 0px #2C2828;
border-radius: 2px border-radius: 2px
} }
@ -51,15 +43,15 @@
border: 1px solid rgba(255, 255, 255, 0.25) border: 1px solid rgba(255, 255, 255, 0.25)
} }
.ace-pastel-on-dark .ace_marker-layer .ace_active_line { .ace-pastel-on-dark .ace_marker-layer .ace_active-line {
background: rgba(255, 255, 255, 0.031) background: rgba(255, 255, 255, 0.031)
} }
.ace-pastel-on-dark .ace_gutter_active_line { .ace-pastel-on-dark .ace_gutter-active-line {
background-color: rgba(255, 255, 255, 0.031) background-color: rgba(255, 255, 255, 0.031)
} }
.ace-pastel-on-dark .ace_marker-layer .ace_selected_word { .ace-pastel-on-dark .ace_marker-layer .ace_selected-word {
border: 1px solid rgba(221, 240, 255, 0.20) border: 1px solid rgba(221, 240, 255, 0.20)
} }
@ -136,7 +128,7 @@
color: #C1C144 color: #C1C144
} }
.ace-pastel-on-dark .ace_xml_pe { .ace-pastel-on-dark .ace_xml-pe {
color: #494949 color: #494949
} }

18
lib/ace/theme/solarized_dark.css
View file

@ -1,17 +1,9 @@
.ace-solarized-dark .ace_editor {
border: 2px solid rgb(159, 159, 159)
}
.ace-solarized-dark .ace_editor.ace_focus {
border: 2px solid #327fbd
}
.ace-solarized-dark .ace_gutter { .ace-solarized-dark .ace_gutter {
background: #01313f; background: #01313f;
color: #d0edf7 color: #d0edf7
} }
.ace-solarized-dark .ace_print_margin { .ace-solarized-dark .ace_print-margin {
width: 1px; width: 1px;
background: #33555E background: #33555E
} }
@ -35,12 +27,12 @@
border-bottom: 1px solid #D30102 border-bottom: 1px solid #D30102
} }
.ace-solarized-dark .ace_marker-layer .ace_active_line, .ace-solarized-dark .ace_marker-layer .ace_active-line,
.ace-solarized-dark .ace_marker-layer .ace_selection { .ace-solarized-dark .ace_marker-layer .ace_selection {
background: rgba(255, 255, 255, 0.1) background: rgba(255, 255, 255, 0.1)
} }
.ace-solarized-dark.multiselect .ace_selection.start { .ace-solarized-dark.ace_multiselect .ace_selection.ace_start {
box-shadow: 0 0 3px 0px #002B36; box-shadow: 0 0 3px 0px #002B36;
border-radius: 2px border-radius: 2px
} }
@ -54,11 +46,11 @@
border: 1px solid rgba(147, 161, 161, 0.50) border: 1px solid rgba(147, 161, 161, 0.50)
} }
.ace-solarized-dark .ace_gutter_active_line { .ace-solarized-dark .ace_gutter-active-line {
background-color: #0d3440 background-color: #0d3440
} }
.ace-solarized-dark .ace_marker-layer .ace_selected_word { .ace-solarized-dark .ace_marker-layer .ace_selected-word {
border: 1px solid #073642 border: 1px solid #073642
} }

18
lib/ace/theme/solarized_light.css
View file

@ -1,17 +1,9 @@
.ace-solarized-light .ace_editor {
border: 2px solid rgb(159, 159, 159)
}
.ace-solarized-light .ace_editor.ace_focus {
border: 2px solid #327fbd
}
.ace-solarized-light .ace_gutter { .ace-solarized-light .ace_gutter {
background: #fbf1d3; background: #fbf1d3;
color: #333 color: #333
} }
.ace-solarized-light .ace_print_margin { .ace-solarized-light .ace_print-margin {
width: 1px; width: 1px;
background: #e8e8e8 background: #e8e8e8
} }
@ -37,7 +29,7 @@
background: #073642 background: #073642
} }
.ace-solarized-light.multiselect .ace_selection.start { .ace-solarized-light.ace_multiselect .ace_selection.ace_start {
box-shadow: 0 0 3px 0px #FDF6E3; box-shadow: 0 0 3px 0px #FDF6E3;
border-radius: 2px border-radius: 2px
} }
@ -51,15 +43,15 @@
border: 1px solid rgba(147, 161, 161, 0.50) border: 1px solid rgba(147, 161, 161, 0.50)
} }
.ace-solarized-light .ace_marker-layer .ace_active_line { .ace-solarized-light .ace_marker-layer .ace_active-line {
background: #EEE8D5 background: #EEE8D5
} }
.ace-solarized-light .ace_gutter_active_line { .ace-solarized-light .ace_gutter-active-line {
background-color : #dcdcdc background-color : #dcdcdc
} }
.ace-solarized-light .ace_marker-layer .ace_selected_word { .ace-solarized-light .ace_marker-layer .ace_selected-word {
border: 1px solid #073642 border: 1px solid #073642
} }

20
lib/ace/theme/textmate.css
View file

@ -1,17 +1,9 @@
.ace-tm .ace_editor {
border: 2px solid rgb(159, 159, 159);
}
.ace-tm .ace_editor.ace_focus {
border: 2px solid #327fbd;
}
.ace-tm .ace_gutter { .ace-tm .ace_gutter {
background: #f0f0f0; background: #f0f0f0;
color: #333; color: #333;
} }
.ace-tm .ace_print_margin { .ace-tm .ace_print-margin {
width: 1px; width: 1px;
background: #e8e8e8; background: #e8e8e8;
} }
@ -104,7 +96,7 @@
color: rgb(49, 132, 149); color: rgb(49, 132, 149);
} }
.ace-tm .ace_line .ace_xml_pe { .ace-tm .ace_line .ace_xml-pe {
color: rgb(104, 104, 91); color: rgb(104, 104, 91);
} }
@ -132,7 +124,7 @@
.ace-tm .ace_marker-layer .ace_selection { .ace-tm .ace_marker-layer .ace_selection {
background: rgb(181, 213, 255); background: rgb(181, 213, 255);
} }
.ace-tm.multiselect .ace_selection.start { .ace-tm.ace_multiselect .ace_selection.ace_start {
box-shadow: 0 0 3px 0px white; box-shadow: 0 0 3px 0px white;
border-radius: 2px; border-radius: 2px;
} }
@ -149,15 +141,15 @@
border: 1px solid rgb(192, 192, 192); border: 1px solid rgb(192, 192, 192);
} }
.ace-tm .ace_marker-layer .ace_active_line { .ace-tm .ace_marker-layer .ace_active-line {
background: rgba(0, 0, 0, 0.07); background: rgba(0, 0, 0, 0.07);
} }
.ace-tm .ace_gutter_active_line { .ace-tm .ace_gutter-active-line {
background-color : #dcdcdc; background-color : #dcdcdc;
} }
.ace-tm .ace_marker-layer .ace_selected_word { .ace-tm .ace_marker-layer .ace_selected-word {
background: rgb(250, 250, 255); background: rgb(250, 250, 255);
border: 1px solid rgb(200, 200, 250); border: 1px solid rgb(200, 200, 250);
} }

18
lib/ace/theme/tomorrow.css
View file

@ -1,17 +1,9 @@
.ace-tomorrow .ace_editor {
border: 2px solid rgb(159, 159, 159)
}
.ace-tomorrow .ace_editor.ace_focus {
border: 2px solid #327fbd
}
.ace-tomorrow .ace_gutter { .ace-tomorrow .ace_gutter {
background: #f6f6f6; background: #f6f6f6;
color: #4D4D4C color: #4D4D4C
} }
.ace-tomorrow .ace_print_margin { .ace-tomorrow .ace_print-margin {
width: 1px; width: 1px;
background: #f6f6f6 background: #f6f6f6
} }
@ -37,7 +29,7 @@
background: #D6D6D6 background: #D6D6D6
} }
.ace-tomorrow.multiselect .ace_selection.start { .ace-tomorrow.ace_multiselect .ace_selection.ace_start {
box-shadow: 0 0 3px 0px #FFFFFF; box-shadow: 0 0 3px 0px #FFFFFF;
border-radius: 2px border-radius: 2px
} }
@ -51,15 +43,15 @@
border: 1px solid #D1D1D1 border: 1px solid #D1D1D1
} }
.ace-tomorrow .ace_marker-layer .ace_active_line { .ace-tomorrow .ace_marker-layer .ace_active-line {
background: #EFEFEF background: #EFEFEF
} }
.ace-tomorrow .ace_gutter_active_line { .ace-tomorrow .ace_gutter-active-line {
background-color : #dcdcdc background-color : #dcdcdc
} }
.ace-tomorrow .ace_marker-layer .ace_selected_word { .ace-tomorrow .ace_marker-layer .ace_selected-word {
border: 1px solid #D6D6D6 border: 1px solid #D6D6D6
} }

18
lib/ace/theme/tomorrow_night.css
View file

@ -1,17 +1,9 @@
.ace-tomorrow-night .ace_editor {
border: 2px solid rgb(159, 159, 159)
}
.ace-tomorrow-night .ace_editor.ace_focus {
border: 2px solid #327fbd
}
.ace-tomorrow-night .ace_gutter { .ace-tomorrow-night .ace_gutter {
background: #25282c; background: #25282c;
color: #C5C8C6 color: #C5C8C6
} }
.ace-tomorrow-night .ace_print_margin { .ace-tomorrow-night .ace_print-margin {
width: 1px; width: 1px;
background: #25282c background: #25282c
} }
@ -37,7 +29,7 @@
background: #373B41 background: #373B41
} }
.ace-tomorrow-night.multiselect .ace_selection.start { .ace-tomorrow-night.ace_multiselect .ace_selection.ace_start {
box-shadow: 0 0 3px 0px #1D1F21; box-shadow: 0 0 3px 0px #1D1F21;
border-radius: 2px border-radius: 2px
} }
@ -51,15 +43,15 @@
border: 1px solid #4B4E55 border: 1px solid #4B4E55
} }
.ace-tomorrow-night .ace_marker-layer .ace_active_line { .ace-tomorrow-night .ace_marker-layer .ace_active-line {
background: #282A2E background: #282A2E
} }
.ace-tomorrow-night .ace_gutter_active_line { .ace-tomorrow-night .ace_gutter-active-line {
background-color: #282A2E background-color: #282A2E
} }
.ace-tomorrow-night .ace_marker-layer .ace_selected_word { .ace-tomorrow-night .ace_marker-layer .ace_selected-word {
border: 1px solid #373B41 border: 1px solid #373B41
} }

18
lib/ace/theme/tomorrow_night_blue.css
View file

@ -1,17 +1,9 @@
.ace-tomorrow-night-blue .ace_editor {
border: 2px solid rgb(159, 159, 159)
}
.ace-tomorrow-night-blue .ace_editor.ace_focus {
border: 2px solid #327fbd
}
.ace-tomorrow-night-blue .ace_gutter { .ace-tomorrow-night-blue .ace_gutter {
background: #00204b; background: #00204b;
color: #7388b5 color: #7388b5
} }
.ace-tomorrow-night-blue .ace_print_margin { .ace-tomorrow-night-blue .ace_print-margin {
width: 1px; width: 1px;
background: #00204b background: #00204b
} }
@ -38,7 +30,7 @@
background: #003F8E background: #003F8E
} }
.ace-tomorrow-night-blue.multiselect .ace_selection.start { .ace-tomorrow-night-blue.ace_multiselect .ace_selection.ace_start {
box-shadow: 0 0 3px 0px #002451; box-shadow: 0 0 3px 0px #002451;
border-radius: 2px border-radius: 2px
} }
@ -52,15 +44,15 @@
border: 1px solid #404F7D border: 1px solid #404F7D
} }
.ace-tomorrow-night-blue .ace_marker-layer .ace_active_line { .ace-tomorrow-night-blue .ace_marker-layer .ace_active-line {
background: #00346E background: #00346E
} }
.ace-tomorrow-night-blue .ace_gutter_active_line { .ace-tomorrow-night-blue .ace_gutter-active-line {
background-color: #022040 background-color: #022040
} }
.ace-tomorrow-night-blue .ace_marker-layer .ace_selected_word { .ace-tomorrow-night-blue .ace_marker-layer .ace_selected-word {
border: 1px solid #003F8E border: 1px solid #003F8E
} }

18
lib/ace/theme/tomorrow_night_bright.css
View file

@ -1,17 +1,9 @@
.ace-tomorrow-night-bright .ace_editor {
border: 2px solid rgb(159, 159, 159)
}
.ace-tomorrow-night-bright .ace_editor.ace_focus {
border: 2px solid #327fbd
}
.ace-tomorrow-night-bright .ace_gutter { .ace-tomorrow-night-bright .ace_gutter {
background: #1a1a1a; background: #1a1a1a;
color: #DEDEDE color: #DEDEDE
} }
.ace-tomorrow-night-bright .ace_print_margin { .ace-tomorrow-night-bright .ace_print-margin {
width: 1px; width: 1px;
background: #1a1a1a background: #1a1a1a
} }
@ -37,7 +29,7 @@
background: #424242 background: #424242
} }
.ace-tomorrow-night-bright.multiselect .ace_selection.start { .ace-tomorrow-night-bright.ace_multiselect .ace_selection.ace_start {
box-shadow: 0 0 3px 0px #000000; box-shadow: 0 0 3px 0px #000000;
border-radius: 2px border-radius: 2px
} }
@ -51,15 +43,15 @@
border: 1px solid #343434 border: 1px solid #343434
} }
.ace-tomorrow-night-bright .ace_marker-layer .ace_active_line { .ace-tomorrow-night-bright .ace_marker-layer .ace_active-line {
background: #2A2A2A background: #2A2A2A
} }
.ace-tomorrow-night-bright .ace_gutter_active_line { .ace-tomorrow-night-bright .ace_gutter-active-line {
background-color: #2A2A2A background-color: #2A2A2A
} }
.ace-tomorrow-night-bright .ace_marker-layer .ace_selected_word { .ace-tomorrow-night-bright .ace_marker-layer .ace_selected-word {
border: 1px solid #424242 border: 1px solid #424242
} }

18
lib/ace/theme/tomorrow_night_eighties.css
View file

@ -1,17 +1,9 @@
.ace-tomorrow-night-eighties .ace_editor {
border: 2px solid rgb(159, 159, 159)
}
.ace-tomorrow-night-eighties .ace_editor.ace_focus {
border: 2px solid #327fbd
}
.ace-tomorrow-night-eighties .ace_gutter { .ace-tomorrow-night-eighties .ace_gutter {
background: #272727; background: #272727;
color: #CCC color: #CCC
} }
.ace-tomorrow-night-eighties .ace_print_margin { .ace-tomorrow-night-eighties .ace_print-margin {
width: 1px; width: 1px;
background: #272727 background: #272727
} }
@ -38,7 +30,7 @@
background: #515151 background: #515151
} }
.ace-tomorrow-night-eighties.multiselect .ace_selection.start { .ace-tomorrow-night-eighties.ace_multiselect .ace_selection.ace_start {
box-shadow: 0 0 3px 0px #2D2D2D; box-shadow: 0 0 3px 0px #2D2D2D;
border-radius: 2px border-radius: 2px
} }
@ -52,15 +44,15 @@
border: 1px solid #6A6A6A border: 1px solid #6A6A6A
} }
.ace-tomorrow-night-eighties .ace_marker-layer .ace_active_line { .ace-tomorrow-night-eighties .ace_marker-layer .ace_active-line {
background: #393939 background: #393939
} }
.ace-tomorrow-night-eighties .ace_gutter_active_line { .ace-tomorrow-night-eighties .ace_gutter-active-line {
background-color: #393939 background-color: #393939
} }
.ace-tomorrow-night-eighties .ace_marker-layer .ace_selected_word { .ace-tomorrow-night-eighties .ace_marker-layer .ace_selected-word {
border: 1px solid #515151 border: 1px solid #515151
} }

20
lib/ace/theme/twilight.css
View file

@ -1,17 +1,9 @@
.ace-twilight .ace_editor {
border: 2px solid rgb(159, 159, 159)
}
.ace-twilight .ace_editor.ace_focus {
border: 2px solid #327fbd
}
.ace-twilight .ace_gutter { .ace-twilight .ace_gutter {
background: #232323; background: #232323;
color: #E2E2E2 color: #E2E2E2
} }
.ace-twilight .ace_print_margin { .ace-twilight .ace_print-margin {
width: 1px; width: 1px;
background: #232323 background: #232323
} }
@ -37,7 +29,7 @@
background: rgba(221, 240, 255, 0.20) background: rgba(221, 240, 255, 0.20)
} }
.ace-twilight.multiselect .ace_selection.start { .ace-twilight.ace_multiselect .ace_selection.ace_start {
box-shadow: 0 0 3px 0px #141414; box-shadow: 0 0 3px 0px #141414;
border-radius: 2px border-radius: 2px
} }
@ -51,15 +43,15 @@
border: 1px solid rgba(255, 255, 255, 0.25) border: 1px solid rgba(255, 255, 255, 0.25)
} }
.ace-twilight .ace_marker-layer .ace_active_line { .ace-twilight .ace_marker-layer .ace_active-line {
background: rgba(255, 255, 255, 0.031) background: rgba(255, 255, 255, 0.031)
} }
.ace-twilight .ace_gutter_active_line { .ace-twilight .ace_gutter-active-line {
background-color: rgba(255, 255, 255, 0.031) background-color: rgba(255, 255, 255, 0.031)
} }
.ace-twilight .ace_marker-layer .ace_selected_word { .ace-twilight .ace_marker-layer .ace_selected-word {
border: 1px solid rgba(221, 240, 255, 0.20) border: 1px solid rgba(221, 240, 255, 0.20)
} }
@ -133,7 +125,7 @@
color: #7587A6 color: #7587A6
} }
.ace-twilight .ace_xml_pe { .ace-twilight .ace_xml-pe {
color: #494949 color: #494949
} }

18
lib/ace/theme/vibrant_ink.css
View file

@ -1,17 +1,9 @@
.ace-vibrant-ink .ace_editor {
border: 2px solid rgb(159, 159, 159)
}
.ace-vibrant-ink .ace_editor.ace_focus {
border: 2px solid #327fbd
}
.ace-vibrant-ink .ace_gutter { .ace-vibrant-ink .ace_gutter {
background: #1a1a1a; background: #1a1a1a;
color: #BEBEBE color: #BEBEBE
} }
.ace-vibrant-ink .ace_print_margin { .ace-vibrant-ink .ace_print-margin {
width: 1px; width: 1px;
background: #1a1a1a background: #1a1a1a
} }
@ -37,7 +29,7 @@
background: #6699CC background: #6699CC
} }
.ace-vibrant-ink.multiselect .ace_selection.start { .ace-vibrant-ink.ace_multiselect .ace_selection.ace_start {
box-shadow: 0 0 3px 0px #0F0F0F; box-shadow: 0 0 3px 0px #0F0F0F;
border-radius: 2px border-radius: 2px
} }
@ -51,15 +43,15 @@
border: 1px solid #404040 border: 1px solid #404040
} }
.ace-vibrant-ink .ace_marker-layer .ace_active_line { .ace-vibrant-ink .ace_marker-layer .ace_active-line {
background: #333333 background: #333333
} }
.ace-vibrant-ink .ace_gutter_active_line { .ace-vibrant-ink .ace_gutter-active-line {
background-color: #333333 background-color: #333333
} }
.ace-vibrant-ink .ace_marker-layer .ace_selected_word { .ace-vibrant-ink .ace_marker-layer .ace_selected-word {
border: 1px solid #6699CC border: 1px solid #6699CC
} }

17
lib/ace/theme/xcode.css
View file

@ -1,18 +1,11 @@
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css (UUID: EE3AD170-2B7F-4DE1-B724-C75F13FE0085) */ /* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css (UUID: EE3AD170-2B7F-4DE1-B724-C75F13FE0085) */
.ace-xcode .ace_editor {
border: 2px solid rgb(159, 159, 159)
}
.ace-xcode .ace_editor.ace_focus {
border: 2px solid #327fbd
}
.ace-xcode .ace_gutter { .ace-xcode .ace_gutter {
background: #e8e8e8; background: #e8e8e8;
color: #333 color: #333
} }
.ace-xcode .ace_print_margin { .ace-xcode .ace_print-margin {
width: 1px; width: 1px;
background: #e8e8e8 background: #e8e8e8
} }
@ -38,7 +31,7 @@
background: #B5D5FF background: #B5D5FF
} }
.ace-xcode.multiselect .ace_selection.start { .ace-xcode.ace_multiselect .ace_selection.ace_start {
box-shadow: 0 0 3px 0px #FFFFFF; box-shadow: 0 0 3px 0px #FFFFFF;
border-radius: 2px border-radius: 2px
} }
@ -52,15 +45,15 @@
border: 1px solid #BFBFBF border: 1px solid #BFBFBF
} }
.ace-xcode .ace_marker-layer .ace_active_line { .ace-xcode .ace_marker-layer .ace_active-line {
background: rgba(0, 0, 0, 0.071) background: rgba(0, 0, 0, 0.071)
} }
.ace-xcode .ace_gutter_active_line { .ace-xcode .ace_gutter-active-line {
background-color: rgba(0, 0, 0, 0.071) background-color: rgba(0, 0, 0, 0.071)
} }
.ace-xcode .ace_marker-layer .ace_selected_word { .ace-xcode .ace_marker-layer .ace_selected-word {
border: 1px solid #B5D5FF border: 1px solid #B5D5FF
} }

10
lib/ace/virtual_renderer.js
View file

@ -484,7 +484,7 @@ var VirtualRenderer = function(container, theme) {
if (!this.$gutterLineHighlight) { if (!this.$gutterLineHighlight) {
this.$gutterLineHighlight = dom.createElement("div"); this.$gutterLineHighlight = dom.createElement("div");
this.$gutterLineHighlight.className = "ace_gutter_active_line"; this.$gutterLineHighlight.className = "ace_gutter-active-line";
this.$gutter.appendChild(this.$gutterLineHighlight); this.$gutter.appendChild(this.$gutterLineHighlight);
return; return;
} }
@ -512,11 +512,11 @@ var VirtualRenderer = function(container, theme) {
if (!this.$printMarginEl) { if (!this.$printMarginEl) {
containerEl = dom.createElement("div"); containerEl = dom.createElement("div");
containerEl.className = "ace_print_margin_layer"; containerEl.className = "ace_layer ace_print-margin-layer";
this.$printMarginEl = dom.createElement("div"); this.$printMarginEl = dom.createElement("div");
this.$printMarginEl.className = "ace_print_margin"; this.$printMarginEl.className = "ace_print-margin";
containerEl.appendChild(this.$printMarginEl); containerEl.appendChild(this.$printMarginEl);
this.content.insertBefore(containerEl, this.$textLayer.element); this.content.insertBefore(containerEl, this.content.firstChild);
} }
var style = this.$printMarginEl.style; var style = this.$printMarginEl.style;
@ -686,7 +686,7 @@ var VirtualRenderer = function(container, theme) {
this.scrollLeft = scrollLeft; this.scrollLeft = scrollLeft;
this.session.setScrollLeft(scrollLeft); this.session.setScrollLeft(scrollLeft);
this.scroller.className = this.scrollLeft == 0 ? "ace_scroller" : "ace_scroller horscroll"; this.scroller.className = this.scrollLeft == 0 ? "ace_scroller" : "ace_scroller ace_scroll-left";
} }
// full // full

18
tool/Theme.tmpl.css
View file

@ -1,19 +1,11 @@
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css (UUID: %uuid%) */ /* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css (UUID: %uuid%) */
.%cssClass% .ace_editor {
border: 2px solid rgb(159, 159, 159);
}
.%cssClass% .ace_editor.ace_focus {
border: 2px solid #327fbd;
}
.%cssClass% .ace_gutter { .%cssClass% .ace_gutter {
background: #e8e8e8; background: #e8e8e8;
color: #333; color: #333;
} }
.%cssClass% .ace_print_margin { .%cssClass% .ace_print-margin {
width: 1px; width: 1px;
background: %printMargin%; background: %printMargin%;
} }
@ -39,7 +31,7 @@
background: %selection%; background: %selection%;
} }
.%cssClass%.multiselect .ace_selection.start { .%cssClass%.ace_multiselect .ace_selection.ace_start {
box-shadow: 0 0 3px 0px %background%; box-shadow: 0 0 3px 0px %background%;
border-radius: 2px; border-radius: 2px;
} }
@ -53,15 +45,15 @@
border: 1px solid %bracket%; border: 1px solid %bracket%;
} }
.%cssClass% .ace_marker-layer .ace_active_line { .%cssClass% .ace_marker-layer .ace_active-line {
background: %active_line%; background: %active_line%;
} }
.%cssClass% .ace_gutter_active_line { .%cssClass% .ace_gutter-active-line {
background-color: %active_line%; background-color: %active_line%;
} }
.%cssClass% .ace_marker-layer .ace_selected_word { .%cssClass% .ace_marker-layer .ace_selected-word {
%selected_word_highlight% %selected_word_highlight%
} }

2
tool/tmtheme.js
View file

@ -60,7 +60,7 @@ var supportedScopes = {
"variable.parameter": "variable.parameter", "variable.parameter": "variable.parameter",
"meta": "meta", "meta": "meta",
"meta.tag.sgml.doctype": "xml_pe", "meta.tag.sgml.doctype": "xml-pe",
"meta.tag": "meta.tag", "meta.tag": "meta.tag",
"meta.selector": "meta.selector", "meta.selector": "meta.selector",