ace-rails-ap 3.0.1 → 3.0.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/ace/rails/version.rb +1 -1
- data/vendor/assets/javascripts/ace/ace.js +210 -161
- data/vendor/assets/javascripts/ace/ext-beautify.js +0 -1
- data/vendor/assets/javascripts/ace/ext-chromevox.js +0 -1
- data/vendor/assets/javascripts/ace/ext-elastic_tabstops_lite.js +0 -1
- data/vendor/assets/javascripts/ace/ext-emmet.js +66 -48
- data/vendor/assets/javascripts/ace/ext-keybinding_menu.js +9 -19
- data/vendor/assets/javascripts/ace/ext-language_tools.js +108 -10
- data/vendor/assets/javascripts/ace/ext-linking.js +0 -1
- data/vendor/assets/javascripts/ace/ext-modelist.js +4 -1
- data/vendor/assets/javascripts/ace/ext-old_ie.js +23 -2
- data/vendor/assets/javascripts/ace/ext-searchbox.js +23 -2
- data/vendor/assets/javascripts/ace/ext-settings_menu.js +10 -1
- data/vendor/assets/javascripts/ace/ext-spellcheck.js +0 -1
- data/vendor/assets/javascripts/ace/ext-split.js +0 -1
- data/vendor/assets/javascripts/ace/ext-static_highlight.js +0 -1
- data/vendor/assets/javascripts/ace/ext-statusbar.js +2 -4
- data/vendor/assets/javascripts/ace/ext-textarea.js +0 -1
- data/vendor/assets/javascripts/ace/ext-themelist.js +0 -1
- data/vendor/assets/javascripts/ace/ext-whitespace.js +0 -1
- data/vendor/assets/javascripts/ace/keybinding-emacs.js +159 -50
- data/vendor/assets/javascripts/ace/mode-autohotkey.js +1 -1
- data/vendor/assets/javascripts/ace/mode-c_cpp.js +32 -14
- data/vendor/assets/javascripts/ace/mode-coffee.js +1 -1
- data/vendor/assets/javascripts/ace/mode-coldfusion.js +62 -24
- data/vendor/assets/javascripts/ace/mode-csharp.js +14 -8
- data/vendor/assets/javascripts/ace/mode-css.js +2 -2
- data/vendor/assets/javascripts/ace/mode-curly.js +62 -24
- data/vendor/assets/javascripts/ace/mode-d.js +13 -7
- data/vendor/assets/javascripts/ace/mode-dart.js +32 -14
- data/vendor/assets/javascripts/ace/mode-django.js +62 -24
- data/vendor/assets/javascripts/ace/mode-dockerfile.js +3 -3
- data/vendor/assets/javascripts/ace/mode-dot.js +12 -6
- data/vendor/assets/javascripts/ace/mode-ejs.js +126 -27
- data/vendor/assets/javascripts/ace/mode-elixir.js +493 -0
- data/vendor/assets/javascripts/ace/mode-elm.js +248 -0
- data/vendor/assets/javascripts/ace/mode-forth.js +1 -1
- data/vendor/assets/javascripts/ace/mode-ftl.js +20 -10
- data/vendor/assets/javascripts/ace/mode-gitignore.js +1 -0
- data/vendor/assets/javascripts/ace/mode-glsl.js +32 -14
- data/vendor/assets/javascripts/ace/mode-golang.js +14 -8
- data/vendor/assets/javascripts/ace/mode-groovy.js +22 -12
- data/vendor/assets/javascripts/ace/mode-haml.js +64 -3
- data/vendor/assets/javascripts/ace/mode-handlebars.js +72 -34
- data/vendor/assets/javascripts/ace/mode-haxe.js +14 -8
- data/vendor/assets/javascripts/ace/mode-html.js +62 -24
- data/vendor/assets/javascripts/ace/mode-html_ruby.js +126 -27
- data/vendor/assets/javascripts/ace/mode-jack.js +2 -2
- data/vendor/assets/javascripts/ace/mode-jade.js +21 -11
- data/vendor/assets/javascripts/ace/mode-java.js +22 -12
- data/vendor/assets/javascripts/ace/mode-javascript.js +22 -12
- data/vendor/assets/javascripts/ace/mode-json.js +2 -2
- data/vendor/assets/javascripts/ace/mode-jsoniq.js +47 -1835
- data/vendor/assets/javascripts/ace/mode-jsp.js +22 -12
- data/vendor/assets/javascripts/ace/mode-jsx.js +14 -8
- data/vendor/assets/javascripts/ace/mode-less.js +2 -2
- data/vendor/assets/javascripts/ace/mode-liquid.js +20 -10
- data/vendor/assets/javascripts/ace/mode-logiql.js +2 -2
- data/vendor/assets/javascripts/ace/mode-lsl.js +2 -2
- data/vendor/assets/javascripts/ace/mode-luapage.js +62 -24
- data/vendor/assets/javascripts/ace/mode-markdown.js +62 -24
- data/vendor/assets/javascripts/ace/mode-mel.js +2 -2
- data/vendor/assets/javascripts/ace/mode-mysql.js +12 -6
- data/vendor/assets/javascripts/ace/mode-nix.js +32 -14
- data/vendor/assets/javascripts/ace/mode-objectivec.js +30 -12
- data/vendor/assets/javascripts/ace/mode-pgsql.js +20 -10
- data/vendor/assets/javascripts/ace/mode-php.js +1126 -40
- data/vendor/assets/javascripts/ace/mode-powershell.js +2 -2
- data/vendor/assets/javascripts/ace/mode-protobuf.js +32 -14
- data/vendor/assets/javascripts/ace/mode-rhtml.js +62 -24
- data/vendor/assets/javascripts/ace/mode-ruby.js +66 -5
- data/vendor/assets/javascripts/ace/mode-rust.js +36 -3
- data/vendor/assets/javascripts/ace/mode-scad.js +14 -8
- data/vendor/assets/javascripts/ace/mode-scala.js +22 -12
- data/vendor/assets/javascripts/ace/mode-scss.js +2 -2
- data/vendor/assets/javascripts/ace/mode-sh.js +2 -2
- data/vendor/assets/javascripts/ace/mode-sjs.js +22 -12
- data/vendor/assets/javascripts/ace/mode-smarty.js +62 -24
- data/vendor/assets/javascripts/ace/mode-soy_template.js +63 -25
- data/vendor/assets/javascripts/ace/mode-stylus.js +4 -1
- data/vendor/assets/javascripts/ace/mode-svg.js +62 -24
- data/vendor/assets/javascripts/ace/mode-textile.js +1 -0
- data/vendor/assets/javascripts/ace/mode-twig.js +62 -24
- data/vendor/assets/javascripts/ace/mode-typescript.js +22 -12
- data/vendor/assets/javascripts/ace/mode-vala.js +2 -2
- data/vendor/assets/javascripts/ace/mode-velocity.js +62 -24
- data/vendor/assets/javascripts/ace/mode-xml.js +40 -12
- data/vendor/assets/javascripts/ace/mode-xquery.js +47 -1835
- data/vendor/assets/javascripts/ace/theme-cobalt.js +1 -1
- data/vendor/assets/javascripts/ace/theme-idle_fingers.js +1 -1
- data/vendor/assets/javascripts/ace/theme-tomorrow_night_bright.js +2 -2
- data/vendor/assets/javascripts/ace/worker-coffee.js +15 -5
- data/vendor/assets/javascripts/ace/worker-css.js +15 -5
- data/vendor/assets/javascripts/ace/worker-html.js +15 -5
- data/vendor/assets/javascripts/ace/worker-javascript.js +15 -5
- data/vendor/assets/javascripts/ace/worker-json.js +17 -6
- data/vendor/assets/javascripts/ace/worker-lua.js +15 -5
- data/vendor/assets/javascripts/ace/worker-php.js +15 -5
- data/vendor/assets/javascripts/ace/worker-xquery.js +15 -5
- metadata +4 -2
@@ -5,22 +5,28 @@ var oop = require("../lib/oop");
|
|
5
5
|
var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
|
6
6
|
|
7
7
|
var DocCommentHighlightRules = function() {
|
8
|
-
|
9
8
|
this.$rules = {
|
10
9
|
"start" : [ {
|
11
10
|
token : "comment.doc.tag",
|
12
11
|
regex : "@[\\w\\d_]+" // TODO: fix email addresses
|
13
|
-
},
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
12
|
+
},
|
13
|
+
DocCommentHighlightRules.getTagRule(),
|
14
|
+
{
|
15
|
+
defaultToken : "comment.doc",
|
16
|
+
caseInsensitive: true
|
18
17
|
}]
|
19
18
|
};
|
20
19
|
};
|
21
20
|
|
22
21
|
oop.inherits(DocCommentHighlightRules, TextHighlightRules);
|
23
22
|
|
23
|
+
DocCommentHighlightRules.getTagRule = function(start) {
|
24
|
+
return {
|
25
|
+
token : "comment.doc.tag.storage.type",
|
26
|
+
regex : "\\b(?:TODO|FIXME|XXX|HACK)\\b"
|
27
|
+
};
|
28
|
+
}
|
29
|
+
|
24
30
|
DocCommentHighlightRules.getStartRule = function(start) {
|
25
31
|
return {
|
26
32
|
token : "comment.doc", // doc comment
|
@@ -292,20 +298,24 @@ var JavaScriptHighlightRules = function(options) {
|
|
292
298
|
}
|
293
299
|
],
|
294
300
|
"comment_regex_allowed" : [
|
301
|
+
DocCommentHighlightRules.getTagRule(),
|
295
302
|
{token : "comment", regex : "\\*\\/", next : "start"},
|
296
|
-
{defaultToken : "comment"}
|
303
|
+
{defaultToken : "comment", caseInsensitive: true}
|
297
304
|
],
|
298
305
|
"comment" : [
|
306
|
+
DocCommentHighlightRules.getTagRule(),
|
299
307
|
{token : "comment", regex : "\\*\\/", next : "no_regex"},
|
300
|
-
{defaultToken : "comment"}
|
308
|
+
{defaultToken : "comment", caseInsensitive: true}
|
301
309
|
],
|
302
310
|
"line_comment_regex_allowed" : [
|
311
|
+
DocCommentHighlightRules.getTagRule(),
|
303
312
|
{token : "comment", regex : "$|^", next : "start"},
|
304
|
-
{defaultToken : "comment"}
|
313
|
+
{defaultToken : "comment", caseInsensitive: true}
|
305
314
|
],
|
306
315
|
"line_comment" : [
|
316
|
+
DocCommentHighlightRules.getTagRule(),
|
307
317
|
{token : "comment", regex : "$|^", next : "no_regex"},
|
308
|
-
{defaultToken : "comment"}
|
318
|
+
{defaultToken : "comment", caseInsensitive: true}
|
309
319
|
],
|
310
320
|
"qqstring" : [
|
311
321
|
{
|
@@ -444,11 +454,11 @@ var SAFE_INSERT_BEFORE_TOKENS =
|
|
444
454
|
["text", "paren.rparen", "punctuation.operator", "comment"];
|
445
455
|
|
446
456
|
var context;
|
447
|
-
var contextCache = {}
|
457
|
+
var contextCache = {};
|
448
458
|
var initContext = function(editor) {
|
449
459
|
var id = -1;
|
450
460
|
if (editor.multiSelect) {
|
451
|
-
id = editor.selection.
|
461
|
+
id = editor.selection.index;
|
452
462
|
if (contextCache.rangeCount != editor.multiSelect.rangeCount)
|
453
463
|
contextCache = {rangeCount: editor.multiSelect.rangeCount};
|
454
464
|
}
|
@@ -306,11 +306,11 @@ var SAFE_INSERT_BEFORE_TOKENS =
|
|
306
306
|
["text", "paren.rparen", "punctuation.operator", "comment"];
|
307
307
|
|
308
308
|
var context;
|
309
|
-
var contextCache = {}
|
309
|
+
var contextCache = {};
|
310
310
|
var initContext = function(editor) {
|
311
311
|
var id = -1;
|
312
312
|
if (editor.multiSelect) {
|
313
|
-
id = editor.selection.
|
313
|
+
id = editor.selection.index;
|
314
314
|
if (contextCache.rangeCount != editor.multiSelect.rangeCount)
|
315
315
|
contextCache = {rangeCount: editor.multiSelect.rangeCount};
|
316
316
|
}
|
@@ -280,11 +280,11 @@ var SAFE_INSERT_BEFORE_TOKENS =
|
|
280
280
|
["text", "paren.rparen", "punctuation.operator", "comment"];
|
281
281
|
|
282
282
|
var context;
|
283
|
-
var contextCache = {}
|
283
|
+
var contextCache = {};
|
284
284
|
var initContext = function(editor) {
|
285
285
|
var id = -1;
|
286
286
|
if (editor.multiSelect) {
|
287
|
-
id = editor.selection.
|
287
|
+
id = editor.selection.index;
|
288
288
|
if (contextCache.rangeCount != editor.multiSelect.rangeCount)
|
289
289
|
contextCache = {rangeCount: editor.multiSelect.rangeCount};
|
290
290
|
}
|
@@ -5,22 +5,28 @@ var oop = require("../lib/oop");
|
|
5
5
|
var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
|
6
6
|
|
7
7
|
var DocCommentHighlightRules = function() {
|
8
|
-
|
9
8
|
this.$rules = {
|
10
9
|
"start" : [ {
|
11
10
|
token : "comment.doc.tag",
|
12
11
|
regex : "@[\\w\\d_]+" // TODO: fix email addresses
|
13
|
-
},
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
12
|
+
},
|
13
|
+
DocCommentHighlightRules.getTagRule(),
|
14
|
+
{
|
15
|
+
defaultToken : "comment.doc",
|
16
|
+
caseInsensitive: true
|
18
17
|
}]
|
19
18
|
};
|
20
19
|
};
|
21
20
|
|
22
21
|
oop.inherits(DocCommentHighlightRules, TextHighlightRules);
|
23
22
|
|
23
|
+
DocCommentHighlightRules.getTagRule = function(start) {
|
24
|
+
return {
|
25
|
+
token : "comment.doc.tag.storage.type",
|
26
|
+
regex : "\\b(?:TODO|FIXME|XXX|HACK)\\b"
|
27
|
+
};
|
28
|
+
}
|
29
|
+
|
24
30
|
DocCommentHighlightRules.getStartRule = function(start) {
|
25
31
|
return {
|
26
32
|
token : "comment.doc", // doc comment
|
@@ -292,20 +298,24 @@ var JavaScriptHighlightRules = function(options) {
|
|
292
298
|
}
|
293
299
|
],
|
294
300
|
"comment_regex_allowed" : [
|
301
|
+
DocCommentHighlightRules.getTagRule(),
|
295
302
|
{token : "comment", regex : "\\*\\/", next : "start"},
|
296
|
-
{defaultToken : "comment"}
|
303
|
+
{defaultToken : "comment", caseInsensitive: true}
|
297
304
|
],
|
298
305
|
"comment" : [
|
306
|
+
DocCommentHighlightRules.getTagRule(),
|
299
307
|
{token : "comment", regex : "\\*\\/", next : "no_regex"},
|
300
|
-
{defaultToken : "comment"}
|
308
|
+
{defaultToken : "comment", caseInsensitive: true}
|
301
309
|
],
|
302
310
|
"line_comment_regex_allowed" : [
|
311
|
+
DocCommentHighlightRules.getTagRule(),
|
303
312
|
{token : "comment", regex : "$|^", next : "start"},
|
304
|
-
{defaultToken : "comment"}
|
313
|
+
{defaultToken : "comment", caseInsensitive: true}
|
305
314
|
],
|
306
315
|
"line_comment" : [
|
316
|
+
DocCommentHighlightRules.getTagRule(),
|
307
317
|
{token : "comment", regex : "$|^", next : "no_regex"},
|
308
|
-
{defaultToken : "comment"}
|
318
|
+
{defaultToken : "comment", caseInsensitive: true}
|
309
319
|
],
|
310
320
|
"qqstring" : [
|
311
321
|
{
|
@@ -444,11 +454,11 @@ var SAFE_INSERT_BEFORE_TOKENS =
|
|
444
454
|
["text", "paren.rparen", "punctuation.operator", "comment"];
|
445
455
|
|
446
456
|
var context;
|
447
|
-
var contextCache = {}
|
457
|
+
var contextCache = {};
|
448
458
|
var initContext = function(editor) {
|
449
459
|
var id = -1;
|
450
460
|
if (editor.multiSelect) {
|
451
|
-
id = editor.selection.
|
461
|
+
id = editor.selection.index;
|
452
462
|
if (contextCache.rangeCount != editor.multiSelect.rangeCount)
|
453
463
|
contextCache = {rangeCount: editor.multiSelect.rangeCount};
|
454
464
|
}
|
@@ -5,22 +5,28 @@ var oop = require("../lib/oop");
|
|
5
5
|
var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
|
6
6
|
|
7
7
|
var DocCommentHighlightRules = function() {
|
8
|
-
|
9
8
|
this.$rules = {
|
10
9
|
"start" : [ {
|
11
10
|
token : "comment.doc.tag",
|
12
11
|
regex : "@[\\w\\d_]+" // TODO: fix email addresses
|
13
|
-
},
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
12
|
+
},
|
13
|
+
DocCommentHighlightRules.getTagRule(),
|
14
|
+
{
|
15
|
+
defaultToken : "comment.doc",
|
16
|
+
caseInsensitive: true
|
18
17
|
}]
|
19
18
|
};
|
20
19
|
};
|
21
20
|
|
22
21
|
oop.inherits(DocCommentHighlightRules, TextHighlightRules);
|
23
22
|
|
23
|
+
DocCommentHighlightRules.getTagRule = function(start) {
|
24
|
+
return {
|
25
|
+
token : "comment.doc.tag.storage.type",
|
26
|
+
regex : "\\b(?:TODO|FIXME|XXX|HACK)\\b"
|
27
|
+
};
|
28
|
+
}
|
29
|
+
|
24
30
|
DocCommentHighlightRules.getStartRule = function(start) {
|
25
31
|
return {
|
26
32
|
token : "comment.doc", // doc comment
|
@@ -292,20 +298,24 @@ var JavaScriptHighlightRules = function(options) {
|
|
292
298
|
}
|
293
299
|
],
|
294
300
|
"comment_regex_allowed" : [
|
301
|
+
DocCommentHighlightRules.getTagRule(),
|
295
302
|
{token : "comment", regex : "\\*\\/", next : "start"},
|
296
|
-
{defaultToken : "comment"}
|
303
|
+
{defaultToken : "comment", caseInsensitive: true}
|
297
304
|
],
|
298
305
|
"comment" : [
|
306
|
+
DocCommentHighlightRules.getTagRule(),
|
299
307
|
{token : "comment", regex : "\\*\\/", next : "no_regex"},
|
300
|
-
{defaultToken : "comment"}
|
308
|
+
{defaultToken : "comment", caseInsensitive: true}
|
301
309
|
],
|
302
310
|
"line_comment_regex_allowed" : [
|
311
|
+
DocCommentHighlightRules.getTagRule(),
|
303
312
|
{token : "comment", regex : "$|^", next : "start"},
|
304
|
-
{defaultToken : "comment"}
|
313
|
+
{defaultToken : "comment", caseInsensitive: true}
|
305
314
|
],
|
306
315
|
"line_comment" : [
|
316
|
+
DocCommentHighlightRules.getTagRule(),
|
307
317
|
{token : "comment", regex : "$|^", next : "no_regex"},
|
308
|
-
{defaultToken : "comment"}
|
318
|
+
{defaultToken : "comment", caseInsensitive: true}
|
309
319
|
],
|
310
320
|
"qqstring" : [
|
311
321
|
{
|
@@ -444,11 +454,11 @@ var SAFE_INSERT_BEFORE_TOKENS =
|
|
444
454
|
["text", "paren.rparen", "punctuation.operator", "comment"];
|
445
455
|
|
446
456
|
var context;
|
447
|
-
var contextCache = {}
|
457
|
+
var contextCache = {};
|
448
458
|
var initContext = function(editor) {
|
449
459
|
var id = -1;
|
450
460
|
if (editor.multiSelect) {
|
451
|
-
id = editor.selection.
|
461
|
+
id = editor.selection.index;
|
452
462
|
if (contextCache.rangeCount != editor.multiSelect.rangeCount)
|
453
463
|
contextCache = {rangeCount: editor.multiSelect.rangeCount};
|
454
464
|
}
|
@@ -1554,12 +1564,13 @@ oop.inherits(HtmlHighlightRules, XmlHighlightRules);
|
|
1554
1564
|
exports.HtmlHighlightRules = HtmlHighlightRules;
|
1555
1565
|
});
|
1556
1566
|
|
1557
|
-
define("ace/mode/behaviour/xml",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/token_iterator"], function(require, exports, module) {
|
1567
|
+
define("ace/mode/behaviour/xml",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/token_iterator","ace/lib/lang"], function(require, exports, module) {
|
1558
1568
|
"use strict";
|
1559
1569
|
|
1560
1570
|
var oop = require("../../lib/oop");
|
1561
1571
|
var Behaviour = require("../behaviour").Behaviour;
|
1562
1572
|
var TokenIterator = require("../../token_iterator").TokenIterator;
|
1573
|
+
var lang = require("../../lib/lang");
|
1563
1574
|
|
1564
1575
|
function is(token, type) {
|
1565
1576
|
return token.type.lastIndexOf(type + ".xml") > -1;
|
@@ -1657,29 +1668,56 @@ var XmlBehaviour = function () {
|
|
1657
1668
|
return;
|
1658
1669
|
|
1659
1670
|
return {
|
1660
|
-
text:
|
1671
|
+
text: ">" + "</" + element + ">",
|
1661
1672
|
selection: [1, 1]
|
1662
1673
|
};
|
1663
1674
|
}
|
1664
1675
|
});
|
1665
1676
|
|
1666
|
-
this.add(
|
1677
|
+
this.add("autoindent", "insertion", function (state, action, editor, session, text) {
|
1667
1678
|
if (text == "\n") {
|
1668
1679
|
var cursor = editor.getCursorPosition();
|
1669
1680
|
var line = session.getLine(cursor.row);
|
1670
|
-
var
|
1671
|
-
|
1672
|
-
var next_indent = this.$getIndent(line);
|
1673
|
-
var indent = next_indent + session.getTabString();
|
1681
|
+
var iterator = new TokenIterator(session, cursor.row, cursor.column);
|
1682
|
+
var token = iterator.getCurrentToken();
|
1674
1683
|
|
1675
|
-
|
1676
|
-
|
1677
|
-
|
1678
|
-
}
|
1684
|
+
if (token && token.type.indexOf("tag-close") !== -1) {
|
1685
|
+
while (token && token.type.indexOf("tag-name") === -1) {
|
1686
|
+
token = iterator.stepBackward();
|
1687
|
+
}
|
1688
|
+
|
1689
|
+
if (!token) {
|
1690
|
+
return;
|
1691
|
+
}
|
1692
|
+
|
1693
|
+
var tag = token.value;
|
1694
|
+
var row = iterator.getCurrentTokenRow();
|
1695
|
+
token = iterator.stepBackward();
|
1696
|
+
if (!token || token.type.indexOf("end-tag") !== -1) {
|
1697
|
+
return;
|
1698
|
+
}
|
1699
|
+
|
1700
|
+
if (this.voidElements && !this.voidElements[tag]) {
|
1701
|
+
var nextToken = session.getTokenAt(cursor.row, cursor.column+1);
|
1702
|
+
var line = session.getLine(row);
|
1703
|
+
var nextIndent = this.$getIndent(line);
|
1704
|
+
var indent = nextIndent + session.getTabString();
|
1705
|
+
|
1706
|
+
if (nextToken && nextToken.value === "</") {
|
1707
|
+
return {
|
1708
|
+
text: "\n" + indent + "\n" + nextIndent,
|
1709
|
+
selection: [1, indent.length, 1, indent.length]
|
1710
|
+
};
|
1711
|
+
} else {
|
1712
|
+
return {
|
1713
|
+
text: "\n" + indent
|
1714
|
+
};
|
1715
|
+
}
|
1716
|
+
}
|
1679
1717
|
}
|
1680
1718
|
}
|
1681
1719
|
});
|
1682
|
-
|
1720
|
+
|
1683
1721
|
};
|
1684
1722
|
|
1685
1723
|
oop.inherits(XmlBehaviour, Behaviour);
|
@@ -5,22 +5,28 @@ var oop = require("../lib/oop");
|
|
5
5
|
var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
|
6
6
|
|
7
7
|
var DocCommentHighlightRules = function() {
|
8
|
-
|
9
8
|
this.$rules = {
|
10
9
|
"start" : [ {
|
11
10
|
token : "comment.doc.tag",
|
12
11
|
regex : "@[\\w\\d_]+" // TODO: fix email addresses
|
13
|
-
},
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
12
|
+
},
|
13
|
+
DocCommentHighlightRules.getTagRule(),
|
14
|
+
{
|
15
|
+
defaultToken : "comment.doc",
|
16
|
+
caseInsensitive: true
|
18
17
|
}]
|
19
18
|
};
|
20
19
|
};
|
21
20
|
|
22
21
|
oop.inherits(DocCommentHighlightRules, TextHighlightRules);
|
23
22
|
|
23
|
+
DocCommentHighlightRules.getTagRule = function(start) {
|
24
|
+
return {
|
25
|
+
token : "comment.doc.tag.storage.type",
|
26
|
+
regex : "\\b(?:TODO|FIXME|XXX|HACK)\\b"
|
27
|
+
};
|
28
|
+
}
|
29
|
+
|
24
30
|
DocCommentHighlightRules.getStartRule = function(start) {
|
25
31
|
return {
|
26
32
|
token : "comment.doc", // doc comment
|
@@ -292,20 +298,24 @@ var JavaScriptHighlightRules = function(options) {
|
|
292
298
|
}
|
293
299
|
],
|
294
300
|
"comment_regex_allowed" : [
|
301
|
+
DocCommentHighlightRules.getTagRule(),
|
295
302
|
{token : "comment", regex : "\\*\\/", next : "start"},
|
296
|
-
{defaultToken : "comment"}
|
303
|
+
{defaultToken : "comment", caseInsensitive: true}
|
297
304
|
],
|
298
305
|
"comment" : [
|
306
|
+
DocCommentHighlightRules.getTagRule(),
|
299
307
|
{token : "comment", regex : "\\*\\/", next : "no_regex"},
|
300
|
-
{defaultToken : "comment"}
|
308
|
+
{defaultToken : "comment", caseInsensitive: true}
|
301
309
|
],
|
302
310
|
"line_comment_regex_allowed" : [
|
311
|
+
DocCommentHighlightRules.getTagRule(),
|
303
312
|
{token : "comment", regex : "$|^", next : "start"},
|
304
|
-
{defaultToken : "comment"}
|
313
|
+
{defaultToken : "comment", caseInsensitive: true}
|
305
314
|
],
|
306
315
|
"line_comment" : [
|
316
|
+
DocCommentHighlightRules.getTagRule(),
|
307
317
|
{token : "comment", regex : "$|^", next : "no_regex"},
|
308
|
-
{defaultToken : "comment"}
|
318
|
+
{defaultToken : "comment", caseInsensitive: true}
|
309
319
|
],
|
310
320
|
"qqstring" : [
|
311
321
|
{
|
@@ -444,11 +454,11 @@ var SAFE_INSERT_BEFORE_TOKENS =
|
|
444
454
|
["text", "paren.rparen", "punctuation.operator", "comment"];
|
445
455
|
|
446
456
|
var context;
|
447
|
-
var contextCache = {}
|
457
|
+
var contextCache = {};
|
448
458
|
var initContext = function(editor) {
|
449
459
|
var id = -1;
|
450
460
|
if (editor.multiSelect) {
|
451
|
-
id = editor.selection.
|
461
|
+
id = editor.selection.index;
|
452
462
|
if (contextCache.rangeCount != editor.multiSelect.rangeCount)
|
453
463
|
contextCache = {rangeCount: editor.multiSelect.rangeCount};
|
454
464
|
}
|
@@ -1554,12 +1564,13 @@ oop.inherits(HtmlHighlightRules, XmlHighlightRules);
|
|
1554
1564
|
exports.HtmlHighlightRules = HtmlHighlightRules;
|
1555
1565
|
});
|
1556
1566
|
|
1557
|
-
define("ace/mode/behaviour/xml",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/token_iterator"], function(require, exports, module) {
|
1567
|
+
define("ace/mode/behaviour/xml",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/token_iterator","ace/lib/lang"], function(require, exports, module) {
|
1558
1568
|
"use strict";
|
1559
1569
|
|
1560
1570
|
var oop = require("../../lib/oop");
|
1561
1571
|
var Behaviour = require("../behaviour").Behaviour;
|
1562
1572
|
var TokenIterator = require("../../token_iterator").TokenIterator;
|
1573
|
+
var lang = require("../../lib/lang");
|
1563
1574
|
|
1564
1575
|
function is(token, type) {
|
1565
1576
|
return token.type.lastIndexOf(type + ".xml") > -1;
|
@@ -1657,29 +1668,56 @@ var XmlBehaviour = function () {
|
|
1657
1668
|
return;
|
1658
1669
|
|
1659
1670
|
return {
|
1660
|
-
text:
|
1671
|
+
text: ">" + "</" + element + ">",
|
1661
1672
|
selection: [1, 1]
|
1662
1673
|
};
|
1663
1674
|
}
|
1664
1675
|
});
|
1665
1676
|
|
1666
|
-
this.add(
|
1677
|
+
this.add("autoindent", "insertion", function (state, action, editor, session, text) {
|
1667
1678
|
if (text == "\n") {
|
1668
1679
|
var cursor = editor.getCursorPosition();
|
1669
1680
|
var line = session.getLine(cursor.row);
|
1670
|
-
var
|
1671
|
-
|
1672
|
-
var next_indent = this.$getIndent(line);
|
1673
|
-
var indent = next_indent + session.getTabString();
|
1681
|
+
var iterator = new TokenIterator(session, cursor.row, cursor.column);
|
1682
|
+
var token = iterator.getCurrentToken();
|
1674
1683
|
|
1675
|
-
|
1676
|
-
|
1677
|
-
|
1678
|
-
}
|
1684
|
+
if (token && token.type.indexOf("tag-close") !== -1) {
|
1685
|
+
while (token && token.type.indexOf("tag-name") === -1) {
|
1686
|
+
token = iterator.stepBackward();
|
1687
|
+
}
|
1688
|
+
|
1689
|
+
if (!token) {
|
1690
|
+
return;
|
1691
|
+
}
|
1692
|
+
|
1693
|
+
var tag = token.value;
|
1694
|
+
var row = iterator.getCurrentTokenRow();
|
1695
|
+
token = iterator.stepBackward();
|
1696
|
+
if (!token || token.type.indexOf("end-tag") !== -1) {
|
1697
|
+
return;
|
1698
|
+
}
|
1699
|
+
|
1700
|
+
if (this.voidElements && !this.voidElements[tag]) {
|
1701
|
+
var nextToken = session.getTokenAt(cursor.row, cursor.column+1);
|
1702
|
+
var line = session.getLine(row);
|
1703
|
+
var nextIndent = this.$getIndent(line);
|
1704
|
+
var indent = nextIndent + session.getTabString();
|
1705
|
+
|
1706
|
+
if (nextToken && nextToken.value === "</") {
|
1707
|
+
return {
|
1708
|
+
text: "\n" + indent + "\n" + nextIndent,
|
1709
|
+
selection: [1, indent.length, 1, indent.length]
|
1710
|
+
};
|
1711
|
+
} else {
|
1712
|
+
return {
|
1713
|
+
text: "\n" + indent
|
1714
|
+
};
|
1715
|
+
}
|
1716
|
+
}
|
1679
1717
|
}
|
1680
1718
|
}
|
1681
1719
|
});
|
1682
|
-
|
1720
|
+
|
1683
1721
|
};
|
1684
1722
|
|
1685
1723
|
oop.inherits(XmlBehaviour, Behaviour);
|
@@ -2498,7 +2536,7 @@ var SoyTemplateHighlightRules = function() {
|
|
2498
2536
|
[ 'entity.other.attribute-name.soy',
|
2499
2537
|
'text',
|
2500
2538
|
'keyword.operator.soy' ],
|
2501
|
-
regex: '\\b([\\w]
|
2539
|
+
regex: '\\b([\\w]+)(\\s*)((?::)?)' },
|
2502
2540
|
{ defaultToken: 'meta.tag.param.soy' } ] } ],
|
2503
2541
|
'#primitive':
|
2504
2542
|
[ { token: 'constant.language.soy',
|