ace-rails-ap 4.0.0 → 4.0.1
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 +993 -613
- data/vendor/assets/javascripts/ace/ext-chromevox.js +3 -4
- data/vendor/assets/javascripts/ace/ext-elastic_tabstops_lite.js +5 -6
- data/vendor/assets/javascripts/ace/ext-emmet.js +50 -21
- data/vendor/assets/javascripts/ace/ext-language_tools.js +21 -19
- data/vendor/assets/javascripts/ace/ext-modelist.js +11 -6
- data/vendor/assets/javascripts/ace/ext-old_ie.js +12 -5
- data/vendor/assets/javascripts/ace/ext-searchbox.js +12 -5
- data/vendor/assets/javascripts/ace/ext-settings_menu.js +14 -7
- data/vendor/assets/javascripts/ace/ext-static_highlight.js +5 -5
- data/vendor/assets/javascripts/ace/ext-statusbar.js +14 -12
- data/vendor/assets/javascripts/ace/ext-textarea.js +1 -2
- data/vendor/assets/javascripts/ace/ext-themelist.js +2 -0
- data/vendor/assets/javascripts/ace/ext-whitespace.js +17 -13
- data/vendor/assets/javascripts/ace/keybinding-emacs.js +76 -78
- data/vendor/assets/javascripts/ace/keybinding-vim.js +221 -80
- data/vendor/assets/javascripts/ace/mode-abc.js +2 -3
- data/vendor/assets/javascripts/ace/mode-actionscript.js +2 -3
- data/vendor/assets/javascripts/ace/mode-apache_conf.js +2 -3
- data/vendor/assets/javascripts/ace/mode-applescript.js +2 -3
- data/vendor/assets/javascripts/ace/mode-autohotkey.js +2 -3
- data/vendor/assets/javascripts/ace/mode-batchfile.js +2 -3
- data/vendor/assets/javascripts/ace/mode-c_cpp.js +8 -5
- data/vendor/assets/javascripts/ace/mode-coffee.js +1 -1
- data/vendor/assets/javascripts/ace/mode-coldfusion.js +533 -139
- data/vendor/assets/javascripts/ace/mode-csharp.js +4 -5
- data/vendor/assets/javascripts/ace/mode-css.js +185 -6
- data/vendor/assets/javascripts/ace/mode-curly.js +495 -138
- data/vendor/assets/javascripts/ace/mode-d.js +2 -3
- data/vendor/assets/javascripts/ace/mode-dart.js +8 -5
- data/vendor/assets/javascripts/ace/mode-django.js +495 -138
- data/vendor/assets/javascripts/ace/mode-dockerfile.js +59 -14
- data/vendor/assets/javascripts/ace/mode-dot.js +2 -3
- data/vendor/assets/javascripts/ace/mode-ejs.js +497 -152
- data/vendor/assets/javascripts/ace/mode-elm.js +6 -4
- data/vendor/assets/javascripts/ace/mode-erlang.js +3 -4
- data/vendor/assets/javascripts/ace/mode-forth.js +3 -4
- data/vendor/assets/javascripts/ace/mode-ftl.js +145 -17
- data/vendor/assets/javascripts/ace/mode-gherkin.js +58 -25
- data/vendor/assets/javascripts/ace/mode-glsl.js +8 -5
- data/vendor/assets/javascripts/ace/mode-golang.js +36 -25
- data/vendor/assets/javascripts/ace/mode-groovy.js +145 -17
- data/vendor/assets/javascripts/ace/mode-handlebars.js +496 -140
- data/vendor/assets/javascripts/ace/mode-haskell.js +3 -4
- data/vendor/assets/javascripts/ace/mode-haxe.js +4 -5
- data/vendor/assets/javascripts/ace/mode-html.js +495 -138
- data/vendor/assets/javascripts/ace/mode-html_elixir.js +3372 -0
- data/vendor/assets/javascripts/ace/mode-html_ruby.js +495 -138
- data/vendor/assets/javascripts/ace/mode-ini.js +1 -1
- data/vendor/assets/javascripts/ace/mode-io.js +2 -3
- data/vendor/assets/javascripts/ace/mode-jack.js +4 -5
- data/vendor/assets/javascripts/ace/mode-jade.js +155 -25
- data/vendor/assets/javascripts/ace/mode-java.js +145 -17
- data/vendor/assets/javascripts/ace/mode-javascript.js +145 -17
- data/vendor/assets/javascripts/ace/mode-json.js +4 -5
- data/vendor/assets/javascripts/ace/mode-jsoniq.js +4 -5
- data/vendor/assets/javascripts/ace/mode-jsp.js +150 -23
- data/vendor/assets/javascripts/ace/mode-jsx.js +4 -5
- data/vendor/assets/javascripts/ace/mode-julia.js +2 -3
- data/vendor/assets/javascripts/ace/mode-less.js +5 -6
- data/vendor/assets/javascripts/ace/mode-liquid.js +145 -17
- data/vendor/assets/javascripts/ace/mode-logiql.js +2 -2
- data/vendor/assets/javascripts/ace/mode-lsl.js +8 -10
- data/vendor/assets/javascripts/ace/mode-lua.js +2 -2
- data/vendor/assets/javascripts/ace/mode-luapage.js +497 -140
- data/vendor/assets/javascripts/ace/mode-makefile.js +54 -8
- data/vendor/assets/javascripts/ace/mode-markdown.js +497 -139
- data/vendor/assets/javascripts/ace/mode-mask.js +150 -22
- data/vendor/assets/javascripts/ace/mode-maze.js +283 -0
- data/vendor/assets/javascripts/ace/mode-mel.js +4 -5
- data/vendor/assets/javascripts/ace/mode-mushcode.js +0 -1
- data/vendor/assets/javascripts/ace/mode-mysql.js +1 -1
- data/vendor/assets/javascripts/ace/mode-nix.js +8 -5
- data/vendor/assets/javascripts/ace/mode-objectivec.js +6 -3
- data/vendor/assets/javascripts/ace/mode-perl.js +4 -5
- data/vendor/assets/javascripts/ace/mode-pgsql.js +141 -12
- data/vendor/assets/javascripts/ace/mode-php.js +9872 -143
- data/vendor/assets/javascripts/ace/mode-powershell.js +4 -5
- data/vendor/assets/javascripts/ace/mode-praat.js +18 -14
- data/vendor/assets/javascripts/ace/mode-prolog.js +2 -3
- data/vendor/assets/javascripts/ace/mode-protobuf.js +8 -5
- data/vendor/assets/javascripts/ace/mode-rhtml.js +495 -138
- data/vendor/assets/javascripts/ace/mode-ruby.js +2 -2
- data/vendor/assets/javascripts/ace/mode-rust.js +32 -39
- data/vendor/assets/javascripts/ace/mode-scad.js +4 -5
- data/vendor/assets/javascripts/ace/mode-scala.js +158 -21
- data/vendor/assets/javascripts/ace/mode-scheme.js +118 -1
- data/vendor/assets/javascripts/ace/mode-scss.js +4 -5
- data/vendor/assets/javascripts/ace/mode-sh.js +58 -13
- data/vendor/assets/javascripts/ace/mode-sjs.js +145 -17
- data/vendor/assets/javascripts/ace/mode-smarty.js +495 -138
- data/vendor/assets/javascripts/ace/mode-soy_template.js +496 -140
- data/vendor/assets/javascripts/ace/mode-sql.js +12 -4
- data/vendor/assets/javascripts/ace/mode-sqlserver.js +437 -0
- data/vendor/assets/javascripts/ace/mode-svg.js +147 -20
- data/vendor/assets/javascripts/ace/mode-swift.js +738 -0
- data/vendor/assets/javascripts/ace/mode-swig.js +1099 -0
- data/vendor/assets/javascripts/ace/mode-tcl.js +2 -3
- data/vendor/assets/javascripts/ace/mode-tex.js +1 -0
- data/vendor/assets/javascripts/ace/mode-toml.js +4 -0
- data/vendor/assets/javascripts/ace/mode-twig.js +495 -138
- data/vendor/assets/javascripts/ace/mode-typescript.js +147 -19
- data/vendor/assets/javascripts/ace/mode-vala.js +4 -5
- data/vendor/assets/javascripts/ace/mode-vbscript.js +26 -13
- data/vendor/assets/javascripts/ace/mode-velocity.js +495 -138
- data/vendor/assets/javascripts/ace/mode-verilog.js +8 -0
- data/vendor/assets/javascripts/ace/mode-xml.js +2 -3
- data/vendor/assets/javascripts/ace/mode-xquery.js +4 -5
- data/vendor/assets/javascripts/ace/snippets/actionscript.js +5 -0
- data/vendor/assets/javascripts/ace/snippets/html_elixir.js +7 -0
- data/vendor/assets/javascripts/ace/snippets/java.js +6 -0
- data/vendor/assets/javascripts/ace/snippets/javascript.js +13 -0
- data/vendor/assets/javascripts/ace/snippets/lsl.js +166 -0
- data/vendor/assets/javascripts/ace/snippets/maze.js +16 -0
- data/vendor/assets/javascripts/ace/snippets/php.js +105 -4
- data/vendor/assets/javascripts/ace/snippets/sqlserver.js +76 -0
- data/vendor/assets/javascripts/ace/snippets/swift.js +7 -0
- data/vendor/assets/javascripts/ace/snippets/swig.js +7 -0
- data/vendor/assets/javascripts/ace/theme-clouds.js +0 -1
- data/vendor/assets/javascripts/ace/theme-clouds_midnight.js +0 -1
- data/vendor/assets/javascripts/ace/theme-cobalt.js +3 -3
- data/vendor/assets/javascripts/ace/theme-dawn.js +0 -1
- data/vendor/assets/javascripts/ace/theme-github.js +0 -1
- data/vendor/assets/javascripts/ace/theme-idle_fingers.js +0 -1
- data/vendor/assets/javascripts/ace/theme-iplastic.js +121 -0
- data/vendor/assets/javascripts/ace/theme-katzenmilch.js +1 -2
- data/vendor/assets/javascripts/ace/theme-kr_theme.js +0 -1
- data/vendor/assets/javascripts/ace/theme-kuroir.js +0 -1
- data/vendor/assets/javascripts/ace/theme-merbivore.js +0 -1
- data/vendor/assets/javascripts/ace/theme-merbivore_soft.js +0 -1
- data/vendor/assets/javascripts/ace/theme-mono_industrial.js +0 -1
- data/vendor/assets/javascripts/ace/theme-monokai.js +0 -1
- data/vendor/assets/javascripts/ace/theme-pastel_on_dark.js +0 -1
- data/vendor/assets/javascripts/ace/theme-solarized_dark.js +0 -1
- data/vendor/assets/javascripts/ace/theme-solarized_light.js +0 -1
- data/vendor/assets/javascripts/ace/theme-sqlserver.js +138 -0
- data/vendor/assets/javascripts/ace/theme-terminal.js +0 -1
- data/vendor/assets/javascripts/ace/theme-textmate.js +0 -1
- data/vendor/assets/javascripts/ace/theme-tomorrow.js +0 -1
- data/vendor/assets/javascripts/ace/theme-tomorrow_night.js +0 -1
- data/vendor/assets/javascripts/ace/theme-tomorrow_night_blue.js +0 -1
- data/vendor/assets/javascripts/ace/theme-tomorrow_night_bright.js +0 -1
- data/vendor/assets/javascripts/ace/theme-tomorrow_night_eighties.js +0 -1
- data/vendor/assets/javascripts/ace/theme-twilight.js +0 -1
- data/vendor/assets/javascripts/ace/theme-vibrant_ink.js +0 -1
- data/vendor/assets/javascripts/ace/theme-xcode.js +0 -1
- data/vendor/assets/javascripts/ace/worker-coffee.js +576 -6015
- data/vendor/assets/javascripts/ace/worker-css.js +529 -449
- data/vendor/assets/javascripts/ace/worker-html.js +528 -448
- data/vendor/assets/javascripts/ace/worker-javascript.js +8719 -7656
- data/vendor/assets/javascripts/ace/worker-json.js +530 -450
- data/vendor/assets/javascripts/ace/worker-lua.js +530 -450
- data/vendor/assets/javascripts/ace/worker-php.js +530 -450
- data/vendor/assets/javascripts/ace/worker-xml.js +530 -450
- data/vendor/assets/javascripts/ace/worker-xquery.js +529 -449
- metadata +14 -2
@@ -106,7 +106,7 @@ oop.inherits(FoldMode, BaseFoldMode);
|
|
106
106
|
this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
|
107
107
|
this.singleLineBlockCommentRe= /^\s*(\/\*).*\*\/\s*$/;
|
108
108
|
this.tripleStarBlockCommentRe = /^\s*(\/\*\*\*).*\*\/\s*$/;
|
109
|
-
this.startRegionRe = /^\s*(\/\*|\/\/)
|
109
|
+
this.startRegionRe = /^\s*(\/\*|\/\/)#?region\b/;
|
110
110
|
this._getFoldWidgetBase = this.getFoldWidget;
|
111
111
|
this.getFoldWidget = function(session, foldStyle, row) {
|
112
112
|
var line = session.getLine(row);
|
@@ -194,13 +194,12 @@ oop.inherits(FoldMode, BaseFoldMode);
|
|
194
194
|
|
195
195
|
return new Range(startRow, startColumn, endRow, session.getLine(endRow).length);
|
196
196
|
};
|
197
|
-
|
198
197
|
this.getCommentRegionBlock = function(session, line, row) {
|
199
198
|
var startColumn = line.search(/\s*$/);
|
200
199
|
var maxRow = session.getLength();
|
201
200
|
var startRow = row;
|
202
201
|
|
203
|
-
var re = /^\s*(
|
202
|
+
var re = /^\s*(?:\/\*|\/\/|--)#?(end)?region\b/;
|
204
203
|
var depth = 1;
|
205
204
|
while (++row < maxRow) {
|
206
205
|
line = session.getLine(row);
|
@@ -388,8 +388,8 @@ var CstyleBehaviour = function() {
|
|
388
388
|
if (leftChar == "\\" && token && /escape/.test(token.type))
|
389
389
|
return null;
|
390
390
|
|
391
|
-
var stringBefore = token && /string/.test(token.type);
|
392
|
-
var stringAfter = !rightToken || /string/.test(rightToken.type);
|
391
|
+
var stringBefore = token && /string|escape/.test(token.type);
|
392
|
+
var stringAfter = !rightToken || /string|escape/.test(rightToken.type);
|
393
393
|
|
394
394
|
var pair;
|
395
395
|
if (rightChar == quote) {
|
@@ -530,7 +530,7 @@ oop.inherits(FoldMode, BaseFoldMode);
|
|
530
530
|
this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
|
531
531
|
this.singleLineBlockCommentRe= /^\s*(\/\*).*\*\/\s*$/;
|
532
532
|
this.tripleStarBlockCommentRe = /^\s*(\/\*\*\*).*\*\/\s*$/;
|
533
|
-
this.startRegionRe = /^\s*(\/\*|\/\/)
|
533
|
+
this.startRegionRe = /^\s*(\/\*|\/\/)#?region\b/;
|
534
534
|
this._getFoldWidgetBase = this.getFoldWidget;
|
535
535
|
this.getFoldWidget = function(session, foldStyle, row) {
|
536
536
|
var line = session.getLine(row);
|
@@ -618,13 +618,12 @@ oop.inherits(FoldMode, BaseFoldMode);
|
|
618
618
|
|
619
619
|
return new Range(startRow, startColumn, endRow, session.getLine(endRow).length);
|
620
620
|
};
|
621
|
-
|
622
621
|
this.getCommentRegionBlock = function(session, line, row) {
|
623
622
|
var startColumn = line.search(/\s*$/);
|
624
623
|
var maxRow = session.getLength();
|
625
624
|
var startRow = row;
|
626
625
|
|
627
|
-
var re = /^\s*(
|
626
|
+
var re = /^\s*(?:\/\*|\/\/|--)#?(end)?region\b/;
|
628
627
|
var depth = 1;
|
629
628
|
while (++row < maxRow) {
|
630
629
|
line = session.getLine(row);
|
@@ -54,6 +54,7 @@ define("ace/mode/javascript_highlight_rules",["require","exports","module","ace/
|
|
54
54
|
var oop = require("../lib/oop");
|
55
55
|
var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
|
56
56
|
var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
|
57
|
+
var identifierRe = "[a-zA-Z\\$_\u00a1-\uffff][a-zA-Z\\d\\$_\u00a1-\uffff]*\\b";
|
57
58
|
|
58
59
|
var JavaScriptHighlightRules = function(options) {
|
59
60
|
var keywordMapper = this.createKeywordMapper({
|
@@ -83,7 +84,6 @@ var JavaScriptHighlightRules = function(options) {
|
|
83
84
|
"constant.language.boolean": "true|false"
|
84
85
|
}, "identifier");
|
85
86
|
var kwBeforeRe = "case|do|else|finally|in|instanceof|return|throw|try|typeof|yield|void";
|
86
|
-
var identifierRe = "[a-zA-Z\\$_\u00a1-\uffff][a-zA-Z\\d\\$_\u00a1-\uffff]*\\b";
|
87
87
|
|
88
88
|
var escapedRe = "\\\\(?:x[0-9a-fA-F]{2}|" + // hex
|
89
89
|
"u[0-9a-fA-F]{4}|" + // unicode
|
@@ -171,15 +171,6 @@ var JavaScriptHighlightRules = function(options) {
|
|
171
171
|
token : "keyword",
|
172
172
|
regex : "(?:" + kwBeforeRe + ")\\b",
|
173
173
|
next : "start"
|
174
|
-
}, {
|
175
|
-
token : ["punctuation.operator", "support.function"],
|
176
|
-
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(?=\()/
|
177
|
-
}, {
|
178
|
-
token : ["punctuation.operator", "support.function.dom"],
|
179
|
-
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(?=\()/
|
180
|
-
}, {
|
181
|
-
token : ["punctuation.operator", "support.constant"],
|
182
|
-
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/
|
183
174
|
}, {
|
184
175
|
token : ["support.constant"],
|
185
176
|
regex : /that\b/
|
@@ -189,9 +180,13 @@ var JavaScriptHighlightRules = function(options) {
|
|
189
180
|
}, {
|
190
181
|
token : keywordMapper,
|
191
182
|
regex : identifierRe
|
183
|
+
}, {
|
184
|
+
token : "punctuation.operator",
|
185
|
+
regex : /[.](?![.])/,
|
186
|
+
next : "property"
|
192
187
|
}, {
|
193
188
|
token : "keyword.operator",
|
194
|
-
regex :
|
189
|
+
regex : /--|\+\+|\.{3}|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|[!$%&*+\-~\/^]=?/,
|
195
190
|
next : "start"
|
196
191
|
}, {
|
197
192
|
token : "punctuation.operator",
|
@@ -209,6 +204,38 @@ var JavaScriptHighlightRules = function(options) {
|
|
209
204
|
regex: /^#!.*$/
|
210
205
|
}
|
211
206
|
],
|
207
|
+
property: [{
|
208
|
+
token : "text",
|
209
|
+
regex : "\\s+"
|
210
|
+
}, {
|
211
|
+
token : [
|
212
|
+
"storage.type", "punctuation.operator", "entity.name.function", "text",
|
213
|
+
"keyword.operator", "text",
|
214
|
+
"storage.type", "text", "entity.name.function", "text", "paren.lparen"
|
215
|
+
],
|
216
|
+
regex : "(" + identifierRe + ")(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(?:(\\s+)(\\w+))?(\\s*)(\\()",
|
217
|
+
next: "function_arguments"
|
218
|
+
}, {
|
219
|
+
token : "punctuation.operator",
|
220
|
+
regex : /[.](?![.])/
|
221
|
+
}, {
|
222
|
+
token : "support.function",
|
223
|
+
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(?=\()/
|
224
|
+
}, {
|
225
|
+
token : "support.function.dom",
|
226
|
+
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(?=\()/
|
227
|
+
}, {
|
228
|
+
token : "support.constant",
|
229
|
+
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/
|
230
|
+
}, {
|
231
|
+
token : "identifier",
|
232
|
+
regex : identifierRe
|
233
|
+
}, {
|
234
|
+
regex: "",
|
235
|
+
token: "empty",
|
236
|
+
next: "no_regex"
|
237
|
+
}
|
238
|
+
],
|
212
239
|
"start": [
|
213
240
|
DocCommentHighlightRules.getStartRule("doc-start"),
|
214
241
|
{
|
@@ -363,7 +390,7 @@ var JavaScriptHighlightRules = function(options) {
|
|
363
390
|
if (val == "}" && stack.length) {
|
364
391
|
stack.shift();
|
365
392
|
this.next = stack.shift();
|
366
|
-
if (this.next.indexOf("string") != -1)
|
393
|
+
if (this.next.indexOf("string") != -1 || this.next.indexOf("jsx") != -1)
|
367
394
|
return "paren.quasi.end";
|
368
395
|
}
|
369
396
|
return val == "{" ? "paren.lparen" : "paren.rparen";
|
@@ -387,6 +414,9 @@ var JavaScriptHighlightRules = function(options) {
|
|
387
414
|
defaultToken: "string.quasi"
|
388
415
|
}]
|
389
416
|
});
|
417
|
+
|
418
|
+
if (!options || !options.noJSX)
|
419
|
+
JSX.call(this);
|
390
420
|
}
|
391
421
|
|
392
422
|
this.embedRules(DocCommentHighlightRules, "doc-",
|
@@ -397,6 +427,105 @@ var JavaScriptHighlightRules = function(options) {
|
|
397
427
|
|
398
428
|
oop.inherits(JavaScriptHighlightRules, TextHighlightRules);
|
399
429
|
|
430
|
+
function JSX() {
|
431
|
+
var tagRegex = identifierRe.replace("\\d", "\\d\\-");
|
432
|
+
var jsxTag = {
|
433
|
+
onMatch : function(val, state, stack) {
|
434
|
+
var offset = val.charAt(1) == "/" ? 2 : 1;
|
435
|
+
if (offset == 1) {
|
436
|
+
if (state != this.nextState)
|
437
|
+
stack.unshift(this.next, this.nextState, 0);
|
438
|
+
else
|
439
|
+
stack.unshift(this.next);
|
440
|
+
stack[2]++;
|
441
|
+
} else if (offset == 2) {
|
442
|
+
if (state == this.nextState) {
|
443
|
+
stack[1]--;
|
444
|
+
if (!stack[1] || stack[1] < 0) {
|
445
|
+
stack.shift();
|
446
|
+
stack.shift();
|
447
|
+
}
|
448
|
+
}
|
449
|
+
}
|
450
|
+
return [{
|
451
|
+
type: "meta.tag.punctuation." + (offset == 1 ? "" : "end-") + "tag-open.xml",
|
452
|
+
value: val.slice(0, offset)
|
453
|
+
}, {
|
454
|
+
type: "meta.tag.tag-name.xml",
|
455
|
+
value: val.substr(offset)
|
456
|
+
}];
|
457
|
+
},
|
458
|
+
regex : "</?" + tagRegex + "",
|
459
|
+
next: "jsxAttributes",
|
460
|
+
nextState: "jsx"
|
461
|
+
};
|
462
|
+
this.$rules.start.unshift(jsxTag);
|
463
|
+
var jsxJsRule = {
|
464
|
+
regex: "{",
|
465
|
+
token: "paren.quasi.start",
|
466
|
+
push: "start"
|
467
|
+
};
|
468
|
+
this.$rules.jsx = [
|
469
|
+
jsxJsRule,
|
470
|
+
jsxTag,
|
471
|
+
{include : "reference"},
|
472
|
+
{defaultToken: "string"}
|
473
|
+
];
|
474
|
+
this.$rules.jsxAttributes = [{
|
475
|
+
token : "meta.tag.punctuation.tag-close.xml",
|
476
|
+
regex : "/?>",
|
477
|
+
onMatch : function(value, currentState, stack) {
|
478
|
+
if (currentState == stack[0])
|
479
|
+
stack.shift();
|
480
|
+
if (value.length == 2) {
|
481
|
+
if (stack[0] == this.nextState)
|
482
|
+
stack[1]--;
|
483
|
+
if (!stack[1] || stack[1] < 0) {
|
484
|
+
stack.splice(0, 2);
|
485
|
+
}
|
486
|
+
}
|
487
|
+
this.next = stack[0] || "start";
|
488
|
+
return [{type: this.token, value: value}];
|
489
|
+
},
|
490
|
+
nextState: "jsx"
|
491
|
+
},
|
492
|
+
jsxJsRule,
|
493
|
+
{
|
494
|
+
token : "entity.other.attribute-name.xml",
|
495
|
+
regex : tagRegex
|
496
|
+
}, {
|
497
|
+
token : "keyword.operator.attribute-equals.xml",
|
498
|
+
regex : "="
|
499
|
+
}, {
|
500
|
+
token : "text.tag-whitespace.xml",
|
501
|
+
regex : "\\s+"
|
502
|
+
}, {
|
503
|
+
token : "string.attribute-value.xml",
|
504
|
+
regex : "'",
|
505
|
+
stateName : "jsx_attr_q",
|
506
|
+
push : [
|
507
|
+
{token : "string.attribute-value.xml", regex: "'", next: "pop"},
|
508
|
+
jsxJsRule,
|
509
|
+
{include : "reference"},
|
510
|
+
{defaultToken : "string.attribute-value.xml"}
|
511
|
+
]
|
512
|
+
}, {
|
513
|
+
token : "string.attribute-value.xml",
|
514
|
+
regex : '"',
|
515
|
+
stateName : "jsx_attr_qq",
|
516
|
+
push : [
|
517
|
+
jsxJsRule,
|
518
|
+
{token : "string.attribute-value.xml", regex: '"', next: "pop"},
|
519
|
+
{include : "reference"},
|
520
|
+
{defaultToken : "string.attribute-value.xml"}
|
521
|
+
]
|
522
|
+
}];
|
523
|
+
this.$rules.reference = [{
|
524
|
+
token : "constant.language.escape.reference.xml",
|
525
|
+
regex : "(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"
|
526
|
+
}];
|
527
|
+
}
|
528
|
+
|
400
529
|
exports.JavaScriptHighlightRules = JavaScriptHighlightRules;
|
401
530
|
});
|
402
531
|
|
@@ -407,8 +536,7 @@ var oop = require("../lib/oop");
|
|
407
536
|
var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
|
408
537
|
|
409
538
|
var XmlHighlightRules = function(normalize) {
|
410
|
-
|
411
|
-
var tagRegex = "[a-zA-Z][-_a-zA-Z0-9]*";
|
539
|
+
var tagRegex = "[_:a-zA-Z\xc0-\uffff][-_:.a-zA-Z0-9\xc0-\uffff]*";
|
412
540
|
|
413
541
|
this.$rules = {
|
414
542
|
start : [
|
@@ -794,7 +922,7 @@ var HtmlHighlightRules = function() {
|
|
794
922
|
include : "tag_whitespace"
|
795
923
|
}, {
|
796
924
|
token : "entity.other.attribute-name.xml",
|
797
|
-
regex : "[-_a-zA-Z0-9
|
925
|
+
regex : "[-_a-zA-Z0-9:.]+"
|
798
926
|
}, {
|
799
927
|
token : "keyword.operator.attribute-equals.xml",
|
800
928
|
regex : "=",
|
@@ -818,7 +946,7 @@ var HtmlHighlightRules = function() {
|
|
818
946
|
return ["meta.tag.punctuation." + (start == "<" ? "" : "end-") + "tag-open.xml",
|
819
947
|
"meta.tag" + (group ? "." + group : "") + ".tag-name.xml"];
|
820
948
|
},
|
821
|
-
regex : "(</?)([-_a-zA-Z0-9
|
949
|
+
regex : "(</?)([-_a-zA-Z0-9:.]+)",
|
822
950
|
next: "tag_stuff"
|
823
951
|
}],
|
824
952
|
tag_stuff: [
|
@@ -828,7 +956,7 @@ var HtmlHighlightRules = function() {
|
|
828
956
|
});
|
829
957
|
|
830
958
|
this.embedTagRules(CssHighlightRules, "css-", "style");
|
831
|
-
this.embedTagRules(JavaScriptHighlightRules, "js-", "script");
|
959
|
+
this.embedTagRules(new JavaScriptHighlightRules({noJSX: true}).getRules(), "js-", "script");
|
832
960
|
|
833
961
|
if (this.constructor === HtmlHighlightRules)
|
834
962
|
this.normalizeRules();
|
@@ -943,6 +1071,7 @@ var MarkdownHighlightRules = function() {
|
|
943
1071
|
}],
|
944
1072
|
"allowBlock": [
|
945
1073
|
{token : "support.function", regex : "^ {4}.+", next : "allowBlock"},
|
1074
|
+
{token : "empty_line", regex : '^$', next: "allowBlock"},
|
946
1075
|
{token : "empty", regex : "", next : "start"}
|
947
1076
|
],
|
948
1077
|
|
@@ -1478,7 +1607,7 @@ var LessHighlightRules = function() {
|
|
1478
1607
|
regex: "\\.[a-z0-9-_]+"
|
1479
1608
|
}, {
|
1480
1609
|
token: "variable.language",
|
1481
|
-
regex: ":[a-z0-9-_]
|
1610
|
+
regex: ":[a-z_][a-z0-9-_]*"
|
1482
1611
|
}, {
|
1483
1612
|
token: "constant",
|
1484
1613
|
regex: "[a-z0-9-_]+"
|
@@ -1656,7 +1785,7 @@ define("ace/mode/coffee_highlight_rules",["require","exports","module","ace/lib/
|
|
1656
1785
|
regex : "(\\.)(\\s*)(" + illegal + ")"
|
1657
1786
|
}, {
|
1658
1787
|
token : "punctuation.operator",
|
1659
|
-
regex : "\\."
|
1788
|
+
regex : "\\.{1,3}"
|
1660
1789
|
}, {
|
1661
1790
|
token : ["keyword", "text", "language.support.class",
|
1662
1791
|
"text", "keyword", "text", "language.support.class"],
|
@@ -1799,7 +1928,7 @@ var JadeHighlightRules = function() {
|
|
1799
1928
|
},
|
1800
1929
|
{
|
1801
1930
|
token: "meta.tag.any.jade",
|
1802
|
-
regex: /^\s*(?!\w+\:)(?:[\w]+|(?=\.|#)])/,
|
1931
|
+
regex: /^\s*(?!\w+\:)(?:[\w-]+|(?=\.|#)])/,
|
1803
1932
|
next: "tag_single"
|
1804
1933
|
},
|
1805
1934
|
{
|
@@ -1856,13 +1985,9 @@ var JadeHighlightRules = function() {
|
|
1856
1985
|
regex : '"(?=.)',
|
1857
1986
|
next : "qqstring"
|
1858
1987
|
},
|
1859
|
-
{
|
1860
|
-
token: "entity.other.attribute-name.jade",
|
1861
|
-
regex: "\\b[a-zA-Z\\-:]+"
|
1862
|
-
},
|
1863
1988
|
{
|
1864
1989
|
token: ["entity.other.attribute-name.jade", "punctuation"],
|
1865
|
-
regex: "
|
1990
|
+
regex: "([a-zA-Z:\\.-]+)(=)?",
|
1866
1991
|
next: "attribute_strings"
|
1867
1992
|
},
|
1868
1993
|
{
|
@@ -1881,6 +2006,11 @@ var JadeHighlightRules = function() {
|
|
1881
2006
|
token : "string",
|
1882
2007
|
regex : '"(?=.)',
|
1883
2008
|
next : "qqstring"
|
2009
|
+
},
|
2010
|
+
{
|
2011
|
+
token : "string",
|
2012
|
+
regex : '(?=\\S)',
|
2013
|
+
next : "tag_attributes"
|
1884
2014
|
}
|
1885
2015
|
],
|
1886
2016
|
"qqstring" : [
|
@@ -54,6 +54,7 @@ define("ace/mode/javascript_highlight_rules",["require","exports","module","ace/
|
|
54
54
|
var oop = require("../lib/oop");
|
55
55
|
var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
|
56
56
|
var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
|
57
|
+
var identifierRe = "[a-zA-Z\\$_\u00a1-\uffff][a-zA-Z\\d\\$_\u00a1-\uffff]*\\b";
|
57
58
|
|
58
59
|
var JavaScriptHighlightRules = function(options) {
|
59
60
|
var keywordMapper = this.createKeywordMapper({
|
@@ -83,7 +84,6 @@ var JavaScriptHighlightRules = function(options) {
|
|
83
84
|
"constant.language.boolean": "true|false"
|
84
85
|
}, "identifier");
|
85
86
|
var kwBeforeRe = "case|do|else|finally|in|instanceof|return|throw|try|typeof|yield|void";
|
86
|
-
var identifierRe = "[a-zA-Z\\$_\u00a1-\uffff][a-zA-Z\\d\\$_\u00a1-\uffff]*\\b";
|
87
87
|
|
88
88
|
var escapedRe = "\\\\(?:x[0-9a-fA-F]{2}|" + // hex
|
89
89
|
"u[0-9a-fA-F]{4}|" + // unicode
|
@@ -171,15 +171,6 @@ var JavaScriptHighlightRules = function(options) {
|
|
171
171
|
token : "keyword",
|
172
172
|
regex : "(?:" + kwBeforeRe + ")\\b",
|
173
173
|
next : "start"
|
174
|
-
}, {
|
175
|
-
token : ["punctuation.operator", "support.function"],
|
176
|
-
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(?=\()/
|
177
|
-
}, {
|
178
|
-
token : ["punctuation.operator", "support.function.dom"],
|
179
|
-
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(?=\()/
|
180
|
-
}, {
|
181
|
-
token : ["punctuation.operator", "support.constant"],
|
182
|
-
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/
|
183
174
|
}, {
|
184
175
|
token : ["support.constant"],
|
185
176
|
regex : /that\b/
|
@@ -189,9 +180,13 @@ var JavaScriptHighlightRules = function(options) {
|
|
189
180
|
}, {
|
190
181
|
token : keywordMapper,
|
191
182
|
regex : identifierRe
|
183
|
+
}, {
|
184
|
+
token : "punctuation.operator",
|
185
|
+
regex : /[.](?![.])/,
|
186
|
+
next : "property"
|
192
187
|
}, {
|
193
188
|
token : "keyword.operator",
|
194
|
-
regex :
|
189
|
+
regex : /--|\+\+|\.{3}|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|[!$%&*+\-~\/^]=?/,
|
195
190
|
next : "start"
|
196
191
|
}, {
|
197
192
|
token : "punctuation.operator",
|
@@ -209,6 +204,38 @@ var JavaScriptHighlightRules = function(options) {
|
|
209
204
|
regex: /^#!.*$/
|
210
205
|
}
|
211
206
|
],
|
207
|
+
property: [{
|
208
|
+
token : "text",
|
209
|
+
regex : "\\s+"
|
210
|
+
}, {
|
211
|
+
token : [
|
212
|
+
"storage.type", "punctuation.operator", "entity.name.function", "text",
|
213
|
+
"keyword.operator", "text",
|
214
|
+
"storage.type", "text", "entity.name.function", "text", "paren.lparen"
|
215
|
+
],
|
216
|
+
regex : "(" + identifierRe + ")(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(?:(\\s+)(\\w+))?(\\s*)(\\()",
|
217
|
+
next: "function_arguments"
|
218
|
+
}, {
|
219
|
+
token : "punctuation.operator",
|
220
|
+
regex : /[.](?![.])/
|
221
|
+
}, {
|
222
|
+
token : "support.function",
|
223
|
+
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(?=\()/
|
224
|
+
}, {
|
225
|
+
token : "support.function.dom",
|
226
|
+
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(?=\()/
|
227
|
+
}, {
|
228
|
+
token : "support.constant",
|
229
|
+
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/
|
230
|
+
}, {
|
231
|
+
token : "identifier",
|
232
|
+
regex : identifierRe
|
233
|
+
}, {
|
234
|
+
regex: "",
|
235
|
+
token: "empty",
|
236
|
+
next: "no_regex"
|
237
|
+
}
|
238
|
+
],
|
212
239
|
"start": [
|
213
240
|
DocCommentHighlightRules.getStartRule("doc-start"),
|
214
241
|
{
|
@@ -363,7 +390,7 @@ var JavaScriptHighlightRules = function(options) {
|
|
363
390
|
if (val == "}" && stack.length) {
|
364
391
|
stack.shift();
|
365
392
|
this.next = stack.shift();
|
366
|
-
if (this.next.indexOf("string") != -1)
|
393
|
+
if (this.next.indexOf("string") != -1 || this.next.indexOf("jsx") != -1)
|
367
394
|
return "paren.quasi.end";
|
368
395
|
}
|
369
396
|
return val == "{" ? "paren.lparen" : "paren.rparen";
|
@@ -387,6 +414,9 @@ var JavaScriptHighlightRules = function(options) {
|
|
387
414
|
defaultToken: "string.quasi"
|
388
415
|
}]
|
389
416
|
});
|
417
|
+
|
418
|
+
if (!options || !options.noJSX)
|
419
|
+
JSX.call(this);
|
390
420
|
}
|
391
421
|
|
392
422
|
this.embedRules(DocCommentHighlightRules, "doc-",
|
@@ -397,6 +427,105 @@ var JavaScriptHighlightRules = function(options) {
|
|
397
427
|
|
398
428
|
oop.inherits(JavaScriptHighlightRules, TextHighlightRules);
|
399
429
|
|
430
|
+
function JSX() {
|
431
|
+
var tagRegex = identifierRe.replace("\\d", "\\d\\-");
|
432
|
+
var jsxTag = {
|
433
|
+
onMatch : function(val, state, stack) {
|
434
|
+
var offset = val.charAt(1) == "/" ? 2 : 1;
|
435
|
+
if (offset == 1) {
|
436
|
+
if (state != this.nextState)
|
437
|
+
stack.unshift(this.next, this.nextState, 0);
|
438
|
+
else
|
439
|
+
stack.unshift(this.next);
|
440
|
+
stack[2]++;
|
441
|
+
} else if (offset == 2) {
|
442
|
+
if (state == this.nextState) {
|
443
|
+
stack[1]--;
|
444
|
+
if (!stack[1] || stack[1] < 0) {
|
445
|
+
stack.shift();
|
446
|
+
stack.shift();
|
447
|
+
}
|
448
|
+
}
|
449
|
+
}
|
450
|
+
return [{
|
451
|
+
type: "meta.tag.punctuation." + (offset == 1 ? "" : "end-") + "tag-open.xml",
|
452
|
+
value: val.slice(0, offset)
|
453
|
+
}, {
|
454
|
+
type: "meta.tag.tag-name.xml",
|
455
|
+
value: val.substr(offset)
|
456
|
+
}];
|
457
|
+
},
|
458
|
+
regex : "</?" + tagRegex + "",
|
459
|
+
next: "jsxAttributes",
|
460
|
+
nextState: "jsx"
|
461
|
+
};
|
462
|
+
this.$rules.start.unshift(jsxTag);
|
463
|
+
var jsxJsRule = {
|
464
|
+
regex: "{",
|
465
|
+
token: "paren.quasi.start",
|
466
|
+
push: "start"
|
467
|
+
};
|
468
|
+
this.$rules.jsx = [
|
469
|
+
jsxJsRule,
|
470
|
+
jsxTag,
|
471
|
+
{include : "reference"},
|
472
|
+
{defaultToken: "string"}
|
473
|
+
];
|
474
|
+
this.$rules.jsxAttributes = [{
|
475
|
+
token : "meta.tag.punctuation.tag-close.xml",
|
476
|
+
regex : "/?>",
|
477
|
+
onMatch : function(value, currentState, stack) {
|
478
|
+
if (currentState == stack[0])
|
479
|
+
stack.shift();
|
480
|
+
if (value.length == 2) {
|
481
|
+
if (stack[0] == this.nextState)
|
482
|
+
stack[1]--;
|
483
|
+
if (!stack[1] || stack[1] < 0) {
|
484
|
+
stack.splice(0, 2);
|
485
|
+
}
|
486
|
+
}
|
487
|
+
this.next = stack[0] || "start";
|
488
|
+
return [{type: this.token, value: value}];
|
489
|
+
},
|
490
|
+
nextState: "jsx"
|
491
|
+
},
|
492
|
+
jsxJsRule,
|
493
|
+
{
|
494
|
+
token : "entity.other.attribute-name.xml",
|
495
|
+
regex : tagRegex
|
496
|
+
}, {
|
497
|
+
token : "keyword.operator.attribute-equals.xml",
|
498
|
+
regex : "="
|
499
|
+
}, {
|
500
|
+
token : "text.tag-whitespace.xml",
|
501
|
+
regex : "\\s+"
|
502
|
+
}, {
|
503
|
+
token : "string.attribute-value.xml",
|
504
|
+
regex : "'",
|
505
|
+
stateName : "jsx_attr_q",
|
506
|
+
push : [
|
507
|
+
{token : "string.attribute-value.xml", regex: "'", next: "pop"},
|
508
|
+
jsxJsRule,
|
509
|
+
{include : "reference"},
|
510
|
+
{defaultToken : "string.attribute-value.xml"}
|
511
|
+
]
|
512
|
+
}, {
|
513
|
+
token : "string.attribute-value.xml",
|
514
|
+
regex : '"',
|
515
|
+
stateName : "jsx_attr_qq",
|
516
|
+
push : [
|
517
|
+
jsxJsRule,
|
518
|
+
{token : "string.attribute-value.xml", regex: '"', next: "pop"},
|
519
|
+
{include : "reference"},
|
520
|
+
{defaultToken : "string.attribute-value.xml"}
|
521
|
+
]
|
522
|
+
}];
|
523
|
+
this.$rules.reference = [{
|
524
|
+
token : "constant.language.escape.reference.xml",
|
525
|
+
regex : "(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"
|
526
|
+
}];
|
527
|
+
}
|
528
|
+
|
400
529
|
exports.JavaScriptHighlightRules = JavaScriptHighlightRules;
|
401
530
|
});
|
402
531
|
|
@@ -680,8 +809,8 @@ var CstyleBehaviour = function() {
|
|
680
809
|
if (leftChar == "\\" && token && /escape/.test(token.type))
|
681
810
|
return null;
|
682
811
|
|
683
|
-
var stringBefore = token && /string/.test(token.type);
|
684
|
-
var stringAfter = !rightToken || /string/.test(rightToken.type);
|
812
|
+
var stringBefore = token && /string|escape/.test(token.type);
|
813
|
+
var stringAfter = !rightToken || /string|escape/.test(rightToken.type);
|
685
814
|
|
686
815
|
var pair;
|
687
816
|
if (rightChar == quote) {
|
@@ -822,7 +951,7 @@ oop.inherits(FoldMode, BaseFoldMode);
|
|
822
951
|
this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
|
823
952
|
this.singleLineBlockCommentRe= /^\s*(\/\*).*\*\/\s*$/;
|
824
953
|
this.tripleStarBlockCommentRe = /^\s*(\/\*\*\*).*\*\/\s*$/;
|
825
|
-
this.startRegionRe = /^\s*(\/\*|\/\/)
|
954
|
+
this.startRegionRe = /^\s*(\/\*|\/\/)#?region\b/;
|
826
955
|
this._getFoldWidgetBase = this.getFoldWidget;
|
827
956
|
this.getFoldWidget = function(session, foldStyle, row) {
|
828
957
|
var line = session.getLine(row);
|
@@ -910,13 +1039,12 @@ oop.inherits(FoldMode, BaseFoldMode);
|
|
910
1039
|
|
911
1040
|
return new Range(startRow, startColumn, endRow, session.getLine(endRow).length);
|
912
1041
|
};
|
913
|
-
|
914
1042
|
this.getCommentRegionBlock = function(session, line, row) {
|
915
1043
|
var startColumn = line.search(/\s*$/);
|
916
1044
|
var maxRow = session.getLength();
|
917
1045
|
var startRow = row;
|
918
1046
|
|
919
|
-
var re = /^\s*(
|
1047
|
+
var re = /^\s*(?:\/\*|\/\/|--)#?(end)?region\b/;
|
920
1048
|
var depth = 1;
|
921
1049
|
while (++row < maxRow) {
|
922
1050
|
line = session.getLine(row);
|