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.
Files changed (158) hide show
  1. checksums.yaml +4 -4
  2. data/lib/ace/rails/version.rb +1 -1
  3. data/vendor/assets/javascripts/ace/ace.js +993 -613
  4. data/vendor/assets/javascripts/ace/ext-chromevox.js +3 -4
  5. data/vendor/assets/javascripts/ace/ext-elastic_tabstops_lite.js +5 -6
  6. data/vendor/assets/javascripts/ace/ext-emmet.js +50 -21
  7. data/vendor/assets/javascripts/ace/ext-language_tools.js +21 -19
  8. data/vendor/assets/javascripts/ace/ext-modelist.js +11 -6
  9. data/vendor/assets/javascripts/ace/ext-old_ie.js +12 -5
  10. data/vendor/assets/javascripts/ace/ext-searchbox.js +12 -5
  11. data/vendor/assets/javascripts/ace/ext-settings_menu.js +14 -7
  12. data/vendor/assets/javascripts/ace/ext-static_highlight.js +5 -5
  13. data/vendor/assets/javascripts/ace/ext-statusbar.js +14 -12
  14. data/vendor/assets/javascripts/ace/ext-textarea.js +1 -2
  15. data/vendor/assets/javascripts/ace/ext-themelist.js +2 -0
  16. data/vendor/assets/javascripts/ace/ext-whitespace.js +17 -13
  17. data/vendor/assets/javascripts/ace/keybinding-emacs.js +76 -78
  18. data/vendor/assets/javascripts/ace/keybinding-vim.js +221 -80
  19. data/vendor/assets/javascripts/ace/mode-abc.js +2 -3
  20. data/vendor/assets/javascripts/ace/mode-actionscript.js +2 -3
  21. data/vendor/assets/javascripts/ace/mode-apache_conf.js +2 -3
  22. data/vendor/assets/javascripts/ace/mode-applescript.js +2 -3
  23. data/vendor/assets/javascripts/ace/mode-autohotkey.js +2 -3
  24. data/vendor/assets/javascripts/ace/mode-batchfile.js +2 -3
  25. data/vendor/assets/javascripts/ace/mode-c_cpp.js +8 -5
  26. data/vendor/assets/javascripts/ace/mode-coffee.js +1 -1
  27. data/vendor/assets/javascripts/ace/mode-coldfusion.js +533 -139
  28. data/vendor/assets/javascripts/ace/mode-csharp.js +4 -5
  29. data/vendor/assets/javascripts/ace/mode-css.js +185 -6
  30. data/vendor/assets/javascripts/ace/mode-curly.js +495 -138
  31. data/vendor/assets/javascripts/ace/mode-d.js +2 -3
  32. data/vendor/assets/javascripts/ace/mode-dart.js +8 -5
  33. data/vendor/assets/javascripts/ace/mode-django.js +495 -138
  34. data/vendor/assets/javascripts/ace/mode-dockerfile.js +59 -14
  35. data/vendor/assets/javascripts/ace/mode-dot.js +2 -3
  36. data/vendor/assets/javascripts/ace/mode-ejs.js +497 -152
  37. data/vendor/assets/javascripts/ace/mode-elm.js +6 -4
  38. data/vendor/assets/javascripts/ace/mode-erlang.js +3 -4
  39. data/vendor/assets/javascripts/ace/mode-forth.js +3 -4
  40. data/vendor/assets/javascripts/ace/mode-ftl.js +145 -17
  41. data/vendor/assets/javascripts/ace/mode-gherkin.js +58 -25
  42. data/vendor/assets/javascripts/ace/mode-glsl.js +8 -5
  43. data/vendor/assets/javascripts/ace/mode-golang.js +36 -25
  44. data/vendor/assets/javascripts/ace/mode-groovy.js +145 -17
  45. data/vendor/assets/javascripts/ace/mode-handlebars.js +496 -140
  46. data/vendor/assets/javascripts/ace/mode-haskell.js +3 -4
  47. data/vendor/assets/javascripts/ace/mode-haxe.js +4 -5
  48. data/vendor/assets/javascripts/ace/mode-html.js +495 -138
  49. data/vendor/assets/javascripts/ace/mode-html_elixir.js +3372 -0
  50. data/vendor/assets/javascripts/ace/mode-html_ruby.js +495 -138
  51. data/vendor/assets/javascripts/ace/mode-ini.js +1 -1
  52. data/vendor/assets/javascripts/ace/mode-io.js +2 -3
  53. data/vendor/assets/javascripts/ace/mode-jack.js +4 -5
  54. data/vendor/assets/javascripts/ace/mode-jade.js +155 -25
  55. data/vendor/assets/javascripts/ace/mode-java.js +145 -17
  56. data/vendor/assets/javascripts/ace/mode-javascript.js +145 -17
  57. data/vendor/assets/javascripts/ace/mode-json.js +4 -5
  58. data/vendor/assets/javascripts/ace/mode-jsoniq.js +4 -5
  59. data/vendor/assets/javascripts/ace/mode-jsp.js +150 -23
  60. data/vendor/assets/javascripts/ace/mode-jsx.js +4 -5
  61. data/vendor/assets/javascripts/ace/mode-julia.js +2 -3
  62. data/vendor/assets/javascripts/ace/mode-less.js +5 -6
  63. data/vendor/assets/javascripts/ace/mode-liquid.js +145 -17
  64. data/vendor/assets/javascripts/ace/mode-logiql.js +2 -2
  65. data/vendor/assets/javascripts/ace/mode-lsl.js +8 -10
  66. data/vendor/assets/javascripts/ace/mode-lua.js +2 -2
  67. data/vendor/assets/javascripts/ace/mode-luapage.js +497 -140
  68. data/vendor/assets/javascripts/ace/mode-makefile.js +54 -8
  69. data/vendor/assets/javascripts/ace/mode-markdown.js +497 -139
  70. data/vendor/assets/javascripts/ace/mode-mask.js +150 -22
  71. data/vendor/assets/javascripts/ace/mode-maze.js +283 -0
  72. data/vendor/assets/javascripts/ace/mode-mel.js +4 -5
  73. data/vendor/assets/javascripts/ace/mode-mushcode.js +0 -1
  74. data/vendor/assets/javascripts/ace/mode-mysql.js +1 -1
  75. data/vendor/assets/javascripts/ace/mode-nix.js +8 -5
  76. data/vendor/assets/javascripts/ace/mode-objectivec.js +6 -3
  77. data/vendor/assets/javascripts/ace/mode-perl.js +4 -5
  78. data/vendor/assets/javascripts/ace/mode-pgsql.js +141 -12
  79. data/vendor/assets/javascripts/ace/mode-php.js +9872 -143
  80. data/vendor/assets/javascripts/ace/mode-powershell.js +4 -5
  81. data/vendor/assets/javascripts/ace/mode-praat.js +18 -14
  82. data/vendor/assets/javascripts/ace/mode-prolog.js +2 -3
  83. data/vendor/assets/javascripts/ace/mode-protobuf.js +8 -5
  84. data/vendor/assets/javascripts/ace/mode-rhtml.js +495 -138
  85. data/vendor/assets/javascripts/ace/mode-ruby.js +2 -2
  86. data/vendor/assets/javascripts/ace/mode-rust.js +32 -39
  87. data/vendor/assets/javascripts/ace/mode-scad.js +4 -5
  88. data/vendor/assets/javascripts/ace/mode-scala.js +158 -21
  89. data/vendor/assets/javascripts/ace/mode-scheme.js +118 -1
  90. data/vendor/assets/javascripts/ace/mode-scss.js +4 -5
  91. data/vendor/assets/javascripts/ace/mode-sh.js +58 -13
  92. data/vendor/assets/javascripts/ace/mode-sjs.js +145 -17
  93. data/vendor/assets/javascripts/ace/mode-smarty.js +495 -138
  94. data/vendor/assets/javascripts/ace/mode-soy_template.js +496 -140
  95. data/vendor/assets/javascripts/ace/mode-sql.js +12 -4
  96. data/vendor/assets/javascripts/ace/mode-sqlserver.js +437 -0
  97. data/vendor/assets/javascripts/ace/mode-svg.js +147 -20
  98. data/vendor/assets/javascripts/ace/mode-swift.js +738 -0
  99. data/vendor/assets/javascripts/ace/mode-swig.js +1099 -0
  100. data/vendor/assets/javascripts/ace/mode-tcl.js +2 -3
  101. data/vendor/assets/javascripts/ace/mode-tex.js +1 -0
  102. data/vendor/assets/javascripts/ace/mode-toml.js +4 -0
  103. data/vendor/assets/javascripts/ace/mode-twig.js +495 -138
  104. data/vendor/assets/javascripts/ace/mode-typescript.js +147 -19
  105. data/vendor/assets/javascripts/ace/mode-vala.js +4 -5
  106. data/vendor/assets/javascripts/ace/mode-vbscript.js +26 -13
  107. data/vendor/assets/javascripts/ace/mode-velocity.js +495 -138
  108. data/vendor/assets/javascripts/ace/mode-verilog.js +8 -0
  109. data/vendor/assets/javascripts/ace/mode-xml.js +2 -3
  110. data/vendor/assets/javascripts/ace/mode-xquery.js +4 -5
  111. data/vendor/assets/javascripts/ace/snippets/actionscript.js +5 -0
  112. data/vendor/assets/javascripts/ace/snippets/html_elixir.js +7 -0
  113. data/vendor/assets/javascripts/ace/snippets/java.js +6 -0
  114. data/vendor/assets/javascripts/ace/snippets/javascript.js +13 -0
  115. data/vendor/assets/javascripts/ace/snippets/lsl.js +166 -0
  116. data/vendor/assets/javascripts/ace/snippets/maze.js +16 -0
  117. data/vendor/assets/javascripts/ace/snippets/php.js +105 -4
  118. data/vendor/assets/javascripts/ace/snippets/sqlserver.js +76 -0
  119. data/vendor/assets/javascripts/ace/snippets/swift.js +7 -0
  120. data/vendor/assets/javascripts/ace/snippets/swig.js +7 -0
  121. data/vendor/assets/javascripts/ace/theme-clouds.js +0 -1
  122. data/vendor/assets/javascripts/ace/theme-clouds_midnight.js +0 -1
  123. data/vendor/assets/javascripts/ace/theme-cobalt.js +3 -3
  124. data/vendor/assets/javascripts/ace/theme-dawn.js +0 -1
  125. data/vendor/assets/javascripts/ace/theme-github.js +0 -1
  126. data/vendor/assets/javascripts/ace/theme-idle_fingers.js +0 -1
  127. data/vendor/assets/javascripts/ace/theme-iplastic.js +121 -0
  128. data/vendor/assets/javascripts/ace/theme-katzenmilch.js +1 -2
  129. data/vendor/assets/javascripts/ace/theme-kr_theme.js +0 -1
  130. data/vendor/assets/javascripts/ace/theme-kuroir.js +0 -1
  131. data/vendor/assets/javascripts/ace/theme-merbivore.js +0 -1
  132. data/vendor/assets/javascripts/ace/theme-merbivore_soft.js +0 -1
  133. data/vendor/assets/javascripts/ace/theme-mono_industrial.js +0 -1
  134. data/vendor/assets/javascripts/ace/theme-monokai.js +0 -1
  135. data/vendor/assets/javascripts/ace/theme-pastel_on_dark.js +0 -1
  136. data/vendor/assets/javascripts/ace/theme-solarized_dark.js +0 -1
  137. data/vendor/assets/javascripts/ace/theme-solarized_light.js +0 -1
  138. data/vendor/assets/javascripts/ace/theme-sqlserver.js +138 -0
  139. data/vendor/assets/javascripts/ace/theme-terminal.js +0 -1
  140. data/vendor/assets/javascripts/ace/theme-textmate.js +0 -1
  141. data/vendor/assets/javascripts/ace/theme-tomorrow.js +0 -1
  142. data/vendor/assets/javascripts/ace/theme-tomorrow_night.js +0 -1
  143. data/vendor/assets/javascripts/ace/theme-tomorrow_night_blue.js +0 -1
  144. data/vendor/assets/javascripts/ace/theme-tomorrow_night_bright.js +0 -1
  145. data/vendor/assets/javascripts/ace/theme-tomorrow_night_eighties.js +0 -1
  146. data/vendor/assets/javascripts/ace/theme-twilight.js +0 -1
  147. data/vendor/assets/javascripts/ace/theme-vibrant_ink.js +0 -1
  148. data/vendor/assets/javascripts/ace/theme-xcode.js +0 -1
  149. data/vendor/assets/javascripts/ace/worker-coffee.js +576 -6015
  150. data/vendor/assets/javascripts/ace/worker-css.js +529 -449
  151. data/vendor/assets/javascripts/ace/worker-html.js +528 -448
  152. data/vendor/assets/javascripts/ace/worker-javascript.js +8719 -7656
  153. data/vendor/assets/javascripts/ace/worker-json.js +530 -450
  154. data/vendor/assets/javascripts/ace/worker-lua.js +530 -450
  155. data/vendor/assets/javascripts/ace/worker-php.js +530 -450
  156. data/vendor/assets/javascripts/ace/worker-xml.js +530 -450
  157. data/vendor/assets/javascripts/ace/worker-xquery.js +529 -449
  158. metadata +14 -2
