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();
@@ -196,7 +242,7 @@ oop.inherits(FoldMode, BaseFoldMode);
196
242
  this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
197
243
  this.singleLineBlockCommentRe= /^\s*(\/\*).*\*\/\s*$/;
198
244
  this.tripleStarBlockCommentRe = /^\s*(\/\*\*\*).*\*\/\s*$/;
199
- this.startRegionRe = /^\s*(\/\*|\/\/)#region\b/;
245
+ this.startRegionRe = /^\s*(\/\*|\/\/)#?region\b/;
200
246
  this._getFoldWidgetBase = this.getFoldWidget;
201
247
  this.getFoldWidget = function(session, foldStyle, row) {
202
248
  var line = session.getLine(row);
@@ -284,13 +330,12 @@ oop.inherits(FoldMode, BaseFoldMode);
284
330
 
285
331
  return new Range(startRow, startColumn, endRow, session.getLine(endRow).length);
286
332
  };
287
-
288
333
  this.getCommentRegionBlock = function(session, line, row) {
289
334
  var startColumn = line.search(/\s*$/);
290
335
  var maxRow = session.getLength();
291
336
  var startRow = row;
292
337
 
293
- var re = /^\s*(?:\/\*|\/\/)#(end)?region\b/;
338
+ var re = /^\s*(?:\/\*|\/\/|--)#?(end)?region\b/;
294
339
  var depth = 1;
295
340
  while (++row < maxRow) {
296
341
  line = session.getLine(row);
@@ -552,8 +597,8 @@ var CstyleBehaviour = function() {
552
597
  if (leftChar == "\\" && token && /escape/.test(token.type))
553
598
  return null;
554
599
 
555
- var stringBefore = token && /string/.test(token.type);
556
- var stringAfter = !rightToken || /string/.test(rightToken.type);
600
+ var stringBefore = token && /string|escape/.test(token.type);
601
+ var stringAfter = !rightToken || /string|escape/.test(rightToken.type);
557
602
 
558
603
  var pair;
559
604
  if (rightChar == quote) {
@@ -766,7 +811,7 @@ var DockerfileHighlightRules = function() {
766
811
  if (startRules[i].token == "variable.language") {
767
812
  startRules.splice(i, 0, {
768
813
  token: "constant.language",
769
- regex: "(?:^(?:FROM|MAINTAINER|RUN|CMD|EXPOSE|ENV|ADD|ENTRYPOINT|VOLUME|USER|WORKDIR|ONBUILD|COPY)\\b)",
814
+ regex: "(?:^(?:FROM|MAINTAINER|RUN|CMD|EXPOSE|ENV|ADD|ENTRYPOINT|VOLUME|USER|WORKDIR|ONBUILD|COPY|LABEL)\\b)",
770
815
  caseInsensitive: true
771
816
  });
772
817
  break;
@@ -240,7 +240,7 @@ oop.inherits(FoldMode, BaseFoldMode);
240
240
  this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
241
241
  this.singleLineBlockCommentRe= /^\s*(\/\*).*\*\/\s*$/;
242
242
  this.tripleStarBlockCommentRe = /^\s*(\/\*\*\*).*\*\/\s*$/;
243
- this.startRegionRe = /^\s*(\/\*|\/\/)#region\b/;
243
+ this.startRegionRe = /^\s*(\/\*|\/\/)#?region\b/;
244
244
  this._getFoldWidgetBase = this.getFoldWidget;
245
245
  this.getFoldWidget = function(session, foldStyle, row) {
246
246
  var line = session.getLine(row);
@@ -328,13 +328,12 @@ oop.inherits(FoldMode, BaseFoldMode);
328
328
 
329
329
  return new Range(startRow, startColumn, endRow, session.getLine(endRow).length);
330
330
  };
331
-
332
331
  this.getCommentRegionBlock = function(session, line, row) {
333
332
  var startColumn = line.search(/\s*$/);
334
333
  var maxRow = session.getLength();
335
334
  var startRow = row;
336
335
 
337
- var re = /^\s*(?:\/\*|\/\/)#(end)?region\b/;
336
+ var re = /^\s*(?:\/\*|\/\/|--)#?(end)?region\b/;
338
337
  var depth = 1;
339
338
  while (++row < maxRow) {
340
339
  line = session.getLine(row);
@@ -198,6 +198,7 @@ define("ace/mode/javascript_highlight_rules",["require","exports","module","ace/
198
198
  var oop = require("../lib/oop");
199
199
  var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
200
200
  var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
201
+ var identifierRe = "[a-zA-Z\\$_\u00a1-\uffff][a-zA-Z\\d\\$_\u00a1-\uffff]*\\b";
201
202
 
202
203
  var JavaScriptHighlightRules = function(options) {
203
204
  var keywordMapper = this.createKeywordMapper({
@@ -227,7 +228,6 @@ var JavaScriptHighlightRules = function(options) {
227
228
  "constant.language.boolean": "true|false"
228
229
  }, "identifier");
229
230
  var kwBeforeRe = "case|do|else|finally|in|instanceof|return|throw|try|typeof|yield|void";
230
- var identifierRe = "[a-zA-Z\\$_\u00a1-\uffff][a-zA-Z\\d\\$_\u00a1-\uffff]*\\b";
231
231
 
232
232
  var escapedRe = "\\\\(?:x[0-9a-fA-F]{2}|" + // hex
233
233
  "u[0-9a-fA-F]{4}|" + // unicode
@@ -315,15 +315,6 @@ var JavaScriptHighlightRules = function(options) {
315
315
  token : "keyword",
316
316
  regex : "(?:" + kwBeforeRe + ")\\b",
317
317
  next : "start"
318
- }, {
319
- token : ["punctuation.operator", "support.function"],
320
- regex : /(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:op|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/
321
- }, {
322
- token : ["punctuation.operator", "support.function.dom"],
323
- regex : /(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName|ClassName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/
324
- }, {
325
- token : ["punctuation.operator", "support.constant"],
326
- regex : /(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/
327
318
  }, {
328
319
  token : ["support.constant"],
329
320
  regex : /that\b/
@@ -333,9 +324,13 @@ var JavaScriptHighlightRules = function(options) {
333
324
  }, {
334
325
  token : keywordMapper,
335
326
  regex : identifierRe
327
+ }, {
328
+ token : "punctuation.operator",
329
+ regex : /[.](?![.])/,
330
+ next : "property"
336
331
  }, {
337
332
  token : "keyword.operator",
338
- regex : /--|\+\+|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|[!$%&*+\-~\/^]=?/,
333
+ regex : /--|\+\+|\.{3}|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|[!$%&*+\-~\/^]=?/,
339
334
  next : "start"
340
335
  }, {
341
336
  token : "punctuation.operator",
@@ -353,6 +348,38 @@ var JavaScriptHighlightRules = function(options) {
353
348
  regex: /^#!.*$/
354
349
  }
355
350
  ],
351
+ property: [{
352
+ token : "text",
353
+ regex : "\\s+"
354
+ }, {
355
+ token : [
356
+ "storage.type", "punctuation.operator", "entity.name.function", "text",
357
+ "keyword.operator", "text",
358
+ "storage.type", "text", "entity.name.function", "text", "paren.lparen"
359
+ ],
360
+ regex : "(" + identifierRe + ")(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(?:(\\s+)(\\w+))?(\\s*)(\\()",
361
+ next: "function_arguments"
362
+ }, {
363
+ token : "punctuation.operator",
364
+ regex : /[.](?![.])/
365
+ }, {
366
+ token : "support.function",
367
+ 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(?=\()/
368
+ }, {
369
+ token : "support.function.dom",
370
+ 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(?=\()/
371
+ }, {
372
+ token : "support.constant",
373
+ 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/
374
+ }, {
375
+ token : "identifier",
376
+ regex : identifierRe
377
+ }, {
378
+ regex: "",
379
+ token: "empty",
380
+ next: "no_regex"
381
+ }
382
+ ],
356
383
  "start": [
357
384
  DocCommentHighlightRules.getStartRule("doc-start"),
358
385
  {
@@ -507,7 +534,7 @@ var JavaScriptHighlightRules = function(options) {
507
534
  if (val == "}" && stack.length) {
508
535
  stack.shift();
509
536
  this.next = stack.shift();
510
- if (this.next.indexOf("string") != -1)
537
+ if (this.next.indexOf("string") != -1 || this.next.indexOf("jsx") != -1)
511
538
  return "paren.quasi.end";
512
539
  }
513
540
  return val == "{" ? "paren.lparen" : "paren.rparen";
@@ -531,6 +558,9 @@ var JavaScriptHighlightRules = function(options) {
531
558
  defaultToken: "string.quasi"
532
559
  }]
533
560
  });
561
+
562
+ if (!options || !options.noJSX)
563
+ JSX.call(this);
534
564
  }
535
565
 
536
566
  this.embedRules(DocCommentHighlightRules, "doc-",
@@ -541,6 +571,105 @@ var JavaScriptHighlightRules = function(options) {
541
571
 
542
572
  oop.inherits(JavaScriptHighlightRules, TextHighlightRules);
543
573
 
574
+ function JSX() {
575
+ var tagRegex = identifierRe.replace("\\d", "\\d\\-");
576
+ var jsxTag = {
577
+ onMatch : function(val, state, stack) {
578
+ var offset = val.charAt(1) == "/" ? 2 : 1;
579
+ if (offset == 1) {
580
+ if (state != this.nextState)
581
+ stack.unshift(this.next, this.nextState, 0);
582
+ else
583
+ stack.unshift(this.next);
584
+ stack[2]++;
585
+ } else if (offset == 2) {
586
+ if (state == this.nextState) {
587
+ stack[1]--;
588
+ if (!stack[1] || stack[1] < 0) {
589
+ stack.shift();
590
+ stack.shift();
591
+ }
592
+ }
593
+ }
594
+ return [{
595
+ type: "meta.tag.punctuation." + (offset == 1 ? "" : "end-") + "tag-open.xml",
596
+ value: val.slice(0, offset)
597
+ }, {
598
+ type: "meta.tag.tag-name.xml",
599
+ value: val.substr(offset)
600
+ }];
601
+ },
602
+ regex : "</?" + tagRegex + "",
603
+ next: "jsxAttributes",
604
+ nextState: "jsx"
605
+ };
606
+ this.$rules.start.unshift(jsxTag);
607
+ var jsxJsRule = {
608
+ regex: "{",
609
+ token: "paren.quasi.start",
610
+ push: "start"
611
+ };
612
+ this.$rules.jsx = [
613
+ jsxJsRule,
614
+ jsxTag,
615
+ {include : "reference"},
616
+ {defaultToken: "string"}
617
+ ];
618
+ this.$rules.jsxAttributes = [{
619
+ token : "meta.tag.punctuation.tag-close.xml",
620
+ regex : "/?>",
621
+ onMatch : function(value, currentState, stack) {
622
+ if (currentState == stack[0])
623
+ stack.shift();
624
+ if (value.length == 2) {
625
+ if (stack[0] == this.nextState)
626
+ stack[1]--;
627
+ if (!stack[1] || stack[1] < 0) {
628
+ stack.splice(0, 2);
629
+ }
630
+ }
631
+ this.next = stack[0] || "start";
632
+ return [{type: this.token, value: value}];
633
+ },
634
+ nextState: "jsx"
635
+ },
636
+ jsxJsRule,
637
+ {
638
+ token : "entity.other.attribute-name.xml",
639
+ regex : tagRegex
640
+ }, {
641
+ token : "keyword.operator.attribute-equals.xml",
642
+ regex : "="
643
+ }, {
644
+ token : "text.tag-whitespace.xml",
645
+ regex : "\\s+"
646
+ }, {
647
+ token : "string.attribute-value.xml",
648
+ regex : "'",
649
+ stateName : "jsx_attr_q",
650
+ push : [
651
+ {token : "string.attribute-value.xml", regex: "'", next: "pop"},
652
+ jsxJsRule,
653
+ {include : "reference"},
654
+ {defaultToken : "string.attribute-value.xml"}
655
+ ]
656
+ }, {
657
+ token : "string.attribute-value.xml",
658
+ regex : '"',
659
+ stateName : "jsx_attr_qq",
660
+ push : [
661
+ jsxJsRule,
662
+ {token : "string.attribute-value.xml", regex: '"', next: "pop"},
663
+ {include : "reference"},
664
+ {defaultToken : "string.attribute-value.xml"}
665
+ ]
666
+ }];
667
+ this.$rules.reference = [{
668
+ token : "constant.language.escape.reference.xml",
669
+ regex : "(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"
670
+ }];
671
+ }
672
+
544
673
  exports.JavaScriptHighlightRules = JavaScriptHighlightRules;
545
674
  });
546
675
 
@@ -551,8 +680,7 @@ var oop = require("../lib/oop");
551
680
  var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
552
681
 
553
682
  var XmlHighlightRules = function(normalize) {
554
-
555
- var tagRegex = "[a-zA-Z][-_a-zA-Z0-9]*";
683
+ var tagRegex = "[_:a-zA-Z\xc0-\uffff][-_:.a-zA-Z0-9\xc0-\uffff]*";
556
684
 
557
685
  this.$rules = {
558
686
  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();
@@ -1119,8 +1247,8 @@ var CstyleBehaviour = function() {
1119
1247
  if (leftChar == "\\" && token && /escape/.test(token.type))
1120
1248
  return null;
1121
1249
 
1122
- var stringBefore = token && /string/.test(token.type);
1123
- var stringAfter = !rightToken || /string/.test(rightToken.type);
1250
+ var stringBefore = token && /string|escape/.test(token.type);
1251
+ var stringAfter = !rightToken || /string|escape/.test(rightToken.type);
1124
1252
 
1125
1253
  var pair;
1126
1254
  if (rightChar == quote) {
@@ -1261,7 +1389,7 @@ oop.inherits(FoldMode, BaseFoldMode);
1261
1389
  this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
1262
1390
  this.singleLineBlockCommentRe= /^\s*(\/\*).*\*\/\s*$/;
1263
1391
  this.tripleStarBlockCommentRe = /^\s*(\/\*\*\*).*\*\/\s*$/;
1264
- this.startRegionRe = /^\s*(\/\*|\/\/)#region\b/;
1392
+ this.startRegionRe = /^\s*(\/\*|\/\/)#?region\b/;
1265
1393
  this._getFoldWidgetBase = this.getFoldWidget;
1266
1394
  this.getFoldWidget = function(session, foldStyle, row) {
1267
1395
  var line = session.getLine(row);
@@ -1349,13 +1477,12 @@ oop.inherits(FoldMode, BaseFoldMode);
1349
1477
 
1350
1478
  return new Range(startRow, startColumn, endRow, session.getLine(endRow).length);
1351
1479
  };
1352
-
1353
1480
  this.getCommentRegionBlock = function(session, line, row) {
1354
1481
  var startColumn = line.search(/\s*$/);
1355
1482
  var maxRow = session.getLength();
1356
1483
  var startRow = row;
1357
1484
 
1358
- var re = /^\s*(?:\/\*|\/\/)#(end)?region\b/;
1485
+ var re = /^\s*(?:\/\*|\/\/|--)#?(end)?region\b/;
1359
1486
  var depth = 1;
1360
1487
  while (++row < maxRow) {
1361
1488
  line = session.getLine(row);
@@ -1464,6 +1591,180 @@ oop.inherits(Mode, TextMode);
1464
1591
  exports.Mode = Mode;
1465
1592
  });
1466
1593
 
1594
+ define("ace/mode/css_completions",["require","exports","module"], function(require, exports, module) {
1595
+ "use strict";
1596
+
1597
+ var propertyMap = {
1598
+ "background": {"#$0": 1},
1599
+ "background-color": {"#$0": 1, "transparent": 1, "fixed": 1},
1600
+ "background-image": {"url('/$0')": 1},
1601
+ "background-repeat": {"repeat": 1, "repeat-x": 1, "repeat-y": 1, "no-repeat": 1, "inherit": 1},
1602
+ "background-position": {"bottom":2, "center":2, "left":2, "right":2, "top":2, "inherit":2,},
1603
+ "background-attachment": {"scroll": 1, "fixed": 1},
1604
+ "background-size": {"cover": 1, "contain": 1},
1605
+ "background-clip": {"border-box": 1, "padding-box": 1, "content-box": 1},
1606
+ "background-origin": {"border-box": 1, "padding-box": 1, "content-box": 1},
1607
+ "border": {"solid $0": 1, "dashed $0": 1, "dotted $0": 1, "#$0": 1},
1608
+ "border-color": {"#$0": 1},
1609
+ "border-style": {"solid":2, "dashed":2, "dotted":2, "double":2, "groove":2, "hidden":2, "inherit":2, "inset":2, "none":2, "outset":2, "ridged":2,},
1610
+ "border-collapse": {"collapse": 1, "separate": 1},
1611
+ "bottom": {"px": 1, "em": 1, "%": 1},
1612
+ "clear": {"left": 1, "right": 1, "both": 1, "none": 1},
1613
+ "color": {"#$0": 1, "rgb(#$00,0,0)": 1},
1614
+ "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},
1615
+ "display": {"none": 1, "block": 1, "inline": 1, "inline-block": 1, "table-cell": 1},
1616
+ "empty-cells": {"show": 1, "hide": 1},
1617
+ "float": {"left": 1, "right": 1, "none": 1},
1618
+ "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},
1619
+ "font-size": {"px": 1, "em": 1, "%": 1},
1620
+ "font-weight": {"bold": 1, "normal": 1},
1621
+ "font-style": {"italic": 1, "normal": 1},
1622
+ "font-variant": {"normal": 1, "small-caps": 1},
1623
+ "height": {"px": 1, "em": 1, "%": 1},
1624
+ "left": {"px": 1, "em": 1, "%": 1},
1625
+ "letter-spacing": {"normal": 1},
1626
+ "line-height": {"normal": 1},
1627
+ "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},
1628
+ "margin": {"px": 1, "em": 1, "%": 1},
1629
+ "margin-right": {"px": 1, "em": 1, "%": 1},
1630
+ "margin-left": {"px": 1, "em": 1, "%": 1},
1631
+ "margin-top": {"px": 1, "em": 1, "%": 1},
1632
+ "margin-bottom": {"px": 1, "em": 1, "%": 1},
1633
+ "max-height": {"px": 1, "em": 1, "%": 1},
1634
+ "max-width": {"px": 1, "em": 1, "%": 1},
1635
+ "min-height": {"px": 1, "em": 1, "%": 1},
1636
+ "min-width": {"px": 1, "em": 1, "%": 1},
1637
+ "overflow": {"hidden": 1, "visible": 1, "auto": 1, "scroll": 1},
1638
+ "overflow-x": {"hidden": 1, "visible": 1, "auto": 1, "scroll": 1},
1639
+ "overflow-y": {"hidden": 1, "visible": 1, "auto": 1, "scroll": 1},
1640
+ "padding": {"px": 1, "em": 1, "%": 1},
1641
+ "padding-top": {"px": 1, "em": 1, "%": 1},
1642
+ "padding-right": {"px": 1, "em": 1, "%": 1},
1643
+ "padding-bottom": {"px": 1, "em": 1, "%": 1},
1644
+ "padding-left": {"px": 1, "em": 1, "%": 1},
1645
+ "page-break-after": {"auto": 1, "always": 1, "avoid": 1, "left": 1, "right": 1},
1646
+ "page-break-before": {"auto": 1, "always": 1, "avoid": 1, "left": 1, "right": 1},
1647
+ "position": {"absolute": 1, "relative": 1, "fixed": 1, "static": 1},
1648
+ "right": {"px": 1, "em": 1, "%": 1},
1649
+ "table-layout": {"fixed": 1, "auto": 1},
1650
+ "text-decoration": {"none": 1, "underline": 1, "line-through": 1, "blink": 1},
1651
+ "text-align": {"left": 1, "right": 1, "center": 1, "justify": 1},
1652
+ "text-transform": {"capitalize": 1, "uppercase": 1, "lowercase": 1, "none": 1},
1653
+ "top": {"px": 1, "em": 1, "%": 1},
1654
+ "vertical-align": {"top": 1, "bottom": 1},
1655
+ "visibility": {"hidden": 1, "visible": 1},
1656
+ "white-space": {"nowrap": 1, "normal": 1, "pre": 1, "pre-line": 1, "pre-wrap": 1},
1657
+ "width": {"px": 1, "em": 1, "%": 1},
1658
+ "word-spacing": {"normal": 1},
1659
+ "filter": {"alpha(opacity=$0100)": 1},
1660
+
1661
+ "text-shadow": {"$02px 2px 2px #777": 1},
1662
+ "text-overflow": {"ellipsis-word": 1, "clip": 1, "ellipsis": 1},
1663
+ "-moz-border-radius": 1,
1664
+ "-moz-border-radius-topright": 1,
1665
+ "-moz-border-radius-bottomright": 1,
1666
+ "-moz-border-radius-topleft": 1,
1667
+ "-moz-border-radius-bottomleft": 1,
1668
+ "-webkit-border-radius": 1,
1669
+ "-webkit-border-top-right-radius": 1,
1670
+ "-webkit-border-top-left-radius": 1,
1671
+ "-webkit-border-bottom-right-radius": 1,
1672
+ "-webkit-border-bottom-left-radius": 1,
1673
+ "-moz-box-shadow": 1,
1674
+ "-webkit-box-shadow": 1,
1675
+ "transform": {"rotate($00deg)": 1, "skew($00deg)": 1},
1676
+ "-moz-transform": {"rotate($00deg)": 1, "skew($00deg)": 1},
1677
+ "-webkit-transform": {"rotate($00deg)": 1, "skew($00deg)": 1 }
1678
+ };
1679
+
1680
+ var CssCompletions = function() {
1681
+
1682
+ };
1683
+
1684
+ (function() {
1685
+
1686
+ this.completionsDefined = false;
1687
+
1688
+ this.defineCompletions = function() {
1689
+ if (document) {
1690
+ var style = document.createElement('c').style;
1691
+
1692
+ for (var i in style) {
1693
+ if (typeof style[i] !== 'string')
1694
+ continue;
1695
+
1696
+ var name = i.replace(/[A-Z]/g, function(x) {
1697
+ return '-' + x.toLowerCase();
1698
+ });
1699
+
1700
+ if (!propertyMap.hasOwnProperty(name))
1701
+ propertyMap[name] = 1;
1702
+ }
1703
+ }
1704
+
1705
+ this.completionsDefined = true;
1706
+ }
1707
+
1708
+ this.getCompletions = function(state, session, pos, prefix) {
1709
+ if (!this.completionsDefined) {
1710
+ this.defineCompletions();
1711
+ }
1712
+
1713
+ var token = session.getTokenAt(pos.row, pos.column);
1714
+
1715
+ if (!token)
1716
+ return [];
1717
+ if (state==='ruleset'){
1718
+ var line = session.getLine(pos.row).substr(0, pos.column);
1719
+ if (/:[^;]+$/.test(line)) {
1720
+ /([\w\-]+):[^:]*$/.test(line);
1721
+
1722
+ return this.getPropertyValueCompletions(state, session, pos, prefix);
1723
+ } else {
1724
+ return this.getPropertyCompletions(state, session, pos, prefix);
1725
+ }
1726
+ }
1727
+
1728
+ return [];
1729
+ };
1730
+
1731
+ this.getPropertyCompletions = function(state, session, pos, prefix) {
1732
+ var properties = Object.keys(propertyMap);
1733
+ return properties.map(function(property){
1734
+ return {
1735
+ caption: property,
1736
+ snippet: property + ': $0',
1737
+ meta: "property",
1738
+ score: Number.MAX_VALUE
1739
+ };
1740
+ });
1741
+ };
1742
+
1743
+ this.getPropertyValueCompletions = function(state, session, pos, prefix) {
1744
+ var line = session.getLine(pos.row).substr(0, pos.column);
1745
+ var property = (/([\w\-]+):[^:]*$/.exec(line) || {})[1];
1746
+
1747
+ if (!property)
1748
+ return [];
1749
+ var values = [];
1750
+ if (property in propertyMap && typeof propertyMap[property] === "object") {
1751
+ values = Object.keys(propertyMap[property]);
1752
+ }
1753
+ return values.map(function(value){
1754
+ return {
1755
+ caption: value,
1756
+ snippet: value,
1757
+ meta: "property value",
1758
+ score: Number.MAX_VALUE
1759
+ };
1760
+ });
1761
+ };
1762
+
1763
+ }).call(CssCompletions.prototype);
1764
+
1765
+ exports.CssCompletions = CssCompletions;
1766
+ });
1767
+
1467
1768
  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) {
1468
1769
  "use strict";
1469
1770
 
@@ -1543,7 +1844,7 @@ oop.inherits(CssBehaviour, CstyleBehaviour);
1543
1844
  exports.CssBehaviour = CssBehaviour;
1544
1845
  });
1545
1846
 
1546
- 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) {
1847
+ 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) {
1547
1848
  "use strict";
1548
1849
 
1549
1850
  var oop = require("../lib/oop");
@@ -1551,6 +1852,7 @@ var TextMode = require("./text").Mode;
1551
1852
  var CssHighlightRules = require("./css_highlight_rules").CssHighlightRules;
1552
1853
  var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
1553
1854
  var WorkerClient = require("../worker/worker_client").WorkerClient;
1855
+ var CssCompletions = require("./css_completions").CssCompletions;
1554
1856
  var CssBehaviour = require("./behaviour/css").CssBehaviour;
1555
1857
  var CStyleFoldMode = require("./folding/cstyle").FoldMode;
1556
1858
 
@@ -1558,6 +1860,7 @@ var Mode = function() {
1558
1860
  this.HighlightRules = CssHighlightRules;
1559
1861
  this.$outdent = new MatchingBraceOutdent();
1560
1862
  this.$behaviour = new CssBehaviour();
1863
+ this.$completer = new CssCompletions();
1561
1864
  this.foldingRules = new CStyleFoldMode();
1562
1865
  };
1563
1866
  oop.inherits(Mode, TextMode);
@@ -1590,6 +1893,10 @@ oop.inherits(Mode, TextMode);
1590
1893
  this.$outdent.autoOutdent(doc, row);
1591
1894
  };
1592
1895
 
1896
+ this.getCompletions = function(state, session, pos, prefix) {
1897
+ return this.$completer.getCompletions(state, session, pos, prefix);
1898
+ };
1899
+
1593
1900
  this.createWorker = function(session) {
1594
1901
  var worker = new WorkerClient(["ace"], "ace/mode/css_worker", "Worker");
1595
1902
  worker.attachToDocument(session.getDocument());
@@ -2179,118 +2486,120 @@ var eventAttributes = [
2179
2486
  var globalAttributes = commonAttributes.concat(eventAttributes);
2180
2487
 
2181
2488
  var attributeMap = {
2182
- "html": ["manifest"],
2183
- "head": [],
2184
- "title": [],
2185
- "base": ["href", "target"],
2186
- "link": ["href", "hreflang", "rel", "media", "type", "sizes"],
2187
- "meta": ["http-equiv", "name", "content", "charset"],
2188
- "style": ["type", "media", "scoped"],
2189
- "script": ["charset", "type", "src", "defer", "async"],
2190
- "noscript": ["href"],
2191
- "body": ["onafterprint", "onbeforeprint", "onbeforeunload", "onhashchange", "onmessage", "onoffline", "onpopstate", "onredo", "onresize", "onstorage", "onundo", "onunload"],
2192
- "section": [],
2193
- "nav": [],
2194
- "article": ["pubdate"],
2195
- "aside": [],
2196
- "h1": [],
2197
- "h2": [],
2198
- "h3": [],
2199
- "h4": [],
2200
- "h5": [],
2201
- "h6": [],
2202
- "header": [],
2203
- "footer": [],
2204
- "address": [],
2205
- "main": [],
2206
- "p": [],
2207
- "hr": [],
2208
- "pre": [],
2209
- "blockquote": ["cite"],
2210
- "ol": ["start", "reversed"],
2211
- "ul": [],
2212
- "li": ["value"],
2213
- "dl": [],
2214
- "dt": [],
2215
- "dd": [],
2216
- "figure": [],
2217
- "figcaption": [],
2218
- "div": [],
2219
- "a": ["href", "target", "ping", "rel", "media", "hreflang", "type"],
2220
- "em": [],
2221
- "strong": [],
2222
- "small": [],
2223
- "s": [],
2224
- "cite": [],
2225
- "q": ["cite"],
2226
- "dfn": [],
2227
- "abbr": [],
2228
- "data": [],
2229
- "time": ["datetime"],
2230
- "code": [],
2231
- "var": [],
2232
- "samp": [],
2233
- "kbd": [],
2234
- "sub": [],
2235
- "sup": [],
2236
- "i": [],
2237
- "b": [],
2238
- "u": [],
2239
- "mark": [],
2240
- "ruby": [],
2241
- "rt": [],
2242
- "rp": [],
2243
- "bdi": [],
2244
- "bdo": [],
2245
- "span": [],
2246
- "br": [],
2247
- "wbr": [],
2248
- "ins": ["cite", "datetime"],
2249
- "del": ["cite", "datetime"],
2250
- "img": ["alt", "src", "height", "width", "usemap", "ismap"],
2251
- "iframe": ["name", "src", "height", "width", "sandbox", "seamless"],
2252
- "embed": ["src", "height", "width", "type"],
2253
- "object": ["param", "data", "type", "height" , "width", "usemap", "name", "form", "classid"],
2254
- "param": ["name", "value"],
2255
- "video": ["src", "autobuffer", "autoplay", "loop", "controls", "width", "height", "poster"],
2256
- "audio": ["src", "autobuffer", "autoplay", "loop", "controls"],
2257
- "source": ["src", "type", "media"],
2258
- "track": ["kind", "src", "srclang", "label", "default"],
2259
- "canvas": ["width", "height"],
2260
- "map": ["name"],
2261
- "area": ["shape", "coords", "href", "hreflang", "alt", "target", "media", "rel", "ping", "type"],
2262
- "svg": [],
2263
- "math": [],
2264
- "table": ["summary"],
2265
- "caption": [],
2266
- "colgroup": ["span"],
2267
- "col": ["span"],
2268
- "tbody": [],
2269
- "thead": [],
2270
- "tfoot": [],
2271
- "tr": [],
2272
- "td": ["headers", "rowspan", "colspan"],
2273
- "th": ["headers", "rowspan", "colspan", "scope"],
2274
- "form": ["accept-charset", "action", "autocomplete", "enctype", "method", "name", "novalidate", "target"],
2275
- "fieldset": ["disabled", "form", "name"],
2276
- "legend": [],
2277
- "label": ["form", "for"],
2278
- "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"],
2279
- "button": ["autofocus", "disabled", "form", "formaction", "formenctype", "formmethod", "formnovalidate", "formtarget", "name", "value", "type"],
2280
- "select": ["autofocus", "disabled", "form", "multiple", "name", "size"],
2281
- "datalist": [],
2282
- "optgroup": ["disabled", "label"],
2283
- "option": ["disabled", "selected", "label", "value"],
2284
- "textarea": ["autofocus", "disabled", "form", "maxlength", "name", "placeholder", "readonly", "required", "rows", "cols", "wrap"],
2285
- "keygen": ["autofocus", "challenge", "disabled", "form", "keytype", "name"],
2286
- "output": ["for", "form", "name"],
2287
- "progress": ["value", "max"],
2288
- "meter": ["value", "min", "max", "low", "high", "optimum"],
2289
- "details": ["open"],
2290
- "summary": [],
2291
- "command": ["type", "label", "icon", "disabled", "checked", "radiogroup", "command"],
2292
- "menu": ["type", "label"],
2293
- "dialog": ["open"]
2489
+ "html": {"manifest": 1},
2490
+ "head": {},
2491
+ "title": {},
2492
+ "base": {"href": 1, "target": 1},
2493
+ "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},
2494
+ "meta": {"http-equiv": {"content-type": 1}, "name": {"description": 1, "keywords": 1}, "content": {"text/html; charset=UTF-8": 1}, "charset": 1},
2495
+ "style": {"type": 1, "media": {"all": 1, "screen": 1, "print": 1}, "scoped": 1},
2496
+ "script": {"charset": 1, "type": {"text/javascript": 1}, "src": 1, "defer": 1, "async": 1},
2497
+ "noscript": {"href": 1},
2498
+ "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},
2499
+ "section": {},
2500
+ "nav": {},
2501
+ "article": {"pubdate": 1},
2502
+ "aside": {},
2503
+ "h1": {},
2504
+ "h2": {},
2505
+ "h3": {},
2506
+ "h4": {},
2507
+ "h5": {},
2508
+ "h6": {},
2509
+ "header": {},
2510
+ "footer": {},
2511
+ "address": {},
2512
+ "main": {},
2513
+ "p": {},
2514
+ "hr": {},
2515
+ "pre": {},
2516
+ "blockquote": {"cite": 1},
2517
+ "ol": {"start": 1, "reversed": 1},
2518
+ "ul": {},
2519
+ "li": {"value": 1},
2520
+ "dl": {},
2521
+ "dt": {},
2522
+ "dd": {},
2523
+ "figure": {},
2524
+ "figcaption": {},
2525
+ "div": {},
2526
+ "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},
2527
+ "em": {},
2528
+ "strong": {},
2529
+ "small": {},
2530
+ "s": {},
2531
+ "cite": {},
2532
+ "q": {"cite": 1},
2533
+ "dfn": {},
2534
+ "abbr": {},
2535
+ "data": {},
2536
+ "time": {"datetime": 1},
2537
+ "code": {},
2538
+ "var": {},
2539
+ "samp": {},
2540
+ "kbd": {},
2541
+ "sub": {},
2542
+ "sup": {},
2543
+ "i": {},
2544
+ "b": {},
2545
+ "u": {},
2546
+ "mark": {},
2547
+ "ruby": {},
2548
+ "rt": {},
2549
+ "rp": {},
2550
+ "bdi": {},
2551
+ "bdo": {},
2552
+ "span": {},
2553
+ "br": {},
2554
+ "wbr": {},
2555
+ "ins": {"cite": 1, "datetime": 1},
2556
+ "del": {"cite": 1, "datetime": 1},
2557
+ "img": {"alt": 1, "src": 1, "height": 1, "width": 1, "usemap": 1, "ismap": 1},
2558
+ "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}},
2559
+ "embed": {"src": 1, "height": 1, "width": 1, "type": 1},
2560
+ "object": {"param": 1, "data": 1, "type": 1, "height" : 1, "width": 1, "usemap": 1, "name": 1, "form": 1, "classid": 1},
2561
+ "param": {"name": 1, "value": 1},
2562
+ "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}},
2563
+ "audio": {"src": 1, "autobuffer": 1, "autoplay": {"autoplay": 1}, "loop": {"loop": 1}, "controls": {"controls": 1}, "muted": {"muted": 1}, "preload": {"auto": 1, "metadata": 1, "none": 1 }},
2564
+ "source": {"src": 1, "type": 1, "media": 1},
2565
+ "track": {"kind": 1, "src": 1, "srclang": 1, "label": 1, "default": 1},
2566
+ "canvas": {"width": 1, "height": 1},
2567
+ "map": {"name": 1},
2568
+ "area": {"shape": 1, "coords": 1, "href": 1, "hreflang": 1, "alt": 1, "target": 1, "media": 1, "rel": 1, "ping": 1, "type": 1},
2569
+ "svg": {},
2570
+ "math": {},
2571
+ "table": {"summary": 1},
2572
+ "caption": {},
2573
+ "colgroup": {"span": 1},
2574
+ "col": {"span": 1},
2575
+ "tbody": {},
2576
+ "thead": {},
2577
+ "tfoot": {},
2578
+ "tr": {},
2579
+ "td": {"headers": 1, "rowspan": 1, "colspan": 1},
2580
+ "th": {"headers": 1, "rowspan": 1, "colspan": 1, "scope": 1},
2581
+ "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}},
2582
+ "fieldset": {"disabled": 1, "form": 1, "name": 1},
2583
+ "legend": {},
2584
+ "label": {"form": 1, "for": 1},
2585
+ "input": {
2586
+ "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},
2587
+ "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},
2588
+ "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}},
2589
+ "select": {"autofocus": 1, "disabled": 1, "form": 1, "multiple": {"multiple": 1}, "name": 1, "size": 1, "readonly":{"readonly": 1}},
2590
+ "datalist": {},
2591
+ "optgroup": {"disabled": 1, "label": 1},
2592
+ "option": {"disabled": 1, "selected": 1, "label": 1, "value": 1},
2593
+ "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}},
2594
+ "keygen": {"autofocus": 1, "challenge": {"challenge": 1}, "disabled": {"disabled": 1}, "form": 1, "keytype": {"rsa": 1, "dsa": 1, "ec": 1}, "name": 1},
2595
+ "output": {"for": 1, "form": 1, "name": 1},
2596
+ "progress": {"value": 1, "max": 1},
2597
+ "meter": {"value": 1, "min": 1, "max": 1, "low": 1, "high": 1, "optimum": 1},
2598
+ "details": {"open": 1},
2599
+ "summary": {},
2600
+ "command": {"type": 1, "label": 1, "icon": 1, "disabled": 1, "checked": 1, "radiogroup": 1, "command": 1},
2601
+ "menu": {"type": 1, "label": 1},
2602
+ "dialog": {"open": 1}
2294
2603
  };
2295
2604
 
2296
2605
  var elements = Object.keys(attributeMap);
@@ -2309,6 +2618,16 @@ function findTagName(session, pos) {
2309
2618
  return token.value;
2310
2619
  }
2311
2620
 
2621
+ function findAttributeName(session, pos) {
2622
+ var iterator = new TokenIterator(session, pos.row, pos.column);
2623
+ var token = iterator.getCurrentToken();
2624
+ while (token && !is(token, "attribute-name")){
2625
+ token = iterator.stepBackward();
2626
+ }
2627
+ if (token)
2628
+ return token.value;
2629
+ }
2630
+
2312
2631
  var HtmlCompletions = function() {
2313
2632
 
2314
2633
  };
@@ -2323,7 +2642,12 @@ var HtmlCompletions = function() {
2323
2642
  if (is(token, "tag-name") || is(token, "tag-open") || is(token, "end-tag-open"))
2324
2643
  return this.getTagCompletions(state, session, pos, prefix);
2325
2644
  if (is(token, "tag-whitespace") || is(token, "attribute-name"))
2326
- return this.getAttributeCompetions(state, session, pos, prefix);
2645
+ return this.getAttributeCompletions(state, session, pos, prefix);
2646
+ if (is(token, "attribute-value"))
2647
+ return this.getAttributeValueCompletions(state, session, pos, prefix);
2648
+ var line = session.getLine(pos.row).substr(0, pos.column);
2649
+ if (/&[A-z]*$/i.test(line))
2650
+ return this.getHTMLEntityCompletions(state, session, pos, prefix);
2327
2651
 
2328
2652
  return [];
2329
2653
  };
@@ -2338,13 +2662,13 @@ var HtmlCompletions = function() {
2338
2662
  });
2339
2663
  };
2340
2664
 
2341
- this.getAttributeCompetions = function(state, session, pos, prefix) {
2665
+ this.getAttributeCompletions = function(state, session, pos, prefix) {
2342
2666
  var tagName = findTagName(session, pos);
2343
2667
  if (!tagName)
2344
2668
  return [];
2345
2669
  var attributes = globalAttributes;
2346
2670
  if (tagName in attributeMap) {
2347
- attributes = attributes.concat(attributeMap[tagName]);
2671
+ attributes = attributes.concat(Object.keys(attributeMap[tagName]));
2348
2672
  }
2349
2673
  return attributes.map(function(attribute){
2350
2674
  return {
@@ -2356,6 +2680,39 @@ var HtmlCompletions = function() {
2356
2680
  });
2357
2681
  };
2358
2682
 
2683
+ this.getAttributeValueCompletions = function(state, session, pos, prefix) {
2684
+ var tagName = findTagName(session, pos);
2685
+ var attributeName = findAttributeName(session, pos);
2686
+
2687
+ if (!tagName)
2688
+ return [];
2689
+ var values = [];
2690
+ if (tagName in attributeMap && attributeName in attributeMap[tagName] && typeof attributeMap[tagName][attributeName] === "object") {
2691
+ values = Object.keys(attributeMap[tagName][attributeName]);
2692
+ }
2693
+ return values.map(function(value){
2694
+ return {
2695
+ caption: value,
2696
+ snippet: value,
2697
+ meta: "attribute value",
2698
+ score: Number.MAX_VALUE
2699
+ };
2700
+ });
2701
+ };
2702
+
2703
+ this.getHTMLEntityCompletions = function(state, session, pos, prefix) {
2704
+ 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;'];
2705
+
2706
+ return values.map(function(value){
2707
+ return {
2708
+ caption: value,
2709
+ snippet: value.substr(1),
2710
+ meta: "html entity",
2711
+ score: Number.MAX_VALUE
2712
+ };
2713
+ });
2714
+ };
2715
+
2359
2716
  }).call(HtmlCompletions.prototype);
2360
2717
 
2361
2718
  exports.HtmlCompletions = HtmlCompletions;
@@ -2906,9 +3263,7 @@ var EjsHighlightRules = function(start, end) {
2906
3263
  });
2907
3264
  }
2908
3265
 
2909
- this.embedRules(JavaScriptHighlightRules, "ejs-");
2910
-
2911
- this.$rules["ejs-start"].unshift({
3266
+ this.embedRules(JavaScriptHighlightRules, "ejs-", [{
2912
3267
  token : "markup.list.meta.tag",
2913
3268
  regex : "-?" + end,
2914
3269
  next : "pop"
@@ -2916,17 +3271,7 @@ var EjsHighlightRules = function(start, end) {
2916
3271
  token: "comment",
2917
3272
  regex: "//.*?" + end,
2918
3273
  next: "pop"
2919
- });
2920
-
2921
- this.$rules["ejs-no_regex"].unshift({
2922
- token : "markup.list.meta.tag",
2923
- regex : "-?" + end,
2924
- next : "pop"
2925
- }, {
2926
- token: "comment",
2927
- regex: "//.*?" + end,
2928
- next: "pop"
2929
- });
3274
+ }]);
2930
3275
 
2931
3276
  this.normalizeRules();
2932
3277
  };