codemirror-rails 5.0 → 5.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (42) hide show
  1. checksums.yaml +4 -4
  2. data/lib/codemirror/rails/version.rb +2 -2
  3. data/vendor/assets/javascripts/codemirror.js +104 -64
  4. data/vendor/assets/javascripts/codemirror/addons/dialog/dialog.js +3 -1
  5. data/vendor/assets/javascripts/codemirror/addons/edit/closebrackets.js +144 -121
  6. data/vendor/assets/javascripts/codemirror/addons/fold/foldgutter.js +4 -2
  7. data/vendor/assets/javascripts/codemirror/addons/hint/css-hint.js +4 -0
  8. data/vendor/assets/javascripts/codemirror/addons/hint/sql-hint.js +13 -8
  9. data/vendor/assets/javascripts/codemirror/addons/lint/lint.js +2 -0
  10. data/vendor/assets/javascripts/codemirror/addons/merge/merge.js +40 -0
  11. data/vendor/assets/javascripts/codemirror/addons/mode/multiplex_test.js +33 -0
  12. data/vendor/assets/javascripts/codemirror/addons/scroll/simplescrollbars.js +8 -2
  13. data/vendor/assets/javascripts/codemirror/addons/tern/tern.js +1 -1
  14. data/vendor/assets/javascripts/codemirror/keymaps/sublime.js +13 -0
  15. data/vendor/assets/javascripts/codemirror/keymaps/vim.js +43 -54
  16. data/vendor/assets/javascripts/codemirror/modes/asciiarmor.js +73 -0
  17. data/vendor/assets/javascripts/codemirror/modes/clike.js +2 -1
  18. data/vendor/assets/javascripts/codemirror/modes/clojure.js +1 -0
  19. data/vendor/assets/javascripts/codemirror/modes/cmake.js +97 -0
  20. data/vendor/assets/javascripts/codemirror/modes/commonlisp.js +1 -0
  21. data/vendor/assets/javascripts/codemirror/modes/css.js +1 -0
  22. data/vendor/assets/javascripts/codemirror/modes/groovy.js +1 -0
  23. data/vendor/assets/javascripts/codemirror/modes/htmlembedded.js +18 -76
  24. data/vendor/assets/javascripts/codemirror/modes/javascript.js +5 -0
  25. data/vendor/assets/javascripts/codemirror/modes/kotlin.js +1 -0
  26. data/vendor/assets/javascripts/codemirror/modes/less_test.js +51 -0
  27. data/vendor/assets/javascripts/codemirror/modes/mllike.js +1 -1
  28. data/vendor/assets/javascripts/codemirror/modes/properties.js +1 -1
  29. data/vendor/assets/javascripts/codemirror/modes/python.js +1 -0
  30. data/vendor/assets/javascripts/codemirror/modes/sass.js +1 -1
  31. data/vendor/assets/javascripts/codemirror/modes/scheme.js +1 -0
  32. data/vendor/assets/javascripts/codemirror/modes/scss_test.js +110 -0
  33. data/vendor/assets/javascripts/codemirror/modes/smarty.js +100 -107
  34. data/vendor/assets/javascripts/codemirror/modes/stylus.js +651 -332
  35. data/vendor/assets/javascripts/codemirror/modes/test.js +67 -0
  36. data/vendor/assets/javascripts/codemirror/modes/troff.js +82 -0
  37. data/vendor/assets/javascripts/codemirror/modes/vb.js +6 -5
  38. data/vendor/assets/javascripts/codemirror/modes/verilog.js +53 -53
  39. data/vendor/assets/stylesheets/codemirror.css +11 -8
  40. data/vendor/assets/stylesheets/codemirror/themes/mdn-like.css +1 -1
  41. metadata +9 -3
  42. data/vendor/assets/javascripts/codemirror/modes/smartymixed.js +0 -197
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: codemirror-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: '5.0'
4
+ version: '5.1'
5
5
  platform: ruby
6
6
  authors:
7
7
  - Nathan Fixler
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-02-28 00:00:00.000000000 Z
11
+ date: 2015-04-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: railties
@@ -245,6 +245,7 @@ files:
245
245
  - vendor/assets/javascripts/codemirror/addons/merge/merge.js
