ace-rails-ap 3.0.2 → 3.0.3
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 +403 -326
- data/vendor/assets/javascripts/ace/ext-language_tools.js +56 -40
- data/vendor/assets/javascripts/ace/ext-modelist.js +7 -3
- data/vendor/assets/javascripts/ace/ext-settings_menu.js +8 -4
- data/vendor/assets/javascripts/ace/ext-static_highlight.js +12 -5
- data/vendor/assets/javascripts/ace/keybinding-vim.js +5234 -1558
- data/vendor/assets/javascripts/ace/mode-abap.js +1 -1
- data/vendor/assets/javascripts/ace/mode-abc.js +261 -0
- data/vendor/assets/javascripts/ace/mode-actionscript.js +47 -1
- data/vendor/assets/javascripts/ace/mode-apache_conf.js +47 -1
- data/vendor/assets/javascripts/ace/mode-applescript.js +47 -1
- data/vendor/assets/javascripts/ace/mode-autohotkey.js +47 -1
- data/vendor/assets/javascripts/ace/mode-batchfile.js +47 -1
- data/vendor/assets/javascripts/ace/mode-c_cpp.js +101 -56
- data/vendor/assets/javascripts/ace/mode-coffee.js +3 -3
- data/vendor/assets/javascripts/ace/mode-coldfusion.js +114 -63
- data/vendor/assets/javascripts/ace/mode-csharp.js +99 -55
- data/vendor/assets/javascripts/ace/mode-css.js +98 -53
- data/vendor/assets/javascripts/ace/mode-curly.js +114 -63
- data/vendor/assets/javascripts/ace/mode-d.js +47 -1
- data/vendor/assets/javascripts/ace/mode-dart.js +103 -58
- data/vendor/assets/javascripts/ace/mode-diff.js +85 -85
- data/vendor/assets/javascripts/ace/mode-django.js +114 -63
- data/vendor/assets/javascripts/ace/mode-dockerfile.js +97 -52
- data/vendor/assets/javascripts/ace/mode-dot.js +47 -1
- data/vendor/assets/javascripts/ace/mode-eiffel.js +30 -37
- data/vendor/assets/javascripts/ace/mode-ejs.js +117 -63
- data/vendor/assets/javascripts/ace/mode-elm.js +47 -1
- data/vendor/assets/javascripts/ace/mode-erlang.js +47 -1
- data/vendor/assets/javascripts/ace/mode-forth.js +47 -1
- data/vendor/assets/javascripts/ace/mode-ftl.js +10 -7
- data/vendor/assets/javascripts/ace/mode-glsl.js +101 -56
- data/vendor/assets/javascripts/ace/mode-golang.js +96 -51
- data/vendor/assets/javascripts/ace/mode-groovy.js +98 -53
- data/vendor/assets/javascripts/ace/mode-haml.js +3 -0
- data/vendor/assets/javascripts/ace/mode-handlebars.js +114 -63
- data/vendor/assets/javascripts/ace/mode-haskell.js +49 -3
- data/vendor/assets/javascripts/ace/mode-haxe.js +96 -51
- data/vendor/assets/javascripts/ace/mode-html.js +114 -63
- data/vendor/assets/javascripts/ace/mode-html_ruby.js +117 -63
- data/vendor/assets/javascripts/ace/mode-io.js +47 -1
- data/vendor/assets/javascripts/ace/mode-jack.js +96 -51
- data/vendor/assets/javascripts/ace/mode-jade.js +10 -7
- data/vendor/assets/javascripts/ace/mode-java.js +98 -53
- data/vendor/assets/javascripts/ace/mode-javascript.js +98 -53
- data/vendor/assets/javascripts/ace/mode-json.js +99 -54
- data/vendor/assets/javascripts/ace/mode-jsoniq.js +98 -51
- data/vendor/assets/javascripts/ace/mode-jsp.js +106 -58
- data/vendor/assets/javascripts/ace/mode-jsx.js +96 -51
- data/vendor/assets/javascripts/ace/mode-julia.js +47 -1
- data/vendor/assets/javascripts/ace/mode-latex.js +1 -1
- data/vendor/assets/javascripts/ace/mode-lean.js +281 -0
- data/vendor/assets/javascripts/ace/mode-less.js +96 -51
- data/vendor/assets/javascripts/ace/mode-liquid.js +10 -7
- data/vendor/assets/javascripts/ace/mode-live_script.js +481 -0
- data/vendor/assets/javascripts/ace/mode-livescript.js +5 -8
- data/vendor/assets/javascripts/ace/mode-logiql.js +49 -50
- data/vendor/assets/javascripts/ace/mode-lsl.js +96 -51
- data/vendor/assets/javascripts/ace/mode-lua.js +3 -3
- data/vendor/assets/javascripts/ace/mode-luapage.js +117 -66
- data/vendor/assets/javascripts/ace/mode-makefile.js +1 -1
- data/vendor/assets/javascripts/ace/mode-markdown.js +134 -67
- data/vendor/assets/javascripts/ace/mode-mask.js +1985 -0
- data/vendor/assets/javascripts/ace/mode-mel.js +96 -51
- data/vendor/assets/javascripts/ace/mode-mips_assembler.js +235 -0
- data/vendor/assets/javascripts/ace/mode-mipsassembler.js +196 -0
- data/vendor/assets/javascripts/ace/mode-nix.js +101 -56
- data/vendor/assets/javascripts/ace/mode-objectivec.js +52 -6
- data/vendor/assets/javascripts/ace/mode-perl.js +47 -1
- data/vendor/assets/javascripts/ace/mode-pgsql.js +1 -1
- data/vendor/assets/javascripts/ace/mode-php.js +139 -85
- data/vendor/assets/javascripts/ace/mode-powershell.js +96 -51
- data/vendor/assets/javascripts/ace/mode-praat.js +47 -1
- data/vendor/assets/javascripts/ace/mode-prolog.js +47 -1
- data/vendor/assets/javascripts/ace/mode-protobuf.js +101 -56
- data/vendor/assets/javascripts/ace/mode-rdoc.js +1 -1
- data/vendor/assets/javascripts/ace/mode-rhtml.js +114 -63
- data/vendor/assets/javascripts/ace/mode-ruby.js +52 -50
- data/vendor/assets/javascripts/ace/mode-rust.js +57 -18
- data/vendor/assets/javascripts/ace/mode-scad.js +96 -51
- data/vendor/assets/javascripts/ace/mode-scala.js +98 -53
- data/vendor/assets/javascripts/ace/mode-scss.js +96 -51
- data/vendor/assets/javascripts/ace/mode-sh.js +97 -52
- data/vendor/assets/javascripts/ace/mode-sjs.js +98 -53
- data/vendor/assets/javascripts/ace/mode-smarty.js +114 -63
- data/vendor/assets/javascripts/ace/mode-soy_template.js +114 -63
- data/vendor/assets/javascripts/ace/mode-stylus.js +1 -1
- data/vendor/assets/javascripts/ace/mode-svg.js +132 -65
- data/vendor/assets/javascripts/ace/mode-tcl.js +47 -1
- data/vendor/assets/javascripts/ace/mode-twig.js +114 -63
- data/vendor/assets/javascripts/ace/mode-typescript.js +98 -53
- data/vendor/assets/javascripts/ace/mode-vala.js +96 -51
- data/vendor/assets/javascripts/ace/mode-velocity.js +114 -63
- data/vendor/assets/javascripts/ace/mode-vhdl.js +21 -21
- data/vendor/assets/javascripts/ace/mode-xml.js +34 -12
- data/vendor/assets/javascripts/ace/mode-xquery.js +98 -51
- data/vendor/assets/javascripts/ace/snippets/abc.js +38 -0
- data/vendor/assets/javascripts/ace/snippets/elixir.js +7 -0
- data/vendor/assets/javascripts/ace/snippets/elm.js +7 -0
- data/vendor/assets/javascripts/ace/snippets/lean.js +7 -0
- data/vendor/assets/javascripts/ace/snippets/live_script.js +7 -0
- data/vendor/assets/javascripts/ace/snippets/mask.js +7 -0
- data/vendor/assets/javascripts/ace/snippets/mips_assembler.js +7 -0
- data/vendor/assets/javascripts/ace/snippets/mipsassembler.js +7 -0
- data/vendor/assets/javascripts/ace/snippets/r.js +1 -1
- data/vendor/assets/javascripts/ace/theme-clouds_midnight.js +1 -1
- data/vendor/assets/javascripts/ace/theme-github.js +7 -1
- data/vendor/assets/javascripts/ace/theme-katzenmilch.js +3 -0
- data/vendor/assets/javascripts/ace/theme-kuroir.js +3 -0
- data/vendor/assets/javascripts/ace/worker-coffee.js +6 -7
- data/vendor/assets/javascripts/ace/worker-css.js +5 -5
- data/vendor/assets/javascripts/ace/worker-html.js +4354 -4354
- data/vendor/assets/javascripts/ace/worker-javascript.js +2435 -1397
- data/vendor/assets/javascripts/ace/worker-json.js +6 -7
- data/vendor/assets/javascripts/ace/worker-lua.js +11 -11
- data/vendor/assets/javascripts/ace/worker-php.js +4 -8
- data/vendor/assets/javascripts/ace/worker-xml.js +3809 -0
- data/vendor/assets/javascripts/ace/worker-xquery.js +38 -47
- metadata +18 -9
- data/vendor/assets/javascripts/ace/ext-options.js +0 -252
- data/vendor/assets/javascripts/ace/mode-html_completions.js +0 -309
- data/vendor/assets/javascripts/ace/mode-luahtml.js +0 -2415
- data/vendor/assets/javascripts/ace/mode-mushcode_high_rules.js +0 -569
- data/vendor/assets/javascripts/ace/mode-tmsnippet.js +0 -200
- data/vendor/assets/javascripts/ace/theme-kr.js +0 -105
@@ -149,12 +149,35 @@ var FoldMode = exports.FoldMode = function(commentRegex) {
|
|
149
149
|
oop.inherits(FoldMode, BaseFoldMode);
|
150
150
|
|
151
151
|
(function() {
|
152
|
-
|
152
|
+
|
153
153
|
this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
|
154
154
|
this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
|
155
|
+
this.singleLineBlockCommentRe= /^\s*(\/\*).*\*\/\s*$/;
|
156
|
+
this.tripleStarBlockCommentRe = /^\s*(\/\*\*\*).*\*\/\s*$/;
|
157
|
+
this.startRegionRe = /^\s*(\/\*|\/\/)#region\b/;
|
158
|
+
this._getFoldWidgetBase = this.getFoldWidget;
|
159
|
+
this.getFoldWidget = function(session, foldStyle, row) {
|
160
|
+
var line = session.getLine(row);
|
161
|
+
|
162
|
+
if (this.singleLineBlockCommentRe.test(line)) {
|
163
|
+
if (!this.startRegionRe.test(line) && !this.tripleStarBlockCommentRe.test(line))
|
164
|
+
return "";
|
165
|
+
}
|
166
|
+
|
167
|
+
var fw = this._getFoldWidgetBase(session, foldStyle, row);
|
168
|
+
|
169
|
+
if (!fw && this.startRegionRe.test(line))
|
170
|
+
return "start"; // lineCommentRegionStart
|
171
|
+
|
172
|
+
return fw;
|
173
|
+
};
|
155
174
|
|
156
175
|
this.getFoldWidgetRange = function(session, foldStyle, row, forceMultiline) {
|
157
176
|
var line = session.getLine(row);
|
177
|
+
|
178
|
+
if (this.startRegionRe.test(line))
|
179
|
+
return this.getCommentRegionBlock(session, line, row);
|
180
|
+
|
158
181
|
var match = line.match(this.foldingStartMarker);
|
159
182
|
if (match) {
|
160
183
|
var i = match.index;
|
@@ -219,6 +242,29 @@ oop.inherits(FoldMode, BaseFoldMode);
|
|
219
242
|
|
220
243
|
return new Range(startRow, startColumn, endRow, session.getLine(endRow).length);
|
221
244
|
};
|
245
|
+
|
246
|
+
this.getCommentRegionBlock = function(session, line, row) {
|
247
|
+
var startColumn = line.search(/\s*$/);
|
248
|
+
var maxRow = session.getLength();
|
249
|
+
var startRow = row;
|
250
|
+
|
251
|
+
var re = /^\s*(?:\/\*|\/\/)#(end)?region\b/;
|
252
|
+
var depth = 1;
|
253
|
+
while (++row < maxRow) {
|
254
|
+
line = session.getLine(row);
|
255
|
+
var m = re.exec(line);
|
256
|
+
if (!m) continue;
|
257
|
+
if (m[1]) depth--;
|
258
|
+
else depth++;
|
259
|
+
|
260
|
+
if (!depth) break;
|
261
|
+
}
|
262
|
+
|
263
|
+
var endRow = row;
|
264
|
+
if (endRow > startRow) {
|
265
|
+
return new Range(startRow, startColumn, endRow, line.length);
|
266
|
+
}
|
267
|
+
};
|
222
268
|
|
223
269
|
}).call(FoldMode.prototype);
|
224
270
|
|
@@ -857,12 +857,35 @@ var FoldMode = exports.FoldMode = function(commentRegex) {
|
|
857
857
|
oop.inherits(FoldMode, BaseFoldMode);
|
858
858
|
|
859
859
|
(function() {
|
860
|
-
|
860
|
+
|
861
861
|
this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
|
862
862
|
this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
|
863
|
+
this.singleLineBlockCommentRe= /^\s*(\/\*).*\*\/\s*$/;
|
864
|
+
this.tripleStarBlockCommentRe = /^\s*(\/\*\*\*).*\*\/\s*$/;
|
865
|
+
this.startRegionRe = /^\s*(\/\*|\/\/)#region\b/;
|
866
|
+
this._getFoldWidgetBase = this.getFoldWidget;
|
867
|
+
this.getFoldWidget = function(session, foldStyle, row) {
|
868
|
+
var line = session.getLine(row);
|
869
|
+
|
870
|
+
if (this.singleLineBlockCommentRe.test(line)) {
|
871
|
+
if (!this.startRegionRe.test(line) && !this.tripleStarBlockCommentRe.test(line))
|
872
|
+
return "";
|
873
|
+
}
|
874
|
+
|
875
|
+
var fw = this._getFoldWidgetBase(session, foldStyle, row);
|
876
|
+
|
877
|
+
if (!fw && this.startRegionRe.test(line))
|
878
|
+
return "start"; // lineCommentRegionStart
|
879
|
+
|
880
|
+
return fw;
|
881
|
+
};
|
863
882
|
|
864
883
|
this.getFoldWidgetRange = function(session, foldStyle, row, forceMultiline) {
|
865
884
|
var line = session.getLine(row);
|
885
|
+
|
886
|
+
if (this.startRegionRe.test(line))
|
887
|
+
return this.getCommentRegionBlock(session, line, row);
|
888
|
+
|
866
889
|
var match = line.match(this.foldingStartMarker);
|
867
890
|
if (match) {
|
868
891
|
var i = match.index;
|
@@ -927,6 +950,29 @@ oop.inherits(FoldMode, BaseFoldMode);
|
|
927
950
|
|
928
951
|
return new Range(startRow, startColumn, endRow, session.getLine(endRow).length);
|
929
952
|
};
|
953
|
+
|
954
|
+
this.getCommentRegionBlock = function(session, line, row) {
|
955
|
+
var startColumn = line.search(/\s*$/);
|
956
|
+
var maxRow = session.getLength();
|
957
|
+
var startRow = row;
|
958
|
+
|
959
|
+
var re = /^\s*(?:\/\*|\/\/)#(end)?region\b/;
|
960
|
+
var depth = 1;
|
961
|
+
while (++row < maxRow) {
|
962
|
+
line = session.getLine(row);
|
963
|
+
var m = re.exec(line);
|
964
|
+
if (!m) continue;
|
965
|
+
if (m[1]) depth--;
|
966
|
+
else depth++;
|
967
|
+
|
968
|
+
if (!depth) break;
|
969
|
+
}
|
970
|
+
|
971
|
+
var endRow = row;
|
972
|
+
if (endRow > startRow) {
|
973
|
+
return new Range(startRow, startColumn, endRow, line.length);
|
974
|
+
}
|
975
|
+
};
|
930
976
|
|
931
977
|
}).call(FoldMode.prototype);
|
932
978
|
|
@@ -145,12 +145,35 @@ var FoldMode = exports.FoldMode = function(commentRegex) {
|
|
145
145
|
oop.inherits(FoldMode, BaseFoldMode);
|
146
146
|
|
147
147
|
(function() {
|
148
|
-
|
148
|
+
|
149
149
|
this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
|
150
150
|
this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
|
151
|
+
this.singleLineBlockCommentRe= /^\s*(\/\*).*\*\/\s*$/;
|
152
|
+
this.tripleStarBlockCommentRe = /^\s*(\/\*\*\*).*\*\/\s*$/;
|
153
|
+
this.startRegionRe = /^\s*(\/\*|\/\/)#region\b/;
|
154
|
+
this._getFoldWidgetBase = this.getFoldWidget;
|
155
|
+
this.getFoldWidget = function(session, foldStyle, row) {
|
156
|
+
var line = session.getLine(row);
|
157
|
+
|
158
|
+
if (this.singleLineBlockCommentRe.test(line)) {
|
159
|
+
if (!this.startRegionRe.test(line) && !this.tripleStarBlockCommentRe.test(line))
|
160
|
+
return "";
|
161
|
+
}
|
162
|
+
|
163
|
+
var fw = this._getFoldWidgetBase(session, foldStyle, row);
|
164
|
+
|
165
|
+
if (!fw && this.startRegionRe.test(line))
|
166
|
+
return "start"; // lineCommentRegionStart
|
167
|
+
|
168
|
+
return fw;
|
169
|
+
};
|
151
170
|
|
152
171
|
this.getFoldWidgetRange = function(session, foldStyle, row, forceMultiline) {
|
153
172
|
var line = session.getLine(row);
|
173
|
+
|
174
|
+
if (this.startRegionRe.test(line))
|
175
|
+
return this.getCommentRegionBlock(session, line, row);
|
176
|
+
|
154
177
|
var match = line.match(this.foldingStartMarker);
|
155
178
|
if (match) {
|
156
179
|
var i = match.index;
|
@@ -215,6 +238,29 @@ oop.inherits(FoldMode, BaseFoldMode);
|
|
215
238
|
|
216
239
|
return new Range(startRow, startColumn, endRow, session.getLine(endRow).length);
|
217
240
|
};
|
241
|
+
|
242
|
+
this.getCommentRegionBlock = function(session, line, row) {
|
243
|
+
var startColumn = line.search(/\s*$/);
|
244
|
+
var maxRow = session.getLength();
|
245
|
+
var startRow = row;
|
246
|
+
|
247
|
+
var re = /^\s*(?:\/\*|\/\/)#(end)?region\b/;
|
248
|
+
var depth = 1;
|
249
|
+
while (++row < maxRow) {
|
250
|
+
line = session.getLine(row);
|
251
|
+
var m = re.exec(line);
|
252
|
+
if (!m) continue;
|
253
|
+
if (m[1]) depth--;
|
254
|
+
else depth++;
|
255
|
+
|
256
|
+
if (!depth) break;
|
257
|
+
}
|
258
|
+
|
259
|
+
var endRow = row;
|
260
|
+
if (endRow > startRow) {
|
261
|
+
return new Range(startRow, startColumn, endRow, line.length);
|
262
|
+
}
|
263
|
+
};
|
218
264
|
|
219
265
|
}).call(FoldMode.prototype);
|
220
266
|
|
@@ -8,7 +8,7 @@ var supportType = exports.supportType = "animation-fill-mode|alignment-adjust|al
|
|
8
8
|
var supportFunction = exports.supportFunction = "rgb|rgba|url|attr|counter|counters";
|
9
9
|
var supportConstant = exports.supportConstant = "absolute|after-edge|after|all-scroll|all|alphabetic|always|antialiased|armenian|auto|avoid-column|avoid-page|avoid|balance|baseline|before-edge|before|below|bidi-override|block-line-height|block|bold|bolder|border-box|both|bottom|box|break-all|break-word|capitalize|caps-height|caption|center|central|char|circle|cjk-ideographic|clone|close-quote|col-resize|collapse|column|consider-shifts|contain|content-box|cover|crosshair|cubic-bezier|dashed|decimal-leading-zero|decimal|default|disabled|disc|disregard-shifts|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ease-in|ease-in-out|ease-out|ease|ellipsis|end|exclude-ruby|fill|fixed|georgian|glyphs|grid-height|groove|hand|hanging|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|icon|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|ideographic|inactive|include-ruby|inherit|initial|inline-block|inline-box|inline-line-height|inline-table|inline|inset|inside|inter-ideograph|inter-word|invert|italic|justify|katakana-iroha|katakana|keep-all|last|left|lighter|line-edge|line-through|line|linear|list-item|local|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|mathematical|max-height|max-size|medium|menu|message-box|middle|move|n-resize|ne-resize|newspaper|no-change|no-close-quote|no-drop|no-open-quote|no-repeat|none|normal|not-allowed|nowrap|nw-resize|oblique|open-quote|outset|outside|overline|padding-box|page|pointer|pre-line|pre-wrap|pre|preserve-3d|progress|relative|repeat-x|repeat-y|repeat|replaced|reset-size|ridge|right|round|row-resize|rtl|s-resize|scroll|se-resize|separate|slice|small-caps|small-caption|solid|space|square|start|static|status-bar|step-end|step-start|steps|stretch|strict|sub|super|sw-resize|table-caption|table-cell|table-column-group|table-column|table-footer-group|table-header-group|table-row-group|table-row|table|tb-rl|text-after-edge|text-before-edge|text-bottom|text-size|text-top|text|thick|thin|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|use-script|vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|z-index|zero";
|
10
10
|
var supportConstantColor = exports.supportConstantColor = "aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow";
|
11
|
-
var supportConstantFonts = exports.supportConstantFonts = "arial|century|comic|courier|garamond|georgia|helvetica|impact|lucida|symbol|system|tahoma|times|trebuchet|utopia|verdana|webdings|sans-serif|serif|monospace";
|
11
|
+
var supportConstantFonts = exports.supportConstantFonts = "arial|century|comic|courier|cursive|fantasy|garamond|georgia|helvetica|impact|lucida|symbol|system|tahoma|times|trebuchet|utopia|verdana|webdings|sans-serif|serif|monospace";
|
12
12
|
|
13
13
|
var numRe = exports.numRe = "\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))";
|
14
14
|
var pseudoElements = exports.pseudoElements = "(\\:+)\\b(after|before|first-letter|first-line|moz-selection|selection)\\b";
|
@@ -320,7 +320,7 @@ var JavaScriptHighlightRules = function(options) {
|
|
320
320
|
regex : /(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:op|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/
|
321
321
|
}, {
|
322
322
|
token : ["punctuation.operator", "support.function.dom"],
|
323
|
-
regex : /(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/
|
323
|
+
regex : /(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName|ClassName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/
|
324
324
|
}, {
|
325
325
|
token : ["punctuation.operator", "support.constant"],
|
326
326
|
regex : /(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/
|
@@ -551,6 +551,9 @@ var oop = require("../lib/oop");
|
|
551
551
|
var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
|
552
552
|
|
553
553
|
var XmlHighlightRules = function(normalize) {
|
554
|
+
|
555
|
+
var tagRegex = "[a-zA-Z][-_a-zA-Z0-9]*";
|
556
|
+
|
554
557
|
this.$rules = {
|
555
558
|
start : [
|
556
559
|
{token : "string.cdata.xml", regex : "<\\!\\[CDATA\\[", next : "cdata"},
|
@@ -560,7 +563,7 @@ var XmlHighlightRules = function(normalize) {
|
|
560
563
|
},
|
561
564
|
{
|
562
565
|
token : ["punctuation.instruction.xml", "keyword.instruction.xml"],
|
563
|
-
regex : "(<\\?)(
|
566
|
+
regex : "(<\\?)(" + tagRegex + ")", next : "processing_instruction",
|
564
567
|
},
|
565
568
|
{token : "comment.xml", regex : "<\\!--", next : "comment"},
|
566
569
|
{
|
@@ -576,7 +579,7 @@ var XmlHighlightRules = function(normalize) {
|
|
576
579
|
|
577
580
|
xml_decl : [{
|
578
581
|
token : "entity.other.attribute-name.decl-attribute-name.xml",
|
579
|
-
regex : "(?:
|
582
|
+
regex : "(?:" + tagRegex + ":)?" + tagRegex + ""
|
580
583
|
}, {
|
581
584
|
token : "keyword.operator.decl-attribute-equals.xml",
|
582
585
|
regex : "="
|
@@ -612,7 +615,7 @@ var XmlHighlightRules = function(normalize) {
|
|
612
615
|
next: "pop"
|
613
616
|
}, {
|
614
617
|
token : ["punctuation.markup-decl.xml", "keyword.markup-decl.xml"],
|
615
|
-
regex : "(<\\!)(
|
618
|
+
regex : "(<\\!)(" + tagRegex + ")",
|
616
619
|
push : [{
|
617
620
|
token : "text",
|
618
621
|
regex : "\\s+"
|
@@ -648,7 +651,7 @@ var XmlHighlightRules = function(normalize) {
|
|
648
651
|
|
649
652
|
tag : [{
|
650
653
|
token : ["meta.tag.punctuation.tag-open.xml", "meta.tag.punctuation.end-tag-open.xml", "meta.tag.tag-name.xml"],
|
651
|
-
regex : "(?:(<)|(</))((?:
|
654
|
+
regex : "(?:(<)|(</))((?:" + tagRegex + ":)?" + tagRegex + ")",
|
652
655
|
next: [
|
653
656
|
{include : "attributes"},
|
654
657
|
{token : "meta.tag.punctuation.tag-close.xml", regex : "/?>", next : "start"}
|
@@ -679,7 +682,7 @@ var XmlHighlightRules = function(normalize) {
|
|
679
682
|
|
680
683
|
attributes: [{
|
681
684
|
token : "entity.other.attribute-name.xml",
|
682
|
-
regex : "(?:
|
685
|
+
regex : "(?:" + tagRegex + ":)?" + tagRegex + ""
|
683
686
|
}, {
|
684
687
|
token : "keyword.operator.attribute-equals.xml",
|
685
688
|
regex : "="
|
@@ -66,13 +66,13 @@ var c_cppHighlightRules = function() {
|
|
66
66
|
var storageType = (
|
67
67
|
"asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|" +
|
68
68
|
"_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void|" +
|
69
|
-
"class|wchar_t|template"
|
69
|
+
"class|wchar_t|template|char16_t|char32_t"
|
70
70
|
);
|
71
71
|
|
72
72
|
var storageModifiers = (
|
73
73
|
"const|extern|register|restrict|static|volatile|inline|private|" +
|
74
74
|
"protected|public|friend|explicit|virtual|export|mutable|typename|" +
|
75
|
-
"constexpr|new|delete"
|
75
|
+
"constexpr|new|delete|alignas|alignof|decltype|noexcept|thread_local"
|
76
76
|
);
|
77
77
|
|
78
78
|
var keywordOperators = (
|
@@ -81,7 +81,7 @@ var c_cppHighlightRules = function() {
|
|
81
81
|
);
|
82
82
|
|
83
83
|
var builtinConstants = (
|
84
|
-
"NULL|true|false|TRUE|FALSE"
|
84
|
+
"NULL|true|false|TRUE|FALSE|nullptr"
|
85
85
|
);
|
86
86
|
|
87
87
|
var keywordMapper = this.$keywords = this.createKeywordMapper({
|
@@ -129,11 +129,11 @@ var c_cppHighlightRules = function() {
|
|
129
129
|
regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?(L|l|UL|ul|u|U|F|f|ll|LL|ull|ULL)?\\b"
|
130
130
|
}, {
|
131
131
|
token : "keyword", // pre-compiler directives
|
132
|
-
regex : "#\\s*(?:include|import|pragma|line|define|undef
|
132
|
+
regex : "#\\s*(?:include|import|pragma|line|define|undef)\\b",
|
133
133
|
next : "directive"
|
134
134
|
}, {
|
135
135
|
token : "keyword", // special case pre-compiler directive
|
136
|
-
regex : "
|
136
|
+
regex : "#\\s*(?:endif|if|ifdef|else|elif|ifndef)\\b"
|
137
137
|
}, {
|
138
138
|
token : "support.function.C99.c",
|
139
139
|
regex : cFunctions
|
@@ -314,6 +314,19 @@ var initContext = function(editor) {
|
|
314
314
|
};
|
315
315
|
};
|
316
316
|
|
317
|
+
var getWrapped = function(selection, selected, opening, closing) {
|
318
|
+
var rowDiff = selection.end.row - selection.start.row;
|
319
|
+
return {
|
320
|
+
text: opening + selected + closing,
|
321
|
+
selection: [
|
322
|
+
0,
|
323
|
+
selection.start.column + 1,
|
324
|
+
rowDiff,
|
325
|
+
selection.end.column + (rowDiff ? 0 : 1)
|
326
|
+
]
|
327
|
+
};
|
328
|
+
};
|
329
|
+
|
317
330
|
var CstyleBehaviour = function() {
|
318
331
|
this.add("braces", "insertion", function(state, action, editor, session, text) {
|
319
332
|
var cursor = editor.getCursorPosition();
|
@@ -323,10 +336,7 @@ var CstyleBehaviour = function() {
|
|
323
336
|
var selection = editor.getSelectionRange();
|
324
337
|
var selected = session.doc.getTextRange(selection);
|
325
338
|
if (selected !== "" && selected !== "{" && editor.getWrapBehavioursEnabled()) {
|
326
|
-
return {
|
327
|
-
text: '{' + selected + '}',
|
328
|
-
selection: false
|
329
|
-
};
|
339
|
+
return getWrapped(selection, selected, '{', '}');
|
330
340
|
} else if (CstyleBehaviour.isSaneInsertion(editor, session)) {
|
331
341
|
if (/[\]\}\)]/.test(line[cursor.column]) || editor.inMultiSelectMode) {
|
332
342
|
CstyleBehaviour.recordAutoInsert(editor, session, "}");
|
@@ -406,10 +416,7 @@ var CstyleBehaviour = function() {
|
|
406
416
|
var selection = editor.getSelectionRange();
|
407
417
|
var selected = session.doc.getTextRange(selection);
|
408
418
|
if (selected !== "" && editor.getWrapBehavioursEnabled()) {
|
409
|
-
return
|
410
|
-
text: '(' + selected + ')',
|
411
|
-
selection: false
|
412
|
-
};
|
419
|
+
return getWrapped(selection, selected, '(', ')');
|
413
420
|
} else if (CstyleBehaviour.isSaneInsertion(editor, session)) {
|
414
421
|
CstyleBehaviour.recordAutoInsert(editor, session, ")");
|
415
422
|
return {
|
@@ -454,10 +461,7 @@ var CstyleBehaviour = function() {
|
|
454
461
|
var selection = editor.getSelectionRange();
|
455
462
|
var selected = session.doc.getTextRange(selection);
|
456
463
|
if (selected !== "" && editor.getWrapBehavioursEnabled()) {
|
457
|
-
return
|
458
|
-
text: '[' + selected + ']',
|
459
|
-
selection: false
|
460
|
-
};
|
464
|
+
return getWrapped(selection, selected, '[', ']');
|
461
465
|
} else if (CstyleBehaviour.isSaneInsertion(editor, session)) {
|
462
466
|
CstyleBehaviour.recordAutoInsert(editor, session, "]");
|
463
467
|
return {
|
@@ -503,49 +507,44 @@ var CstyleBehaviour = function() {
|
|
503
507
|
var selection = editor.getSelectionRange();
|
504
508
|
var selected = session.doc.getTextRange(selection);
|
505
509
|
if (selected !== "" && selected !== "'" && selected != '"' && editor.getWrapBehavioursEnabled()) {
|
506
|
-
return
|
507
|
-
|
508
|
-
selection: false
|
509
|
-
};
|
510
|
-
} else {
|
510
|
+
return getWrapped(selection, selected, quote, quote);
|
511
|
+
} else if (!selected) {
|
511
512
|
var cursor = editor.getCursorPosition();
|
512
513
|
var line = session.doc.getLine(cursor.row);
|
513
514
|
var leftChar = line.substring(cursor.column-1, cursor.column);
|
514
|
-
|
515
|
+
var rightChar = line.substring(cursor.column, cursor.column + 1);
|
516
|
+
|
517
|
+
var token = session.getTokenAt(cursor.row, cursor.column);
|
518
|
+
var rightToken = session.getTokenAt(cursor.row, cursor.column + 1);
|
519
|
+
if (leftChar == "\\" && token && /escape/.test(token.type))
|
515
520
|
return null;
|
521
|
+
|
522
|
+
var stringBefore = token && /string/.test(token.type);
|
523
|
+
var stringAfter = !rightToken || /string/.test(rightToken.type);
|
524
|
+
|
525
|
+
var pair;
|
526
|
+
if (rightChar == quote) {
|
527
|
+
pair = stringBefore !== stringAfter;
|
528
|
+
} else {
|
529
|
+
if (stringBefore && !stringAfter)
|
530
|
+
return null; // wrap string with different quote
|
531
|
+
if (stringBefore && stringAfter)
|
532
|
+
return null; // do not pair quotes inside strings
|
533
|
+
var wordRe = session.$mode.tokenRe;
|
534
|
+
wordRe.lastIndex = 0;
|
535
|
+
var isWordBefore = wordRe.test(leftChar);
|
536
|
+
wordRe.lastIndex = 0;
|
537
|
+
var isWordAfter = wordRe.test(leftChar);
|
538
|
+
if (isWordBefore || isWordAfter)
|
539
|
+
return null; // before or after alphanumeric
|
540
|
+
if (rightChar && !/[\s;,.})\]\\]/.test(rightChar))
|
541
|
+
return null; // there is rightChar and it isn't closing
|
542
|
+
pair = true;
|
516
543
|
}
|
517
|
-
|
518
|
-
|
519
|
-
|
520
|
-
|
521
|
-
for (var x = 0; x < tokens.length; x++) {
|
522
|
-
token = tokens[x];
|
523
|
-
if (token.type == "string") {
|
524
|
-
quotepos = -1;
|
525
|
-
} else if (quotepos < 0) {
|
526
|
-
quotepos = token.value.indexOf(quote);
|
527
|
-
}
|
528
|
-
if ((token.value.length + col) > selection.start.column) {
|
529
|
-
break;
|
530
|
-
}
|
531
|
-
col += tokens[x].value.length;
|
532
|
-
}
|
533
|
-
if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf(quote) === token.value.length-1)))) {
|
534
|
-
if (!CstyleBehaviour.isSaneInsertion(editor, session))
|
535
|
-
return;
|
536
|
-
return {
|
537
|
-
text: quote + quote,
|
538
|
-
selection: [1,1]
|
539
|
-
};
|
540
|
-
} else if (token && token.type === "string") {
|
541
|
-
var rightChar = line.substring(cursor.column, cursor.column + 1);
|
542
|
-
if (rightChar == quote) {
|
543
|
-
return {
|
544
|
-
text: '',
|
545
|
-
selection: [1, 1]
|
546
|
-
};
|
547
|
-
}
|
548
|
-
}
|
544
|
+
return {
|
545
|
+
text: pair ? quote + quote : "",
|
546
|
+
selection: [1,1]
|
547
|
+
};
|
549
548
|
}
|
550
549
|
}
|
551
550
|
});
|
@@ -657,12 +656,35 @@ var FoldMode = exports.FoldMode = function(commentRegex) {
|
|
657
656
|
oop.inherits(FoldMode, BaseFoldMode);
|
658
657
|
|
659
658
|
(function() {
|
660
|
-
|
659
|
+
|
661
660
|
this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
|
662
661
|
this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
|
662
|
+
this.singleLineBlockCommentRe= /^\s*(\/\*).*\*\/\s*$/;
|
663
|
+
this.tripleStarBlockCommentRe = /^\s*(\/\*\*\*).*\*\/\s*$/;
|
664
|
+
this.startRegionRe = /^\s*(\/\*|\/\/)#region\b/;
|
665
|
+
this._getFoldWidgetBase = this.getFoldWidget;
|
666
|
+
this.getFoldWidget = function(session, foldStyle, row) {
|
667
|
+
var line = session.getLine(row);
|
668
|
+
|
669
|
+
if (this.singleLineBlockCommentRe.test(line)) {
|
670
|
+
if (!this.startRegionRe.test(line) && !this.tripleStarBlockCommentRe.test(line))
|
671
|
+
return "";
|
672
|
+
}
|
673
|
+
|
674
|
+
var fw = this._getFoldWidgetBase(session, foldStyle, row);
|
675
|
+
|
676
|
+
if (!fw && this.startRegionRe.test(line))
|
677
|
+
return "start"; // lineCommentRegionStart
|
678
|
+
|
679
|
+
return fw;
|
680
|
+
};
|
663
681
|
|
664
682
|
this.getFoldWidgetRange = function(session, foldStyle, row, forceMultiline) {
|
665
683
|
var line = session.getLine(row);
|
684
|
+
|
685
|
+
if (this.startRegionRe.test(line))
|
686
|
+
return this.getCommentRegionBlock(session, line, row);
|
687
|
+
|
666
688
|
var match = line.match(this.foldingStartMarker);
|
667
689
|
if (match) {
|
668
690
|
var i = match.index;
|
@@ -727,6 +749,29 @@ oop.inherits(FoldMode, BaseFoldMode);
|
|
727
749
|
|
728
750
|
return new Range(startRow, startColumn, endRow, session.getLine(endRow).length);
|
729
751
|
};
|
752
|
+
|
753
|
+
this.getCommentRegionBlock = function(session, line, row) {
|
754
|
+
var startColumn = line.search(/\s*$/);
|
755
|
+
var maxRow = session.getLength();
|
756
|
+
var startRow = row;
|
757
|
+
|
758
|
+
var re = /^\s*(?:\/\*|\/\/)#(end)?region\b/;
|
759
|
+
var depth = 1;
|
760
|
+
while (++row < maxRow) {
|
761
|
+
line = session.getLine(row);
|
762
|
+
var m = re.exec(line);
|
763
|
+
if (!m) continue;
|
764
|
+
if (m[1]) depth--;
|
765
|
+
else depth++;
|
766
|
+
|
767
|
+
if (!depth) break;
|
768
|
+
}
|
769
|
+
|
770
|
+
var endRow = row;
|
771
|
+
if (endRow > startRow) {
|
772
|
+
return new Range(startRow, startColumn, endRow, line.length);
|
773
|
+
}
|
774
|
+
};
|
730
775
|
|
731
776
|
}).call(FoldMode.prototype);
|
732
777
|
|