ace-rails-ap 3.0.2 → 3.0.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (127) hide show
  1. checksums.yaml +4 -4
  2. data/lib/ace/rails/version.rb +1 -1
  3. data/vendor/assets/javascripts/ace/ace.js +403 -326
  4. data/vendor/assets/javascripts/ace/ext-language_tools.js +56 -40
  5. data/vendor/assets/javascripts/ace/ext-modelist.js +7 -3
  6. data/vendor/assets/javascripts/ace/ext-settings_menu.js +8 -4
  7. data/vendor/assets/javascripts/ace/ext-static_highlight.js +12 -5
  8. data/vendor/assets/javascripts/ace/keybinding-vim.js +5234 -1558
  9. data/vendor/assets/javascripts/ace/mode-abap.js +1 -1
  10. data/vendor/assets/javascripts/ace/mode-abc.js +261 -0
  11. data/vendor/assets/javascripts/ace/mode-actionscript.js +47 -1
  12. data/vendor/assets/javascripts/ace/mode-apache_conf.js +47 -1
  13. data/vendor/assets/javascripts/ace/mode-applescript.js +47 -1
  14. data/vendor/assets/javascripts/ace/mode-autohotkey.js +47 -1
  15. data/vendor/assets/javascripts/ace/mode-batchfile.js +47 -1
  16. data/vendor/assets/javascripts/ace/mode-c_cpp.js +101 -56
  17. data/vendor/assets/javascripts/ace/mode-coffee.js +3 -3
  18. data/vendor/assets/javascripts/ace/mode-coldfusion.js +114 -63
  19. data/vendor/assets/javascripts/ace/mode-csharp.js +99 -55
  20. data/vendor/assets/javascripts/ace/mode-css.js +98 -53
  21. data/vendor/assets/javascripts/ace/mode-curly.js +114 -63
  22. data/vendor/assets/javascripts/ace/mode-d.js +47 -1
  23. data/vendor/assets/javascripts/ace/mode-dart.js +103 -58
  24. data/vendor/assets/javascripts/ace/mode-diff.js +85 -85
  25. data/vendor/assets/javascripts/ace/mode-django.js +114 -63
  26. data/vendor/assets/javascripts/ace/mode-dockerfile.js +97 -52
  27. data/vendor/assets/javascripts/ace/mode-dot.js +47 -1
  28. data/vendor/assets/javascripts/ace/mode-eiffel.js +30 -37
  29. data/vendor/assets/javascripts/ace/mode-ejs.js +117 -63
  30. data/vendor/assets/javascripts/ace/mode-elm.js +47 -1
  31. data/vendor/assets/javascripts/ace/mode-erlang.js +47 -1
  32. data/vendor/assets/javascripts/ace/mode-forth.js +47 -1
  33. data/vendor/assets/javascripts/ace/mode-ftl.js +10 -7
  34. data/vendor/assets/javascripts/ace/mode-glsl.js +101 -56
  35. data/vendor/assets/javascripts/ace/mode-golang.js +96 -51
  36. data/vendor/assets/javascripts/ace/mode-groovy.js +98 -53
  37. data/vendor/assets/javascripts/ace/mode-haml.js +3 -0
  38. data/vendor/assets/javascripts/ace/mode-handlebars.js +114 -63
  39. data/vendor/assets/javascripts/ace/mode-haskell.js +49 -3
  40. data/vendor/assets/javascripts/ace/mode-haxe.js +96 -51
  41. data/vendor/assets/javascripts/ace/mode-html.js +114 -63
  42. data/vendor/assets/javascripts/ace/mode-html_ruby.js +117 -63
  43. data/vendor/assets/javascripts/ace/mode-io.js +47 -1
  44. data/vendor/assets/javascripts/ace/mode-jack.js +96 -51
  45. data/vendor/assets/javascripts/ace/mode-jade.js +10 -7
  46. data/vendor/assets/javascripts/ace/mode-java.js +98 -53
  47. data/vendor/assets/javascripts/ace/mode-javascript.js +98 -53
  48. data/vendor/assets/javascripts/ace/mode-json.js +99 -54
  49. data/vendor/assets/javascripts/ace/mode-jsoniq.js +98 -51
  50. data/vendor/assets/javascripts/ace/mode-jsp.js +106 -58
  51. data/vendor/assets/javascripts/ace/mode-jsx.js +96 -51
  52. data/vendor/assets/javascripts/ace/mode-julia.js +47 -1
  53. data/vendor/assets/javascripts/ace/mode-latex.js +1 -1
  54. data/vendor/assets/javascripts/ace/mode-lean.js +281 -0
  55. data/vendor/assets/javascripts/ace/mode-less.js +96 -51
  56. data/vendor/assets/javascripts/ace/mode-liquid.js +10 -7
  57. data/vendor/assets/javascripts/ace/mode-live_script.js +481 -0
  58. data/vendor/assets/javascripts/ace/mode-livescript.js +5 -8
  59. data/vendor/assets/javascripts/ace/mode-logiql.js +49 -50
  60. data/vendor/assets/javascripts/ace/mode-lsl.js +96 -51
  61. data/vendor/assets/javascripts/ace/mode-lua.js +3 -3
  62. data/vendor/assets/javascripts/ace/mode-luapage.js +117 -66
  63. data/vendor/assets/javascripts/ace/mode-makefile.js +1 -1
  64. data/vendor/assets/javascripts/ace/mode-markdown.js +134 -67
  65. data/vendor/assets/javascripts/ace/mode-mask.js +1985 -0
  66. data/vendor/assets/javascripts/ace/mode-mel.js +96 -51
  67. data/vendor/assets/javascripts/ace/mode-mips_assembler.js +235 -0
  68. data/vendor/assets/javascripts/ace/mode-mipsassembler.js +196 -0
  69. data/vendor/assets/javascripts/ace/mode-nix.js +101 -56
  70. data/vendor/assets/javascripts/ace/mode-objectivec.js +52 -6
  71. data/vendor/assets/javascripts/ace/mode-perl.js +47 -1
  72. data/vendor/assets/javascripts/ace/mode-pgsql.js +1 -1
  73. data/vendor/assets/javascripts/ace/mode-php.js +139 -85
  74. data/vendor/assets/javascripts/ace/mode-powershell.js +96 -51
  75. data/vendor/assets/javascripts/ace/mode-praat.js +47 -1
  76. data/vendor/assets/javascripts/ace/mode-prolog.js +47 -1
  77. data/vendor/assets/javascripts/ace/mode-protobuf.js +101 -56
  78. data/vendor/assets/javascripts/ace/mode-rdoc.js +1 -1
  79. data/vendor/assets/javascripts/ace/mode-rhtml.js +114 -63
  80. data/vendor/assets/javascripts/ace/mode-ruby.js +52 -50
  81. data/vendor/assets/javascripts/ace/mode-rust.js +57 -18
  82. data/vendor/assets/javascripts/ace/mode-scad.js +96 -51
  83. data/vendor/assets/javascripts/ace/mode-scala.js +98 -53
  84. data/vendor/assets/javascripts/ace/mode-scss.js +96 -51
  85. data/vendor/assets/javascripts/ace/mode-sh.js +97 -52
  86. data/vendor/assets/javascripts/ace/mode-sjs.js +98 -53
  87. data/vendor/assets/javascripts/ace/mode-smarty.js +114 -63
  88. data/vendor/assets/javascripts/ace/mode-soy_template.js +114 -63
  89. data/vendor/assets/javascripts/ace/mode-stylus.js +1 -1
  90. data/vendor/assets/javascripts/ace/mode-svg.js +132 -65
  91. data/vendor/assets/javascripts/ace/mode-tcl.js +47 -1
  92. data/vendor/assets/javascripts/ace/mode-twig.js +114 -63
  93. data/vendor/assets/javascripts/ace/mode-typescript.js +98 -53
  94. data/vendor/assets/javascripts/ace/mode-vala.js +96 -51
  95. data/vendor/assets/javascripts/ace/mode-velocity.js +114 -63
  96. data/vendor/assets/javascripts/ace/mode-vhdl.js +21 -21
  97. data/vendor/assets/javascripts/ace/mode-xml.js +34 -12
  98. data/vendor/assets/javascripts/ace/mode-xquery.js +98 -51
  99. data/vendor/assets/javascripts/ace/snippets/abc.js +38 -0
  100. data/vendor/assets/javascripts/ace/snippets/elixir.js +7 -0
  101. data/vendor/assets/javascripts/ace/snippets/elm.js +7 -0
  102. data/vendor/assets/javascripts/ace/snippets/lean.js +7 -0
  103. data/vendor/assets/javascripts/ace/snippets/live_script.js +7 -0
  104. data/vendor/assets/javascripts/ace/snippets/mask.js +7 -0
  105. data/vendor/assets/javascripts/ace/snippets/mips_assembler.js +7 -0
  106. data/vendor/assets/javascripts/ace/snippets/mipsassembler.js +7 -0
  107. data/vendor/assets/javascripts/ace/snippets/r.js +1 -1
  108. data/vendor/assets/javascripts/ace/theme-clouds_midnight.js +1 -1
  109. data/vendor/assets/javascripts/ace/theme-github.js +7 -1
  110. data/vendor/assets/javascripts/ace/theme-katzenmilch.js +3 -0
  111. data/vendor/assets/javascripts/ace/theme-kuroir.js +3 -0
  112. data/vendor/assets/javascripts/ace/worker-coffee.js +6 -7
  113. data/vendor/assets/javascripts/ace/worker-css.js +5 -5
  114. data/vendor/assets/javascripts/ace/worker-html.js +4354 -4354
  115. data/vendor/assets/javascripts/ace/worker-javascript.js +2435 -1397
  116. data/vendor/assets/javascripts/ace/worker-json.js +6 -7
  117. data/vendor/assets/javascripts/ace/worker-lua.js +11 -11
  118. data/vendor/assets/javascripts/ace/worker-php.js +4 -8
  119. data/vendor/assets/javascripts/ace/worker-xml.js +3809 -0
  120. data/vendor/assets/javascripts/ace/worker-xquery.js +38 -47
  121. metadata +18 -9
  122. data/vendor/assets/javascripts/ace/ext-options.js +0 -252
  123. data/vendor/assets/javascripts/ace/mode-html_completions.js +0 -309
  124. data/vendor/assets/javascripts/ace/mode-luahtml.js +0 -2415
  125. data/vendor/assets/javascripts/ace/mode-mushcode_high_rules.js +0 -569
  126. data/vendor/assets/javascripts/ace/mode-tmsnippet.js +0 -200
  127. data/vendor/assets/javascripts/ace/theme-kr.js +0 -105