@@ -8,7 +8,7 @@ var reservedKeywords = exports.reservedKeywords = (
8
8
  '!|{|}|case|do|done|elif|else|'+
9
9
  'esac|fi|for|if|in|then|until|while|'+
10
10
  '&|;|export|local|read|typeset|unset|'+
11
- 'elif|select|set'
11
+ 'elif|select|set|function|declare|readonly'
12
12
  );
13
13
 
14
14
  var languageConstructs = exports.languageConstructs = (
@@ -39,7 +39,7 @@ var ShHighlightRules = function() {
39
39
  var fileDescriptor = "(?:&" + intPart + ")";
40
40
 
41
41
  var variableName = "[a-zA-Z_][a-zA-Z0-9_]*";
42
- var variable = "(?:(?:\\$" + variableName + ")|(?:" + variableName + "=))";
42
+ var variable = "(?:" + variableName + "=)";
43
43
 
44
44
  var builtinVariable = "(?:\\$(?:SHLVL|\\$|\\!|\\?))";
45
45
 
@@ -57,10 +57,12 @@ var ShHighlightRules = function() {
57
57
  regex : '"',
58
58
  push : [{
59
59
  token : "constant.language.escape",
60
- regex : /\\(?:[$abeEfnrtv\\'"]|x[a-fA-F\d]{1,2}|u[a-fA-F\d]{4}([a-fA-F\d]{4})?|c.|\d{1,3})/
60
+ regex : /\\(?:[$`"\\]|$)/
61
61
  }, {
62
- token : "constant",
63
- regex : /\$\w+/
62
+ include : "variables"
63
+ }, {
64
+ token : "keyword.operator",
65
+ regex : /`/ // TODO highlight `
64
66
  }, {
65
67
  token : "string",
66
68
  regex : '"',
@@ -68,6 +70,19 @@ var ShHighlightRules = function() {
68
70
  }, {
69
71
  defaultToken: "string"
70
72
  }]
73
+ }, {
74
+ token : "string",
75
+ regex : "\\$'",
76
+ push : [{
77
+ token : "constant.language.escape",
78
+ regex : /\\(?:[abeEfnrtv\\'"]|x[a-fA-F\d]{1,2}|u[a-fA-F\d]{4}([a-fA-F\d]{4})?|c.|\d{1,3})/
79
+ }, {
80
+ token : "string",
81
+ regex : "'",
82
+ next: "pop"
83
+ }, {
84
+ defaultToken: "string"
85
+ }]
71
86
  }, {
72
87
  regex : "<<<",
73
88
  token : "keyword.operator"
@@ -127,12 +142,17 @@ var ShHighlightRules = function() {
127
142
  return stack[0];
128
143
  return currentState;
129
144
  }
145
+ }, {
146
+ token : ["keyword", "text", "text", "text", "variable"],
147
+ regex : /(declare|local|readonly)(\s+)(?:(-[fixar]+)(\s+))?([a-zA-Z_][a-zA-Z0-9_]*\b)/
130
148
  }, {
131
149
  token : "variable.language",
132
150
  regex : builtinVariable
133
151
  }, {
134
152
  token : "variable",
135
153
  regex : variable
154
+ }, {
155
+ include : "variables"
136
156
  }, {
137
157
  token : "support.function",
138
158
  regex : func
@@ -153,14 +173,40 @@ var ShHighlightRules = function() {
153
173
  regex : "[a-zA-Z_][a-zA-Z0-9_]*\\b"
154
174
  }, {
155
175
  token : "keyword.operator",
156
- regex : "\\+|\\-|\\*|\\*\\*|\\/|\\/\\/|~|<|>|<=|=>|=|!="
176
+ regex : "\\+|\\-|\\*|\\*\\*|\\/|\\/\\/|~|<|>|<=|=>|=|!=|[%&|`]"
177
+ }, {
178
+ token : "punctuation.operator",
179
+ regex : ";"
157
180
  }, {
158
181
  token : "paren.lparen",
159
182
  regex : "[\\[\\(\\{]"
160
183
  }, {
161
184
  token : "paren.rparen",
162
- regex : "[\\]\\)\\}]"
163
- } ]
185
+ regex : "[\\]]"
186
+ }, {
187
+ token : "paren.rparen",
188
+ regex : "[\\)\\}]",
189
+ next : "pop"
190
+ }],
191
+ variables: [{
192
+ token : "variable",
193
+ regex : /(\$)(\w+)/
194
+ }, {
195
+ token : ["variable", "paren.lparen"],
196
+ regex : /(\$)(\()/,
197
+ push : "start"
198
+ }, {
199
+ token : ["variable", "paren.lparen", "keyword.operator", "variable", "keyword.operator"],
200
+ regex : /(\$)(\{)([#!]?)(\w+|[*@#?\-$!0_])(:[?+\-=]?|##?|%%?|,,?\/|\^\^?)?/,
201
+ push : "start"
202
+ }, {
203
+ token : "variable",
204
+ regex : /\$[*@#?\-$!0_]/
205
+ }, {
206
+ token : ["variable", "paren.lparen"],
207
+ regex : /(\$)(\{)/,
208
+ push : "start"
209
+ }]
164
210
  };
165
211
 
166
212
  this.normalizeRules();
@@ -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*(\/\*|\/\/)#region\b/;
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*(?:\/\*|\/\/)#(end)?region\b/;
1047
+ var re = /^\s*(?:\/\*|\/\/|--)#?(end)?region\b/;
920
1048
  var depth = 1;
921
1049
  while (++row < maxRow) {
922
1050
  line = session.getLine(row);
@@ -1032,8 +1160,7 @@ var oop = require("../lib/oop");
1032
1160
  var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
1033
1161
 
1034
1162
  var XmlHighlightRules = function(normalize) {
1035
-
1036
- var tagRegex = "[a-zA-Z][-_a-zA-Z0-9]*";
1163
+ var tagRegex = "[_:a-zA-Z\xc0-\uffff][-_:.a-zA-Z0-9\xc0-\uffff]*";
1037
1164
 
1038
1165
  this.$rules = {
1039
1166
  start : [
@@ -1667,7 +1794,7 @@ oop.inherits(Mode, TextMode);
1667
1794
 
1668
1795
  this.blockComment = {start: "<!--", end: "-->"};
1669
1796
 
1670
- this.createWorker = function(session) {
1797
+ this.createWorker = function(session) {
1671
1798
  var worker = new WorkerClient(["ace"], "ace/mode/xml_worker", "Worker");
1672
1799
  worker.attachToDocument(session.getDocument());
1673
1800
 
@@ -1832,6 +1959,180 @@ exports.CssHighlightRules = CssHighlightRules;
1832
1959
 
1833
1960
  });
1834
1961
 
1962
+ define("ace/mode/css_completions",["require","exports","module"], function(require, exports, module) {
1963
+ "use strict";
1964
+
1965
+ var propertyMap = {
1966
+ "background": {"#$0": 1},
1967
+ "background-color": {"#$0": 1, "transparent": 1, "fixed": 1},
1968
+ "background-image": {"url('/$0')": 1},
1969
+ "background-repeat": {"repeat": 1, "repeat-x": 1, "repeat-y": 1, "no-repeat": 1, "inherit": 1},
1970
+ "background-position": {"bottom":2, "center":2, "left":2, "right":2, "top":2, "inherit":2,},
1971
+ "background-attachment": {"scroll": 1, "fixed": 1},
1972
+ "background-size": {"cover": 1, "contain": 1},
1973
+ "background-clip": {"border-box": 1, "padding-box": 1, "content-box": 1},
1974
+ "background-origin": {"border-box": 1, "padding-box": 1, "content-box": 1},
1975
+ "border": {"solid $0": 1, "dashed $0": 1, "dotted $0": 1, "#$0": 1},
1976
+ "border-color": {"#$0": 1},
1977
+ "border-style": {"solid":2, "dashed":2, "dotted":2, "double":2, "groove":2, "hidden":2, "inherit":2, "inset":2, "none":2, "outset":2, "ridged":2,},
1978
+ "border-collapse": {"collapse": 1, "separate": 1},
1979
+ "bottom": {"px": 1, "em": 1, "%": 1},
1980
+ "clear": {"left": 1, "right": 1, "both": 1, "none": 1},
1981
+ "color": {"#$0": 1, "rgb(#$00,0,0)": 1},
1982
+ "cursor": {"default": 1, "pointer": 1, "move": 1, "text": 1, "wait": 1, "help": 1, "progress": 1, "n-resize": 1, "ne-resize": 1, "e-resize": 1, "se-resize": 1, "s-resize": 1, "sw-resize": 1, "w-resize": 1, "nw-resize": 1},
1983
+ "display": {"none": 1, "block": 1, "inline": 1, "inline-block": 1, "table-cell": 1},
1984
+ "empty-cells": {"show": 1, "hide": 1},
1985
+ "float": {"left": 1, "right": 1, "none": 1},
1986
+ "font-family": {"Arial":2,"Comic Sans MS":2,"Consolas":2,"Courier New":2,"Courier":2,"Georgia":2,"Monospace":2,"Sans-Serif":2, "Segoe UI":2,"Tahoma":2,"Times New Roman":2,"Trebuchet MS":2,"Verdana": 1},
1987
+ "font-size": {"px": 1, "em": 1, "%": 1},
1988
+ "font-weight": {"bold": 1, "normal": 1},
1989
+ "font-style": {"italic": 1, "normal": 1},
1990
+ "font-variant": {"normal": 1, "small-caps": 1},
1991
+ "height": {"px": 1, "em": 1, "%": 1},
1992
+ "left": {"px": 1, "em": 1, "%": 1},
1993
+ "letter-spacing": {"normal": 1},
1994
+ "line-height": {"normal": 1},
1995
+ "list-style-type": {"none": 1, "disc": 1, "circle": 1, "square": 1, "decimal": 1, "decimal-leading-zero": 1, "lower-roman": 1, "upper-roman": 1, "lower-greek": 1, "lower-latin": 1, "upper-latin": 1, "georgian": 1, "lower-alpha": 1, "upper-alpha": 1},
1996
+ "margin": {"px": 1, "em": 1, "%": 1},
1997
+ "margin-right": {"px": 1, "em": 1, "%": 1},
1998
+ "margin-left": {"px": 1, "em": 1, "%": 1},
1999
+ "margin-top": {"px": 1, "em": 1, "%": 1},
2000
+ "margin-bottom": {"px": 1, "em": 1, "%": 1},
2001
+ "max-height": {"px": 1, "em": 1, "%": 1},
2002
+ "max-width": {"px": 1, "em": 1, "%": 1},
2003
+ "min-height": {"px": 1, "em": 1, "%": 1},
2004
+ "min-width": {"px": 1, "em": 1, "%": 1},
2005
+ "overflow": {"hidden": 1, "visible": 1, "auto": 1, "scroll": 1},
2006
+ "overflow-x": {"hidden": 1, "visible": 1, "auto": 1, "scroll": 1},
2007
+ "overflow-y": {"hidden": 1, "visible": 1, "auto": 1, "scroll": 1},
2008
+ "padding": {"px": 1, "em": 1, "%": 1},
2009
+ "padding-top": {"px": 1, "em": 1, "%": 1},
2010
+ "padding-right": {"px": 1, "em": 1, "%": 1},
2011
+ "padding-bottom": {"px": 1, "em": 1, "%": 1},
2012
+ "padding-left": {"px": 1, "em": 1, "%": 1},
2013
+ "page-break-after": {"auto": 1, "always": 1, "avoid": 1, "left": 1, "right": 1},
2014
+ "page-break-before": {"auto": 1, "always": 1, "avoid": 1, "left": 1, "right": 1},
2015
+ "position": {"absolute": 1, "relative": 1, "fixed": 1, "static": 1},
2016
+ "right": {"px": 1, "em": 1, "%": 1},
2017
+ "table-layout": {"fixed": 1, "auto": 1},
2018
+ "text-decoration": {"none": 1, "underline": 1, "line-through": 1, "blink": 1},
2019
+ "text-align": {"left": 1, "right": 1, "center": 1, "justify": 1},
2020
+ "text-transform": {"capitalize": 1, "uppercase": 1, "lowercase": 1, "none": 1},
2021
+ "top": {"px": 1, "em": 1, "%": 1},
2022
+ "vertical-align": {"top": 1, "bottom": 1},
2023
+ "visibility": {"hidden": 1, "visible": 1},
2024
+ "white-space": {"nowrap": 1, "normal": 1, "pre": 1, "pre-line": 1, "pre-wrap": 1},
2025
+ "width": {"px": 1, "em": 1, "%": 1},
2026
+ "word-spacing": {"normal": 1},
2027
+ "filter": {"alpha(opacity=$0100)": 1},
2028
+
2029
+ "text-shadow": {"$02px 2px 2px #777": 1},
2030
+ "text-overflow": {"ellipsis-word": 1, "clip": 1, "ellipsis": 1},
2031
+ "-moz-border-radius": 1,
2032
+ "-moz-border-radius-topright": 1,
2033
+ "-moz-border-radius-bottomright": 1,
2034
+ "-moz-border-radius-topleft": 1,
2035
+ "-moz-border-radius-bottomleft": 1,
2036
+ "-webkit-border-radius": 1,
2037
+ "-webkit-border-top-right-radius": 1,
2038
+ "-webkit-border-top-left-radius": 1,
2039
+ "-webkit-border-bottom-right-radius": 1,
2040
+ "-webkit-border-bottom-left-radius": 1,
2041
+ "-moz-box-shadow": 1,
2042
+ "-webkit-box-shadow": 1,
2043
+ "transform": {"rotate($00deg)": 1, "skew($00deg)": 1},
2044
+ "-moz-transform": {"rotate($00deg)": 1, "skew($00deg)": 1},
2045
+ "-webkit-transform": {"rotate($00deg)": 1, "skew($00deg)": 1 }
2046
+ };
2047
+
2048
+ var CssCompletions = function() {
2049
+
2050
+ };
2051
+
2052
+ (function() {
2053
+
2054
+ this.completionsDefined = false;
2055
+
2056
+ this.defineCompletions = function() {
2057
+ if (document) {
2058
+ var style = document.createElement('c').style;
2059
+
2060
+ for (var i in style) {
2061
+ if (typeof style[i] !== 'string')
2062
+ continue;
2063
+
2064
+ var name = i.replace(/[A-Z]/g, function(x) {
2065
+ return '-' + x.toLowerCase();
2066
+ });
2067
+
2068
+ if (!propertyMap.hasOwnProperty(name))
2069
+ propertyMap[name] = 1;
2070
+ }
2071
+ }
2072
+
2073
+ this.completionsDefined = true;
2074
+ }
2075
+
2076
+ this.getCompletions = function(state, session, pos, prefix) {
2077
+ if (!this.completionsDefined) {
2078
+ this.defineCompletions();
2079
+ }
2080
+
2081
+ var token = session.getTokenAt(pos.row, pos.column);
2082
+
2083
+ if (!token)
2084
+ return [];
2085
+ if (state==='ruleset'){
2086
+ var line = session.getLine(pos.row).substr(0, pos.column);
2087
+ if (/:[^;]+$/.test(line)) {
2088
+ /([\w\-]+):[^:]*$/.test(line);
2089
+
2090
+ return this.getPropertyValueCompletions(state, session, pos, prefix);
2091
+ } else {
2092
+ return this.getPropertyCompletions(state, session, pos, prefix);
2093
+ }
2094
+ }
2095
+
2096
+ return [];
2097
+ };
2098
+
2099
+ this.getPropertyCompletions = function(state, session, pos, prefix) {
2100
+ var properties = Object.keys(propertyMap);
2101
+ return properties.map(function(property){
2102
+ return {
2103
+ caption: property,
2104
+ snippet: property + ': $0',
2105
+ meta: "property",
2106
+ score: Number.MAX_VALUE
2107
+ };
2108
+ });
2109
+ };
2110
+
2111
+ this.getPropertyValueCompletions = function(state, session, pos, prefix) {
2112
+ var line = session.getLine(pos.row).substr(0, pos.column);
2113
+ var property = (/([\w\-]+):[^:]*$/.exec(line) || {})[1];
2114
+
2115
+ if (!property)
2116
+ return [];
2117
+ var values = [];
2118
+ if (property in propertyMap && typeof propertyMap[property] === "object") {
2119
+ values = Object.keys(propertyMap[property]);
2120
+ }
2121
+ return values.map(function(value){
2122
+ return {
2123
+ caption: value,
2124
+ snippet: value,
2125
+ meta: "property value",
2126
+ score: Number.MAX_VALUE
2127
+ };
2128
+ });
2129
+ };
2130
+
2131
+ }).call(CssCompletions.prototype);
2132
+
2133
+ exports.CssCompletions = CssCompletions;
2134
+ });
2135
+
1835
2136
  define("ace/mode/behaviour/css",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/mode/behaviour/cstyle","ace/token_iterator"], function(require, exports, module) {
1836
2137
  "use strict";
1837
2138
 
@@ -1911,7 +2212,7 @@ oop.inherits(CssBehaviour, CstyleBehaviour);
1911
2212
  exports.CssBehaviour = CssBehaviour;
1912
2213
  });
1913
2214
 
1914
- define("ace/mode/css",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/css_highlight_rules","ace/mode/matching_brace_outdent","ace/worker/worker_client","ace/mode/behaviour/css","ace/mode/folding/cstyle"], function(require, exports, module) {
2215
+ define("ace/mode/css",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/css_highlight_rules","ace/mode/matching_brace_outdent","ace/worker/worker_client","ace/mode/css_completions","ace/mode/behaviour/css","ace/mode/folding/cstyle"], function(require, exports, module) {
1915
2216
  "use strict";
1916
2217
 
1917
2218
  var oop = require("../lib/oop");
@@ -1919,6 +2220,7 @@ var TextMode = require("./text").Mode;
1919
2220
  var CssHighlightRules = require("./css_highlight_rules").CssHighlightRules;
1920
2221
  var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
1921
2222
  var WorkerClient = require("../worker/worker_client").WorkerClient;
2223
+ var CssCompletions = require("./css_completions").CssCompletions;
1922
2224
  var CssBehaviour = require("./behaviour/css").CssBehaviour;
1923
2225
  var CStyleFoldMode = require("./folding/cstyle").FoldMode;
1924
2226
 
@@ -1926,6 +2228,7 @@ var Mode = function() {
1926
2228
  this.HighlightRules = CssHighlightRules;
1927
2229
  this.$outdent = new MatchingBraceOutdent();
1928
2230
  this.$behaviour = new CssBehaviour();
2231
+ this.$completer = new CssCompletions();
1929
2232
  this.foldingRules = new CStyleFoldMode();
1930
2233
  };
1931
2234
  oop.inherits(Mode, TextMode);
@@ -1958,6 +2261,10 @@ oop.inherits(Mode, TextMode);
1958
2261
  this.$outdent.autoOutdent(doc, row);
1959
2262
  };
1960
2263
 
2264
+ this.getCompletions = function(state, session, pos, prefix) {
2265
+ return this.$completer.getCompletions(state, session, pos, prefix);
2266
+ };
2267
+
1961
2268
  this.createWorker = function(session) {
1962
2269
  var worker = new WorkerClient(["ace"], "ace/mode/css_worker", "Worker");
1963
2270
  worker.attachToDocument(session.getDocument());
@@ -2017,7 +2324,7 @@ var HtmlHighlightRules = function() {
2017
2324
  include : "tag_whitespace"
2018
2325
  }, {
2019
2326
  token : "entity.other.attribute-name.xml",
2020
- regex : "[-_a-zA-Z0-9:]+"
2327
+ regex : "[-_a-zA-Z0-9:.]+"
2021
2328
  }, {
2022
2329
  token : "keyword.operator.attribute-equals.xml",
2023
2330
  regex : "=",
@@ -2041,7 +2348,7 @@ var HtmlHighlightRules = function() {
2041
2348
  return ["meta.tag.punctuation." + (start == "<" ? "" : "end-") + "tag-open.xml",
2042
2349
  "meta.tag" + (group ? "." + group : "") + ".tag-name.xml"];
2043
2350
  },
2044
- regex : "(</?)([-_a-zA-Z0-9:]+)",
2351
+ regex : "(</?)([-_a-zA-Z0-9:.]+)",
2045
2352
  next: "tag_stuff"
2046
2353
  }],
2047
2354
  tag_stuff: [
@@ -2051,7 +2358,7 @@ var HtmlHighlightRules = function() {
2051
2358
  });
2052
2359
 
2053
2360
  this.embedTagRules(CssHighlightRules, "css-", "style");
2054
- this.embedTagRules(JavaScriptHighlightRules, "js-", "script");
2361
+ this.embedTagRules(new JavaScriptHighlightRules({noJSX: true}).getRules(), "js-", "script");
2055
2362
 
2056
2363
  if (this.constructor === HtmlHighlightRules)
2057
2364
  this.normalizeRules();
@@ -2225,118 +2532,120 @@ var eventAttributes = [
2225
2532
  var globalAttributes = commonAttributes.concat(eventAttributes);
2226
2533
 
2227
2534
  var attributeMap = {
2228
- "html": ["manifest"],
2229
- "head": [],
2230
- "title": [],
2231
- "base": ["href", "target"],
2232
- "link": ["href", "hreflang", "rel", "media", "type", "sizes"],
2233
- "meta": ["http-equiv", "name", "content", "charset"],
2234
- "style": ["type", "media", "scoped"],
2235
- "script": ["charset", "type", "src", "defer", "async"],
2236
- "noscript": ["href"],
2237
- "body": ["onafterprint", "onbeforeprint", "onbeforeunload", "onhashchange", "onmessage", "onoffline", "onpopstate", "onredo", "onresize", "onstorage", "onundo", "onunload"],
2238
- "section": [],
2239
- "nav": [],
2240
- "article": ["pubdate"],
2241
- "aside": [],
2242
- "h1": [],
2243
- "h2": [],
2244
- "h3": [],
2245
- "h4": [],
2246
- "h5": [],
2247
- "h6": [],
2248
- "header": [],
2249
- "footer": [],
2250
- "address": [],
2251
- "main": [],
2252
- "p": [],
2253
- "hr": [],
2254
- "pre": [],
2255
- "blockquote": ["cite"],
2256
- "ol": ["start", "reversed"],
2257
- "ul": [],
2258
- "li": ["value"],
2259
- "dl": [],
2260
- "dt": [],
2261
- "dd": [],
2262
- "figure": [],
2263
- "figcaption": [],
2264
- "div": [],
2265
- "a": ["href", "target", "ping", "rel", "media", "hreflang", "type"],
2266
- "em": [],
2267
- "strong": [],
2268
- "small": [],
2269
- "s": [],
2270
- "cite": [],
2271
- "q": ["cite"],
2272
- "dfn": [],
2273
- "abbr": [],
2274
- "data": [],
2275
- "time": ["datetime"],
2276
- "code": [],
2277
- "var": [],
2278
- "samp": [],
2279
- "kbd": [],
2280
- "sub": [],
2281
- "sup": [],
2282
- "i": [],
2283
- "b": [],
2284
- "u": [],
2285
- "mark": [],
2286
- "ruby": [],
2287
- "rt": [],
2288
- "rp": [],
2289
- "bdi": [],
2290
- "bdo": [],
2291
- "span": [],
2292
- "br": [],
2293
- "wbr": [],
2294
- "ins": ["cite", "datetime"],
2295
- "del": ["cite", "datetime"],
2296
- "img": ["alt", "src", "height", "width", "usemap", "ismap"],
2297
- "iframe": ["name", "src", "height", "width", "sandbox", "seamless"],
2298
- "embed": ["src", "height", "width", "type"],
2299
- "object": ["param", "data", "type", "height" , "width", "usemap", "name", "form", "classid"],
2300
- "param": ["name", "value"],
2301
- "video": ["src", "autobuffer", "autoplay", "loop", "controls", "width", "height", "poster"],
2302
- "audio": ["src", "autobuffer", "autoplay", "loop", "controls"],
2303
- "source": ["src", "type", "media"],
2304
- "track": ["kind", "src", "srclang", "label", "default"],
2305
- "canvas": ["width", "height"],
2306
- "map": ["name"],
2307
- "area": ["shape", "coords", "href", "hreflang", "alt", "target", "media", "rel", "ping", "type"],
2308
- "svg": [],
2309
- "math": [],
2310
- "table": ["summary"],
2311
- "caption": [],
2312
- "colgroup": ["span"],
2313
- "col": ["span"],
2314
- "tbody": [],
2315
- "thead": [],
2316
- "tfoot": [],
2317
- "tr": [],
2318
- "td": ["headers", "rowspan", "colspan"],
2319
- "th": ["headers", "rowspan", "colspan", "scope"],
2320
- "form": ["accept-charset", "action", "autocomplete", "enctype", "method", "name", "novalidate", "target"],
2321
- "fieldset": ["disabled", "form", "name"],
2322
- "legend": [],
2323
- "label": ["form", "for"],
2324
- "input": ["type", "accept", "alt", "autocomplete", "checked", "disabled", "form", "formaction", "formenctype", "formmethod", "formnovalidate", "formtarget", "height", "list", "max", "maxlength", "min", "multiple", "pattern", "placeholder", "readonly", "required", "size", "src", "step", "width", "files", "value"],
2325
- "button": ["autofocus", "disabled", "form", "formaction", "formenctype", "formmethod", "formnovalidate", "formtarget", "name", "value", "type"],
2326
- "select": ["autofocus", "disabled", "form", "multiple", "name", "size"],
2327
- "datalist": [],
2328
- "optgroup": ["disabled", "label"],
2329
- "option": ["disabled", "selected", "label", "value"],
2330
- "textarea": ["autofocus", "disabled", "form", "maxlength", "name", "placeholder", "readonly", "required", "rows", "cols", "wrap"],
2331
- "keygen": ["autofocus", "challenge", "disabled", "form", "keytype", "name"],
2332
- "output": ["for", "form", "name"],
2333
- "progress": ["value", "max"],
2334
- "meter": ["value", "min", "max", "low", "high", "optimum"],
2335
- "details": ["open"],
2336
- "summary": [],
2337
- "command": ["type", "label", "icon", "disabled", "checked", "radiogroup", "command"],
2338
- "menu": ["type", "label"],
2339
- "dialog": ["open"]
2535
+ "html": {"manifest": 1},
2536
+ "head": {},
2537
+ "title": {},
2538
+ "base": {"href": 1, "target": 1},
2539
+ "link": {"href": 1, "hreflang": 1, "rel": {"stylesheet": 1, "icon": 1}, "media": {"all": 1, "screen": 1, "print": 1}, "type": {"text/css": 1, "image/png": 1, "image/jpeg": 1, "image/gif": 1}, "sizes": 1},
2540
+ "meta": {"http-equiv": {"content-type": 1}, "name": {"description": 1, "keywords": 1}, "content": {"text/html; charset=UTF-8": 1}, "charset": 1},
2541
+ "style": {"type": 1, "media": {"all": 1, "screen": 1, "print": 1}, "scoped": 1},
2542
+ "script": {"charset": 1, "type": {"text/javascript": 1}, "src": 1, "defer": 1, "async": 1},
2543
+ "noscript": {"href": 1},
2544
+ "body": {"onafterprint": 1, "onbeforeprint": 1, "onbeforeunload": 1, "onhashchange": 1, "onmessage": 1, "onoffline": 1, "onpopstate": 1, "onredo": 1, "onresize": 1, "onstorage": 1, "onundo": 1, "onunload": 1},
2545
+ "section": {},
2546
+ "nav": {},
2547
+ "article": {"pubdate": 1},
2548
+ "aside": {},
2549
+ "h1": {},
2550
+ "h2": {},
2551
+ "h3": {},
2552
+ "h4": {},
2553
+ "h5": {},
2554
+ "h6": {},
2555
+ "header": {},
2556
+ "footer": {},
2557
+ "address": {},
2558
+ "main": {},
2559
+ "p": {},
2560
+ "hr": {},
2561
+ "pre": {},
2562
+ "blockquote": {"cite": 1},
2563
+ "ol": {"start": 1, "reversed": 1},
2564
+ "ul": {},
2565
+ "li": {"value": 1},
2566
+ "dl": {},
2567
+ "dt": {},
2568
+ "dd": {},
2569
+ "figure": {},
2570
+ "figcaption": {},
2571
+ "div": {},
2572
+ "a": {"href": 1, "target": {"_blank": 1, "top": 1}, "ping": 1, "rel": {"nofollow": 1, "alternate": 1, "author": 1, "bookmark": 1, "help": 1, "license": 1, "next": 1, "noreferrer": 1, "prefetch": 1, "prev": 1, "search": 1, "tag": 1}, "media": 1, "hreflang": 1, "type": 1},
2573
+ "em": {},
2574
+ "strong": {},
2575
+ "small": {},
2576
+ "s": {},
2577
+ "cite": {},
2578
+ "q": {"cite": 1},
2579
+ "dfn": {},
2580
+ "abbr": {},
2581
+ "data": {},
2582
+ "time": {"datetime": 1},
2583
+ "code": {},
2584
+ "var": {},
2585
+ "samp": {},
2586
+ "kbd": {},
2587
+ "sub": {},
2588
+ "sup": {},
2589
+ "i": {},
2590
+ "b": {},
2591
+ "u": {},
2592
+ "mark": {},
2593
+ "ruby": {},
2594
+ "rt": {},
2595
+ "rp": {},
2596
+ "bdi": {},
2597
+ "bdo": {},
2598
+ "span": {},
2599
+ "br": {},
2600
+ "wbr": {},
2601
+ "ins": {"cite": 1, "datetime": 1},
2602
+ "del": {"cite": 1, "datetime": 1},
2603
+ "img": {"alt": 1, "src": 1, "height": 1, "width": 1, "usemap": 1, "ismap": 1},
2604
+ "iframe": {"name": 1, "src": 1, "height": 1, "width": 1, "sandbox": {"allow-same-origin": 1, "allow-top-navigation": 1, "allow-forms": 1, "allow-scripts": 1}, "seamless": {"seamless": 1}},
2605
+ "embed": {"src": 1, "height": 1, "width": 1, "type": 1},
2606
+ "object": {"param": 1, "data": 1, "type": 1, "height" : 1, "width": 1, "usemap": 1, "name": 1, "form": 1, "classid": 1},
2607
+ "param": {"name": 1, "value": 1},
2608
+ "video": {"src": 1, "autobuffer": 1, "autoplay": {"autoplay": 1}, "loop": {"loop": 1}, "controls": {"controls": 1}, "width": 1, "height": 1, "poster": 1, "muted": {"muted": 1}, "preload": {"auto": 1, "metadata": 1, "none": 1}},
2609
+ "audio": {"src": 1, "autobuffer": 1, "autoplay": {"autoplay": 1}, "loop": {"loop": 1}, "controls": {"controls": 1}, "muted": {"muted": 1}, "preload": {"auto": 1, "metadata": 1, "none": 1 }},
2610
+ "source": {"src": 1, "type": 1, "media": 1},
2611
+ "track": {"kind": 1, "src": 1, "srclang": 1, "label": 1, "default": 1},
2612
+ "canvas": {"width": 1, "height": 1},
2613
+ "map": {"name": 1},
2614
+ "area": {"shape": 1, "coords": 1, "href": 1, "hreflang": 1, "alt": 1, "target": 1, "media": 1, "rel": 1, "ping": 1, "type": 1},
2615
+ "svg": {},
2616
+ "math": {},
2617
+ "table": {"summary": 1},
2618
+ "caption": {},
2619
+ "colgroup": {"span": 1},
2620
+ "col": {"span": 1},
2621
+ "tbody": {},
2622
+ "thead": {},
2623
+ "tfoot": {},
2624
+ "tr": {},
2625
+ "td": {"headers": 1, "rowspan": 1, "colspan": 1},
2626
+ "th": {"headers": 1, "rowspan": 1, "colspan": 1, "scope": 1},
2627
+ "form": {"accept-charset": 1, "action": 1, "autocomplete": 1, "enctype": {"multipart/form-data": 1, "application/x-www-form-urlencoded": 1}, "method": {"get": 1, "post": 1}, "name": 1, "novalidate": 1, "target": {"_blank": 1, "top": 1}},
2628
+ "fieldset": {"disabled": 1, "form": 1, "name": 1},
2629
+ "legend": {},
2630
+ "label": {"form": 1, "for": 1},
2631
+ "input": {
2632
+ "type": {"text": 1, "password": 1, "hidden": 1, "checkbox": 1, "submit": 1, "radio": 1, "file": 1, "button": 1, "reset": 1, "image": 31, "color": 1, "date": 1, "datetime": 1, "datetime-local": 1, "email": 1, "month": 1, "number": 1, "range": 1, "search": 1, "tel": 1, "time": 1, "url": 1, "week": 1},
2633
+ "accept": 1, "alt": 1, "autocomplete": {"on": 1, "off": 1}, "autofocus": {"autofocus": 1}, "checked": {"checked": 1}, "disabled": {"disabled": 1}, "form": 1, "formaction": 1, "formenctype": {"application/x-www-form-urlencoded": 1, "multipart/form-data": 1, "text/plain": 1}, "formmethod": {"get": 1, "post": 1}, "formnovalidate": {"formnovalidate": 1}, "formtarget": {"_blank": 1, "_self": 1, "_parent": 1, "_top": 1}, "height": 1, "list": 1, "max": 1, "maxlength": 1, "min": 1, "multiple": {"multiple": 1}, "pattern": 1, "placeholder": 1, "readonly": {"readonly": 1}, "required": {"required": 1}, "size": 1, "src": 1, "step": 1, "width": 1, "files": 1, "value": 1},
2634
+ "button": {"autofocus": 1, "disabled": {"disabled": 1}, "form": 1, "formaction": 1, "formenctype": 1, "formmethod": 1, "formnovalidate": 1, "formtarget": 1, "name": 1, "value": 1, "type": {"button": 1, "submit": 1}},
2635
+ "select": {"autofocus": 1, "disabled": 1, "form": 1, "multiple": {"multiple": 1}, "name": 1, "size": 1, "readonly":{"readonly": 1}},
2636
+ "datalist": {},
2637
+ "optgroup": {"disabled": 1, "label": 1},
2638
+ "option": {"disabled": 1, "selected": 1, "label": 1, "value": 1},
2639
+ "textarea": {"autofocus": {"autofocus": 1}, "disabled": {"disabled": 1}, "form": 1, "maxlength": 1, "name": 1, "placeholder": 1, "readonly": {"readonly": 1}, "required": {"required": 1}, "rows": 1, "cols": 1, "wrap": {"on": 1, "off": 1, "hard": 1, "soft": 1}},
2640
+ "keygen": {"autofocus": 1, "challenge": {"challenge": 1}, "disabled": {"disabled": 1}, "form": 1, "keytype": {"rsa": 1, "dsa": 1, "ec": 1}, "name": 1},
2641
+ "output": {"for": 1, "form": 1, "name": 1},
2642
+ "progress": {"value": 1, "max": 1},
2643
+ "meter": {"value": 1, "min": 1, "max": 1, "low": 1, "high": 1, "optimum": 1},
2644
+ "details": {"open": 1},
2645
+ "summary": {},
2646
+ "command": {"type": 1, "label": 1, "icon": 1, "disabled": 1, "checked": 1, "radiogroup": 1, "command": 1},
2647
+ "menu": {"type": 1, "label": 1},
2648
+ "dialog": {"open": 1}
2340
2649
  };
2341
2650
 
2342
2651
  var elements = Object.keys(attributeMap);
@@ -2355,6 +2664,16 @@ function findTagName(session, pos) {
2355
2664
  return token.value;
2356
2665
  }
2357
2666
 
2667
+ function findAttributeName(session, pos) {
2668
+ var iterator = new TokenIterator(session, pos.row, pos.column);
2669
+ var token = iterator.getCurrentToken();
2670
+ while (token && !is(token, "attribute-name")){
2671
+ token = iterator.stepBackward();
2672
+ }
2673
+ if (token)
2674
+ return token.value;
2675
+ }
2676
+
2358
2677
  var HtmlCompletions = function() {
2359
2678
 
2360
2679
  };
@@ -2369,7 +2688,12 @@ var HtmlCompletions = function() {
2369
2688
  if (is(token, "tag-name") || is(token, "tag-open") || is(token, "end-tag-open"))
2370
2689
  return this.getTagCompletions(state, session, pos, prefix);
2371
2690
  if (is(token, "tag-whitespace") || is(token, "attribute-name"))
2372
- return this.getAttributeCompetions(state, session, pos, prefix);
2691
+ return this.getAttributeCompletions(state, session, pos, prefix);
2692
+ if (is(token, "attribute-value"))
2693
+ return this.getAttributeValueCompletions(state, session, pos, prefix);
2694
+ var line = session.getLine(pos.row).substr(0, pos.column);
2695
+ if (/&[A-z]*$/i.test(line))
2696
+ return this.getHTMLEntityCompletions(state, session, pos, prefix);
2373
2697
 
2374
2698
  return [];
2375
2699
  };
@@ -2384,13 +2708,13 @@ var HtmlCompletions = function() {
2384
2708
  });
2385
2709
  };
2386
2710
 
2387
- this.getAttributeCompetions = function(state, session, pos, prefix) {
2711
+ this.getAttributeCompletions = function(state, session, pos, prefix) {
2388
2712
  var tagName = findTagName(session, pos);
2389
2713
  if (!tagName)
2390
2714
  return [];
2391
2715
  var attributes = globalAttributes;
2392
2716
  if (tagName in attributeMap) {
2393
- attributes = attributes.concat(attributeMap[tagName]);
2717
+ attributes = attributes.concat(Object.keys(attributeMap[tagName]));
2394
2718
  }
2395
2719
  return attributes.map(function(attribute){
2396
2720
  return {
@@ -2402,6 +2726,39 @@ var HtmlCompletions = function() {
2402
2726
  });
2403
2727
  };
2404
2728
 
2729
+ this.getAttributeValueCompletions = function(state, session, pos, prefix) {
2730
+ var tagName = findTagName(session, pos);
2731
+ var attributeName = findAttributeName(session, pos);
2732
+
2733
+ if (!tagName)
2734
+ return [];
2735
+ var values = [];
2736
+ if (tagName in attributeMap && attributeName in attributeMap[tagName] && typeof attributeMap[tagName][attributeName] === "object") {
2737
+ values = Object.keys(attributeMap[tagName][attributeName]);
2738
+ }
2739
+ return values.map(function(value){
2740
+ return {
2741
+ caption: value,
2742
+ snippet: value,
2743
+ meta: "attribute value",
2744
+ score: Number.MAX_VALUE
2745
+ };
2746
+ });
2747
+ };
2748
+
2749
+ this.getHTMLEntityCompletions = function(state, session, pos, prefix) {
2750
+ var values = ['&Aacute;', '&aacute;', '&Acirc;', '&acirc;', '&acute;', '&AElig;', '&aelig;', '&Agrave;', '&agrave;', '&alefsym;', '&Alpha;', '&alpha;', '&amp;', '&and;', '&ang;', '&Aring;', '&aring;', '&asymp;', '&Atilde;', '&atilde;', '&Auml;', '&auml;', '&bdquo;', '&Beta;', '&beta;', '&brvbar;', '&bull;', '&cap;', '&Ccedil;', '&ccedil;', '&cedil;', '&cent;', '&Chi;', '&chi;', '&circ;', '&clubs;', '&cong;', '&copy;', '&crarr;', '&cup;', '&curren;', '&Dagger;', '&dagger;', '&dArr;', '&darr;', '&deg;', '&Delta;', '&delta;', '&diams;', '&divide;', '&Eacute;', '&eacute;', '&Ecirc;', '&ecirc;', '&Egrave;', '&egrave;', '&empty;', '&emsp;', '&ensp;', '&Epsilon;', '&epsilon;', '&equiv;', '&Eta;', '&eta;', '&ETH;', '&eth;', '&Euml;', '&euml;', '&euro;', '&exist;', '&fnof;', '&forall;', '&frac12;', '&frac14;', '&frac34;', '&frasl;', '&Gamma;', '&gamma;', '&ge;', '&gt;', '&hArr;', '&harr;', '&hearts;', '&hellip;', '&Iacute;', '&iacute;', '&Icirc;', '&icirc;', '&iexcl;', '&Igrave;', '&igrave;', '&image;', '&infin;', '&int;', '&Iota;', '&iota;', '&iquest;', '&isin;', '&Iuml;', '&iuml;', '&Kappa;', '&kappa;', '&Lambda;', '&lambda;', '&lang;', '&laquo;', '&lArr;', '&larr;', '&lceil;', '&ldquo;', '&le;', '&lfloor;', '&lowast;', '&loz;', '&lrm;', '&lsaquo;', '&lsquo;', '&lt;', '&macr;', '&mdash;', '&micro;', '&middot;', '&minus;', '&Mu;', '&mu;', '&nabla;', '&nbsp;', '&ndash;', '&ne;', '&ni;', '&not;', '&notin;', '&nsub;', '&Ntilde;', '&ntilde;', '&Nu;', '&nu;', '&Oacute;', '&oacute;', '&Ocirc;', '&ocirc;', '&OElig;', '&oelig;', '&Ograve;', '&ograve;', '&oline;', '&Omega;', '&omega;', '&Omicron;', '&omicron;', '&oplus;', '&or;', '&ordf;', '&ordm;', '&Oslash;', '&oslash;', '&Otilde;', '&otilde;', '&otimes;', '&Ouml;', '&ouml;', '&para;', '&part;', '&permil;', '&perp;', '&Phi;', '&phi;', '&Pi;', '&pi;', '&piv;', '&plusmn;', '&pound;', '&Prime;', '&prime;', '&prod;', '&prop;', '&Psi;', '&psi;', '&quot;', '&radic;', '&rang;', '&raquo;', '&rArr;', '&rarr;', '&rceil;', '&rdquo;', '&real;', '&reg;', '&rfloor;', '&Rho;', '&rho;', '&rlm;', '&rsaquo;', '&rsquo;', '&sbquo;', '&Scaron;', '&scaron;', '&sdot;', '&sect;', '&shy;', '&Sigma;', '&sigma;', '&sigmaf;', '&sim;', '&spades;', '&sub;', '&sube;', '&sum;', '&sup;', '&sup1;', '&sup2;', '&sup3;', '&supe;', '&szlig;', '&Tau;', '&tau;', '&there4;', '&Theta;', '&theta;', '&thetasym;', '&thinsp;', '&THORN;', '&thorn;', '&tilde;', '&times;', '&trade;', '&Uacute;', '&uacute;', '&uArr;', '&uarr;', '&Ucirc;', '&ucirc;', '&Ugrave;', '&ugrave;', '&uml;', '&upsih;', '&Upsilon;', '&upsilon;', '&Uuml;', '&uuml;', '&weierp;', '&Xi;', '&xi;', '&Yacute;', '&yacute;', '&yen;', '&Yuml;', '&yuml;', '&Zeta;', '&zeta;', '&zwj;', '&zwnj;'];
2751
+
2752
+ return values.map(function(value){
2753
+ return {
2754
+ caption: value,
2755
+ snippet: value.substr(1),
2756
+ meta: "html entity",
2757
+ score: Number.MAX_VALUE
2758
+ };
2759
+ });
2760
+ };
2761
+
2405
2762
  }).call(HtmlCompletions.prototype);
2406
2763
 
2407
2764
  exports.HtmlCompletions = HtmlCompletions;
@@ -2586,6 +2943,7 @@ var MarkdownHighlightRules = function() {
2586
2943
  }],
2587
2944
  "allowBlock": [
2588
2945
  {token : "support.function", regex : "^ {4}.+", next : "allowBlock"},
2946
+ {token : "empty_line", regex : '^$', next: "allowBlock"},
2589
2947
  {token : "empty", regex : "", next : "start"}
2590
2948
  ],
2591
2949