246
246
  - vendor/assets/javascripts/codemirror/addons/mode/loadmode.js
247
247
  - vendor/assets/javascripts/codemirror/addons/mode/multiplex.js
248
+ - vendor/assets/javascripts/codemirror/addons/mode/multiplex_test.js
248
249
  - vendor/assets/javascripts/codemirror/addons/mode/overlay.js
249
250
  - vendor/assets/javascripts/codemirror/addons/mode/simple.js
250
251
  - vendor/assets/javascripts/codemirror/addons/runmode/colorize.js
@@ -268,9 +269,11 @@ files:
268
269
  - vendor/assets/javascripts/codemirror/keymaps/sublime.js
269
270
  - vendor/assets/javascripts/codemirror/keymaps/vim.js
270
271
  - vendor/assets/javascripts/codemirror/modes/apl.js
272
+ - vendor/assets/javascripts/codemirror/modes/asciiarmor.js
271
273
  - vendor/assets/javascripts/codemirror/modes/asterisk.js
272
274
  - vendor/assets/javascripts/codemirror/modes/clike.js
273
275
  - vendor/assets/javascripts/codemirror/modes/clojure.js
276
+ - vendor/assets/javascripts/codemirror/modes/cmake.js
274
277
  - vendor/assets/javascripts/codemirror/modes/cobol.js
275
278
  - vendor/assets/javascripts/codemirror/modes/coffeescript.js
276
279
  - vendor/assets/javascripts/codemirror/modes/commonlisp.js
@@ -306,6 +309,7 @@ files:
306
309
  - vendor/assets/javascripts/codemirror/modes/jinja2.js
307
310
  - vendor/assets/javascripts/codemirror/modes/julia.js
308
311
  - vendor/assets/javascripts/codemirror/modes/kotlin.js
312
+ - vendor/assets/javascripts/codemirror/modes/less_test.js
309
313
  - vendor/assets/javascripts/codemirror/modes/livescript.js
310
314
  - vendor/assets/javascripts/codemirror/modes/lua.js
311
315
  - vendor/assets/javascripts/codemirror/modes/markdown.js
@@ -331,12 +335,12 @@ files:
331
335
  - vendor/assets/javascripts/codemirror/modes/rust.js
332
336
  - vendor/assets/javascripts/codemirror/modes/sass.js
333
337
  - vendor/assets/javascripts/codemirror/modes/scheme.js
338
+ - vendor/assets/javascripts/codemirror/modes/scss_test.js
334
339
  - vendor/assets/javascripts/codemirror/modes/shell.js
335
340
  - vendor/assets/javascripts/codemirror/modes/sieve.js
336
341
  - vendor/assets/javascripts/codemirror/modes/slim.js
337
342
  - vendor/assets/javascripts/codemirror/modes/smalltalk.js
338
343
  - vendor/assets/javascripts/codemirror/modes/smarty.js
339
- - vendor/assets/javascripts/codemirror/modes/smartymixed.js
340
344
  - vendor/assets/javascripts/codemirror/modes/solr.js
341
345
  - vendor/assets/javascripts/codemirror/modes/soy.js
342
346
  - vendor/assets/javascripts/codemirror/modes/sparql.js
@@ -345,11 +349,13 @@ files:
345
349
  - vendor/assets/javascripts/codemirror/modes/stex.js
346
350
  - vendor/assets/javascripts/codemirror/modes/stylus.js
347
351
  - vendor/assets/javascripts/codemirror/modes/tcl.js
352
+ - vendor/assets/javascripts/codemirror/modes/test.js
348
353
  - vendor/assets/javascripts/codemirror/modes/textile.js
349
354
  - vendor/assets/javascripts/codemirror/modes/tiddlywiki.js
350
355
  - vendor/assets/javascripts/codemirror/modes/tiki.js
351
356
  - vendor/assets/javascripts/codemirror/modes/toml.js
352
357
  - vendor/assets/javascripts/codemirror/modes/tornado.js
358
+ - vendor/assets/javascripts/codemirror/modes/troff.js
353
359
  - vendor/assets/javascripts/codemirror/modes/turtle.js