@@ -87,7 +87,7 @@ var AbapHighlightRules = function() {
87
87
  {token : "string", regex : "`", next : "start"},
88
88
  {defaultToken : "string"}
89
89
  ]
90
- }
90
+ };
91
91
  };
92
92
  oop.inherits(AbapHighlightRules, TextHighlightRules);
93
93
 
@@ -0,0 +1,261 @@
1
+ define("ace/mode/abc_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"], function (require, exports, module) {
2
+ "use strict";
3
+
4
+ var oop = require("../lib/oop");
5
+ var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
6
+
7
+ var ABCHighlightRules = function () {
8
+
9
+ this.$rules = {
10
+ start: [
11
+ {
12
+ token: ['zupfnoter.information.comment.line.percentage', 'information.keyword', 'in formation.keyword.embedded'],
13
+ regex: '(%%%%)(hn\\.[a-z]*)(.*)',
14
+ comment: 'Instruction Comment'
15
+ },
16
+ {
17
+ token: ['information.comment.line.percentage', 'information.keyword.embedded'],
18
+ regex: '(%%)(.*)',
19
+ comment: 'Instruction Comment'
20
+ },
21
+
22
+ {
23
+ token: 'comment.line.percentage',
24
+ regex: '%.*',
25
+ comment: 'Comments'
26
+ },
27
+
28
+ {
29
+ token: 'barline.keyword.operator',
30
+ regex: '[\\[:]*[|:][|\\]:]*(?:\\[?[0-9]+)?|\\[[0-9]+',
31
+ comment: 'Bar lines'
32
+ },
33
+ {
34
+ token: ['information.keyword.embedded', 'information.argument.string.unquoted'],
35
+ regex: '(\\[[A-Za-z]:)([^\\]]*\\])',
36
+ comment: 'embedded Header lines'
37
+ },
38
+ {
39
+ token: ['information.keyword', 'information.argument.string.unquoted'],
40
+ regex: '^([A-Za-z]:)([^%\\\\]*)',
41
+ comment: 'Header lines'
42
+ },
43
+ {
44
+ token: ['text', 'entity.name.function', 'string.unquoted', 'text'],
45
+ regex: '(\\[)([A-Z]:)(.*?)(\\])',
46
+ comment: 'Inline fields'
47
+ },
48
+ {
49
+ token: ['accent.constant.language', 'pitch.constant.numeric', 'duration.constant.numeric'],
50
+ regex: '([\\^=_]*)([A-Ga-gz][,\']*)([0-9]*/*[><0-9]*)',
51
+ comment: 'Notes'
52
+ },
53
+ {
54
+ token: 'zupfnoter.jumptarget.string.quoted',
55
+ regex: '[\\"!]\\^\\:.*?[\\"!]',
56
+ comment: 'Zupfnoter jumptarget'
57
+ }, {
58
+ token: 'zupfnoter.goto.string.quoted',
59
+ regex: '[\\"!]\\^\\@.*?[\\"!]',
60
+ comment: 'Zupfnoter goto'
61
+ },
62
+ {
63
+ token: 'zupfnoter.annotation.string.quoted',
64
+ regex: '[\\"!]\\^\\!.*?[\\"!]',
65
+ comment: 'Zupfnoter annoation'
66
+ },
67
+ {
68
+ token: 'zupfnoter.annotationref.string.quoted',
69
+ regex: '[\\"!]\\^\\#.*?[\\"!]',
70
+ comment: 'Zupfnoter annotation reference'
71
+ },
72
+ {
73
+ token: 'chordname.string.quoted',
74
+ regex: '[\\"!]\\^.*?[\\"!]',
75
+ comment: 'abc chord'
76
+ },
77
+ {
78
+ token: 'string.quoted',
79
+ regex: '[\\"!].*?[\\"!]',
80
+ comment: 'abc annotation'
81
+ }
82
+
83
+ ]
84
+ };
85
+
86
+ this.normalizeRules();
87
+ };
88
+
89
+ ABCHighlightRules.metaData = {
90
+ fileTypes: ['abc'],
91
+ name: 'ABC',
92
+ scopeName: 'text.abcnotation'
93
+ };
94
+
95
+
96
+ oop.inherits(ABCHighlightRules, TextHighlightRules);
97
+
98
+ exports.ABCHighlightRules = ABCHighlightRules;
99
+ });
100
+
101
+ define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"], function(require, exports, module) {
102
+ "use strict";
103
+
104
+ var oop = require("../../lib/oop");
105
+ var Range = require("../../range").Range;
106
+ var BaseFoldMode = require("./fold_mode").FoldMode;
107
+
108
+ var FoldMode = exports.FoldMode = function(commentRegex) {
109
+ if (commentRegex) {
110
+ this.foldingStartMarker = new RegExp(
111
+ this.foldingStartMarker.source.replace(/\|[^|]*?$/, "|" + commentRegex.start)
112
+ );
113
+ this.foldingStopMarker = new RegExp(
114
+ this.foldingStopMarker.source.replace(/\|[^|]*?$/, "|" + commentRegex.end)
115
+ );
116
+ }
117
+ };
118
+ oop.inherits(FoldMode, BaseFoldMode);
119
+
120
+ (function() {
121
+
122
+ this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
123
+ this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
124
+ this.singleLineBlockCommentRe= /^\s*(\/\*).*\*\/\s*$/;
125
+ this.tripleStarBlockCommentRe = /^\s*(\/\*\*\*).*\*\/\s*$/;
126
+ this.startRegionRe = /^\s*(\/\*|\/\/)#region\b/;
127
+ this._getFoldWidgetBase = this.getFoldWidget;
128
+ this.getFoldWidget = function(session, foldStyle, row) {
129
+ var line = session.getLine(row);
130
+
131
+ if (this.singleLineBlockCommentRe.test(line)) {
132
+ if (!this.startRegionRe.test(line) && !this.tripleStarBlockCommentRe.test(line))
133
+ return "";
134
+ }
135
+
136
+ var fw = this._getFoldWidgetBase(session, foldStyle, row);
137
+
138
+ if (!fw && this.startRegionRe.test(line))
139
+ return "start"; // lineCommentRegionStart
140
+
141
+ return fw;
142
+ };
143
+
144
+ this.getFoldWidgetRange = function(session, foldStyle, row, forceMultiline) {
145
+ var line = session.getLine(row);
146
+
147
+ if (this.startRegionRe.test(line))
148
+ return this.getCommentRegionBlock(session, line, row);
149
+
150
+ var match = line.match(this.foldingStartMarker);
151
+ if (match) {
152
+ var i = match.index;
153
+
154
+ if (match[1])
155
+ return this.openingBracketBlock(session, match[1], row, i);
156
+
157
+ var range = session.getCommentFoldRange(row, i + match[0].length, 1);
158
+
159
+ if (range && !range.isMultiLine()) {
160
+ if (forceMultiline) {
161
+ range = this.getSectionRange(session, row);
162
+ } else if (foldStyle != "all")
163
+ range = null;
164
+ }
165
+
166
+ return range;
167
+ }
168
+
169
+ if (foldStyle === "markbegin")
170
+ return;
171
+
172
+ var match = line.match(this.foldingStopMarker);
173
+ if (match) {
174
+ var i = match.index + match[0].length;
175
+
176
+ if (match[1])
177
+ return this.closingBracketBlock(session, match[1], row, i);
178
+
179
+ return session.getCommentFoldRange(row, i, -1);
180
+ }
181
+ };
182
+
183
+ this.getSectionRange = function(session, row) {
184
+ var line = session.getLine(row);
185
+ var startIndent = line.search(/\S/);
186
+ var startRow = row;
187
+ var startColumn = line.length;
188
+ row = row + 1;
189
+ var endRow = row;
190
+ var maxRow = session.getLength();
191
+ while (++row < maxRow) {
192
+ line = session.getLine(row);
193
+ var indent = line.search(/\S/);
194
+ if (indent === -1)
195
+ continue;
196
+ if (startIndent > indent)
197
+ break;
198
+ var subRange = this.getFoldWidgetRange(session, "all", row);
199
+
200
+ if (subRange) {
201
+ if (subRange.start.row <= startRow) {
202
+ break;
203
+ } else if (subRange.isMultiLine()) {
204
+ row = subRange.end.row;
205
+ } else if (startIndent == indent) {
206
+ break;
207
+ }
208
+ }
209
+ endRow = row;
210
+ }
211
+
212
+ return new Range(startRow, startColumn, endRow, session.getLine(endRow).length);
213
+ };
214
+
215
+ this.getCommentRegionBlock = function(session, line, row) {
216
+ var startColumn = line.search(/\s*$/);
217
+ var maxRow = session.getLength();
218
+ var startRow = row;
219
+
220
+ var re = /^\s*(?:\/\*|\/\/)#(end)?region\b/;
221
+ var depth = 1;
222
+ while (++row < maxRow) {
223
+ line = session.getLine(row);
224
+ var m = re.exec(line);
225
+ if (!m) continue;
226
+ if (m[1]) depth--;
227
+ else depth++;
228
+
229
+ if (!depth) break;
230
+ }
231
+
232
+ var endRow = row;
233
+ if (endRow > startRow) {
234
+ return new Range(startRow, startColumn, endRow, line.length);
235
+ }
236
+ };
237
+
238
+ }).call(FoldMode.prototype);
239
+
240
+ });
241
+
242
+ define("ace/mode/abc",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/abc_highlight_rules","ace/mode/folding/cstyle"], function (require, exports, module) {
243
+ "use strict";
244
+
245
+ var oop = require("../lib/oop");
246
+ var TextMode = require("./text").Mode;
247
+ var ABCHighlightRules = require("./abc_highlight_rules").ABCHighlightRules;
248
+ var FoldMode = require("./folding/cstyle").FoldMode;
249
+
250
+ var Mode = function () {
251
+ this.HighlightRules = ABCHighlightRules;
252
+ this.foldingRules = new FoldMode();
253
+ };
254
+ oop.inherits(Mode, TextMode);
255
+
256
+ (function () {
257
+ this.$id = "ace/mode/abc"
258
+ }).call(Mode.prototype);
259
+
260
+ exports.Mode = Mode;
261
+ });
@@ -122,12 +122,35 @@ var FoldMode = exports.FoldMode = function(commentRegex) {
122
122
  oop.inherits(FoldMode, BaseFoldMode);
123
123
 
124
124
  (function() {
125
-
125
+
126
126
  this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
127
127
  this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
128
+ this.singleLineBlockCommentRe= /^\s*(\/\*).*\*\/\s*$/;
129
+ this.tripleStarBlockCommentRe = /^\s*(\/\*\*\*).*\*\/\s*$/;
130
+ this.startRegionRe = /^\s*(\/\*|\/\/)#region\b/;
131
+ this._getFoldWidgetBase = this.getFoldWidget;
132
+ this.getFoldWidget = function(session, foldStyle, row) {
133
+ var line = session.getLine(row);
134
+
135
+ if (this.singleLineBlockCommentRe.test(line)) {
136
+ if (!this.startRegionRe.test(line) && !this.tripleStarBlockCommentRe.test(line))
137
+ return "";
138
+ }
139
+
140
+ var fw = this._getFoldWidgetBase(session, foldStyle, row);
141
+
142
+ if (!fw && this.startRegionRe.test(line))
143
+ return "start"; // lineCommentRegionStart
144
+
145
+ return fw;
146
+ };
128
147
 
129
148
  this.getFoldWidgetRange = function(session, foldStyle, row, forceMultiline) {
130
149
  var line = session.getLine(row);
150
+
151
+ if (this.startRegionRe.test(line))
152
+ return this.getCommentRegionBlock(session, line, row);
153
+
131
154
  var match = line.match(this.foldingStartMarker);
132
155
  if (match) {
133
156
  var i = match.index;
@@ -192,6 +215,29 @@ oop.inherits(FoldMode, BaseFoldMode);
192
215
 
193
216
  return new Range(startRow, startColumn, endRow, session.getLine(endRow).length);
194
217
  };
218
+
219
+ this.getCommentRegionBlock = function(session, line, row) {
220
+ var startColumn = line.search(/\s*$/);
221
+ var maxRow = session.getLength();
222
+ var startRow = row;
223
+
224
+ var re = /^\s*(?:\/\*|\/\/)#(end)?region\b/;
225
+ var depth = 1;
226
+ while (++row < maxRow) {
227
+ line = session.getLine(row);
228
+ var m = re.exec(line);
229
+ if (!m) continue;
230
+ if (m[1]) depth--;
231
+ else depth++;
232
+
233
+ if (!depth) break;
234
+ }
235
+
236
+ var endRow = row;
237
+ if (endRow > startRow) {
238
+ return new Range(startRow, startColumn, endRow, line.length);
239
+ }
240
+ };
195
241
 
196
242
  }).call(FoldMode.prototype);
197
243
 
@@ -212,12 +212,35 @@ var FoldMode = exports.FoldMode = function(commentRegex) {
212
212
  oop.inherits(FoldMode, BaseFoldMode);
213
213
 
214
214
  (function() {
215
-
215
+
216
216
  this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
217
217
  this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
218
+ this.singleLineBlockCommentRe= /^\s*(\/\*).*\*\/\s*$/;
219
+ this.tripleStarBlockCommentRe = /^\s*(\/\*\*\*).*\*\/\s*$/;
220
+ this.startRegionRe = /^\s*(\/\*|\/\/)#region\b/;
221
+ this._getFoldWidgetBase = this.getFoldWidget;
222
+ this.getFoldWidget = function(session, foldStyle, row) {
223
+ var line = session.getLine(row);
224
+
225
+ if (this.singleLineBlockCommentRe.test(line)) {
226
+ if (!this.startRegionRe.test(line) && !this.tripleStarBlockCommentRe.test(line))
227
+ return "";
228
+ }
229
+
230
+ var fw = this._getFoldWidgetBase(session, foldStyle, row);
231
+
232
+ if (!fw && this.startRegionRe.test(line))
233
+ return "start"; // lineCommentRegionStart
234
+
235
+ return fw;
236
+ };
218
237
 
219
238
  this.getFoldWidgetRange = function(session, foldStyle, row, forceMultiline) {
220
239
  var line = session.getLine(row);
240
+
241
+ if (this.startRegionRe.test(line))
242
+ return this.getCommentRegionBlock(session, line, row);
243
+
221
244
  var match = line.match(this.foldingStartMarker);
222
245
  if (match) {
223
246
  var i = match.index;
@@ -282,6 +305,29 @@ oop.inherits(FoldMode, BaseFoldMode);
282
305
 
283
306
  return new Range(startRow, startColumn, endRow, session.getLine(endRow).length);
284
307
  };
308
+
309
+ this.getCommentRegionBlock = function(session, line, row) {
310
+ var startColumn = line.search(/\s*$/);
311
+ var maxRow = session.getLength();
312
+ var startRow = row;
313
+
314
+ var re = /^\s*(?:\/\*|\/\/)#(end)?region\b/;
315
+ var depth = 1;
316
+ while (++row < maxRow) {
317
+ line = session.getLine(row);
318
+ var m = re.exec(line);
319
+ if (!m) continue;
320
+ if (m[1]) depth--;
321
+ else depth++;
322
+
323
+ if (!depth) break;
324
+ }
325
+
326
+ var endRow = row;
327
+ if (endRow > startRow) {
328
+ return new Range(startRow, startColumn, endRow, line.length);
329
+ }
330
+ };
285
331
 
286
332
  }).call(FoldMode.prototype);
287
333
 
@@ -126,12 +126,35 @@ var FoldMode = exports.FoldMode = function(commentRegex) {
126
126
  oop.inherits(FoldMode, BaseFoldMode);
127
127
 
128
128
  (function() {
129
-
129
+
130
130
  this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
131
131
  this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
132
+ this.singleLineBlockCommentRe= /^\s*(\/\*).*\*\/\s*$/;
133
+ this.tripleStarBlockCommentRe = /^\s*(\/\*\*\*).*\*\/\s*$/;
134
+ this.startRegionRe = /^\s*(\/\*|\/\/)#region\b/;
135
+ this._getFoldWidgetBase = this.getFoldWidget;
136
+ this.getFoldWidget = function(session, foldStyle, row) {
137
+ var line = session.getLine(row);
138
+
139
+ if (this.singleLineBlockCommentRe.test(line)) {
140
+ if (!this.startRegionRe.test(line) && !this.tripleStarBlockCommentRe.test(line))
141
+ return "";
142
+ }
143
+
144
+ var fw = this._getFoldWidgetBase(session, foldStyle, row);
145
+
146
+ if (!fw && this.startRegionRe.test(line))
147
+ return "start"; // lineCommentRegionStart
148
+
149
+ return fw;
150
+ };
132
151
 
133
152
  this.getFoldWidgetRange = function(session, foldStyle, row, forceMultiline) {
134
153
  var line = session.getLine(row);
154
+
155
+ if (this.startRegionRe.test(line))
156
+ return this.getCommentRegionBlock(session, line, row);
157
+
135
158
  var match = line.match(this.foldingStartMarker);
136
159
  if (match) {
137
160
  var i = match.index;
@@ -196,6 +219,29 @@ oop.inherits(FoldMode, BaseFoldMode);
196
219
 
197
220
  return new Range(startRow, startColumn, endRow, session.getLine(endRow).length);
198
221
  };
222
+
223
+ this.getCommentRegionBlock = function(session, line, row) {
224
+ var startColumn = line.search(/\s*$/);
225
+ var maxRow = session.getLength();
226
+ var startRow = row;
227
+
228
+ var re = /^\s*(?:\/\*|\/\/)#(end)?region\b/;
229
+ var depth = 1;
230
+ while (++row < maxRow) {
231
+ line = session.getLine(row);
232
+ var m = re.exec(line);
233
+ if (!m) continue;
234
+ if (m[1]) depth--;
235
+ else depth++;
236
+
237
+ if (!depth) break;
238
+ }
239
+
240
+ var endRow = row;
241
+ if (endRow > startRow) {
242
+ return new Range(startRow, startColumn, endRow, line.length);
243
+ }
244
+ };
199
245
 
200
246
  }).call(FoldMode.prototype);
201
247