354
360
  - vendor/assets/javascripts/codemirror/modes/vb.js
355
361
  - vendor/assets/javascripts/codemirror/modes/vbscript.js
@@ -1,197 +0,0 @@
1
- // CodeMirror, copyright (c) by Marijn Haverbeke and others
2
- // Distributed under an MIT license: http://codemirror.net/LICENSE
3
-
4
- /**
5
- * @file smartymixed.js
6
- * @brief Smarty Mixed Codemirror mode (Smarty + Mixed HTML)
7
- * @author Ruslan Osmanov <rrosmanov at gmail dot com>
8
- * @version 3.0
9
- * @date 05.07.2013
10
- */
11
-
12
- // Warning: Don't base other modes on this one. This here is a
13
- // terrible way to write a mixed mode.
14
-
15
- (function(mod) {
16
- if (typeof exports == "object" && typeof module == "object") // CommonJS
17
- mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed"), require("../smarty/smarty"));
18
- else if (typeof define == "function" && define.amd) // AMD
19
- define(["../../lib/codemirror", "../htmlmixed/htmlmixed", "../smarty/smarty"], mod);
20
- else // Plain browser env
21
- mod(CodeMirror);
22
- })(function(CodeMirror) {
23
- "use strict";
24
-
25
- CodeMirror.defineMode("smartymixed", function(config) {
26
- var htmlMixedMode = CodeMirror.getMode(config, "htmlmixed");
27
- var smartyMode = CodeMirror.getMode(config, "smarty");
28
-
29
- var settings = {
30
- rightDelimiter: '}',
31
- leftDelimiter: '{'
32
- };
33
-
34
- if (config.hasOwnProperty("leftDelimiter")) {
35
- settings.leftDelimiter = config.leftDelimiter;
36
- }
37
- if (config.hasOwnProperty("rightDelimiter")) {
38
- settings.rightDelimiter = config.rightDelimiter;
39
- }
40
-
41
- function reEsc(str) { return str.replace(/[^\s\w]/g, "\\$&"); }
42
-
43
- var reLeft = reEsc(settings.leftDelimiter), reRight = reEsc(settings.rightDelimiter);
44
- var regs = {
45
- smartyComment: new RegExp("^" + reRight + "\\*"),
46
- literalOpen: new RegExp(reLeft + "literal" + reRight),
47
- literalClose: new RegExp(reLeft + "\/literal" + reRight),
48
- hasLeftDelimeter: new RegExp(".*" + reLeft),
49
- htmlHasLeftDelimeter: new RegExp("[^<>]*" + reLeft)
50
- };
51
-
52
- var helpers = {
53
- chain: function(stream, state, parser) {
54
- state.tokenize = parser;
55
- return parser(stream, state);
56
- },
57
-
58
- cleanChain: function(stream, state, parser) {
59
- state.tokenize = null;
60
- state.localState = null;
61
- state.localMode = null;
62
- return (typeof parser == "string") ? (parser ? parser : null) : parser(stream, state);
63
- },
64
-
65
- maybeBackup: function(stream, pat, style) {
66
- var cur = stream.current();
67
- var close = cur.search(pat),
68
- m;
69
- if (close > - 1) stream.backUp(cur.length - close);
70
- else if (m = cur.match(/<\/?$/)) {
71
- stream.backUp(cur.length);
72
- if (!stream.match(pat, false)) stream.match(cur[0]);
73
- }
74
- return style;
75
- }
76
- };
77
-
78
- var parsers = {
79
- html: function(stream, state) {
80
- var htmlTagName = state.htmlMixedState.htmlState.context && state.htmlMixedState.htmlState.context.tagName
81
- ? state.htmlMixedState.htmlState.context.tagName
82
- : null;
83
-
84
- if (!state.inLiteral && stream.match(regs.htmlHasLeftDelimeter, false) && htmlTagName === null) {
85
- state.tokenize = parsers.smarty;
86
- state.localMode = smartyMode;
87
- state.localState = smartyMode.startState(htmlMixedMode.indent(state.htmlMixedState, ""));
88
- return helpers.maybeBackup(stream, settings.leftDelimiter, smartyMode.token(stream, state.localState));
89
- } else if (!state.inLiteral && stream.match(settings.leftDelimiter, false)) {
90
- state.tokenize = parsers.smarty;
91
- state.localMode = smartyMode;
92
- state.localState = smartyMode.startState(htmlMixedMode.indent(state.htmlMixedState, ""));
93
- return helpers.maybeBackup(stream, settings.leftDelimiter, smartyMode.token(stream, state.localState));
94
- }
95
- return htmlMixedMode.token(stream, state.htmlMixedState);
96
- },
97
-
98
- smarty: function(stream, state) {
99
- if (stream.match(settings.leftDelimiter, false)) {
100
- if (stream.match(regs.smartyComment, false)) {
101
- return helpers.chain(stream, state, parsers.inBlock("comment", "*" + settings.rightDelimiter));
102
- }
103
- } else if (stream.match(settings.rightDelimiter, false)) {
104
- stream.eat(settings.rightDelimiter);
105
- state.tokenize = parsers.html;
106
- state.localMode = htmlMixedMode;
107
- state.localState = state.htmlMixedState;
108
- return "tag";
109
- }
110
-
111
- return helpers.maybeBackup(stream, settings.rightDelimiter, smartyMode.token(stream, state.localState));
112
- },
113
-
114
- inBlock: function(style, terminator) {
115
- return function(stream, state) {
116
- while (!stream.eol()) {
117
- if (stream.match(terminator)) {
118
- helpers.cleanChain(stream, state, "");
119
- break;
120
- }
121
- stream.next();
122
- }
123
- return style;
124
- };
125
- }
126
- };
127
-
128
- return {
129
- startState: function() {
130
- var state = htmlMixedMode.startState();
131
- return {
132
- token: parsers.html,
133
- localMode: null,
134
- localState: null,
135
- htmlMixedState: state,
136
- tokenize: null,
137
- inLiteral: false
138
- };
139
- },
140
-
141
- copyState: function(state) {
142
- var local = null, tok = (state.tokenize || state.token);
143
- if (state.localState) {
144
- local = CodeMirror.copyState((tok != parsers.html ? smartyMode : htmlMixedMode), state.localState);
145
- }
146
- return {
147
- token: state.token,
148
- tokenize: state.tokenize,
149
- localMode: state.localMode,
150
- localState: local,
151
- htmlMixedState: CodeMirror.copyState(htmlMixedMode, state.htmlMixedState),
152
- inLiteral: state.inLiteral
153
- };
154
- },
155
-
156
- token: function(stream, state) {
157
- if (stream.match(settings.leftDelimiter, false)) {
158
- if (!state.inLiteral && stream.match(regs.literalOpen, true)) {
159
- state.inLiteral = true;
160
- return "keyword";
161
- } else if (state.inLiteral && stream.match(regs.literalClose, true)) {
162
- state.inLiteral = false;
163
- return "keyword";
164
- }
165
- }
166
- if (state.inLiteral && state.localState != state.htmlMixedState) {
167
- state.tokenize = parsers.html;
168
- state.localMode = htmlMixedMode;
169
- state.localState = state.htmlMixedState;
170
- }
171
-
172
- var style = (state.tokenize || state.token)(stream, state);
173
- return style;
174
- },
175
-
176
- indent: function(state, textAfter) {
177
- if (state.localMode == smartyMode
178
- || (state.inLiteral && !state.localMode)
179
- || regs.hasLeftDelimeter.test(textAfter)) {
180
- return CodeMirror.Pass;
181
- }
182
- return htmlMixedMode.indent(state.htmlMixedState, textAfter);
183
- },
184
-
185
- innerMode: function(state) {
186
- return {
187
- state: state.localState || state.htmlMixedState,
188
- mode: state.localMode || htmlMixedMode
189
- };
190
- }
191
- };
192
- }, "htmlmixed", "smarty");
193
-
194
- CodeMirror.defineMIME("text/x-smarty", "smartymixed");
195
- // vim: et ts=2 sts=2 sw=2
196
-
197
- });